diff --git a/Android.mk b/Android.mk
index 349b79c..eeaad0c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,9 +22,10 @@
 LOCAL_STATIC_ANDROID_LIBRARIES := \
     android-support-v4 \
     android-support-v13 \
-    android-support-v7-recyclerview \
-    android-support-v7-preference \
     android-support-v7-appcompat \
+    android-support-v7-cardview \
+    android-support-v7-preference \
+    android-support-v7-recyclerview \
     android-support-v14-preference
 
 LOCAL_JAVA_LIBRARIES := \
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c596152..3c13d25 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -73,6 +73,7 @@
     <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
     <uses-permission android:name="android.permission.READ_SEARCH_INDEXABLES" />
     <uses-permission android:name="android.permission.OEM_UNLOCK_STATE" />
+    <uses-permission android:name="android.permission.MANAGE_USER_OEM_UNLOCK_STATE" />
     <uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
     <uses-permission android:name="android.permission.MANAGE_FINGERPRINT" />
@@ -166,8 +167,6 @@
                 android:value="com.android.settings.category.ia.homepage"/>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.network.NetworkDashboardFragment"/>
-            <meta-data android:name="com.android.settings.summary"
-                android:resource="@string/network_dashboard_summary"/>
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -193,8 +192,6 @@
                 android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"/>
             <meta-data android:name="com.android.settings.category"
                 android:value="com.android.settings.category.ia.homepage"/>
-            <meta-data android:name="com.android.settings.summary"
-                android:resource="@string/connected_devices_dashboard_summary"/>
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -210,10 +207,11 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".search2.SearchActivity"
+        <activity android:name=".search.SearchActivity"
                   android:label="@string/search_settings"
                   android:icon="@drawable/ic_search_history"
-                  android:parentActivityName="Settings">
+                  android:parentActivityName="Settings"
+                  android:theme="@style/Theme.Settings.NoActionBar">
         </activity>
 
         <!-- Top-level settings -->
@@ -268,7 +266,7 @@
 
         <activity android:name="Settings$ConfigureWifiSettingsActivity"
                 android:taskAffinity="com.android.settings"
-                android:label="@string/wifi_configure_titlebar"
+                android:label="@string/wifi_configure_settings_preference_title"
                 android:icon="@drawable/ic_settings_wireless"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:parentActivityName="Settings$WifiSettingsActivity">
@@ -545,7 +543,7 @@
         </activity>
 
         <activity android:name=".Settings$LanguageAndInputSettingsActivity"
-            android:label="@string/language_keyboard_settings_title"
+            android:label="@string/language_input_gesture_title"
             android:icon="@drawable/ic_settings_language"
             android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings$SystemDashboardActivity">
@@ -621,7 +619,7 @@
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="LanguageSettings"
-                android:label="@string/language_keyboard_settings_title"
+                android:label="@string/language_input_gesture_title"
                 android:clearTaskOnLaunch="true"
                 android:exported="true"
                 android:targetActivity="Settings$LanguageAndInputSettingsActivity">
@@ -766,14 +764,14 @@
                 android:icon="@drawable/ic_settings_notifications"
                 android:exported="true"
                 android:taskAffinity="">
-            <intent-filter android:priority="1">
+            <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.suggested.category.SETTINGS_ONLY" />
+                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.notification.ZenModeSettings" />
             <meta-data android:name="com.android.settings.dismiss"
-                android:value="30" />
+                android:value="8,12,30" />
             <meta-data android:name="com.android.settings.title"
                 android:resource="@string/zen_mode_automation_suggestion_title" />
             <meta-data android:name="com.android.settings.summary"
@@ -792,14 +790,32 @@
                   android:label="@string/wallpaper_settings_title"
                   android:icon="@drawable/ic_wallpaper"
                   android:theme="@android:style/Theme.NoDisplay">
-            <intent-filter android:priority="1">
+            <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.suggested.category.SETTINGS_ONLY" />
+                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
             </intent-filter>
             <meta-data android:name="com.android.settings.title"
                        android:resource="@string/wallpaper_suggestion_title" />
             <meta-data android:name="com.android.settings.summary"
                        android:resource="@string/wallpaper_suggestion_summary" />
+            <meta-data android:name="com.android.settings.dismiss"
+                       android:value="3,7,30" />
+        </activity>
+
+        <activity android:name=".support.NewDeviceIntroSuggestionActivity"
+                  android:label="@string/new_device_suggestion_title"
+                  android:icon="@drawable/ic_new_releases_24dp"
+                  android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.dismiss"
+                       android:value="0,4" />
+            <meta-data android:name="com.android.settings.title"
+                       android:resource="@string/new_device_suggestion_title" />
+            <meta-data android:name="com.android.settings.summary"
+                       android:resource="@string/new_device_suggestion_summary" />
         </activity>
 
         <activity android:name="Settings$ZenModeScheduleRuleSettingsActivity"
@@ -958,11 +974,6 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
-            <intent-filter android:priority="200">
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.ia.apps" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.ManageApplications" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1502,17 +1513,22 @@
         <!-- Second and third-level settings -->
 
         <!-- Lock screen settings -->
-        <activity android:name="ConfirmDeviceCredentialActivity"
+        <activity android:name=".password.ConfirmDeviceCredentialActivity"
             android:exported="true"
             android:theme="@android:style/Theme.NoDisplay">
             <intent-filter android:priority="1">
                 <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
+                <action android:name="android.app.action.CONFIRM_FRP_CREDENTIAL" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+        <!-- Activity alias for compatibility -->
+        <activity-alias android:name=".ConfirmDeviceCredentialActivity"
+            android:targetActivity=".password.ConfirmDeviceCredentialActivity"
+            android:exported="true" />
 
         <!-- Note this must not be exported since it authenticates the given user -->
-        <activity android:name="ConfirmDeviceCredentialActivity$InternalActivity"
+        <activity android:name=".password.ConfirmDeviceCredentialActivity$InternalActivity"
             android:exported="false"
             android:permission="android.permission.MANAGE_USERS"
             android:resizeableActivity="false"
@@ -1532,7 +1548,7 @@
             android:icon="@drawable/ic_suggested_notifications">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.suggested.category.DEFAULT_SETUP_WIZARD_ONLY" />
+                <category android:name="com.android.settings.suggested.category.LOCK_SCREEN_REDACTION" />
             </intent-filter>
             <meta-data android:name="com.android.settings.require_user_type"
                        android:value="primary" />
@@ -1543,7 +1559,7 @@
         </activity>
 
         <activity android:name=".notification.RedactionInterstitial"
-            android:theme="@style/SetupWizardTheme.Light" />
+            android:theme="@style/GlifTheme.Light" />
 
         <activity android:name=".notification.RedactionSettingsStandalone"
                   android:exported="true">
@@ -1553,12 +1569,12 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="ConfirmLockPattern"
-            android:theme="@style/SetupWizardTheme.Light"/>
+        <activity android:name=".password.ConfirmLockPattern"
+            android:theme="@style/GlifTheme.Light"/>
 
-        <activity android:name="ConfirmLockPassword"
+        <activity android:name=".password.ConfirmLockPassword"
             android:windowSoftInputMode="stateHidden|adjustResize"
-            android:theme="@style/SetupWizardTheme.Light"/>
+            android:theme="@style/GlifTheme.Light"/>
 
         <activity
             android:name=".Settings$FingerprintSuggestionActivity"
@@ -1566,10 +1582,10 @@
             android:icon="@drawable/ic_suggestion_fingerprint">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.suggested.category.SETTINGS_ONLY" />
+                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
             </intent-filter>
             <meta-data android:name="com.android.settings.dismiss"
-                android:value="10,30" />
+                android:value="5,9,30" />
             <meta-data android:name="com.android.settings.require_feature"
                 android:value="android.hardware.fingerprint" />
             <meta-data android:name="com.android.settings.title"
@@ -1590,7 +1606,7 @@
         <activity android:name=".fingerprint.SetupFingerprintEnrollIntroduction"
             android:exported="true"
             android:permission="android.permission.MANAGE_FINGERPRINT"
-            android:theme="@style/SetupWizardTheme.Light">
+            android:theme="@style/GlifTheme.Light">
             <intent-filter>
                 <action android:name="android.settings.FINGERPRINT_SETUP" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1598,19 +1614,19 @@
         </activity>
 
         <!-- Note this must not be exported since it returns the password in the intent -->
-        <activity android:name="ConfirmLockPattern$InternalActivity"
+        <activity android:name=".password.ConfirmLockPattern$InternalActivity"
             android:exported="false"
-            android:theme="@style/SetupWizardTheme.Light"/>
+            android:theme="@style/GlifTheme.Light"/>
 
         <!-- Note this must not be exported since it returns the password in the intent -->
-        <activity android:name="ConfirmLockPassword$InternalActivity"
+        <activity android:name=".password.ConfirmLockPassword$InternalActivity"
             android:exported="false"
             android:windowSoftInputMode="adjustResize"
-            android:theme="@style/SetupWizardTheme.Light"/>
+            android:theme="@style/GlifTheme.Light"/>
 
-        <activity android:name="SetupChooseLockGeneric"
+        <activity android:name=".password.SetupChooseLockGeneric"
             android:taskAffinity="com.android.wizard"
-            android:theme="@style/SetupWizardTheme.Light"
+            android:theme="@style/GlifTheme.Light"
             android:label="@string/lock_settings_picker_title">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.SETUP_LOCK_SCREEN" />
@@ -1618,7 +1634,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="ChooseLockGeneric"
+        <activity android:name=".password.ChooseLockGeneric"
             android:label="@string/lockpassword_choose_lock_generic_header"
             android:excludeFromRecents="true"
             android:exported="false" />
@@ -1653,10 +1669,10 @@
             android:icon="@drawable/ic_suggestion_fingerprint">
             <intent-filter android:priority="2">
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.suggested.category.LOCK_SCREEN" />
+                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
             </intent-filter>
             <meta-data android:name="com.android.settings.dismiss"
-                       android:value="0,30" />
+                       android:value="2,6,30" />
             <meta-data android:name="com.android.settings.require_feature"
                 android:value="android.hardware.fingerprint" />
             <meta-data android:name="com.android.settings.title"
@@ -1665,38 +1681,38 @@
                 android:resource="@string/suggested_fingerprint_lock_settings_summary" />
         </activity>
 
-        <activity android:name="ChooseLockGeneric$InternalActivity" android:exported="false"
+        <activity android:name=".password.ChooseLockGeneric$InternalActivity"
+            android:exported="false"
             android:label="@string/lockpassword_choose_lock_generic_header"
-            android:excludeFromRecents="true"
-        />
+            android:excludeFromRecents="true" />
 
-        <activity android:name="SetupChooseLockPattern"
+        <activity android:name=".password.SetupChooseLockPattern"
             android:exported="false"
             android:taskAffinity="com.android.wizard"
-            android:theme="@style/SetupWizardTheme.Light" />
+            android:theme="@style/GlifTheme.Light" />
 
-        <activity android:name="ChooseLockPattern"
+        <activity android:name=".password.ChooseLockPattern"
             android:exported="false"
-            android:theme="@style/SetupWizardTheme.Light" />
+            android:theme="@style/GlifTheme.Light" />
 
-        <activity android:name="SetupChooseLockPassword"
+        <activity android:name=".password.SetupChooseLockPassword"
             android:exported="false"
             android:taskAffinity="com.android.wizard"
-            android:theme="@style/SetupWizardTheme.Light"
+            android:theme="@style/GlifTheme.Light"
             android:windowSoftInputMode="stateVisible|adjustResize" />
 
-        <activity android:name="ChooseLockPassword"
+        <activity android:name=".password.ChooseLockPassword"
             android:exported="false"
-            android:theme="@style/SetupWizardTheme.Light"
+            android:theme="@style/GlifTheme.Light"
             android:windowSoftInputMode="stateVisible|adjustResize"/>
 
         <activity android:name=".SetupEncryptionInterstitial"
             android:label="@string/encryption_interstitial_header"
             android:taskAffinity="com.android.wizard"
-            android:theme="@style/SetupWizardTheme.Light"/>
+            android:theme="@style/GlifTheme.Light"/>
 
         <activity android:name=".EncryptionInterstitial"
-            android:theme="@style/SetupWizardTheme.Light" />
+            android:theme="@style/GlifTheme.Light" />
 
         <activity android:name=".Settings$StatusActivity"
                 android:label="@string/device_status_activity_title"
@@ -2535,8 +2551,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
                 android:value="com.android.settings.category.ia.apps"/>
-            <meta-data android:name="com.android.settings.summary"
-                android:resource="@string/summary_empty"/>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.notification.ConfigureNotificationSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2600,7 +2614,6 @@
 
         <!-- Show application-level notification settings (app passed in as extras) -->
         <activity android:name="Settings$AppNotificationSettingsActivity"
-                android:label="@string/app_notifications_title"
                 android:exported="true">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APP_NOTIFICATION_SETTINGS" />
@@ -2616,7 +2629,6 @@
 
         <!-- Show channel-level notification settings (channel passed in as extras) -->
         <activity android:name="Settings$ChannelNotificationSettingsActivity"
-                  android:label="@string/app_notifications_title"
                   android:exported="true">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.CHANNEL_NOTIFICATION_SETTINGS" />
@@ -2786,12 +2798,12 @@
                   android:taskAffinity="">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.suggested.category.SETTINGS_ONLY" />
+                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.WifiCallingSettings" />
             <meta-data android:name="com.android.settings.dismiss"
-                android:value="10" />
+                android:value="10,14,30" />
             <meta-data android:name="com.android.settings.title"
                 android:resource="@string/wifi_calling_suggestion_title" />
             <meta-data android:name="com.android.settings.summary"
@@ -2899,7 +2911,7 @@
                 <action android:name="android.settings.HOME_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter android:priority="130">
+            <intent-filter android:priority="120">
                 <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
@@ -2964,6 +2976,11 @@
                        android:value="com.android.settings.deletionhelper.AutomaticStorageManagerSettings" />
         </activity>
 
+        <activity android:name="Settings$LegacySupportActivity">
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+            android:value="com.android.settings.dashboard.SupportFragment"/>
+        </activity>
+
         <!-- Information architecture host activities -->
 
         <!-- Alias for battery settings in new IA. Remove and merge metadata into TargetActivity -->
@@ -3013,17 +3030,20 @@
                        android:resource="@string/system_dashboard_summary"/>
         </activity>
 
-        <activity android:name=".Settings$SupportDashboardActivity"
+        <activity android:name=".support.SupportDashboardActivity"
                   android:label="@string/page_tab_title_support"
                   android:icon="@drawable/ic_help"
+                  android:theme="@android:style/Theme.NoDisplay"
                   android:enabled="@bool/config_support_enabled">
             <intent-filter android:priority="-2">
                 <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.settings.action.SUPPORT_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <meta-data android:name="com.android.settings.category"
                        android:value="com.android.settings.category.ia.homepage"/>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.dashboard.SupportFragment"/>
             <meta-data android:name="com.android.settings.summary"
                        android:resource="@string/support_summary"/>
         </activity>
@@ -3088,6 +3108,31 @@
             android:permission="android.permission.DUMP"
             android:enabled="@bool/config_has_help" />
 
+
+        <!-- Activities for moves/gestures suggestions -->
+        <activity
+            android:name=".Settings$CameraLiftTriggerSuggestionActivity"
+            android:label="@string/camera_lift_trigger_title"
+            android:icon="@drawable/ic_settings_camera"
+            android:enabled="@bool/config_cameraLiftTriggerAvailable">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.GESTURE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.dismiss"
+                       android:value="3,7,30" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.gestures.CameraLiftTriggerSettings"/>
+            <meta-data android:name="com.android.settings.title"
+                       android:resource="@string/camera_lift_trigger_title" />
+            <meta-data android:name="com.android.settings.summary"
+                       android:resource="@string/camera_lift_trigger_suggestion_summary" />
+        </activity>
+
         <activity android:name=".applications.autofill.AutofillPickerActivity"
                 android:excludeFromRecents="true"
                 android:launchMode="singleInstance"
diff --git a/res/drawable-nodpi/gesture_camera_lift b/res/drawable-nodpi/gesture_camera_lift
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/drawable-nodpi/gesture_camera_lift
diff --git a/res/drawable/ic_add_24dp.xml b/res/drawable/ic_add_24dp.xml
index 2014603..f87a882 100644
--- a/res/drawable/ic_add_24dp.xml
+++ b/res/drawable/ic_add_24dp.xml
@@ -18,7 +18,7 @@
         android:height="24dp"
         android:viewportWidth="24"
         android:viewportHeight="24"
-        android:tint="?android:attr/colorAccent">
+        android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
diff --git a/res/drawable/ic_battery_alert_24dp.xml b/res/drawable/ic_battery_alert_24dp.xml
new file mode 100644
index 0000000..cadd882
--- /dev/null
+++ b/res/drawable/ic_battery_alert_24dp.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ 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
+  -->
+<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/colorError">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.67,4L14,4L14,2h-4v2L8.33,4C7.6,4 7,4.6 7,5.33v15.33C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33L17,5.33C17,4.6 16.4,4 15.67,4zM13,18h-2v-2h2v2zM13,14h-2L11,9h2v5z"/>
+</vector>
diff --git a/res/drawable/ic_chevron_right_24dp.xml b/res/drawable/ic_chevron_right_24dp.xml
new file mode 100644
index 0000000..63532cb
--- /dev/null
+++ b/res/drawable/ic_chevron_right_24dp.xml
@@ -0,0 +1,27 @@
+<!--
+  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.
+  -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:tint="?android:attr/colorControlNormal">
+    <path android:fillColor="#FF000000"
+          android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z" />
+</vector>
diff --git a/res/drawable/ic_fingerprint_24dp.xml b/res/drawable/ic_fingerprint_24dp.xml
index 714a05e..e52f0f5 100644
--- a/res/drawable/ic_fingerprint_24dp.xml
+++ b/res/drawable/ic_fingerprint_24dp.xml
@@ -18,7 +18,7 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?android:attr/colorAccent">
+        android:tint="?android:attr/colorControlNormal">
     <path
         android:pathData="M17.81,4.47c-0.08,0 -0.16,-0.02 -0.23,-0.06C15.66,3.42 14,3 12.01,3c-1.98,0 -3.86,0.47 -5.57,1.41 -0.24,0.13 -0.54,0.04 -0.68,-0.2 -0.13,-0.24 -0.04,-0.55 0.2,-0.68C7.82,2.52 9.86,2 12.01,2c2.13,0 3.99,0.47 6.03,1.52 0.25,0.13 0.34,0.43 0.21,0.67 -0.09,0.18 -0.26,0.28 -0.44,0.28zM3.5,9.72c-0.1,0 -0.2,-0.03 -0.29,-0.09 -0.23,-0.16 -0.28,-0.47 -0.12,-0.7 0.99,-1.4 2.25,-2.5 3.75,-3.27C9.98,4.04 14,4.03 17.15,5.65c1.5,0.77 2.76,1.86 3.75,3.25 0.16,0.22 0.11,0.54 -0.12,0.7 -0.23,0.16 -0.54,0.11 -0.7,-0.12 -0.9,-1.26 -2.04,-2.25 -3.39,-2.94 -2.87,-1.47 -6.54,-1.47 -9.4,0.01 -1.36,0.7 -2.5,1.7 -3.4,2.96 -0.08,0.14 -0.23,0.21 -0.39,0.21zM9.75,21.79c-0.13,0 -0.26,-0.05 -0.35,-0.15 -0.87,-0.87 -1.34,-1.43 -2.01,-2.64 -0.69,-1.23 -1.05,-2.73 -1.05,-4.34 0,-2.97 2.54,-5.39 5.66,-5.39s5.66,2.42 5.66,5.39c0,0.28 -0.22,0.5 -0.5,0.5s-0.5,-0.22 -0.5,-0.5c0,-2.42 -2.09,-4.39 -4.66,-4.39 -2.57,0 -4.66,1.97 -4.66,4.39 0,1.44 0.32,2.77 0.93,3.85 0.64,1.15 1.08,1.64 1.85,2.42 0.19,0.2 0.19,0.51 0,0.71 -0.11,0.1 -0.24,0.15 -0.37,0.15zM16.92,19.94c-1.19,0 -2.24,-0.3 -3.1,-0.89 -1.49,-1.01 -2.38,-2.65 -2.38,-4.39 0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5c0,1.41 0.72,2.74 1.94,3.56 0.71,0.48 1.54,0.71 2.54,0.71 0.24,0 0.64,-0.03 1.04,-0.1 0.27,-0.05 0.53,0.13 0.58,0.41 0.05,0.27 -0.13,0.53 -0.41,0.58 -0.57,0.11 -1.07,0.12 -1.21,0.12zM14.91,22c-0.04,0 -0.09,-0.01 -0.13,-0.02 -1.59,-0.44 -2.63,-1.03 -3.72,-2.1 -1.4,-1.39 -2.17,-3.24 -2.17,-5.22 0,-1.62 1.38,-2.94 3.08,-2.94 1.7,0 3.08,1.32 3.08,2.94 0,1.07 0.93,1.94 2.08,1.94s2.08,-0.87 2.08,-1.94c0,-3.77 -3.25,-6.83 -7.25,-6.83 -2.84,0 -5.44,1.58 -6.61,4.03 -0.39,0.81 -0.59,1.76 -0.59,2.8 0,0.78 0.07,2.01 0.67,3.61 0.1,0.26 -0.03,0.55 -0.29,0.64 -0.26,0.1 -0.55,-0.04 -0.64,-0.29 -0.49,-1.31 -0.73,-2.61 -0.73,-3.96 0,-1.2 0.23,-2.29 0.68,-3.24 1.33,-2.79 4.28,-4.6 7.51,-4.6 4.55,0 8.25,3.51 8.25,7.83 0,1.62 -1.38,2.94 -3.08,2.94s-3.08,-1.32 -3.08,-2.94c0,-1.07 -0.93,-1.94 -2.08,-1.94s-2.08,0.87 -2.08,1.94c0,1.71 0.66,3.31 1.87,4.51 0.95,0.94 1.86,1.46 3.27,1.85 0.27,0.07 0.42,0.35 0.35,0.61 -0.05,0.23 -0.26,0.38 -0.47,0.38z"
         android:fillColor="#000000"/>
diff --git a/res/drawable/ic_new_releases_24dp.xml b/res/drawable/ic_new_releases_24dp.xml
new file mode 100644
index 0000000..b8fbb20
--- /dev/null
+++ b/res/drawable/ic_new_releases_24dp.xml
@@ -0,0 +1,26 @@
+<!--
+  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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path android:fillColor="#FF000000"
+          android:pathData="M23,12l-2.44,-2.78 0.34,-3.68 -3.61,-0.82 -1.89,-3.18L12,3 8.6,1.54 6.71,4.72l-3.61,0.81 0.34,3.68L1,12l2.44,2.78 -0.34,3.69 3.61,0.82 1.89,3.18L12,21l3.4,1.46 1.89,-3.18 3.61,-0.82 -0.34,-3.68L23,12zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" />
+</vector>
diff --git a/res/drawable/ic_password.xml b/res/drawable/ic_password.xml
new file mode 100644
index 0000000..57591c2
--- /dev/null
+++ b/res/drawable/ic_password.xml
@@ -0,0 +1,34 @@
+<!--
+    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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M21.5,9.39l-1.63,0l0.81,-1.42l-0.86,-0.5l-0.82,1.42l-0.82,-1.42l-0.86,0.5l0.81,1.42l-1.63,0l0,1l1.63,0l-0.81,1.41l0.86,0.5l0.82,-1.41l0.82,1.41l0.86,-0.5l-0.81,-1.41l1.63,0z" />
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M13.68,7.97l-0.86,-0.5l-0.82,1.42l-0.82,-1.42l-0.86,0.5l0.81,1.42l-1.63,0l0,1l1.63,0l-0.81,1.41l0.86,0.5l0.82,-1.41l0.82,1.41l0.86,-0.5l-0.81,-1.41l1.63,0l0,-1l-1.63,0z" />
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M6.68,7.97l-0.86,-0.5l-0.82,1.42l-0.82,-1.42l-0.86,0.5l0.81,1.42l-1.63,0l0,1l1.63,0l-0.81,1.41l0.86,0.5l0.82,-1.41l0.82,1.41l0.86,-0.5l-0.81,-1.41l1.63,0l0,-1l-1.63,0z" />
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M21,17.89H3c-0.28,0 -0.5,-0.22 -0.5,-0.5v-1c0,-0.28 0.22,-0.5 0.5,-0.5h18c0.28,0 0.5,0.22 0.5,0.5v1C21.5,17.66 21.28,17.89 21,17.89z" />
+</vector>
diff --git a/res/drawable/ic_pattern.xml b/res/drawable/ic_pattern.xml
new file mode 100644
index 0000000..003111e
--- /dev/null
+++ b/res/drawable/ic_pattern.xml
@@ -0,0 +1,37 @@
+<!--
+    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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M4,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M4,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M12,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M20,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M20,18c-0.93,0 -1.7,0.64 -1.93,1.5h-4.14c-0.22,-0.86 -1,-1.5 -1.93,-1.5s-1.7,0.64 -1.93,1.5H5.93c-0.05,-0.18 -0.12,-0.35 -0.21,-0.51l5.28,-5.28C11.29,13.89 11.63,14 12,14c1.1,0 2,-0.9 2,-2c0,-0.37 -0.11,-0.71 -0.28,-1.01l5.28,-5.28C19.29,5.89 19.63,6 20,6c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2c0,0.37 0.11,0.71 0.28,1.01l-5.28,5.28C12.71,10.11 12.37,10 12,10c-1.1,0 -2,0.9 -2,2c0,0.37 0.11,0.71 0.28,1.01l-5.28,5.28C4.71,18.11 4.37,18 4,18c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c0.93,0 1.7,-0.64 1.93,-1.5h4.14c0.22,0.86 1,1.5 1.93,1.5s1.7,-0.64 1.93,-1.5h4.14c0.22,0.86 1,1.5 1.93,1.5c1.1,0 2,-0.9 2,-2S21.1,18 20,18z" />
+</vector>
diff --git a/res/drawable/ic_pin.xml b/res/drawable/ic_pin.xml
new file mode 100644
index 0000000..0176019
--- /dev/null
+++ b/res/drawable/ic_pin.xml
@@ -0,0 +1,25 @@
+<!--
+    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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M20,4L4,4A2,2 0,0 0,2 6L2,18a2,2 0,0 0,2 2L20,20a2,2 0,0 0,2 -2L22,6A2,2 0,0 0,20 4ZM7.1,15L5.9,15L5.9,10.2L4.7,10.2L4.7,9L7.1,9v6ZM13.2,11.4A1.2,1.2 0,0 1,12 12.6L10.8,12.6v1.2h2.4L13.2,15L9.6,15L9.6,12.6a1.2,1.2 0,0 1,1.2 -1.2L12,11.4L12,10.2L9.6,10.2L9.6,9L12,9a1.2,1.2 0,0 1,1.2 1.2v1.2ZM19.3,11.1a0.9,0.9 0,0 1,-0.9 0.9,0.9 0.9,0 0,1 0.9,0.9v0.9A1.2,1.2 0,0 1,18.1 15L15.7,15L15.7,13.8h2.4L18.1,12.6L16.9,12.6L16.9,11.4h1.2L18.1,10.2L15.7,10.2L15.7,9h2.4a1.2,1.2 0,0 1,1.2 1.2v0.9Z" />
+</vector>
diff --git a/res/drawable/ic_settings_accessibility.xml b/res/drawable/ic_settings_accessibility.xml
index 34c0bdd..1570312 100644
--- a/res/drawable/ic_settings_accessibility.xml
+++ b/res/drawable/ic_settings_accessibility.xml
@@ -21,5 +21,5 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M12.0,2.0c1.1,0.0 2.0,0.9 2.0,2.0s-0.9,2.0 -2.0,2.0 -2.0,-0.9 -2.0,-2.0 0.9,-2.0 2.0,-2.0zm9.0,7.0l-6.0,0.0l0.0,13.0l-2.0,0.0l0.0,-6.0l-2.0,0.0l0.0,6.0L9.0,22.0L9.0,9.0L3.0,9.0L3.0,7.0l18.0,0.0l0.0,2.0z"/>
+        android:pathData="M20.5 6c-2.61.7-5.67 1-8.5 1s-5.89-.3-8.5-1L3 8c1.86.5 4 .83 6 1v13h2v-6h2v6h2V9c2-.17 4.14-.5 6-1l-.5-2zM12 6c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2z"/>
 </vector>
diff --git a/res/drawable/ic_suggested_notifications.xml b/res/drawable/ic_suggested_notifications.xml
index 00bd736..5a8f0e9 100644
--- a/res/drawable/ic_suggested_notifications.xml
+++ b/res/drawable/ic_suggested_notifications.xml
@@ -14,12 +14,11 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/suw_color_accent_light">
+    android:width="24.0dp"
+    android:height="24.0dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12.0,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0l-4.0,0.0c0.0,1.0 0.89,2.0 2.0,2.0zm6.0,-6.0l0.0,-5.0c0.0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4.0c0.0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.0,0.67 -1.5,1.5l0.0,0.68C7.63,5.36 6.0,7.92 6.0,11.0l0.0,5.0l-2.0,2.0l0.0,1.0l16.0,0.0l0.0,-1.0l-2.0,-2.0z"/>
+        android:fillColor="@color/suw_color_accent_light"
+        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4a2,2 0,0 0,2 2zM18,16v-5c0,-3.07 -1.64,-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.68C7.63,5.36 6,7.92 6,11v5l-2.15,2.15a0.5,0.5 0,0 0,0.35 0.85h15.6c0.45,0 0.67,-0.54 0.35,-0.85L18,16z"/>
 </vector>
diff --git a/res/drawable/ic_suggestion_fingerprint.xml b/res/drawable/ic_suggestion_fingerprint.xml
index feebd94..bf5ee2e 100644
--- a/res/drawable/ic_suggestion_fingerprint.xml
+++ b/res/drawable/ic_suggestion_fingerprint.xml
@@ -18,7 +18,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="32dp"
         android:height="32dp"
-        android:tint="?android:attr/colorAccent"
+        android:tint="?android:attr/colorControlNormal"
         android:viewportWidth="32.0"
         android:viewportHeight="32.0">
     <path
diff --git a/res/layout/account_type_preference.xml b/res/drawable/selectable_card.xml
similarity index 63%
copy from res/layout/account_type_preference.xml
copy to res/drawable/selectable_card.xml
index f7ba859..9c19877 100644
--- a/res/layout/account_type_preference.xml
+++ b/res/drawable/selectable_card.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!--
+     Copyright (C) 2016 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,9 +15,8 @@
      limitations under the License.
 -->
 
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/accountTypeIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:contentDescription="@null" />
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:drawable="?android:attr/colorBackground"/>
+</ripple>
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index 63b7e48..0cc9339 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -22,7 +22,6 @@
     <include layout="@layout/confirm_lock_background_base" />
 
     <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/topLayout"
         android:orientation="vertical"
         android:layout_width="match_parent"
@@ -45,18 +44,12 @@
             android:layout_marginEnd="24dp"
             android:layout_marginTop="8dp"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"/>
+            android:layout_height="wrap_content"/>
 
         <FrameLayout
-            android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="horizontal">
+            android:layout_height="0dp"
+            android:layout_weight="1">
 
             <Button
                 style="@android:style/Widget.Material.Button.Borderless"
@@ -69,24 +62,31 @@
                 android:layout_marginEnd="8dp"
                 android:layout_marginBottom="14dp"/>
 
-            <EditText android:id="@+id/password_entry"
-                android:layout_width="208dp"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal|bottom"
-                android:layout_marginBottom="26dp"
-                android:inputType="textPassword"
-                android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"
-                android:gravity="center"
-                android:textSize="16sp"
-                style="@style/TextAppearance.PasswordEntry"/>
+                android:layout_gravity="center_vertical"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
 
-            <TextView style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
-                android:accessibilityLiveRegion="polite"
-                android:id="@+id/errorText"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal|bottom"
-                android:layout_marginBottom="10dp"/>
+                <com.android.settings.widget.ScrollToParentEditText
+                    android:id="@+id/password_entry"
+                    android:layout_width="208dp"
+                    android:layout_height="wrap_content"
+                    android:inputType="textPassword"
+                    android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"
+                    android:gravity="center"
+                    android:textSize="16sp"
+                    style="@style/TextAppearance.PasswordEntry"/>
+
+                <TextView style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+                    android:accessibilityLiveRegion="polite"
+                    android:id="@+id/errorText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"/>
+
+            </LinearLayout>
 
             <ImageView
                 android:id="@+id/fingerprintIcon"
diff --git a/res/layout-land/fingerprint_enroll_finish.xml b/res/layout-land/fingerprint_enroll_finish.xml
index ca1a2d2..bb7e295 100644
--- a/res/layout-land/fingerprint_enroll_finish.xml
+++ b/res/layout-land/fingerprint_enroll_finish.xml
@@ -20,6 +20,7 @@
     android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout="@layout/suw_glif_blank_template"
     style="?attr/fingerprint_layout_theme">
 
     <LinearLayout
@@ -28,18 +29,34 @@
         android:layout_height="match_parent"
         android:orientation="horizontal"
         android:clipToPadding="false"
-        android:clipChildren="false"
-        android:paddingBottom="0dp">
+        android:clipChildren="false">
 
         <LinearLayout
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
+            android:layout_height="match_parent"
             android:clipChildren="false"
             android:clipToPadding="false"
             android:orientation="vertical">
 
+            <ImageView
+                android:id="@+id/suw_layout_icon"
+                style="@style/SuwGlifIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="0dp"
+                android:layout_marginRight="0dp"
+                android:contentDescription="@null"
+                android:src="@drawable/ic_fingerprint_header"/>
+
+            <TextView
+                android:id="@+id/suw_layout_title"
+                style="@style/SuwGlifHeaderTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="0dp"
+                android:layout_marginRight="0dp"/>
+
             <TextView
                 android:id="@+id/message"
                 style="@style/SuwDescription.Glif"
@@ -47,15 +64,10 @@
                 android:layout_height="wrap_content"
                 android:text="@string/security_settings_fingerprint_enroll_finish_message"/>
 
-            <TextView
-                android:id="@+id/message_secondary"
-                style="@style/SuwDescription.Glif"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/suw_description_glif_margin_top"
-                android:text="@string/setup_fingerprint_enroll_finish_message_secondary"
-                android:textColor="?android:attr/textColorSecondary"
-                android:visibility="gone" />
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -89,21 +101,20 @@
 
         </LinearLayout>
 
-        <FrameLayout
+        <com.android.setupwizardlib.view.FillContentLayout
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical">
+            android:layout_height="match_parent">
 
             <ImageView
                 android:id="@+id/fingerprint_in_app_indicator"
-                android:layout_width="@dimen/fingerprint_in_app_indicator_size"
-                android:layout_height="@dimen/fingerprint_in_app_indicator_size"
-                android:layout_gravity="center_horizontal"
+                style="@style/SuwContentIllustration"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:contentDescription="@android:string/fingerprint_icon_content_description"
                 android:src="@drawable/fp_app_indicator" />
 
-        </FrameLayout>
+        </com.android.setupwizardlib.view.FillContentLayout>
 
     </LinearLayout>
 
diff --git a/res/layout/account_header.xml b/res/layout/account_header.xml
deleted file mode 100755
index 818d47c..0000000
--- a/res/layout/account_header.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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"
-        style="@style/EntityHeader"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:gravity="center_vertical"
-        android:paddingTop="24dip"
-        android:paddingBottom="24dip"
-        android:orientation="horizontal">
-
-        <LinearLayout
-          android:id="@+id/icon_container"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:minWidth="56dp"
-          android:orientation="horizontal"
-          android:paddingEnd="12dp"
-          android:paddingTop="12dp"
-          android:paddingBottom="12dp">
-                <ImageView
-                  android:id="@android:id/icon"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:maxWidth="48dp"
-                  android:maxHeight="48dp"/>
-        </LinearLayout>
-
-        <TextView
-          android:id="@android:id/title"
-          style="@style/TextAppearance.EntityHeaderTitle"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:singleLine="true"/>
-
-</LinearLayout>
diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml
deleted file mode 100644
index 2db23e4..0000000
--- a/res/layout/app_details.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2016 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:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <!-- App snippet with buttons -->
-    <RelativeLayout
-        android:id="@+id/app_snippet"
-        style="@style/EntityHeader"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="0dp"
-        android:paddingTop="24dp"
-        android:paddingBottom="24dp">
-        <ImageView
-            android:id="@+id/app_detail_icon"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
-            android:scaleType="fitXY"
-            android:layout_gravity="center_horizontal"
-            android:antialias="true"/>
-
-        <LinearLayout
-            android:id="@+id/app_detail_links"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:orientation="vertical">
-
-            <ImageButton
-                android:id="@+id/right_button"
-                style="?android:attr/actionOverflowButtonStyle"
-                android:layout_width="wrap_content"
-                android:layout_weight="1"
-                android:layout_height="0dp"
-                android:minWidth="@dimen/min_tap_target_size"
-                android:src="@drawable/ic_settings_24dp"
-                android:tint="?android:attr/colorAccent"/>
-
-            <ImageButton
-                android:id="@+id/left_button"
-                style="?android:attr/actionOverflowButtonStyle"
-                android:layout_width="wrap_content"
-                android:layout_weight="1"
-                android:layout_height="0dp"
-                android:minWidth="@dimen/min_tap_target_size"
-                android:src="@null"
-                android:tint="?android:attr/colorAccent"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_toEndOf="@id/app_detail_icon"
-            android:layout_toStartOf="@id/app_detail_links"
-            android:paddingStart="24dp"
-            android:paddingEnd="24dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/app_detail_title"
-                style="@style/TextAppearance.EntityHeaderTitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:singleLine="false"
-                android:ellipsize="marquee"
-                android:gravity="start"
-                android:textDirection="locale"
-                android:paddingTop="8dp"/>
-
-            <TextView
-                android:id="@+id/install_type"
-                android:visibility="gone"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="start"
-                android:singleLine="true"
-                android:ellipsize="marquee"
-                android:textAppearance="@android:style/TextAppearance.Material.Body1"
-                android:textColor="?android:attr/textColorSecondary"/>
-
-            <TextView
-                android:id="@+id/app_detail_summary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="start"
-                android:singleLine="true"
-                android:ellipsize="marquee"
-                android:textAppearance="@android:style/TextAppearance.Material.Body1"
-                android:textColor="?android:attr/textColorSecondary"/>
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/app_domains_dialog.xml b/res/layout/app_domains_dialog.xml
index f9c6b64..d006027 100644
--- a/res/layout/app_domains_dialog.xml
+++ b/res/layout/app_domains_dialog.xml
@@ -15,18 +15,12 @@
      limitations under the License.
 -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             android:paddingStart="24dp"
-             android:paddingTop="16dp"
-             android:paddingEnd="24dp">
+<ListView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/list"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:divider="@null"
+    android:scrollbarStyle="insideOverlay"
+    android:padding="24dp" />
 
-    <ListView
-            android:id="@android:id/list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:divider="@null"
-            android:scrollbarStyle="insideOverlay" />
-
-</FrameLayout>
diff --git a/res/layout/app_domains_item.xml b/res/layout/app_domains_item.xml
index e2ccbd3..5aa9cfa 100644
--- a/res/layout/app_domains_item.xml
+++ b/res/layout/app_domains_item.xml
@@ -15,12 +15,12 @@
      limitations under the License.
 -->
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/domain_name"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="4dp"
     android:paddingEnd="4dp"
-    android:paddingTop="16dp"
-    android:divider="@null"
-    />
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp" />
diff --git a/res/layout/app_item.xml b/res/layout/app_item.xml
index 15a9014..d53afc9 100644
--- a/res/layout/app_item.xml
+++ b/res/layout/app_item.xml
@@ -18,16 +18,16 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="72dp"
-    android:paddingTop="16dp"
-    android:paddingBottom="16dp"
+    android:paddingTop="12dp"
+    android:paddingBottom="12dp"
     android:gravity="top"
     android:columnCount="3"
     android:duplicateParentState="true">
 
     <ImageView
         android:id="@android:id/icon"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
         android:layout_gravity="center"
         android:scaleType="fitXY"
         android:layout_marginEnd="16dip"
diff --git a/res/layout/battery_header.xml b/res/layout/battery_header.xml
index 97cc016..b7a8199 100644
--- a/res/layout/battery_header.xml
+++ b/res/layout/battery_header.xml
@@ -17,7 +17,7 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/app_snippet"
+    android:id="@+id/battery_entity_header"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center"
@@ -39,6 +39,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
+            android:fontFamily="@*android:string/config_headlineFontFamily"
             android:textAppearance="@android:style/TextAppearance.Material.Display1"/>
 
         <TextView
@@ -48,6 +49,12 @@
             android:layout_marginTop="12dp"
             android:textAppearance="@android:style/TextAppearance.Material.Small"/>
 
+        <TextView
+            android:id="@+id/summary2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="@android:style/TextAppearance.Material.Small"/>
+
     </LinearLayout>
 
     <com.android.settings.fuelgauge.BatteryMeterView
diff --git a/res/layout/battery_history_detail.xml b/res/layout/battery_history_detail.xml
index b782e39..ea75865 100644
--- a/res/layout/battery_history_detail.xml
+++ b/res/layout/battery_history_detail.xml
@@ -49,7 +49,7 @@
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textColor="?android:attr/textColorSecondary"/>
 
-            <com.android.settingslib.graph.UsageView
+            <com.android.settings.graph.UsageView
                 android:id="@+id/battery_usage"
                 android:layout_width="match_parent"
                 android:layout_height="141dp"
diff --git a/res/layout/battery_usage_graph.xml b/res/layout/battery_usage_graph.xml
index 80f966b..1ab848e 100644
--- a/res/layout/battery_usage_graph.xml
+++ b/res/layout/battery_usage_graph.xml
@@ -28,11 +28,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
+        android:fontFamily="@*android:string/config_headlineFontFamily"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textSize="36sp"
         android:textColor="?android:attr/colorAccent" />
 
-    <com.android.settingslib.graph.UsageView
+    <com.android.settings.graph.UsageView
         android:id="@+id/battery_usage"
         android:layout_width="match_parent"
         android:layout_height="141dp"
diff --git a/res/layout/choose_lock_dialog_item.xml b/res/layout/choose_lock_dialog_item.xml
new file mode 100644
index 0000000..8e78f99
--- /dev/null
+++ b/res/layout/choose_lock_dialog_item.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    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.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:drawablePadding="24dp"
+    android:ellipsize="marquee"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+    android:textColor="?android:attr/textColorAlertDialogListItem" />
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index 0888b5e..02912ee 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -32,41 +32,44 @@
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
-        <!-- header text ('Enter Pin') -->
-        <TextView
-            android:id="@+id/headerText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:accessibilityLiveRegion="polite"
-            android:gravity="center"
-            android:lines="2"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-        <!-- Password entry field -->
-        <EditText android:id="@+id/password_entry"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:inputType="textPassword"
-            android:imeOptions="actionNext|flagNoExtractUi|flagForceAscii"
-            android:textSize="24sp"
-            style="@style/TextAppearance.PasswordEntry"/>
-
         <LinearLayout
-                android:id="@+id/bottom_container"
+            android:id="@+id/password_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:orientation="vertical"
+            android:layoutMode="opticalBounds"
+            android:paddingBottom="8dp">
+
+            <!-- Password entry field -->
+            <com.android.settings.widget.ScrollToParentEditText
+                android:id="@+id/password_entry"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                android:orientation="vertical">
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:inputType="textPassword"
+                android:imeOptions="actionNext|flagNoExtractUi|flagForceAscii"
+                android:textSize="24sp"
+                style="@style/TextAppearance.PasswordEntry"/>
 
             <android.support.v7.widget.RecyclerView
-                    android:id="@+id/password_requirements_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
+                android:id="@+id/password_requirements_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
 
         </LinearLayout>
+
+        <Button
+            android:id="@+id/screen_lock_options"
+            style="@style/SuwGlifButton.Tertiary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/setup_lock_settings_options_button_label"
+            android:visibility="gone" />
+
     </LinearLayout>
 
 </com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/choose_lock_pattern_common.xml b/res/layout/choose_lock_pattern_common.xml
index a54987d..3ea960d 100644
--- a/res/layout/choose_lock_pattern_common.xml
+++ b/res/layout/choose_lock_pattern_common.xml
@@ -22,20 +22,42 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:icon="@drawable/ic_lock"
+    android:layout="@layout/suw_glif_blank_template"
     settings:suwFooter="@layout/choose_lock_pattern_common_footer"
     settings:suwHeaderText="@string/lockpassword_choose_your_pattern_header">
 
     <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
         android:id="@+id/topLayout"
-        style="@style/SuwContentFrame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipChildren="false"
         android:clipToPadding="false"
         android:orientation="vertical">
 
+        <LinearLayout
+            style="@style/SuwGlifHeaderContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/suw_layout_icon"
+                style="@style/LockPatternIconStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_lock" />
+
+            <TextView
+                android:id="@+id/suw_layout_title"
+                style="@style/SuwGlifHeaderTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
+
         <!-- takes up all space above button bar at bottom -->
         <LinearLayout
+            style="@style/SuwContentFrame"
             android:layout_width="match_parent"
             android:layout_height="0dip"
             android:layout_weight="1"
@@ -47,7 +69,6 @@
             <TextView android:id="@+id/headerText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:minLines="2"
                 android:gravity="center"
                 android:textSize="18sp" />
@@ -55,7 +76,7 @@
             <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
                 android:layout_width="match_parent"
                 android:layout_height="0dip"
-                android:layout_weight="4" />
+                android:layout_weight="1" />
 
         </LinearLayout>
 
diff --git a/res/layout/account_type_preference.xml b/res/layout/condition_header_icon.xml
similarity index 64%
rename from res/layout/account_type_preference.xml
rename to res/layout/condition_header_icon.xml
index f7ba859..4f93f54 100644
--- a/res/layout/account_type_preference.xml
+++ b/res/layout/condition_header_icon.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!--
+     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.
@@ -15,8 +16,10 @@
 -->
 
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/accountTypeIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:contentDescription="@null" />
+    android:id="@android:id/icon"
+    android:layout_width="@dimen/dashboard_tile_image_size"
+    android:layout_height="@dimen/dashboard_tile_image_size"
+    android:layout_marginStart="0dp"
+    android:layout_marginEnd="24dp"
+    android:tint="?android:attr/colorAccent"
+    android:scaleType="centerInside"/>
diff --git a/res/layout/condition_tile_new_ui.xml b/res/layout/condition_tile_new_ui.xml
new file mode 100644
index 0000000..d8d2284
--- /dev/null
+++ b/res/layout/condition_tile_new_ui.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/colorSecondary"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:orientation="horizontal"
+        android:gravity="center_vertical">
+
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="@dimen/dashboard_tile_image_size"
+            android:layout_height="@dimen/dashboard_tile_image_size"
+            android:layout_marginStart="14dp"
+            android:layout_marginEnd="24dp"
+            android:tint="?android:attr/colorAccent" />
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/colorAccent" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@android:id/summary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="62dp"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingBottom="8dp"
+        android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+        android:alpha=".7"
+        android:textColor="?android:attr/textColorPrimary" />
+
+    <android.support.v7.widget.ButtonBarLayout
+        android:id="@+id/buttonBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="62dp"
+        android:paddingBottom="8dp"
+        style="?android:attr/buttonBarStyle"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+        <Button
+            android:id="@+id/first_action"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:paddingStart="0dp"
+            android:alpha=".8"
+            android:textAlignment="viewStart"
+            android:textColor="?android:attr/colorAccent"
+            style="?android:attr/buttonBarButtonStyle" />
+
+        <Button
+            android:id="@+id/second_action"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:alpha=".8"
+            android:textAlignment="viewStart"
+            android:textColor="?android:attr/colorAccent"
+            style="?android:attr/buttonBarButtonStyle" />
+
+    </android.support.v7.widget.ButtonBarLayout>
+
+    <include layout="@layout/horizontal_divider" />
+
+</LinearLayout>
diff --git a/res/layout/confirm_lock_password_base.xml b/res/layout/confirm_lock_password_base.xml
index 6942863..0c65e86 100644
--- a/res/layout/confirm_lock_password_base.xml
+++ b/res/layout/confirm_lock_password_base.xml
@@ -47,8 +47,7 @@
             android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"
             android:layout_marginTop="12dp"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            />
+            android:layout_height="wrap_content" />
 
         <Button
             style="@android:style/Widget.Material.Button.Borderless"
@@ -64,29 +63,36 @@
               android:layout_height="0dp"
               android:layout_weight="1"/>
 
-        <EditText
-            android:id="@+id/password_entry"
-            android:layout_width="208dp"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="-40dp"
-            android:inputType="textPassword"
-            android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"
-            android:gravity="center"
-            android:textSize="16sp"
-            style="@style/TextAppearance.PasswordEntry"/>
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
 
-        <TextView
-            style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
-            android:accessibilityLiveRegion="polite"
-            android:id="@+id/errorText"
-            android:layout_width="wrap_content"
+            <com.android.settings.widget.ScrollToParentEditText
+                android:id="@+id/password_entry"
+                android:layout_width="208dp"
+                android:layout_height="wrap_content"
+                android:inputType="textPassword"
+                android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"
+                android:gravity="center"
+                android:textSize="16sp"
+                style="@style/TextAppearance.PasswordEntry"/>
+
+            <TextView
+                style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+                android:accessibilityLiveRegion="polite"
+                android:id="@+id/errorText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="12dp"/>
+
+        </LinearLayout>
+
+        <View android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
-            android:gravity="center_vertical"/>
+            android:layout_weight="1"/>
 
         <ImageView
             android:id="@+id/fingerprintIcon"
diff --git a/res/layout/confirm_lock_password_internal.xml b/res/layout/confirm_lock_password_internal.xml
index 0652e7e..701ff57 100644
--- a/res/layout/confirm_lock_password_internal.xml
+++ b/res/layout/confirm_lock_password_internal.xml
@@ -19,7 +19,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:icon="@drawable/ic_lock"
-    android:layout="@layout/suw_glif_blank_template"
     android:importantForAutofill="noExcludeDescendants">
 
     <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
@@ -28,19 +27,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <ImageView
-            android:id="@+id/suw_layout_icon"
-            style="@style/SuwGlifIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_lock" />
-
-        <TextView
-            android:id="@+id/headerText"
-            style="@style/SuwGlifHeaderTitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
         <TextView
             android:id="@+id/detailsText"
             style="@style/SuwDescription.Glif"
@@ -54,29 +40,36 @@
             android:layout_height="0dp"
             android:layout_weight="1" />
 
-        <EditText
-            android:id="@+id/password_entry"
-            android:layout_width="208dp"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="-40dp"
-            android:inputType="textPassword"
-            android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"
-            android:gravity="center"
-            android:textSize="16sp"
-            style="@style/TextAppearance.PasswordEntry"/>
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
 
-        <TextView
-            style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
-            android:accessibilityLiveRegion="polite"
-            android:id="@+id/errorText"
-            android:layout_width="wrap_content"
+            <com.android.settings.widget.ScrollToParentEditText
+                android:id="@+id/password_entry"
+                android:layout_width="208dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:inputType="textPassword"
+                android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"
+                android:gravity="center"
+                android:textSize="16sp"
+                style="@style/TextAppearance.PasswordEntry"/>
+
+            <TextView
+                android:id="@+id/errorText"
+                style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:accessibilityLiveRegion="polite"/>
+
+        </LinearLayout>
+
+        <Space
+            android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
-            android:gravity="center_vertical"/>
+            android:layout_weight="1" />
 
         <ImageView
             android:id="@+id/fingerprintIcon"
diff --git a/res/layout/confirm_lock_pattern_internal_base.xml b/res/layout/confirm_lock_pattern_internal_base.xml
index e20d04d..cd5739e 100644
--- a/res/layout/confirm_lock_pattern_internal_base.xml
+++ b/res/layout/confirm_lock_pattern_internal_base.xml
@@ -27,77 +27,61 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <ScrollView
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="2">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-            <LinearLayout
+            <ImageView
+                android:id="@+id/suw_layout_icon"
+                style="@style/LockPatternIconStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_lock" />
+
+            <TextView
+                android:id="@+id/headerText"
+                style="@style/SuwGlifHeaderTitle"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
+                android:layout_height="wrap_content" />
 
-                <ImageView
-                    android:id="@+id/suw_layout_icon"
-                    style="@style/SuwGlifIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_lock" />
+            <TextView
+                style="@style/SuwDescription.Glif"
+                android:id="@+id/detailsText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="?attr/suwMarginSides"
+                android:layout_marginEnd="?attr/suwMarginSides" />
 
-                <TextView
-                    android:id="@+id/headerText"
-                    style="@style/SuwGlifHeaderTitle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
-                <TextView
-                    style="@style/SuwDescription.Glif"
-                    android:id="@+id/detailsText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="?attr/suwMarginSides"
-                    android:layout_marginEnd="?attr/suwMarginSides" />
-
-            </LinearLayout>
-
-        </ScrollView>
+        </LinearLayout>
 
         <com.android.internal.widget.LockPatternView
             android:id="@+id/lockPattern"
-            android:layout_width="312dp"
-            android:layout_height="0dp"
-            android:layout_weight="3"
-            android:layout_gravity="center_horizontal"/>
-
-        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1"
-            android:orientation="vertical">
+            android:layout_weight="4"
+            android:layout_gravity="center_horizontal"/>
 
-            <TextView
-                style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
-                android:accessibilityLiveRegion="polite"
-                android:id="@+id/errorText"
-                android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="12dp"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="12dp"
-                android:gravity="center_vertical"/>
+        <TextView
+            style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+            android:accessibilityLiveRegion="polite"
+            android:id="@+id/errorText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="12dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
+            android:gravity="center_vertical"/>
 
-            <ImageView
-                android:id="@+id/fingerprintIcon"
-                android:layout_gravity="center_horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_marginBottom="24dp"
-                android:contentDescription="@string/confirm_fingerprint_icon_content_description"
-                android:visibility="gone"/>
-        </LinearLayout>
+        <ImageView
+            android:id="@+id/fingerprintIcon"
+            android:layout_gravity="center_horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="24dp"
+            android:contentDescription="@string/confirm_fingerprint_icon_content_description"
+            android:visibility="gone"/>
 
         <Button
             android:id="@+id/cancelButton"
diff --git a/res/layout/convert_fbe.xml b/res/layout/convert_fbe.xml
index 4a9d7c0..d1e0cea 100644
--- a/res/layout/convert_fbe.xml
+++ b/res/layout/convert_fbe.xml
@@ -23,7 +23,7 @@
         <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
+                android:layout_marginStart="@dimen/preference_no_icon_padding_start"
                 android:layout_marginEnd="12dp"
                 android:layout_marginTop="12dp"
                 android:textSize="18sp"
diff --git a/res/layout/account_type_preference.xml b/res/layout/dashboard_header_spacer.xml
similarity index 60%
copy from res/layout/account_type_preference.xml
copy to res/layout/dashboard_header_spacer.xml
index f7ba859..442ae48 100644
--- a/res/layout/account_type_preference.xml
+++ b/res/layout/dashboard_header_spacer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- 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.
@@ -14,9 +14,12 @@
      limitations under the License.
 -->
 
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/accountTypeIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:contentDescription="@null" />
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/search_bar_margin">
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="?android:attr/actionBarSize"/>
+</LinearLayout>
diff --git a/res/layout/dashboard_tile.xml b/res/layout/dashboard_tile.xml
index 1ec1730..e35dbff 100644
--- a/res/layout/dashboard_tile.xml
+++ b/res/layout/dashboard_tile.xml
@@ -30,8 +30,8 @@
         android:layout_width="@dimen/dashboard_tile_image_size"
         android:layout_height="@dimen/dashboard_tile_image_size"
         android:scaleType="centerInside"
-        android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
-        android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end" />
+        android:layout_marginStart="@dimen/dashboard_tile_image_margin"
+        android:layout_marginEnd="@dimen/dashboard_tile_image_margin" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -53,7 +53,7 @@
             android:textColor="?android:attr/textColorSecondary"
             android:maxLines="1"
             android:ellipsize="end"
-            android:paddingEnd="@dimen/dashboard_tile_image_margin_start" />
+            android:paddingEnd="@dimen/dashboard_tile_image_margin" />
 
     </LinearLayout>
 
diff --git a/res/layout/data_usage_graph.xml b/res/layout/data_usage_graph.xml
index dc0559d..8f83d14 100644
--- a/res/layout/data_usage_graph.xml
+++ b/res/layout/data_usage_graph.xml
@@ -22,7 +22,7 @@
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:orientation="vertical">
 
-    <com.android.settingslib.graph.UsageView
+    <com.android.settings.graph.UsageView
         android:id="@+id/data_usage"
         android:layout_width="match_parent"
         android:layout_height="@dimen/data_usage_chart_height"
diff --git a/res/layout/dream_info_row.xml b/res/layout/dream_info_row.xml
deleted file mode 100644
index fd70ad5..0000000
--- a/res/layout/dream_info_row.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--
-     Copyright (C) 2012 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:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:clickable="true"
-    android:focusable="true"
-    android:orientation="horizontal"
-    android:background="?android:attr/selectableItemBackground" >
-
-    <!-- Dream icon -->
-
-    <ImageView
-        android:id="@android:id/icon"
-        android:layout_width="@android:dimen/app_icon_size"
-        android:layout_height="@android:dimen/app_icon_size"
-        android:layout_centerVertical="true"
-        android:layout_marginBottom="10dp"
-        android:layout_marginStart="0dp"
-        android:layout_marginEnd="6dp"
-        android:layout_marginTop="10dp"
-        android:contentDescription="@null"
-        android:maxHeight="@android:dimen/app_icon_size"
-        android:maxWidth="@android:dimen/app_icon_size"
-        android:scaleType="fitCenter" />
-
-    <!-- Dream caption -->
-
-    <TextView
-        android:id="@android:id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:layout_centerVertical="true"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:gravity="center_vertical"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textAlignment="viewStart"
-        android:labelFor="@android:id/button2" />
-
-    <!-- Dream radio button -->
-
-    <RadioButton
-        android:id="@android:id/button1"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"
-        android:duplicateParentState="true"
-        android:clickable="false"
-        android:focusable="false" />
-
-    <!-- Divider -->
-
-    <ImageView
-        android:id="@+id/divider"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_centerVertical="true"
-        android:contentDescription="@null"
-        android:src="@drawable/nav_divider" />
-
-    <!-- Settings icon -->
-
-    <ImageView
-        android:id="@android:id/button2"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_centerVertical="true"
-        android:layout_margin="0dip"
-        android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/screensaver_settings_button"
-        android:padding="8dip"
-        android:clickable="true"
-        android:focusable="true"
-        android:src="@drawable/ic_settings" />
-
-</LinearLayout>
diff --git a/res/layout/dream_start_button.xml b/res/layout/dream_start_button.xml
new file mode 100644
index 0000000..7d5e0c9
--- /dev/null
+++ b/res/layout/dream_start_button.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  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.
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:gravity="bottom"
+    android:paddingTop="4dp"
+    android:paddingStart="72dp"
+    android:paddingEnd="72dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <Button
+        android:id="@+id/dream_start_now_button"
+        style="@style/DreamStartButton"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/screensaver_settings_dream_start"
+        android:paddingEnd="8dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/expand_preference.xml b/res/layout/expand_preference.xml
index f17e67c..729dfd9 100644
--- a/res/layout/expand_preference.xml
+++ b/res/layout/expand_preference.xml
@@ -28,10 +28,10 @@
     android:clipToPadding="false">
 
     <LinearLayout
-        android:id="@+id/icon_container"
+        android:id="@+id/icon_frame"
+        style="@style/preference_icon_frame"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minWidth="56dp"
         android:gravity="start|center_vertical"
         android:orientation="horizontal"
         android:paddingEnd="12dp"
diff --git a/res/layout/fingerprint_enroll_finish_base.xml b/res/layout/fingerprint_enroll_finish_base.xml
index 6d9cf70..f666942 100644
--- a/res/layout/fingerprint_enroll_finish_base.xml
+++ b/res/layout/fingerprint_enroll_finish_base.xml
@@ -40,38 +40,20 @@
             android:layout_marginTop="@dimen/suw_description_glif_margin_top"
             android:text="@string/security_settings_fingerprint_enroll_finish_message"/>
 
-        <TextView
-            android:id="@+id/message_secondary"
-            style="@style/SuwDescription.Glif"
+        <com.android.setupwizardlib.view.FillContentLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/suw_description_glif_margin_top"
-            android:text="@string/setup_fingerprint_enroll_finish_message_secondary"
-            android:textColor="?android:attr/textColorSecondary"
-            android:visibility="gone" />
+            android:layout_height="0dp"
+            android:layout_weight="1">
 
-        <View
-            android:layout_height="24dp"
-            android:layout_width="match_parent"
-            android:layout_weight="1"/>
+            <ImageView
+                android:id="@+id/fingerprint_in_app_indicator"
+                style="@style/SuwContentIllustration"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@android:string/fingerprint_icon_content_description"
+                android:src="@drawable/fp_app_indicator" />
 
-        <ImageView
-            android:id="@+id/fingerprint_in_app_indicator"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_weight="5"
-            android:minHeight="@dimen/fingerprint_in_app_indicator_min_size"
-            android:minWidth="@dimen/fingerprint_in_app_indicator_min_size"
-            android:maxHeight="@dimen/fingerprint_in_app_indicator_max_size"
-            android:maxWidth="@dimen/fingerprint_in_app_indicator_max_size"
-            android:layout_gravity="center_horizontal"
-            android:contentDescription="@android:string/fingerprint_icon_content_description"
-            android:src="@drawable/fp_app_indicator" />
-
-        <View
-            android:layout_height="24dp"
-            android:layout_width="match_parent"
-            android:layout_weight="1"/>
+        </com.android.setupwizardlib.view.FillContentLayout>
 
     </LinearLayout>
 
diff --git a/res/layout/account_type_preference.xml b/res/layout/horizontal_divider.xml
similarity index 64%
copy from res/layout/account_type_preference.xml
copy to res/layout/horizontal_divider.xml
index f7ba859..e4a277d 100644
--- a/res/layout/account_type_preference.xml
+++ b/res/layout/horizontal_divider.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!--
+     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.
@@ -14,9 +15,9 @@
      limitations under the License.
 -->
 
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/accountTypeIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:contentDescription="@null" />
+<View
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/divider"
+    android:layout_width="match_parent"
+    android:layout_height=".75dp"
+    android:background="?android:attr/dividerHorizontal" />
\ No newline at end of file
diff --git a/res/layout/master_clear.xml b/res/layout/master_clear.xml
index 662b7db..4423e10 100644
--- a/res/layout/master_clear.xml
+++ b/res/layout/master_clear.xml
@@ -102,6 +102,38 @@
                         android:text="@string/erase_external_storage_description" />
                 </LinearLayout>
             </LinearLayout>
+            <LinearLayout android:id="@+id/erase_esim_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:focusable="true"
+                    android:clickable="true">
+                <CheckBox android:id="@+id/erase_esim"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:paddingEnd="8dp"
+                        android:focusable="false"
+                        android:clickable="false"
+                        android:duplicateParentState="true" />
+                <LinearLayout android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:orientation="vertical">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="12dp"
+                        android:textSize="18sp"
+                        android:text="@string/erase_esim_storage" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="4sp"
+                        android:textSize="14sp"
+                        android:text="@string/erase_esim_storage_description" />
+                </LinearLayout>
+            </LinearLayout>
         </LinearLayout>
     </ScrollView>
     <Button
diff --git a/res/layout/password_requirement_item.xml b/res/layout/password_requirement_item.xml
index df7f45c..8080f10 100644
--- a/res/layout/password_requirement_item.xml
+++ b/res/layout/password_requirement_item.xml
@@ -15,8 +15,8 @@
 -->
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/description_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingStart="4dp"
-        android:textSize="14sp"/>
\ No newline at end of file
+    android:id="@+id/description_text"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="?attr/suwGlifHeaderGravity"
+    android:textSize="14sp"/>
diff --git a/res/layout/preference_footer.xml b/res/layout/preference_footer.xml
deleted file mode 100644
index 5302d93..0000000
--- a/res/layout/preference_footer.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2016 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:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:background="?android:attr/selectableItemBackground"
-    android:clipToPadding="false">
-
-    <LinearLayout
-        android:id="@+id/icon_container"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minWidth="56dp"
-        android:gravity="start|top"
-        android:orientation="horizontal"
-        android:paddingEnd="12dp"
-        android:paddingTop="20dp"
-        android:paddingBottom="4dp">
-        <ImageView
-            android:id="@android:id/icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-    </LinearLayout>
-
-    <com.android.settingslib.widget.LinkTextView
-        android:id="@android:id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingBottom="16dp"
-        android:paddingTop="16dp"
-        android:maxLines="10"
-        android:textColor="?android:attr/textColorSecondary"
-        android:ellipsize="marquee" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/preference_linearcolor.xml b/res/layout/preference_linearcolor.xml
deleted file mode 100644
index f3abb9c..0000000
--- a/res/layout/preference_linearcolor.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="?android:attr/listPreferredItemHeight"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-    <com.android.settings.applications.LinearColorBar
-        android:id="@+id/linear_color_bar"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
-        android:gravity="center_vertical"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:shadowRadius="4"
-        android:shadowColor="?android:attr/colorBackground"
-        android:shadowDx="2"
-        android:shadowDy="2">
-    </com.android.settings.applications.LinearColorBar>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/preference_material_settings.xml b/res/layout/preference_material_settings.xml
index 9682e32..e2ab3bb 100644
--- a/res/layout/preference_material_settings.xml
+++ b/res/layout/preference_material_settings.xml
@@ -28,10 +28,10 @@
     android:clipToPadding="false">
 
     <LinearLayout
-        android:id="@+id/icon_container"
+        android:id="@+id/icon_frame"
+        style="@style/preference_icon_frame"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minWidth="56dp"
         android:gravity="start|center_vertical"
         android:orientation="horizontal"
         android:paddingEnd="12dp"
diff --git a/res/layout/preference_small_icon.xml b/res/layout/preference_small_icon.xml
new file mode 100644
index 0000000..e734b4b
--- /dev/null
+++ b/res/layout/preference_small_icon.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  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.
+  -->
+
+<!-- Same as preference_material except that it uses a 24dp fixed size icon -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:minHeight="?android:attr/listPreferredItemHeightSmall"
+              android:gravity="center_vertical"
+              android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+              android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+              android:background="?android:attr/selectableItemBackground"
+              android:clipToPadding="false"
+              android:focusable="true" >
+
+    <LinearLayout
+        android:id="@+id/icon_frame"
+        style="@style/preference_icon_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="start|center_vertical"
+        android:orientation="horizontal"
+        android:paddingEnd="12dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp">
+        <android.support.v7.internal.widget.PreferenceImageView
+            android:id="@android:id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:maxWidth="24dp"
+            app:maxHeight="24dp" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView android:id="@android:id/title"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:singleLine="true"
+                  android:textAppearance="?android:attr/textAppearanceListItem"
+                  android:ellipsize="marquee" />
+
+        <TextView android:id="@android:id/summary"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_below="@android:id/title"
+                  android:layout_alignStart="@android:id/title"
+                  android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+                  android:textColor="?android:attr/textColorSecondary"
+                  android:maxLines="10" />
+
+    </RelativeLayout>
+
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout android:id="@android:id/widget_frame"
+                  android:layout_width="wrap_content"
+                  android:layout_height="match_parent"
+                  android:gravity="end|center_vertical"
+                  android:paddingStart="16dp"
+                  android:orientation="vertical" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/preference_volume_slider.xml b/res/layout/preference_volume_slider.xml
index 3eb0c97..107a8ae 100644
--- a/res/layout/preference_volume_slider.xml
+++ b/res/layout/preference_volume_slider.xml
@@ -26,7 +26,7 @@
     android:orientation="horizontal">
 
     <LinearLayout
-        android:id="@+id/icon_container"
+        android:id="@+id/icon_frame"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:minWidth="44dp"
diff --git a/res/layout/preference_widget_summary.xml b/res/layout/preference_widget_summary.xml
index 2d7ed1d..fae5027 100644
--- a/res/layout/preference_widget_summary.xml
+++ b/res/layout/preference_widget_summary.xml
@@ -18,6 +18,8 @@
     android:id="@+id/widget_summary"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:drawablePadding="8dp"
+    android:gravity="center_vertical|end"
     android:textAlignment="viewEnd"
     android:textAppearance="?android:attr/textAppearanceSmall"
     android:textColor="?android:attr/textColorSecondary" />
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index e11e997..e7d08cc 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -206,6 +206,14 @@
                 android:layout_height="wrap_content"
                 android:text="@string/wfc_provisioned_switch_string"/>
 
+        <!-- EAB/Presence provisioned -->
+        <Switch android:id="@+id/eab_provisioned_switch"
+                android:textSize="14sp"
+                android:layout_marginTop="8dip"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/eab_provisioned_switch_string"/>
+
         <!-- SMSC -->
         <RelativeLayout android:layout_width="match_parent"
                         android:layout_height="wrap_content">
@@ -302,5 +310,21 @@
                       android:textSize="12sp" />
         </LinearLayout>
 
+        <!-- Carrier Provisioning -->
+        <LinearLayout style="@style/entry_layout">
+            <Button android:id="@+id/carrier_provisioning"
+                    android:layout_marginTop="8dip"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/carrier_provisioning"
+                    android:textSize="14sp"/>
+            <Button android:id="@+id/trigger_carrier_provisioning"
+                    android:layout_marginTop="8dip"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/trigger_carrier_provisioning"
+                    android:textSize="14sp"/>
+        </LinearLayout>
+
     </LinearLayout>
 </ScrollView>
diff --git a/res/layout/screen_zoom_preview_settings.xml b/res/layout/screen_zoom_preview_settings.xml
index a635612..9a0cc59 100644
--- a/res/layout/screen_zoom_preview_settings.xml
+++ b/res/layout/screen_zoom_preview_settings.xml
@@ -42,7 +42,7 @@
                 <ImageView
                     android:layout_width="48dp"
                     android:layout_height="48dp"
-                    android:src="@drawable/wifi_signal_dark"
+                    android:src="@drawable/ic_settings_wireless"
                     android:tint="?android:attr/colorAccent"
                     android:scaleType="center" />
 
diff --git a/res/layout/search_icon_view.xml b/res/layout/search_icon_view.xml
index 7df0649..ef99bee 100644
--- a/res/layout/search_icon_view.xml
+++ b/res/layout/search_icon_view.xml
@@ -14,20 +14,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-<LinearLayout
+
+<ImageView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/icon_container"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:minWidth="56dp"
-    android:gravity="center_horizontal|top"
-    android:orientation="horizontal"
-    android:paddingEnd="12dp"
-    android:paddingTop="4dp"
-    android:paddingBottom="4dp">
-    <com.android.internal.widget.PreferenceImageView
-        android:id="@android:id/icon"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:scaleType="fitCenter"/>
-</LinearLayout>
\ No newline at end of file
+    android:id="@android:id/icon"
+    android:layout_width="@dimen/dashboard_tile_image_size"
+    android:layout_height="match_parent"
+    android:scaleType="centerInside"
+    android:layout_marginStart="@dimen/dashboard_tile_image_margin"
+    android:layout_marginEnd="@dimen/dashboard_tile_image_margin" />
diff --git a/res/layout/search_inline_switch_item.xml b/res/layout/search_inline_switch_item.xml
index 526f9fd..8f050a3 100644
--- a/res/layout/search_inline_switch_item.xml
+++ b/res/layout/search_inline_switch_item.xml
@@ -21,7 +21,6 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingTop="16dp"
     android:paddingBottom="16dp"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:background="?android:attr/selectableItemBackground"
     android:clipToPadding="false">
diff --git a/res/layout/search_intent_item.xml b/res/layout/search_intent_item.xml
index 98e2a9b..6bc00ad 100644
--- a/res/layout/search_intent_item.xml
+++ b/res/layout/search_intent_item.xml
@@ -21,7 +21,6 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingTop="16dp"
     android:paddingBottom="16dp"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:background="?android:attr/selectableItemBackground"
     android:clipToPadding="false">
diff --git a/res/layout/search_main.xml b/res/layout/search_main.xml
index ab728cd..6de344d 100644
--- a/res/layout/search_main.xml
+++ b/res/layout/search_main.xml
@@ -18,7 +18,6 @@
 -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:id="@+id/main_content"
-             android:layout_height="match_parent"
-             android:layout_width="match_parent"
-             android:background="@color/material_grey_300"/>
+    android:id="@+id/main_content"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"/>
diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml
index 9445e0c..d097cfe 100644
--- a/res/layout/search_panel.xml
+++ b/res/layout/search_panel.xml
@@ -15,71 +15,80 @@
 -->
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/search_panel"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/search_panel_list_background">
 
-    <LinearLayout android:id="@+id/layout_recent_searches"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_gravity="center"
-                  android:orientation="vertical"
-                  android:layout_alignParentTop="true">
+    <FrameLayout
+        android:id="@+id/layout_results"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/feedback_popup"
+        android:orientation="vertical">
 
         <!-- Padding is included in the background -->
-        <android.support.v7.widget.RecyclerView android:id="@+id/list_recent_searches"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:paddingStart="@dimen/dashboard_padding_start"
-                  android:paddingEnd="@dimen/dashboard_padding_end"
-                  android:paddingTop="@dimen/dashboard_padding_top"
-                  android:paddingBottom="@dimen/dashboard_padding_bottom"
-                  android:scrollbarStyle="outsideOverlay"
-                  android:headerDividersEnabled="false"
-                  android:elevation="@dimen/search_panel_elevation"/>
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/layout_results"
-                  android:layout_width="match_parent"
-                  android:layout_height="fill_parent"
-                  android:layout_above="@id/feedback_popup"
-                  android:orientation="vertical">
-
-        <!-- Padding is included in the background -->
-        <android.support.v7.widget.RecyclerView android:id="@+id/list_results"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:paddingStart="@dimen/dashboard_padding_start"
-                  android:paddingEnd="@dimen/dashboard_padding_end"
-                  android:paddingTop="@dimen/dashboard_padding_top"
-                  android:paddingBottom="@dimen/dashboard_padding_bottom"
-                  android:scrollbarStyle="outsideOverlay"
-                  android:scrollbars="vertical"/>
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/list_results"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="@dimen/dashboard_padding_start"
+            android:paddingEnd="@dimen/dashboard_padding_end"
+            android:paddingTop="@dimen/dashboard_padding_top"
+            android:paddingBottom="@dimen/dashboard_padding_bottom"
+            android:scrollbarStyle="outsideOverlay"
+            android:scrollbars="vertical"/>
 
         <LinearLayout
             android:id="@+id/no_results_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingTop="80dp"
+            android:paddingTop="96dp"
             android:orientation="vertical"
             android:visibility="gone">
 
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="?android:attr/actionBarSize"/>
+
             <ImageView
-            android:layout_height="160dp"
-            android:layout_width="160dp"
-            android:layout_gravity="center_horizontal"
-            android:src="@drawable/empty_search_results"/>
+                android:layout_height="160dp"
+                android:layout_width="160dp"
+                android:layout_gravity="center_horizontal"
+                android:src="@drawable/empty_search_results"/>
 
             <TextView
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:paddingTop="24dp"
-            android:textSize="18sp"
-            android:text="@string/search_settings_no_results"
-            android:gravity="center"/>
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:paddingTop="24dp"
+                android:textSize="18sp"
+                android:text="@string/search_settings_no_results"
+                android:gravity="center"/>
+
         </LinearLayout>
-    </LinearLayout>
+
+        <android.support.v7.widget.CardView
+            android:id="@+id/search_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/search_bar_margin"
+            app:cardCornerRadius="2dp"
+            app:cardBackgroundColor="?android:attr/colorBackground"
+            app:cardElevation="2dp">
+
+            <SearchView
+                android:id="@+id/search_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:iconifiedByDefault="false"
+                android:imeOptions="actionSearch|flagNoExtractUi"
+                android:theme="?android:attr/actionBarTheme"/>
+
+        </android.support.v7.widget.CardView>
+
+    </FrameLayout>
 
     <include layout="@layout/search_feedback"/>
+
 </RelativeLayout>
diff --git a/res/layout/settings_entity_header.xml b/res/layout/settings_entity_header.xml
new file mode 100644
index 0000000..ce81b49
--- /dev/null
+++ b/res/layout/settings_entity_header.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2016 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.
+  -->
+
+<!-- Entity header -->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/entity_header"
+    style="@style/EntityHeader"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="0dp"
+    android:paddingTop="24dp"
+    android:paddingBottom="24dp">
+
+    <ImageView
+        android:id="@+id/entity_header_icon"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:scaleType="fitXY"
+        android:layout_gravity="center_horizontal"
+        android:antialias="true" />
+
+    <LinearLayout
+        android:id="@+id/entity_header_links"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignParentEnd="true"
+        android:orientation="vertical">
+
+        <ImageButton
+            android:id="@android:id/button1"
+            style="?android:attr/actionOverflowButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_weight="1"
+            android:layout_height="0dp"
+            android:minWidth="@dimen/min_tap_target_size"
+            android:src="@drawable/ic_settings_24dp"
+            android:tint="?android:attr/colorAccent" />
+
+        <ImageButton
+            android:id="@android:id/button2"
+            style="?android:attr/actionOverflowButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_weight="1"
+            android:layout_height="0dp"
+            android:minWidth="@dimen/min_tap_target_size"
+            android:src="@null"
+            android:tint="?android:attr/colorAccent" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/entity_header_icon"
+        android:layout_toStartOf="@id/entity_header_links"
+        android:paddingStart="24dp"
+        android:paddingEnd="24dp"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/entity_header_title"
+            style="@style/TextAppearance.EntityHeaderTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="false"
+            android:ellipsize="marquee"
+            android:gravity="start"
+            android:textDirection="locale"
+            android:paddingTop="8dp" />
+
+        <TextView
+            android:id="@+id/install_type"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="start"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorSecondary" />
+
+        <TextView
+            android:id="@+id/entity_header_summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="start"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:textAppearance="@android:style/TextAppearance.Material.Body1"
+            android:textColor="?android:attr/textColorSecondary" />
+
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/res/layout/settings_main_dashboard.xml b/res/layout/settings_main_dashboard.xml
index c10193c..1a3b133 100644
--- a/res/layout/settings_main_dashboard.xml
+++ b/res/layout/settings_main_dashboard.xml
@@ -18,7 +18,31 @@
 -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:id="@+id/main_content"
-             android:layout_height="match_parent"
-             android:layout_width="match_parent"
-             />
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
+    <FrameLayout
+        android:id="@+id/main_content"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"/>
+    <android.support.v7.widget.CardView
+        android:id="@+id/search_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/search_bar_margin"
+        app:cardCornerRadius="2dp"
+        app:cardBackgroundColor="?android:attr/colorBackground"
+        app:cardElevation="2dp">
+        <Toolbar
+            android:id="@+id/search_action_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/search_bar_negative_margin"
+            android:background="?android:attr/selectableItemBackground"
+            android:navigationIcon="@drawable/ic_search_24dp"
+            android:title="@string/search_menu"
+            android:titleTextAppearance="?android:attr/subtitleTextAppearance"
+            android:titleTextColor="?android:attr/textColorHint"
+            android:theme="?android:attr/actionBarTheme"/>
+    </android.support.v7.widget.CardView>
+</FrameLayout>
diff --git a/res/layout/settings_summary_preference.xml b/res/layout/settings_summary_preference.xml
index a5dee52..7d550b5 100644
--- a/res/layout/settings_summary_preference.xml
+++ b/res/layout/settings_summary_preference.xml
@@ -26,9 +26,10 @@
         android:id="@android:id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="0dp"
         android:layout_marginTop="0dp"
         android:layout_marginBottom="5dp"
+        android:fontFamily="@*android:string/config_headlineFontFamily"
+        android:paddingTop="0dp"
         android:textColor="?android:attr/colorAccent"
         android:textAppearance="@android:style/TextAppearance.Material.Display1"
         />
diff --git a/res/layout/storage_item.xml b/res/layout/storage_item.xml
index 0c1f60c..a234dc0 100644
--- a/res/layout/storage_item.xml
+++ b/res/layout/storage_item.xml
@@ -20,24 +20,26 @@
               android:orientation="vertical"
               android:minHeight="?android:attr/listPreferredItemHeightSmall"
               android:gravity="center_vertical"
-              android:paddingStart="?android:attr/listPreferredItemPaddingStart"
               android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
               android:paddingTop="16dip"
               android:paddingBottom="16dip"
-              android:background="?android:attr/selectableItemBackground">
+              android:background="?android:attr/selectableItemBackground"
+              android:clipToPadding="false">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:clipToPadding="false"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart">
 
         <LinearLayout
-            android:id="@android:id/icon_frame"
+            android:id="@+id/icon_frame"
+            style="@style/preference_icon_frame"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="start|center_vertical"
-            android:minWidth="60dp"
             android:orientation="horizontal"
             android:paddingEnd="12dp"
             android:paddingTop="4dp"
@@ -76,7 +78,7 @@
         android:id="@android:id/progress"
         android:layout_width="match_parent"
         android:layout_height="8dp"
-        android:layout_marginStart="60dp"
+        android:layout_marginStart="72dp"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="8dp"
         android:visibility="gone"
diff --git a/res/layout/storage_summary.xml b/res/layout/storage_summary.xml
index 1beb49f..d48d62d 100644
--- a/res/layout/storage_summary.xml
+++ b/res/layout/storage_summary.xml
@@ -30,13 +30,14 @@
         android:id="@android:id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:ellipsize="marquee"
+        android:fadingEdge="horizontal"
+        android:fontFamily="@*android:string/config_headlineFontFamily"
         android:singleLine="true"
         android:textAlignment="viewStart"
         android:textAppearance="@android:style/TextAppearance.Material.Subhead"
         android:textColor="?android:attr/colorAccent"
-        android:textSize="36sp"
-        android:ellipsize="marquee"
-        android:fadingEdge="horizontal" />
+        android:textSize="36sp"/>
 
     <TextView
         android:id="@android:id/summary"
diff --git a/res/layout/storage_summary_donut.xml b/res/layout/storage_summary_donut.xml
index eb26077..8e11d71 100644
--- a/res/layout/storage_summary_donut.xml
+++ b/res/layout/storage_summary_donut.xml
@@ -36,10 +36,11 @@
 
         <TextView
             android:id="@android:id/title"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:fontFamily="@*android:string/config_headlineFontFamily"
             android:singleLine="true"
             android:textAlignment="viewStart"
             android:textAppearance="@android:style/TextAppearance.Material.Display1"
diff --git a/res/layout/storage_volume.xml b/res/layout/storage_volume.xml
index 570cec6..39a6f85 100644
--- a/res/layout/storage_volume.xml
+++ b/res/layout/storage_volume.xml
@@ -26,10 +26,9 @@
 
     <LinearLayout
         android:id="@+id/icon_frame"
+        style="@style/preference_icon_frame"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="-4dp"
-        android:minWidth="60dp"
         android:gravity="start|center_vertical"
         android:orientation="horizontal"
         android:paddingEnd="12dp"
diff --git a/res/layout/suggestion_condition_container.xml b/res/layout/suggestion_condition_container.xml
new file mode 100644
index 0000000..089c2c8
--- /dev/null
+++ b/res/layout/suggestion_condition_container.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     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.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/SuggestionConditionStyle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp"
+    android:paddingBottom="@dimen/dashboard_padding_bottom">
+
+    <android.support.v7.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:cardUseCompatPadding="true"
+        app:cardElevation="2dp">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/data"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scrollbars="none"/>
+
+    </android.support.v7.widget.CardView>
+
+</FrameLayout>
diff --git a/res/layout/suggestion_condition_footer.xml b/res/layout/suggestion_condition_footer.xml
new file mode 100644
index 0000000..4e1bbc8
--- /dev/null
+++ b/res/layout/suggestion_condition_footer.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/SuggestionConditionStyle"
+    android:layout_width="match_parent"
+    android:layout_height="56dp"
+    android:orientation="horizontal"
+    android:gravity="center|end">
+
+    <ImageView
+        android:id="@+id/collapse_button"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:padding="16dp"
+        android:src="@drawable/ic_expand_less"/>
+
+</LinearLayout>
diff --git a/res/layout/suggestion_condition_header.xml b/res/layout/suggestion_condition_header.xml
new file mode 100644
index 0000000..a0f73ae
--- /dev/null
+++ b/res/layout/suggestion_condition_header.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     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.
+-->
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/SuggestionConditionStyle"
+    android:layout_width="match_parent"
+    android:layout_height="56dp"
+    android:layout_centerHorizontal="true">
+
+    <FrameLayout
+        android:id="@android:id/icon_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_centerVertical="true">
+
+        <include layout="@layout/condition_header_icon" />
+
+    </FrameLayout>
+
+    <ImageView
+        android:id="@+id/expand_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignParentEnd="true"
+        android:padding="16dp"
+        android:src="@drawable/ic_expand_more"/>
+
+    <TextView
+        android:id="@android:id/summary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_toStartOf="@id/expand_indicator"
+        android:layout_centerVertical="true"
+        android:gravity="end"
+        android:textAppearance="@style/TextAppearance.SuggestionTitle"
+        android:textColor="?android:attr/colorAccent" />
+
+    <TextView
+        android:id="@android:id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@android:id/icon_frame"
+        android:layout_toStartOf="@android:id/summary"
+        android:layout_centerVertical="true"
+        android:singleLine="true"
+        android:ellipsize="end"
+        android:textAppearance="@style/TextAppearance.SuggestionTitle"
+        android:textColor="?android:attr/colorAccent" />
+
+    <LinearLayout
+        android:id="@+id/additional_icons"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_toStartOf="@android:id/summary"
+        android:layout_toEndOf="@android:id/icon_frame"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"/>
+
+</RelativeLayout>
diff --git a/res/layout/suggestion_header.xml b/res/layout/suggestion_header.xml
index f3f39ff..2268636 100644
--- a/res/layout/suggestion_header.xml
+++ b/res/layout/suggestion_header.xml
@@ -28,8 +28,8 @@
         android:id="@android:id/icon"
         android:layout_width="@dimen/dashboard_tile_image_size"
         android:layout_height="@dimen/dashboard_tile_image_size"
-        android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
-        android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"
+        android:layout_marginStart="@dimen/dashboard_tile_image_margin"
+        android:layout_marginEnd="@dimen/dashboard_tile_image_margin"
         android:src="@drawable/ic_expand_more"/>
     <TextView
         android:id="@android:id/title"
diff --git a/res/layout/suggestion_tile.xml b/res/layout/suggestion_tile.xml
index 9e17e38..cabbafd 100644
--- a/res/layout/suggestion_tile.xml
+++ b/res/layout/suggestion_tile.xml
@@ -28,8 +28,8 @@
         android:id="@android:id/icon"
         android:layout_width="@dimen/dashboard_tile_image_size"
         android:layout_height="@dimen/dashboard_tile_image_size"
-        android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
-        android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"
+        android:layout_marginStart="@dimen/dashboard_tile_image_margin"
+        android:layout_marginEnd="@dimen/dashboard_tile_image_margin"
         android:scaleType="centerInside"/>
 
     <RelativeLayout
diff --git a/res/layout/suggestion_tile_card.xml b/res/layout/suggestion_tile_card.xml
new file mode 100644
index 0000000..6f94914
--- /dev/null
+++ b/res/layout/suggestion_tile_card.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    android:background="@drawable/selectable_card"
+    android:clickable="true"
+    android:elevation="2dp"
+    android:focusable="true"
+    android:minHeight="@dimen/dashboard_tile_minimum_height" />
diff --git a/res/layout/suggestion_tile_new_ui.xml b/res/layout/suggestion_tile_new_ui.xml
new file mode 100644
index 0000000..e2dd13a
--- /dev/null
+++ b/res/layout/suggestion_tile_new_ui.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/white"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:minHeight="@dimen/dashboard_tile_minimum_height">
+
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="@dimen/dashboard_tile_image_size"
+            android:layout_height="@dimen/dashboard_tile_image_size"
+            android:layout_marginStart="14dp"
+            android:layout_marginEnd="24dp"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView android:id="@android:id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAppearance="@style/TextAppearance.TileTitle"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"/>
+
+            <TextView android:id="@android:id/summary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="@style/TextAppearance.Small"
+                android:textColor="?android:attr/textColorSecondary"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <include layout="@layout/horizontal_divider" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/support_tile.xml b/res/layout/support_tile.xml
index c2081c7..a42faf0 100644
--- a/res/layout/support_tile.xml
+++ b/res/layout/support_tile.xml
@@ -28,8 +28,8 @@
         android:layout_width="@dimen/dashboard_tile_image_size"
         android:layout_height="@dimen/dashboard_tile_image_size"
         android:scaleType="centerInside"
-        android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
-        android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"/>
+        android:layout_marginStart="@dimen/dashboard_tile_image_margin"
+        android:layout_marginEnd="@dimen/dashboard_tile_image_margin"/>
     <TextView
         android:id="@+id/tile_title"
         android:layout_width="wrap_content"
diff --git a/res/layout/usage_bottom_label.xml b/res/layout/usage_bottom_label.xml
new file mode 100644
index 0000000..6c16880
--- /dev/null
+++ b/res/layout/usage_bottom_label.xml
@@ -0,0 +1,20 @@
+<!--
+    Copyright (C) 2016 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.
+-->
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textAppearance="?android:attr/textAppearanceSmall" />
diff --git a/res/layout/usage_side_label.xml b/res/layout/usage_side_label.xml
new file mode 100644
index 0000000..6c16880
--- /dev/null
+++ b/res/layout/usage_side_label.xml
@@ -0,0 +1,20 @@
+<!--
+    Copyright (C) 2016 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.
+-->
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textAppearance="?android:attr/textAppearanceSmall" />
diff --git a/res/layout/usage_view.xml b/res/layout/usage_view.xml
new file mode 100644
index 0000000..8e9c580
--- /dev/null
+++ b/res/layout/usage_view.xml
@@ -0,0 +1,99 @@
+<!--
+    Copyright (C) 2016 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:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/graph_label_group"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:orientation="horizontal"
+        android:clipChildren="false"
+        android:clipToPadding="false">
+
+        <LinearLayout
+            android:id="@+id/label_group"
+            android:layout_width="@dimen/usage_graph_labels_width"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <include android:id="@+id/label_top"
+                layout="@layout/usage_side_label" />
+
+            <Space
+                android:id="@+id/space1"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <include android:id="@+id/label_middle"
+                layout="@layout/usage_side_label" />
+
+            <Space
+                android:id="@+id/space2"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <include android:id="@+id/label_bottom"
+                layout="@layout/usage_side_label" />
+
+        </LinearLayout>
+
+        <com.android.settings.graph.UsageGraph
+            android:id="@+id/usage_graph"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:layout_marginTop="@dimen/usage_graph_margin_top_bottom"
+            android:layout_marginBottom="@dimen/usage_graph_margin_top_bottom" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/bottom_label_group"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <Space
+            android:id="@+id/bottom_label_space"
+            android:layout_width="@dimen/usage_graph_labels_width"
+            android:layout_height="wrap_content"/>
+        <com.android.settings.graph.BottomLabelLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="horizontal"
+            android:layoutDirection="ltr">
+            <include android:id="@+id/label_start"
+                     layout="@layout/usage_side_label" />
+
+            <Space
+                android:id="@+id/spacer"
+                android:layout_width="40dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <include android:id="@+id/label_end"
+                     layout="@layout/usage_side_label" />
+        </com.android.settings.graph.BottomLabelLayout>
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/vpn_dialog.xml b/res/layout/vpn_dialog.xml
index 47be368..71ce0ad 100644
--- a/res/layout/vpn_dialog.xml
+++ b/res/layout/vpn_dialog.xml
@@ -37,7 +37,8 @@
             <TextView style="@style/vpn_label"
                     android:text="@string/vpn_type"
                     android:labelFor="@+id/type"/>
-            <Spinner style="@style/vpn_value" android:id="@+id/type"
+            <Spinner style="@style/vpn_value"
+                     android:id="@+id/type"
                     android:prompt="@string/vpn_type"
                     android:entries="@array/vpn_types"/>
 
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index ba1f6fc..cfb6d9a 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -53,9 +53,21 @@
                         android:layout_height="wrap_content"
                         style="@style/wifi_item_edit_content"
                         android:hint="@string/wifi_ssid_hint"
-                        android:maxLength="32"
                         android:singleLine="true"
                         android:inputType="textNoSuggestions" />
+
+                <LinearLayout android:id="@+id/ssid_too_long_warning"
+                              android:layout_width="match_parent"
+                              android:layout_height="wrap_content"
+                              android:visibility="gone"
+                              style="@style/wifi_item" >
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_warning"
+                        android:text="@string/wifi_ssid_too_long" />
+                </LinearLayout>
+
              </LinearLayout>
 
             <LinearLayout
diff --git a/res/raw/gesture_camera_lift.mp4 b/res/raw/gesture_camera_lift.mp4
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/gesture_camera_lift.mp4
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 61a6476..d959cef 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Goed"</item>
     <item msgid="8986346415847956850">"Uitstekend"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Altyd"</item>
-    <item msgid="844721238536786870">"Slegs wanneer ingeprop"</item>
-    <item msgid="1986753720941888596">"Nooit"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Altyd"</item>
-    <item msgid="7433294150916905997">"Slegs wanneer ingeprop"</item>
-    <item msgid="1390404486722375028">"Nooit"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Afgelope 30 dae"</item>
     <item msgid="6600989128423965319">"Stel gebruiksiklus …"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 99f01a2..4ad6f64 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Jy is nou \'n ontwikkelaar!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Toemaar, jy is reeds \'n ontwikkelaar."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Aktiveer asseblief eers ontwikkelaaropsies."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Draadloos en netwerke"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Skakelpunte"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Toestel"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE-voorbereid"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Video-oproepe is opgestel"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi-oproepe is opgestel"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/teenwoordigheid is opgestel"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Mobieleradiokrag"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Bekyk SIM-adresboek"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Kyk na vaste skakelnommers"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Skandeer vir toestelle"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Hernoem hierdie toestel"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Hernoem"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ontkoppel?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Dit sal jou verbinding met &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; beëindig."</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Ontkoppel toestel?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Jou foon sal van <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ontkoppel."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Jou tablet sal van <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ontkoppel."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Jou toestel sal van <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ontkoppel."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Ontkoppel"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Jy het nie toestemming om Bluetooth-instellings te verander nie."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Bind nuwe toestel saam"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Nabye toestelle kan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sien as Bluetooth-instellings oop is."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Foon se Bluetooth-adres: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Tablet se Bluetooth-adres: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Toestel se Bluetooth-adres: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Ontkoppel <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Uitsaai"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Dekativeer profiel?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth-saambindingsversoek"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Saambindingsversoek"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Tik om met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> saam te bind."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Wys ontvangde lêers"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Lêers wat ontvang is"</string>
     <string name="device_picker" msgid="4978696506172252813">"Kies Bluetooth-toestel"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth aanskakel"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth afskakel"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wil toegang tot jou boodskappe verkry. Gee toegang aan %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM-toegangversoek"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wil toegang hê tot jou SIM-kaart. As jy toegang tot jou SIM-kaart verleen, sal die dataverbinding op jou toestel vir die duur van die verbinding gedeaktiveer wees. Verleen toegang aan <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Vir ander toestelle sigbaar as \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Jou toestelle"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Bind nuwe toestel saam"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum en tyd"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Kies tydsone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Rekeninge"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Ligging"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Rekeninge"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Sekuriteit en ligging"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Sekuriteit en ligging"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkripsie en eiebewyse"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Foon is geënkripteer"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Toestel is geënkripteer"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Ontsluit met vingerafdruk"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Gebruik jou vingerafdruk"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"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.\n\nLet wel: Jou vingerafdruk sal dalk minder veilig as \'n sterk patroon of PIN wees."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Raak bloot die vingerafdruksensor om aankope te magtig of by programme aan te meld. Wees versigtig wie se vingerafdrukke jy byvoeg. Selfs een bygevoegde vingerafdruk kan enige van hierdie goed doen.\n\nLet wel: Jy kan nie jou vingerafdruk gebruik om hierdie toestel te ontsluit nie. Kontak jou organisasie se administateur vir meer inligting."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Raak eenvoudig die vingerafdruksensor om jou foon te ontsluit, aankope te magtig of 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.\n\nLet wel: Jou vingerafdruk sal dalk minder veilig as \'n sterk patroon of PIN wees."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Kanselleer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Gaan voort"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Slaan oor"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Voeg vingerafdruk by"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Kenmerke vir toestelbeskerming sal nie geaktiveer word nie. Jy sal nie ander mense kan keer om hierdie tablet te gebruik as dit verloor, gesteel of skoongevee word nie."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Kenmerke vir toestelbeskerming sal nie geaktiveer word nie. Jy sal nie ander mense kan keer om hierdie toestel te gebruik as dit verloor, gesteel of uitgevee word nie."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Kenmerke vir toestelbeskerming sal nie geaktiveer word nie. Jy sal nie ander mense kan keer om hierdie foon te gebruik as dit verloor, gesteel of uitgevee word nie."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Kenmerke vir toestelbeskerming sal nie geaktiveer word nie. Jy sal nie ander mense kan keer om hierdie tablet te gebruik as dit verloor of gesteel word nie."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Kenmerke vir toestelbeskerming sal nie geaktiveer word nie. Jy sal nie ander mense kan keer om hierdie toestel te gebruik as dit verloor of gesteel word nie."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Kenmerke vir toestelbeskerming sal nie geaktiveer word nie. Jy sal nie ander mense kan keer om hierdie foon te gebruik as dit verloor of gesteel word nie."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Volgende"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Toestelbeskermingkenmerke sal nie aangeskakel word nie. Jy sal nie ander mense kan keer om hierdie tablet te gebruik as dit verloor, gesteel of teruggestel word nie."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Toestelbeskermingkenmerke sal nie aangeskakel word nie. Jy sal nie ander mense kan keer om hierdie toestel te gebruik as dit verloor, gesteel of teruggestel word nie."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Toestelbeskermingkenmerke sal nie aangeskakel word nie. Jy sal nie ander mense kan keer om hierdie te foon gebruik as dit verloor, gesteel of teruggestel word nie."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Toestelbeskermingkenmerke sal nie aangeskakel word nie. Jy sal nie ander mense kan keer om hierdie tablet te gebruik as dit verloor of gesteel word nie."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Toestelbeskermingkenmerke sal nie aangeskakel word nie. Jy sal nie ander mense kan keer om hierdie toestel te gebruik as dit verloor of gesteel word nie."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Toestelbeskermingkenmerke sal nie aangeskakel word nie. Jy sal nie ander mense kan keer om hierdie foon te gebruik as dit verloor of gesteel word nie."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Slaan in elk geval oor"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Gaan terug"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Vind die sensor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Vind die vingerafdruksensor op die agterkant van jou foon."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Raak die sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Dit is op die agterkant van jou foon. Gebruik jou wysvinger."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustrasie met toestel en ligging van vingerafdruksensor"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Naam"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Goed"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Vee uit"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Kom ons begin"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Raak die sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Plaas jou vinger op die sensor en lig dit op wanneer jy \'n vibrasie voel"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Hou aan daarmee"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Beweeg jou vinger effens om al die verskillende dele van jou vingerafdruk by te voeg"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Vingerafdruk bygevoeg!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Wanneer jy hierdie ikoon sien, kan jy jou vingerafdruk gebruik vir identifisering of om \'n aankoop te magtig."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Raak net die vingerafdruksensor om jou toestel wakker te maak en te ontsluit."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Wanneer jy hierdie ikoon sien, kan jy ook aankope magtig of by programme aanmeld."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Lig en raak dan weer"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Hou aan om jou vinger op te lig om die verskillende dele van jou vingerafdruk by te voeg"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Vingerafdruk bygevoeg"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Gebruik jou vingerafdruk vir identifikasie om aankope goed te keur wanneer jy hierdie ikoon sien."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Slaan vingerafdrukopstelling oor?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Jy het gekies om jou vingerafdruk te gebruik as een manier om jou foon te ontsluit. As jy dit nou oorslaan, sal jy dit later moet opstel. Dit neem net \'n minuut of wat om op te stel."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Stel skermslot op"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Klaar"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Oeps, dis nie die sensor nie"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Gebruik jou toestel se vingerafdruksensor."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Raak sensor op die agterkant van jou foon. Gebruik jou wysvinger."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registrasie is nie voltooi nie"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Tydlimiet vir vingerafdrukregistrasie is bereik. Probeer weer."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Vingerafdrukregistrasie het nie gewerk nie. Probeer weer of gebruik \'n ander vinger."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Keer ander mense om hierdie toestel sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Keer ander mense om hierdie foon sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Kies jou rugsteunmetode vir skermsluiting"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Skermslotopsies"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Skermslotopsies"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skermslot"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Onmiddellik ná slaap"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> ná slaap"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Verander ontsluitpatroon"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Verander ontsluit-PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Verander ontsluitwagwoord"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Probeer weer. Poging <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> van <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Laaste poging"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"As jy met hierdie poging \'n verkeerde werkpatroon invoer, sal jou werkprofiel en geassosieerde data van hierdie toestel af verwyder word."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"As jy met hierdie poging \'n verkeerde werk-PIN invoer, sal jou werkprofiel en geassosieerde data van hierdie toestel af verwyder word."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"As jy met hierdie poging \'n verkeerde werkwagwoord invoer, sal jou werkprofiel en geassosieerde data van hierdie toestel af verwyder word."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Te veel verkeerde pogings. Jou werkprofiel en geassosieerde data sal van hierdie toestel af verwyder word."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Maak toe"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Probeer weer. Poging <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> van <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Jou data sal uitgevee word"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"As jy met jou volgende poging \'n verkeerde patroon invoer, sal hierdie toestel se data uitgevee word"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"As jy met jou volgende poging \'n verkeerde PIN invoer, sal hierdie toestel se data uitgevee word"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"As jy met jou volgende poging \'n verkeerde wagwoord invoer, sal hierdie toestel se data uitgevee word"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"As jy met jou volgende poging \'n verkeerde patroon invoer, sal hierdie gebruiker uitgevee word"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"As jy met jou volgende poging \'n verkeerde PIN invoer, sal hierdie gebruiker uitgevee word"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"As jy met jou volgende poging \'n verkeerde wagwoord invoer, sal hierdie gebruiker uitgevee word"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"As jy met jou volgende poging \'n verkeerde patroon invoer, sal jou werkprofiel en sy data uitgevee word"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"As jy met jou volgende poging \'n verkeerde PIN invoer, sal jou werkprofiel en sy data uitgevee word"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"As jy met jou volgende poging \'n verkeerde wagwoord invoer, sal jou werkprofiel en sy data uitgevee word"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Te veel verkeerde pogings. Hierdie toestel se data sal uitgevee word."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Te veel verkeerde pogings. Hierdie gebruiker sal uitgevee word."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Te veel verkeerde pogings. Hierdie werkprofiel en sy data sal uitgevee word."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Maak toe"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Moet minstens <xliff:g id="COUNT">%d</xliff:g> karakters lank wees"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Die PIN moet minstens <xliff:g id="COUNT">%d</xliff:g> syfers lank wees"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Gaan voort"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Gevorderde Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Wanneer Bluetooth aangeskakel is, kan jou toestel met ander nabygeleë Bluetooth-toestelle kommunikeer."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Om liggingakkuraatheid te verbeter, kan stelselprogramme en -dienste steeds Bluetooth-toestelle bespeur. Jy kan dit in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>skanderinginstellings<xliff:g id="LINK_END_1">LINK_END</xliff:g> verander."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Kon nie koppel nie. Probeer weer."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Toestelbesonderhede"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Toestel se Bluetooth-adres: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Vergeet toestel?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Jou foon sal nie meer met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> saamgebind wees nie"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Jou tablet sal nie meer met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> saamgebind wees nie"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Jou toestel sal nie meer met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> saamgebind wees nie"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Vergeet toestel"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Koppel aan…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sal van mediaoudio ontkoppel word."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>sal van vryhandse oudio ontkoppel word."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Moenie verskaf nie"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Moenie staaf nie"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Geen sertifikaat is gespesifiseer nie. Jou verbinding sal nie privaat wees nie."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Netwerknaam is te lank."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Moet \'n domein spesifiseer."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS beskikbaar"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS beskikbaar)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 netwerk</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Gevorderde Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Stel Wi‑Fi op"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-adres"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-adres"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnetmasker"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vergeet hierdie groep?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Draagbare Wi-Fi-warmkol"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi-warmkol"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Gebruik mobiele verbinding om Wi‑Fi-netwerk te bied"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Deel nie tans hierdie tablet se internetverbinding deur warmkol nie"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Deel nie tans hierdie foon se internetverbinding deur warmkol nie"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Deel nie tans internet of inhoud met ander toestelle nie"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Deel tans hierdie tablet se internetverbinding via warmkol"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Deel tans hierdie foon se internetverbinding via warmkol"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Program deel tans inhoud. Skakel warmkol af en dan aan om internetverbinding te deel"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi-naam"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Skakel tans aan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Ander toestelle kan aan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> koppel"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-wagwoord"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-band"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Gebruik warmkol om \'n Wi-Fi-netwerk vir jou ander toestelle te skep. Warmkol verskaf internet deur jou mobiele dataverbinding te gebruik. Bykomende dataheffings kan dalk geld."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Programme kan \'n warmkol skep om inhoud met nabygeleë toestelle te deel."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Skakel tans Wi-Fi-warmkol aan..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Skakel tans Wi-Fi-warmkol af..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> is aktief"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"As Wi-Fi-oproepe aan is, kan jou foon oproepe deur Wi-Fi-netwerke of jou diensverskaffer se netwerk roeteer, afhangend van jou voorkeur en watter sein die sterkste is. Voordat jy hierdie kenmerk aanskakel, vind by jou diensverskaffer oor tariewe en ander besonderhede uit."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Dateer noodadres op"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Adres wat deur nooddienste as jou ligging gebruik word as jy \'n 911-oproep met Wi-Fi maak"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skerm"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Geen resultate nie"</string>
     <string name="display_settings" msgid="7965901687241669598">"Skerm"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Outodraai skerm"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Helder kleure"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Wissel oriëntasie outomaties wanneer tablet gedraai word"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Verwissel outomaties van oriëntasie wanneer foon draai"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Wissel oriëntasie outomaties wanneer tablet gedraai word"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimeer helderheidsvlak volgens beskikbare lig. Wanneer dié kenmerk aan is, kan jy steeds helderheid tydelik aanpas."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Aandbeligting"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Aandbeligting tint jou skerm geelbruin. Dit maak dit makliker om in dowwe lig te lees of na jou skerm te kyk en sal jou dalk help om makliker aan die slaap te raak."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Skedule"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Skakel outomaties aan"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nooit"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Gepasmaakte skedule"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Sonsondergang tot sonsopkoms"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Skedule"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Geen"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Skakel aan op gepasmaakte tyd"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Skakel aan van sonsondergang tot -opkoms"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Begintyd"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Eindtyd"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensiteit"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Af. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Sal nooit outomaties aanskakel nie."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Sal outomaties aanskakel om <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Sal outomaties aanskakel met sonsondergang."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Aan. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Sal nooit outomaties afskakel nie."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Sal outomaties afskakel om <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Sal outomaties afskakel met sonsopkoms."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Af / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Sal nooit outomaties aanskakel nie"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Sal outomaties aanskakel om <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Sal outomaties aanskakel met sonsondergang"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Aan / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Sal nooit outomaties afskakel nie"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Sal outomaties afskakel om <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Sal outomaties afskakel met sonsopkoms"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Slaap"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skerm skakel af"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> se onaktiwiteit"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Instellings"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Outomatiese helderheid"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lig op om wakker te maak"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Stemmingvertoning"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Stemmingvertoning"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Altyd aan"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nuwe kennisgewings"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Wanneer om te wys"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nuwe kennisgewings"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Maak skerm wakker wanneer jy kennisgewings ontvang"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Altyd aan"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Wys tyd, kennisgewingikone en ander inligting"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Lettertipegrootte"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Maak teks groter of kleiner"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kaart se sluitinstellings"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Die APN kan nie leeg wees nie."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC-veld moet 3 syfers wees."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Die MNC-veld moet uit 2 of 3 syfers bestaan."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Diensverskaffer laat nie toe dat APN\'e van tipe %s bygevoeg word nie."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Laai verstek APN-instellings terug"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Stel terug na verstek"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Terugstel van verstek APN-instellings voltooi"</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Vee SD-kaart uit"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Vee alle data op die interne USB-berging uit, soos musiek of foto\'s."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Vee al die data op die SD-kaart uit, soos musiek of foto\'s."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Vee e-SIM\'s uit"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Vee alle e-SIM\'s op die foon uit. Dit sal nie jou mobielediensplan kanselleer nie."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Vee alle e-SIM\'s op die tablet uit. Dit sal nie jou mobielediensplan kanselleer nie."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Stel tablet terug"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Stel foon terug"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Vee al jou persoonlike inligting en afgelaaide programme uit? Jy kan nie hierdie handeling ontdoen nie!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Kan nie verbind of Wi-Fi-warmkol gebruik wanneer Databespaarder aan is nie"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-verbinding"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB gekoppel, merk om te verbind"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Verbind"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Kan nie verbind wanneer USB-geheue gebruik word nie"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB nie gekoppel nie"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Koppel om aan te skakel"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB-verbindingsfout"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Deel foon se internetverbinding via USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Deel tablet se internetverbinding via USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-verbinding"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Deel tablet se internetverbinding via Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Deel foon se internetverbinding via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Deel tabletinternetverbinding met 1 toestel via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Deel foon se internetverbinding met 1 toestel via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Deel tabletinternetverbinding met <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> toestelle via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Deel foon se internetverbinding met <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> toestelle via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Deel tablet se internetverbinding via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Deel foon se internetverbinding via Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Deel hierdie <xliff:g id="DEVICE_NAME">%1$d</xliff:g> se internetverbinding via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Deel nie tabletnetverbinding via Bluetooth nie"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Deel nie fooninternetverbinding via Bluetooth nie"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Nie verbind nie"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Kan nie aan meer as <xliff:g id="MAXCONNECTION">%1$d</xliff:g> toestelle verbind nie."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sal ontverbind word."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Gebruik warmkol en verbinding om deur jou mobiele dataverbinding internet aan ander toestelle te verskaf."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Gebruik warmkol en verbinding om deur jou mobiele dataverbinding internet aan ander toestelle te verskaf. Programme kan ook \'n warmkol skep om inhoud met nabygeleë toestelle te deel."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hulp"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobiele netwerk"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiele plan"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Liggingmodus"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Gebruik GPS, Wi‑Fi, Bluetooth of mobiele netwerke om ligging te bepaal"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Gebruik Wi-Fi, Bluetooth of mobiele netwerke om ligging te bepaal"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Gebruik GPS om ligging te bepaal"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Gebruik GPS en toestelsensors om ligging te bepaal"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skandeer"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi-opsporing"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Verbeter ligging deur stelselprogramme en -dienste toe te laat om Wi-Fi-netwerke enige tyd te bespeur."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Jy het nie \'n dataverbinding nie. Om die inligting nou te sien, gaan na %s op enige rekenaar wat aan die internet gekoppel is."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laai tans…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Kies jou wagwoord"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Stel wagwoord vir vingerafdruk"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Kies jou patroon"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Stel patroon vir vingerafdruk"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Kies jou PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Stel PIN vir vingerafdruk"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Bevestig jou wagwoord"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bevestig jou patroon"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bevestig jou PIN"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Program-instellings"</string>
     <string name="install_applications" msgid="4872012136210802181">"Onbekende bronne"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Laat alle programbronne toe"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Programme wat onlangs oopgemaak is"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Sien al <xliff:g id="COUNT">%1$d</xliff:g> programme"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> gelede"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Jou tablet en persoonlike data is meer kwesbaar vir aanvalle deur onbekende programme. Deur programme van hierdie bron af te installeer, stem jy in dat jy verantwoordelik is vir enige skade aan jou tablet of verlies van data wat uit hul gebruik kan spruit."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Jou foon en persoonlike data is meer kwesbaar vir aanvalle deur onbekende programme. Deur programme van hierdie bron af te installeer, stem jy in dat jy verantwoordelik is vir enige skade aan jou foon of verlies van data wat uit hul gebruik kan spruit."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Gevorderde instellings"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Stop stelseldiens?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"As jy hierdie diens stop sal sommige eienskappe van jou tablet dalk nie behoorlik werk nie totdat jy dit eers aan en af skakel."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"As jy hierdie diens stop sal sommige eienskappe van jou foon dalk nie behoorlik werk nie totdat jy dit eers aan- en af skakel."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Tale, invoer en gebare"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Tale en invoer"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Tale en invoer"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Invoerbystand"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> drukdienste is aan</item>
       <item quantity="one">1 drukdiens is aan</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> druktake</item>
+      <item quantity="one">1 druktaak</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Drukdienste"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Geen dienste geïnstalleer nie"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Geen drukkers gekry nie"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Gebruikdetails"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Verstel kraggebruik"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Ingeslote pakkette"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Programme wat tans battery laat afloop"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Hou toestel wakker"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Maak toestel in agtergrond wakker"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Vra gereeld vir ligging"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> programme wat tans vreemd optree"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Stop program?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Jou foon kan nie battery normaal bestuur nie omdat <xliff:g id="APP">%1$s</xliff:g> jou foon wakker hou.\n\nJy kan die program dwing stop om dié kwessie te probeer regstel.\n\nAs dit aanhou gebeur, sal jy dalk die program moet deïnstalleer om batterywerkverrigting te verbeter."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Jou tablet kan nie battery normaal bestuur nie omdat <xliff:g id="APP">%1$s</xliff:g> jou tablet wakker hou.\n\nJy kan die program dwing stop om dié kwessie te probeer regstel.\n\nAs dit aanhou gebeur, sal jy dalk die program moet deïnstalleer om batterywerkverrigting te verbeter."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Jou toestel kan nie battery normaal bestuur nie omdat <xliff:g id="APP">%1$s</xliff:g> jou toestel wakker hou.\n\nJy kan die program dwing stop om dié kwessie te probeer regstel.\n\nAs dit aanhou gebeur, sal jy dalk die program moet deïnstalleer om batterywerkverrigting te verbeter."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Stop program"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Skakel gebruik in die agtergrond af?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Jou foon kan nie battery normaal bestuur nie omdat <xliff:g id="APP">%1$s</xliff:g> aanhoudend jou foon wakker maak.\n\nOm hierdie kwessie aan te spreek, kan jou foon verhoed dat hierdie program in die agtergrond loop."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Jou tablet kan nie battery normaal bestuur nie omdat <xliff:g id="APP">%1$s</xliff:g> aanhoudend jou tablet wakker maak.\n\nOm hierdie kwessie aan te spreek, kan jou tablet verhoed dat hierdie program in die agtergrond loop."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Jou toestel kan nie battery normaal bestuur nie omdat <xliff:g id="APP">%1$s</xliff:g> aanhoudend jou toestel wakker maak.\n\nOm hierdie kwessie aan te spreek, kan jou toestel verhoed dat hierdie program in die agtergrond loop."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Skakel af"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Skakel ligging af?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Jou foon kan nie battery normaal bestuur nie omdat <xliff:g id="APP">%1$s</xliff:g> aanhou om jou ligging te versoek wanneer jy nie die program gebruik nie.\n\nJy kan ligging vir hierdie program afskakel om dié kwessie reg te stel."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Jou tablet kan nie battery normaal bestuur nie omdat <xliff:g id="APP">%1$s</xliff:g> aanhou om jou ligging te versoek wanneer jy nie die program gebruik nie.\n\nJy kan ligging vir hierdie program afskakel om dié kwessie reg te stel."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Jou toestel kan nie battery normaal bestuur nie omdat <xliff:g id="APP">%1$s</xliff:g> aanhou om jou ligging te versoek wanneer jy nie die program gebruik nie.\n\nJy kan ligging vir hierdie program afskakel om dié kwessie reg te stel."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Skakel af"</string>
     <string name="power_screen" msgid="3023346080675904613">"Skerm"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Flitslig"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Programme"</string>
     <string name="power_service" msgid="1599661212370831780">"Dienste"</string>
     <string name="power_system" msgid="8290455327965307383">"Stelsel"</string>
-    <string name="power_user" msgid="1889728099253018005">"Gebruiker"</string>
+    <string name="power_user" msgid="3706143225319881667">"Ander gebruikers"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU-totaal"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-voorgrond"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Hou wakker"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Oorberekende kragverbruik"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> lank gebruik"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktief vir <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Skermgebruik <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> gebruik deur <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> van algehele batterygebruik"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Verander PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Wys kennisgewings"</string>
     <string name="help_label" msgid="6886837949306318591">"Hulp en terugvoer"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Hulpartikels, foon- en kletssteun"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Hulpartikels, foon en klets, kom aan die gang"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Rekening vir die inhoud"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Uiterste bedreigings"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Wys %d versteekte item</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Netwerk en internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobiel, datagebruik, warmkol"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobiel"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datagebruik"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"warmkol"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Gekoppelde toestelle"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Programme en kennisgewings"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Toestemmings, verstekprogramme"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Gebruikers en rekeninge"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gebaar"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"betaal, tik, betalings"</string>
     <string name="keywords_backup" msgid="470070289135403022">"rugsteun, rugsteun"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gebaar, rand, kant, aktiewe rand, druk, greep, help, assistent, squeezy, squeezie, squeezey, squeezee, ok google, google assistent"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gebaar, wakker, kennisgewings, skerm, vertoonskerm, skerm af, skerm aan, druk, rand, aan die slaap, slaap, greep"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gebaar, stilte, sluimer, alarm, inkomende oproep, saggies, vertoonskerm, sluitskerm, druk, greep, rand, stop"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Stel Wi-Fi-NFC-merker op"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skryf"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tik \'n merker om te skryf …"</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Moet glad nie werkkennisgewings wys nie"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Hoe wil jy hê moet profielkennisgewings wys wanneer jou toestel gesluit is?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profielkennisgewings"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Kennisgewings"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Kennisgewings"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Programkennisgewings"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kennisgewingkategorie"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Belangrikheid"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Laat die program besluit"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Dringend"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Laat klank toe"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Moenie \'n geluid maak, vibreer of hierdie kennisgewings vir \'n kort tyd op die huidige skerm wys nie."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Min belang"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Middelmatige belang"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Groot belang"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Dringende belang"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Kennisgewingassistent"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Kennisgewingtoegang"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Toegang tot werkprofielkennisgewings is geblokkeer"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Beeld-in-beeld"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Laat beeld-in-beeld toe"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Laat toe dat hierdie program \'n beeld-in-beeld-venster skep terwyl die program oop is of nadat jy dit verlaat het (byvoorbeeld, om voort te gaan om \'n video te kyk). Hierdie venster wys bo-oor ander programme wat jy gebruik."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Ja"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Nee"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Toegang tot Moenie Steur Nie"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Geen geïnstalleerde programme het toegang tot Moenie Steur Nie versoek nie"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Laai tans programme …"</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Hierdie werkprofiel word bestuur deur:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Bestuur deur <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimenteel)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Toestelrotasie"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Draai die skerm se inhoud"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Bly in portretaansig"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Bly in landskapaansig"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Bly in huidige oriëntasie"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Begin veilig"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Gaan voort"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Jy kan hierdie toestel verder beskerm deur jou PIN te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie. \n\nDit help om data op verlore of gesteelde toestelle te beskerm. Vereis \'n PIN om jou toestel te begin?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Jy kan hierdie toestel verder beskerm deur jou wagwoord te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie. \n\nDit help om data op verlore of gesteelde toestelle te beskerm. Vereis \'n wagwoord om jou toestel te begin?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Benewens die gebruik van jou vingerafdruk om jou toestel te ontsluit, kan jy hierdie toestel verder beskerm deur jou PIN te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie. \n\nDit help om data op verlore of gesteelde toestelle te beskerm. Vereis \'n PIN om jou toestel te begin?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Benewens die gebruik van jou vingerafdruk om jou toestel te ontsluit, kan jy hierdie toestel verder beskerm deur jou patroon te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie. \n\nDit help om data op verlore of gesteelde toestelle te beskerm. Vereis \'n patroon om jou toestel te begin?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Benewens die gebruik van jou vingerafdruk om jou toestel te ontsluit, kan jy hierdie toestel verder beskerm deur jou wagwoord te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie. \n\nDit help om data op verlore of gesteelde toestelle te beskerm. Vereis \'n wagwoord om jou toestel te begin&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Jy kan naas die gebruik van jou vingerafdruk om jou toestel te ontsluit, hierdie toestel verder beskerm deur jou wagwoord te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie.\n\nDit help om data op verlore of gesteelde toestelle te beskerm. Wil jy die wagwoord vereis om jou toestel te begin?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ja"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nee"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Vereis PIN?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Opletberigte oor gebruik"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Wys volle toestelgebruik"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Wys programgebruik"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Groot gebruik"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> programme tree abnormaal op</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> tree abnormaal op</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Programme wat battery laat afloop</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> wat battery laat afloop</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Nie geoptimaliseer nie"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nie geoptimeer nie"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimaliseer batterygebruik"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Wys oor ander programme"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> van <xliff:g id="COUNT_1">%2$d</xliff:g> programme word toegelaat om oor ander te wys"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Programme met toestemming"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Ja"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Nee"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Toegelaat"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Nie toegelaat nie"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"installeer programme uit onbekende bronne"</string>
     <string name="write_settings" msgid="4797457275727195681">"Verander stelselinstellings"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"skryf wysig stelselinstellings"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Skerm is geelbruin getint. Dit kan jou help om aan die slaap te raak."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Voorstelle"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> meer"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> voorstelle</item>
+      <item quantity="one">1 voorstel</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> voorstelle</item>
+      <item quantity="one">+1 voorstel</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Verwyder"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Koel kleurtemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gebruik koeler skermkleure"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g>-datawaarskuwing"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g>-datawaarskuwing / <xliff:g id="ID_2">%2$s</xliff:g>-datalimiet"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Faktureringsiklus"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Maandelikse siklus begin op die <xliff:g id="ID_1">%1$s</xliff:g>e van elke maand"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Maandeliks vanaf <xliff:g id="ID_1">%1$s</xliff:g>e"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Maandeliks op dag <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Netwerkbeperkinge"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> beperkings</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 program word toegelaat om onbeperkte data te gebruik wanneer Databespaarder aan is</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Databespaarder"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Onbeperkte datatoegang"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Onbeperkte data"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Agtergronddata is afgeskakel"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Aan"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Af"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Beheer sluitskermkennisgewings"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Wys of versteek kennisgewinginhoud"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Alles"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Steundiens"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Steundiens en wenke"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Kleinste breedte"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Geen geïnstalleerde programme het toegang tot betaalde SMS\'e versoek nie"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Betaalde SMS\'e kan jou geld kos en die koste sal by jou diensverskafferfakture gevoeg word. As jy toestemming vir \'n program aktiveer, sal jy betaalde SMS\'e met daardie program kan stuur."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Outomaties"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Handmatig"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Maak nou spasie beskikbaar"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gebare"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Gebaarkortpaaie"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Vinnige gebare om jou foon te beheer"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Vinnige gebare om jou tablet te beheer"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Vinnige gebare om jou toestel te beheer"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Spring na kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Druk die aan/af-skakelaar twee keer om die kamera vinnig oop te maak. Dit werk op enige skerm."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Maak kamera vinnig oop"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Druk aan/af-skakelaar twee keer om kamera oop te maak"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Draai kamera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Neem selfies vinniger"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Dubbeldraai foon vir selfiemodus"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Dubbeldraai tablet vir selfiemodus"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Dubbeldraai toestel vir selfiemodus"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dubbeltik om na foon te kyk"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dubbeltik om na tablet te kyk"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dubbeltik om na toestel te kyk"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Dubbeltik op jou skerm om jou kennisgewings vinnig na te gaan."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Dubbelklik jou skerm om tyd, kennisgewingikone en ander inligting na te gaan."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Gaan kennisgewings na wanneer skerm af is"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Tel foon op om te kyk"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tel op om na tablet te kyk"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Tel op om na toestel te kyk"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Tel jou foon op om jou kennisgewings vinnig na te gaan."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Tel jou tablet op om jou kennisgewings vinnig na te gaan."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Tel jou toestel op om jou kennisgewings vinnig na te gaan."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Tel jou foon op om tyd, kennisgewingikone en ander inligting na te gaan."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Tel jou tablet op om tyd, kennisgewingikone en ander inligting na te gaan."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Tel jou toestel op om tyd, kennisgewingikone en ander inligting na te gaan."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Gaan kennisgewings na wanneer skerm af is"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Swiep vingerafdruk vir kennisgewings"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Swiep na onder op die vingerafdruksensor aan die agterkant van jou foon om jou kennisgewings na te gaan."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Swiep na onder op die vingerafdruksensor aan die agterkant van jou tablet om jou kennisgewings na te gaan."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Swiep na onder op die vingerafdruksensor aan die agterkant van jou toestel om jou kennisgewings na te gaan."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Sien kennisgewings vinnig"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Swiep na onder op vingerafdruksensor"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Lig op om kamera oop te maak"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Lig jou foon op na \'n fotoneemposisie (landskap of portret) om die kamera outomaties oop te maak. Dit werk wanneer jou foon slaap of gesluit is."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Neem foto\'s wanneer die foon slaap of gesluit is"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Bystandgebaar"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensitiwiteit"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Wil jy hierdie kitsprogram verwyder?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Speletjies"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audiolêers"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Gebruikte spasie"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(gedeïnstalleer vir gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(gedeaktiveer vir gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Outovuldiens"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Kitsprogram"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Skakel die bergingbestuurder af?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Fliek en TV-programme"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Gebruikte spasie"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Diensverskaffervoorsiening-inligting"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger-diensverskaffervoorsiening"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Wat is nuut en opwindend?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Kyk na die top-5-kenmerke"</string>
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 2e991b8..b20d791 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"ጥሩ"</item>
     <item msgid="8986346415847956850">"እጅግ በጣም ጥሩ"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"ሁልጊዜ"</item>
-    <item msgid="844721238536786870">"ሲሰካ ብቻ"</item>
-    <item msgid="1986753720941888596">"በፍፁም"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"ሁልጊዜ"</item>
-    <item msgid="7433294150916905997">"ሲሰካ ብቻ"</item>
-    <item msgid="1390404486722375028">"ፈፅሞ"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"የመጨረሻዎቹ 30 ቀኖች"</item>
     <item msgid="6600989128423965319">"የአጠቃቀም ዑደት አዘጋጅ..."</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index c6360cd..470122b 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"አሁን ገንቢ ሆነዋል!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"አያስፈልግም፣ አስቀድሞ ገንቢ ሆነዋል።"</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"እባክዎ በመጀመሪያ የገንቢ አማራጮችን ያንቁ።"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"የገመድ አልባና አውታረ መረቦች"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"ግንኙነቶች"</string>
     <string name="header_category_device" msgid="4544026001618307754">"መሣሪያ"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"በVoLTE የቀረበ"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"የቪዲዮ ጥሪ ቀርቧል"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"የWifi ጥሪ ቀርቧል"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"የEAB/ተገኝነት ቀርቧል"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"የተንቀሳቃሽ ሬዲዮ ኃይል"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"የሲም አድራሻ ደብተር አሳይ"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"በቋሚነት የሚደወልባቸው  ቁጥሮች"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"መሣሪያዎችን ቃኝ"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"ይህን መሣሪያ ዳግም ሰይም"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"እንደገና ሰይም"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ይለያይ?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ከ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&amp;gt ጋርያልዎትን ተያያዥ ያበቃል።"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"የመሣሪያ ግንኙነት ይቋረጥ?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"የእርስዎን ስልክ ከ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ግንኙነቱ ይቋረጣል።"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"የእርስዎ ጡባዊ ከ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ግንኙነቱ ይቋረጣል።"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"የእርስዎ መሣሪያ ከ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ግንኙነቱ ያቋረጣል።"</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"ግንኙነት አቋርጥ"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"የብሉቱዝ ቅንብሮችን ለመለወጥ ፈቃድ የልዎትም።"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"አዲስ መሣሪያ ያጣምሩ"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> የብሉቱዝ ቅንብሮች ክፍት ሆኖ ሳለ አቅራቢያ ላሉ መሣሪያዎች ይታያል።"</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"የስልክ የብሉቱዝ አድራሻ፦ <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"የጡባዊ የብሉቱዝ አድራሻ፦ <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"የመሣሪያ የብሉቱዝ አድራሻ፦ <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"የ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ግንኙነት ይቋረጥ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ማሰራጨት"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"መገለጫ ይቦዝን?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"የብሉቱዝ ማገናኛ ጥየቃ"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"ማጣመሪያ ጥየቃ"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"ከ«<xliff:g id="DEVICE_NAME">%1$s</xliff:g>» ለማጣመር ነካ ያድርጉ።"</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"የደረሱ ፋይሎችን አሳይ"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"የደረሱ ፋይሎች"</string>
     <string name="device_picker" msgid="4978696506172252813">"የብሉቱዝ መሣሪያ ምረጥ"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ብሉቱዝን ማብራት ይፈልጋል"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ብሉቱዝን ማጥፋት ይፈልጋል"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s የእርስዎን መልዕክቶች ሊደርስበት ይፈልጋል። መዳረሻ ለ%2$s ይሰጥ?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"የሲም መዳረሻ ጥያቄ"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> የእርስዎ ሲም ካርድ ላይ መድረስ ይፈልጋል። ወደ ሲም ካርዱ መዳረሻ መስጠት በእርስዎ መሣሪያ ላይ ግንኙነቱ ላይ በሚቆይበት ጊዜ  ያክል የውሂብ ተገኚነትን ያሰናክላል። ለ<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> መዳረሻ ስጥ"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"ለሌሎች መሣሪያዎች እንደ <xliff:g id="DEVICE_NAME">^1</xliff:g> ሆኖ ይታያል"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"የእርስዎ መሣሪያዎች"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"አዲስ መሣሪያ ያጣምሩ"</string>
     <string name="date_and_time" msgid="9062980487860757694">"ቀን እና ሰዓት"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"የጊዜ ሰቅ ምረጥ"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"መለያዎች"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"አካባቢ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"መለያዎች"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"ደህንነት እና አካባቢ"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"ደህንነት &amp; ሥፍራ"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ምስጠራ እና ምስክርነቶች"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ስልክ ተመስጥሯል"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"መሣሪያ ተመሣጥሯል"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"በጣት አሻራ ይክፈቱ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"ጣት አሻራዎን ይጠቀሙ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"ስልክዎን ለመክፈት፣ ግዢዎችን ለመፍቀድ ወይም ወደ መተግበሪያዎች ለመግባት በቀላሉ የጣት አሻራ ዳሳሹን ይንኩ። የማን ጣት አሻራዎችን እንደሚያክሉ ላይ ይጠንቀቁ። አንዲት የታከለ አሻራ ራሱ እነዚህን ሊያደርግ ይችላል።\n\nማስታወሻ፦ የጣት አሻራዎ ደህንነት ከጠንካራ ስርዓተ ጥለት ወይም ፒን ያነሰ ሊሆን ይችላል።"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"ግዢዎችን ለማጽደቅ ወይም በመለያ ወደ መተግበሪያዎች ለመግባት በቀላሉ የጣት አሻራ ዳሳሹን ይንኩት። የማን ጣት አሻራዎች እንደሚያክሉ ላይ ይጠንቀቁ። አንዲት የታከለ ጣት አሻራ እንኳ ከእነዚህ ውስጥ ማንኛቸውም ማድረግ ይችላል።\n\nማስታወሻ፦ ይህን መሣሪያ ለመክፈት የጣት አሻራዎን መጠቀም አይችሉም። ተጨማሪ መረጃ ለማግኘት የድርጅትዎን አስተዳዳሪ ያነጋግሩ።"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"ስልክዎን ለመክፈት፣ ግዢዎችን ለመፍቀድ ወይም ወደ መተግበሪያዎች ለመግባት በቀላሉ የጣት አሻራ ዳሳሹን ይንኩ። የማን ጣት አሻራዎችን እንደሚያክሉ ላይ ይጠንቀቁ። አንዲት የታከለ አሻራ ራሱ እነዚህን ሊያደርግ ይችላል።\n\nማስታወሻ፦ የጣት አሻራዎ ደህንነት ከጠንካራ ስርዓተ ጥለት ወይም ፒን ያነሰ ሊሆን ይችላል።"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"የእርስዎን ስልክ ለመክፈት ወይም ግዢዎችን ለማጽደቅ የእርስዎን የጣት አሻራ ይጠቀሙ።\n\nማስታወሻ፦ ይህን መሣሪያ ለመክፈት የጣት አሻራን መጠቀም አይችሉም። ለተጨማሪ መረጃ፣ የእርስዎን ድርጅት አስተዳዳሪ ያነጋግሩ።"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"የእርስዎን ስልክ ለመክፈት ወይም ግዢዎችን ለማጽደቅ የእርስዎን የጣት አሻራ ይጠቀሙ።\n\nማስታወሻ፦ የእርስዎ የጣት አሻራ ከጠንካራ ሥርዓተ ጥለት ወይም ፒን ይልቅ ያነሰ ለደህንነት አስተማማኝ ሊሆን ይችላል።"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ይቅር"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ቀጥል"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"ዝለል"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"የጣት አሻራ አክል"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"የመሣሪያ ጥበቃ ባሕሪያት ገቢር አይሆኑም። ይህ ጡባዊ ከጠፋ፣ ከተሰረቀ ወይም ከተጸዳ ሌሎች እንዳይጠቀሙበት ለመከላከል አይችሉም።"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"የመሣሪያ ጥበቃ ባሕሪያት ገቢር አይሆኑም። ይህ መሣሪያ ከጠፋ፣ ከተሰረቀ ወይም ከተጸዳ ሌሎች እንዳይጠቀሙበት ለመከላከል አይችሉም።"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"የመሣሪያ ጥበቃ ባሕሪያት ገቢር አይሆኑም። ይህ ስልክ ከጠፋ፣ ከተሰረቀ ወይም ከተጸዳ ሌሎች እንዳይጠቀሙበት ለመከላከል አይችሉም።"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"የመሣሪያ ጥበቃ ባሕሪያት አይነቁም። ይህ ጡባዊ ከጠፋ ወይም ከተሰረቀ ሌሎች እንዳይጠቀሙበት መከላከል አይችሉም።"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"የመሣሪያ ጥበቃ ባህሪያት ገቢር አይሆኑም። ይህ መሣሪያ ከጠፋ ወይም ከተሰረቀ ሌሎች እንዳይጠቀሙበት መከላከል አይችሉም።"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"የመሳሪያ ጥበቃ ባህሪያት አይነቁም። ይህ ስልክ ከጠፋ ወይም ከተሰረቀ ሌሎች እንዳይጠቀሙበት መከላከል አይችሉም።"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"ቀጣይ"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"የመሣሪያ ጥበቃ ባህሪያት አይበሩም። ይህ ጡባዊ ቢጠፋ፣ ቢሰረቅ ወይም ዳግም እንዲቀናበር ቢደረግ ሌሎች እንዳይጠቀሙበት መከላከል አይችሉም።"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"የመሣሪያ ጥበቃ ባህሪያት አይበሩም። ይህ መሣሪያ ቢጠፋ፣ ቢሰረቅ ወይም ዳግም እንዲቀናበር ቢደረግ ሌሎች እንዳይጠቀሙበት መከላከል አይችሉም።"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"የመሣሪያ ጥበቃ ባህሪያት አይበሩም። ይህ ስልክ ቢጠፋ፣ ቢሰረቅ ወይም ዳግም እንዲቀናበር ቢደረግ ሌሎች እንዳይጠቀሙበት መከላከል አይችሉም።"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"የመሣሪያ ጥበቃ ባህሪያት አይበሩም። ይህ ጡባዊ ቢጠፋ ወይም ቢሰረቅ ሌሎች እንዳይጠቀሙበት መከላከል አይችሉም።"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"የመሣሪያ ጥበቃ ባህሪያት አይበሩም። ይህ መሣሪያ ቢጠፋ ወይም ቢሰረቅ ሌሎች እንዳይጠቀሙበት መከላከል አይችሉም።"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"የመሣሪያ ጥበቃ ባህሪያት አይበሩም። ይህ ስልክ ቢጠፋ ወይም ቢሰረቅ ሌሎች እንዳይጠቀሙበት መከላከል አይችሉም።"</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"ለማንኛውም ዝለል"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"ወደኋላ ተመለስ"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ዳሳሹን ያግኙት"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"በስልክዎ ጀርባ ላይ ያለውን የጣት አሻራ ዳሳሹን ያግኙት።"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"ዳሳሹን ይንኩ"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"በእርስዎ ስልክ ጀርባ ላይ ነው። የእርስዎን አመልካች ጣት ይጠቀሙ።"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ከመሣሪያ እና የጣት አሻራ አነፍናፊ መገኛ አካባቢ መግለጫ ስዕል ጋር"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"ስም"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"እሺ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ሰርዝ"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"እንጀምር"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"ዳሳሹን ይንኩ"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ጣትዎን በዳሳሹ ላይ ያስቀምጡትና ንዝረት ከተሰማዎት በኋላ ያንሱት"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ይቀጥሉ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"ሁሉንም የተለያዩ የጣት አሻራዎን ክፍሎች ከማከል ጣትዎን በትንሹ ያንቀሳቅሱት"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"የጣት አሻራ ታክሏል!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ይህን አዶ ባዩ ቁጥር፣ ማንነትን ለይቶ ለማወቅ ወይም ግዢን ፈቃድ ለመስጠት የእርስዎን የጣት አሻራ መጠቀም ይችላሉ።"</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"የእርስዎን መሣሪያ ለማንቃት እና ለመክፈት የጣት አሻራ ዳሳሹን ነካ ማድረግ ብቻ ይበቃዎታል።"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"ይህን አዶ በሚመለከቱበት ጊዜ በተጨማሪም ግዢዎችን ወይም ወደ በመለያ መተግበሪያ መግባቶችን መፍቀድ ይችላሉ።"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"ያንሱ፣ በመቀጠል መልሰው ይንኩ"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"የእርስዎን የጣት አሻራ የተለያዩ ክፍሎችን ለማከል ጣትዎትን ማንሳትና ማስቀመጥዎን ይቀጥሉ"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"የጣት አሻራ ታክሏል"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"ይህን አዶ ሲመለከቱ፣ ለይቶ ለማወቅ ወይም ግዢዎችን ለማጽደቅ የእርስዎን የጣት አሻራ ይጠቀሙ።"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"የጣት አሻራን ማቀናበር ይዘለል?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"የእርስዎን ስልክ ለመክፈት የጣት አሻራዎችዎን እንደ አንድ መንገድ መርጠዋል። አሁን ከዘለሉት ይህንን በኋላ ላይ ማዘጋጀት ይኖርብዎታል። ማዘጋጀት አንድ ወይም ሁለት ደቂቃ ብቻ ነው የሚወስደው።"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ማያ ገጽ መቆለፊያ ያዋቅሩ"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"ተከናውኗል"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"አረግ አረግ፣ አነፍናፊው ያ አይደለም"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"በመሣሪያዎ ላይ ያለውን የጣት አሻራ አነፍናፊ ይጠቀሙ።"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"በእርስዎ ስልክ ጀርባ ላይ ያለውን ዳሳሽ ይንኩ። የእርስዎን አመልካች ጣት ይጠቀሙ።"</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ምዝገባ አልተጠናቀቀም"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"የጣት አሻራ ምዝገባ ጊዜ ገደብ ላይ ተደርሷል። እንደገና ይሞክሩ።"</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"የጣት አሻራ ምዝገባ አልሰራም። እንደገና ይሞክሩ ወይም የተለየ ጣት ይጠቀሙ።"</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"የመሣሪያ ጥበቃ ማድረጊያ ባሕሪዎችን በማግበር ያለ እርስዎ ፈቃድ ሌሎች ይህን መሣሪያ እንዳይጠቀሙ ይከላከሉዋቸው። መጠቀም የሚፈልጉትን ማያ ገጽ መቆለፊያ ይምረጡ።"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"የመሣሪያ ጥበቃ ባህሪያትን በማግበር ሌሎች ይህን ስልክ ያለእርስዎ ፈቃድ እንዳይጠቀሙበት ይከልክሉ። መጠቀም የሚፈልጉትን የማያ ገጽ መቆለፊያ ይምረጡ።"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"የምትኬ ቁልፍ ገጽ ስልትዎን ይምረጡ"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"ማያ ገጽ መቆለፊያ አማራጮች"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"ማያ ገጽ መቆለፊያ አማራጮች"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ማሳያ መቆለፊያ"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / ወዲያውኑ ከእንቅልፍ በኋላ"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / ከእንቅልፍ በኋላ <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g>"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"መክፈቻ ስርዓት ጥለት ለውጥ"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"መክፈቻ ፒን  ለውጥ"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"መክፈቻ ይለፍ ቃል ለውጥ"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"እንደገና ይሞክሩ። ሙከራ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ከ<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>።"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"የመጨረሻው ሙከራ"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"በዚህ ሙከራ ላይ ትክክል ያልሆነ የስራ ስርዓተ-ጥለት ካስገቡ የስራ መገለጫዎ እና ተጓዳኝ ውሂብ ከዚህ መሣሪያ ይወገዳሉ።"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"በዚህ ሙከራ ላይ ትክክል ያልሆነ ፒን ካስገቡ የስራ መገለጫዎ እና ተጓዳኝ ውሂብ ከዚህ መሣሪያ ይወገዳሉ።"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"በዚህ ሙከራ ላይ ትክክል ያልሆነ የስራ ይለፍ ቃል ካስገቡ የስራ መገለጫዎ እና ተጓዳኝ ውሂብ ከዚህ መሣሪያ ይወገዳሉ።"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"በጣም ብዙ ትክክል ያልሆኑ ሙከራዎች። የስራ መገለጫዎ እና ተጓዳኝ ውሂብ ከዚህ መሣሪያ ይወገዳል።"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"አስወግድ"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"እንደገና ይሞክሩ። ሙከራ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ከ<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>።"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"የእርስዎ ውሂብ ይሰረዛል"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"በሚቀጥለው ሙከራ ላይ ትክክል ያልሆነ ሥርዓተ ጥለት ካስገቡ የዚህ መሣሪያ ውሂብ ይሰረዛል"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"በሚቀጥለው ሙከራ ላይ ትክክል ያልሆነ ፒን ካስገቡ የዚህ መሣሪያ ውሂብ ይሰረዛል"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"በሚቀጥለው ሙከራ ላይ ትክክል ያልሆነ የይለፍ ቃል ካስገቡ የዚህ መሣሪያ ውሂብ ይሰረዛል"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"በሚቀጥለው ሙከራ ላይ ትክክል ያልሆነ ሥርዓተ ጥለት ካስገቡ ይህ ተጠቃሚ ይሰረዛል"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"በሚቀጥለው ሙከራ ላይ ትክክል ያልሆነ ፒን ካስገቡ ይህ ተጠቃሚ ይሰረዛል"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"በሚቀጥለው ሙከራ ላይ ትክክል ያልሆነ የይለፍ ቃል ካስገቡ ይህ ተጠቃሚ ይሰረዛል"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"በሚቀጥለው ሙከራ ላይ ትክክል ያልሆነ ሥርዓተ ጥለት ካስገቡ የእርስዎ የሥራ መገለጫ እና ውሂቡ ይሰረዛሉ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"በሚቀጥለው ሙከራ ላይ ትክክል ያልሆነ ፒን ካስገቡ የእርስዎ የሥራ መገለጫ እና ውሂቡ ይሰረዛሉ"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"በሚቀጥለው ሙከራ ላይ ትክክል ያልሆነ የይለፍ ቃል ካስገቡ የእርስዎ የሥራ መገለጫ እና ውሂቡ ይሰረዛሉ"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"በጣም ብዙ ትክክል ያልሆኑ ሙከራዎች። የዚህ መሣሪያ ውሂብ ይሰረዛል።"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"በጣም ብዙ ትክክል ያልሆኑ ሙከራዎች። ይህ ተጠቃሚ ይሰረዛል።"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"በጣም ብዙ ትክክል ያልሆኑ ሙከራዎች። የዚህ የሥራ መገለጫ እና ውሂቡ ይሰረዛሉ።"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"አሰናብት"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"ቢያንስ <xliff:g id="COUNT">%d</xliff:g> ቁምፊዎች መሆን አለበት"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"ፒን ቢያንስ <xliff:g id="COUNT">%d</xliff:g> አኃዞች መሆን አለበት"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ቀጥል"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"ከፍተኛ ብሉቱዝ"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ብሉቱዝ ሲበራ መሣሪያዎ ሌልች በአቅራቢያ ካሉ መሣሪያዎች ጋር መገናኘት ይችላል።"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"የአካባቢ ትክክለኛነትን ለማሻሻል የስርዓት መተግበሪያዎች እና አገልግሎቶች አሁንም የብሉቱዝ መሣሪያዎችን ማግኘት ይችላሉ። ይህን ለውጥ በ<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ቅንብሮችን መቃኘት<xliff:g id="LINK_END_1">LINK_END</xliff:g> ላይ ሊለውጡት ይችላሉ።"</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"ማገናኘት አልተቻለም። እንደገና ይሞክሩ።"</string>
+    <string name="device_details_title" msgid="6576953269221085300">"የመሣሪያ ዝርዝሮች"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"የመሣሪያ የብሉቱዝ አድራሻ፦ <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"መሣሪያ ይረሳ?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"የእርስዎ ስልክ ከእንግዲህ ከ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ጋር አይጣመርም"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"የእርስዎ ጡባዊ ከእንግዲህ ከ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ጋር አይጣመርም"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"የእርስዎ መሣሪያ ከእንግዲህ ከ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ጋር አይጣመርም"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"መሣሪያን እርሳ"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ወደ..... አያይዝ"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ከማህድረ መረጃ ድምፅይለያያል።"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ከእጅ ነፃኦዲዮ ይለያያል።"</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"አታቅርብ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"አታረጋግጥ"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"ምንም የእውቅና ማረጋገጫ አልተጠቀሰም። የእርስዎ ግንኙነት የግል አይሆንም።"</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"የአውታረ መረብ ስም ከልክ በላይ ረዥም ነው።"</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"ጎራ መጠቀስ አለበት።"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS አለ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS አለ"</string>
@@ -809,7 +838,6 @@
       <item quantity="other">%d አውታረ መረቦች</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"የላቀ Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"የWi-Fi ያዋቅሩ"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC አድራሻ"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP አድራሻ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"የንዑስ አውታር ጭንብል"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ይህ ቡድን ይረሳ?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ተንቀሳቃሽ የWi-Fi መገናኛ ነጥብ"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"የWi‑Fi መገናኛ ነጥብ"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"የWi‑Fi አውታረ መረብ ለማቅረብ የተንቀሳቃሽ ስልክ ግንኙነት ተጠቀም"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"የዚህ ጡባዊ በይነመረብ ግንኙነት በመገናኛ ነጥብ በኩል በማጋራት ላይ አይደለም"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"የዚህ ስልክ በይነመረብ ግንኙነት በመገናኛ ነጥብ በኩል በማጋራት ላይ አይደለም"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"በይነመረብን ወይም ይዘትን ከሌሎች መሣሪያዎች ጋር አይጋራም ያለው"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"የዚህ ጡባዊ በይነመረብ ግንኙነት በመገናኛ ነጥብ በኩል በማጋራት ላይ"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"የዚህ ስልክ በይነመረብ ግንኙነት በመገናኛ ነጥብ በኩል በማጋራት ላይ"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"መተግበሪያ ይዘትን እየተጋራ ነው። በይነመረብ ግንኙነትን ለመጋራት፣ መገናኛ ነጥብን ያጥፉ እና በመቀጠል ያብሩት"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"የWi‑Fi ስም"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ን በማብራት ላይ..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"ሌሎች መሣሪያዎች ወደ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ሊገናኙ ይችላሉ"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"የWi-Fi ይለፍ ቃል"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"የኤፒ ባንድ"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ለእርስዎ ሌሎች መሣሪያዎች የWi‑Fi አውታረ መረብ ለመፍጠር መገናኛ ነጥብ ይጠቀሙ። መገናኛ ነጥብ የእርስዎን የሞባይል ውሂብ ግንኙነት በመጠቀም በይነመረብን ያቀርባል። ተጨማሪ የሞባይል ውሂብ ክፍያዎች ተፈጻሚ ሊሆኑ ይችሉ ይሆናል።"</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"መተግበሪያዎች በአቅራቢያ ካሉ መሣሪያዎች ጋር ይዘትን ለመጋራት መገናኛ ነጥብ ሊፈጥሩ ይችላሉ።"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"የመገናኛ ነጥብን በማብራት ላይ…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"የመገናኛ ነጥብን በማጥፋት ላይ…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ገቢር ነው"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"የWi-Fi ጥሪ ሲበራ የእርስዎ ስልክ በምርጫዎ እና በየትኛው ይበልጥ ጠንካራ እንደሆነ የሚወሰን ሆኖ ጥሪዎችን በWi-Fi አውታረ መረቦች ወይም በአገልግሎት አቅራቢዎ አውታረ መረብ በኩል ሊያዞር ይችላል። ይህን ባህሪ ከማብራትዎ በፊት ክፍያዎችን እና ሌሎች ዝርዝሮችን በተመለከተ አገልግሎት አቅራቢዎን ያነጋግሩ።"</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"የአስቸኳይ አደጋ አድራሻን ያዘምኑ"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"እንደ WiFi ያለ የ911 ጥሪ ካደረጉ የአስቸኳይ አደጋ አገልግሎቶች እንደ የእርስዎ አካባቢ ያለ አድራሻ ይጠቀሙበታል"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"አሳይ"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"ምንም ውጤቶች የሉም"</string>
     <string name="display_settings" msgid="7965901687241669598">"አሳይ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ማያ በራስ ሰር አሽከርክር"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"ፈካ ያሉ ቀለማት"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ጡባዊ ሲሽከረከርየገፅ አቀማመጥ በራስሰርቀይር"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ስልክ ስታሽከረክር በራስሰር ገፅ አቀማመጡን ቀይር"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"ጡባዊ ሲሽከረከርየገፅ አቀማመጥ በራስሰርቀይር"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"ለሚገኘው ብርሃን የብሩህነት ደረጃን ያትቡ። ይሄ ባህሪ ሲበራ አሁንም ብሩህነትን ለጊዜው ማስተካከል ይችላሉ።"</string>
     <string name="night_display_title" msgid="2626451512200357686">"የምሽት ብርሃን"</string>
     <string name="night_display_text" msgid="1837277457033025056">"የምሽት ብርሃን ለማያ ገጽዎ ብርቱካናማ ቅልም ይሰጠዋል። ይሄ ማያ ገጽዎን በደበዘዘ ብርሃን ላይ መመልከት ቀላል ያድርግልዎታል፣ እና በበለጠ ቅለት እንዲተኙ ሊያገዘዎት ይችላል።"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"የጊዜ ሰሌዳ"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"ሁኔታ"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"በራስ-ሰር አብራ"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"በጭራሽ"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"ብጁ መርሐግብር"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"ጸሐይ ከወጣችበት ጊዜ ጀምሮ እስክትጠልቅ ድረስ"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"የጊዜ ሰሌዳ"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"ምንም የለም"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"በብጁ ጊዜ ላይ ራሱ ይበራል"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"ከፀሐይ መውጣት ጀምሮ እስከ ፀሐይ ግባት ድረስ ይበራል"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"የመጀመሪያ ሰዓት"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"የመጨረሻ ሰዓት"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"ሁኔታ"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"ክብደት"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"ጠፍቷል። <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"በጭራሽ በራስ-ሰር አይበራም።"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g> ላይ በራስ-ሰር ይበራል።"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"ጸሐይ ስትጠልቅ በራስ-ሰር ይበራል"</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"በርቷል። <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"በጭራሽ በራስ-ሰር አይጠፋም"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g> ላይ በራስ-ሰር ይጠፋል።"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"ጸሐት ስትወጣ በራስ-ሰር ይጠፋል"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"ጠፍቷል / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"በጭራሽ በራስ-ሰር አይበራም"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g> ላይ በራስ-ሰር ይበራል"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"ፀሐይ ስትጠልቅ በራስ-ሰር ይበራል"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"በርቷል / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"በጭራሽ በራስ-ሰር አይጠፋም"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g> ላይ በራስ-ሰር ይጠፋል"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"ፀሐይ ስትወጣ በራስ-ሰር ይጠፋል"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"አንቀላፋ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"ማያ ገጽ የሚጠፋው"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"ከ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> የእንቅስቃሴ አለመኖር በኋላ"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"ቅንብሮች"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ራስ ሰርብሩህነት"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ለማንቃት ያንሱ"</string>
-    <string name="doze_title" msgid="2259176504273878294">"ከባቢያዊ ማሳያ"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"ከባቢያዊ ማሳያ"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"ሁልጊዜ ይበራል"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"አዳዲስ ማስታወቂያዎች"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"መቼ እንደሚታይ እንደሚደረግ"</string>
+    <string name="doze_title" msgid="2375510714460456687">"አዳዲስ ማስታወቂያዎች"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ማሳወቂያዎችን ሲቀበሉ ማያ ገጽን አንቃ"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"ሁልጊዜ ይበራል"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"ሰዓት፣ የማሳወቂያ አዶዎች እና ሌላ መረጃ አሳይ"</string>
     <string name="title_font_size" msgid="4405544325522105222">"የቁምፊ መጠን"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ጽሑፍ ያተልቁ ወይም ያሳንሱ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"የSIM ካርድ ቆልፍ ቅንብሮች"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN ባዶ መሆን አይችልም።"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"የMCC መስክ 3 አሀዝ መሆን አለበት።"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"የMNC መስክ 2 ወይም 3 አሀዝ መሆን አለበት።"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"የአገልግሎት አቅራቢ ዓይነታቸው %s የሆኑ ኤፒኤንዎችን ማከልን አይፈቅድም።"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"ነባሪ የAPN ቅንብሮችን እነበረበት ይመልሱ"</string>
     <string name="menu_restore" msgid="8260067415075573273">"ወደ ነባሪ ዳግም አስጀምር"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"የዳግም አስጀምር ነባሪ APN ቅንብሮች ተጠናቀዋል"</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"የSD ካርድ አጥፋ"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"እንደ ሙዚቃ እና ፎቶዎች፣ ሁሉንም ውሂብ በውስጥ USB ማከማቻ አጥፋ።"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"እንደ ሙዚቃ እና ፎቶዎች፣ ሁሉንም ውሂብ በSD ካርድ ላይ አጥፋ።"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM ደምስስ"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"በስልኩ ላይ ያሉ ሁሉንም eSIMዎች ይደምስሱ። ይሄ የእርስዎን የተንቀሳቃሽ ስልክ አገልግሎት ዕቅድ አይሰርዘውም።"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"በጡባዊው ላይ ያሉ ሁሉንም eSIMዎች ይደምስሱ። ይሄ የእርስዎን የተንቀሳቃሽ ስልክ አገልግሎት ዕቅድ አይሰርዘውም።"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ጡባዊ ዳግም አስጀምር"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ስልክ ድጋሚ አስጀምር"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"ሁሉም የእርስዎ የግል መረጃ እና የወረዱ መተግበሪያዎች ይሰረዙ? ይህን እርምጃ መቀልበስ አይችሉም!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ውሂብ ቆጣቢ በርቶ ሳለ ግንኙነት መዘርጋት ወይም ተንቀሳቃሽ የመገናኛ ነጥቦችን መጠቀም አይቻልም።"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB መሰካት"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB ተያይዟል፣ ለማያያዝ ተመልከት"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"የተያያዘ"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"የUSB ማከማቻ ጥቅም ላይ ሲሆን ማገናኘት አይቻልም።"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB አልተያያዘም"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"ለማብራት ይገናኙ"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB የመሰካት ስህተት"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"የስልክ በይነመረብ ግንኙነትን በዩኤስቢ በኩል አጋራ"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"የጡባዊ በይነመረብ ግንኙነትን በዩኤስቢ በኩል አጋራ"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ብሉቱዝ ማያያዝ"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"የዚህ ጡባዊ የበይነመረብ ግንኙነትን በብሉቱዝ በኩል በማጋራት ላይ"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"የዚህ ስልክ የበይነመረብ ግንኙነትን በብሉቱዝ በኩል በማጋራት ላይ"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"የዚህ ጡባዊ የበይነመረብ ግንኙነትን በብሉቱዝ በኩል ለ1 መሣሪያ በማጋራት ላይ"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"የዚህ ስልክ የበይነመረብ ግንኙነትን በብሉቱዝ በኩል ለ1 መሣሪያ በማጋራት ላይ"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"የዚህ ጡባዊ የበይነመረብ ግንኙነትን በብሉቱዝ በኩል ለ<xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> መሣሪያዎች በማጋራት ላይ"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"የዚህ ስልክ የበይነመረብ ግንኙነትን በብሉቱዝ በኩል ለ<xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> መሣሪያዎች በማጋራት ላይ"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"የጡባዊ በይነመረብ ግንኙነትን በብሉቱዝ በኩል አጋራ"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"የስልክ በይነመረብ ግንኙነትን በብሉቱዝ በኩል አጋራ"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"የዚህ <xliff:g id="DEVICE_NAME">%1$d</xliff:g> በይነመረብ ግንኙነት በብሉቱዝ በኩል በማጋራት ላይ"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"የዚህ ጡባዊ በይነመረብ ግንኙነት በብሉቱዝ በኩል እየተጋራ አይደለም"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"የዚህ ስልክ በይነመረብ ግንኙነት በብሉቱዝ በኩል እየተጋራ አይደለም"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"አልተገናኘም"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"ከ<xliff:g id="MAXCONNECTION">%1$d</xliff:g> መሣሪያዎች በላይ ማገናኘት አይቻልም።"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> አይያያዝም።"</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"በእርስዎ የተንቀሳቃሽ ስልክ ውሂብ ግንኙነት በኩል በይነመረቡ ለሌሎች መሣሪያዎች ለማቅረብ የመገናኛ ነጥብን እና እንደ ሞደም መሰካትን ይጠቀሙ።"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"በእርስዎ የተንቀሳቃሽ ስልክ ውሂብ ግንኙነት በኩል በይነመረቡ ለሌሎች መሣሪያዎች ለማቅረብ የመገናኛ ነጥብን እና እንደ ሞደም መሰካትን ይጠቀሙ። መተግበሪያዎች በአቅራቢያ ካሉ መሣሪያዎች ጋር ይዘትን ለመጋራት መገናኛ ነጥብን ሊፈጥሩ ይችላሉ።"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"እገዛ"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"የተንቀሳቃሽ ስልክ አውታረ መረብ"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"የሞባይል እቅድ"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"የአካባቢ ሁነታ"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"አካባቢን ለማወቅ ጂፒኤስ፣ Wi‑Fi ፣ ብሉቱዝ ወይም የተንቀሳቃሽ ስልክ አውታረ መረቦችን ይጠቀሙ"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"አካባቢን ለመወሰን Wi‑Fi፣ ብሉቱዝ ወይም የተንቀሳቃሽ ስልክ አውታረ መረቦችን ይጠቀሙ"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"አካባቢን ለማወቅ ጂ ፒ ኤስ ተጠቀም"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"አካባቢን ለማወቅ ጂፒኤስን እና የመሣሪያ ዳሳሾችን ይጠቀሙ"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"በመቃኘት ላይ"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi ቅኝት"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"የስርስዓት መተግበሪያዎች እና አገልግሎቶች በማንኛውም ሰዓት የWi‑Fi መሳሪያዎችን እንዲያገኙ በመፍቀድ አካባቢን ያሻሽሉ"</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"የውሂብ ግንኙነት የለህም። ይህን መረጃ አሁን ለማየት፣ ከማንኛውም ኮምፒዩተር ጋር ወደ %s የተገናኘ በይነ መረብ ሂድ።"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"በማስገባት ላይ..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"የይለፍ ቃለዎን ይምረጡ"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"የጣት አሻራን ለመጠቀም የይለፍ ቃል ያቀናብሩ"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"የእርስዎን ስርዓተ ጥለት ይምረጡ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"የጣት አሻራን ለመጠቀም፣ ሥርዓተ ጥለትን ያቀናብሩ"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"የእርስዎን ፒን ይምረጡ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"የጣት አሻራን ለመጠቀም ፒን ያቀናብሩ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"የይለፍ ቃልዎን ያረጋግጡ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ስርዓተ ጥለትዎን ያረጋግጡ"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"የእርስዎን ፒን ያረጋግጡ"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"መተግበሪያ ቅንብሮች"</string>
     <string name="install_applications" msgid="4872012136210802181">"ያልታወቁ ምንጮች"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"የሁሉም መተግበሪያ ምንጮችን ፍቀድ"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"በቅርቡ የተከፈቱ መተግበሪያዎች"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"ሁሉንም <xliff:g id="COUNT">%1$d</xliff:g> መተግበሪያዎች ይመልከቱ"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"ከ<xliff:g id="TIME">^1</xliff:g> በፊት"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"የእርስዎ ጡባዊ እና የግል ውሂብ ባልታወቁ መተግበሪያዎች ለሚፈጸም ጥቃት ይበልጥ ተጋላጭ ናቸው። ከዚህ ምንጭ የመጡ መተግበሪያዎችን በመጫን እነሱን በመጠቀምዎ በጡባዊዎ ላይ ለሚከሰት ማንኛውም ጉዳት ወይም ለውሂብ መጥፋት ኃላፊነቱን የሚወስዱት እርስዎ መሆኑን ተስማምተዋል።"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"የእርስዎ ስልክ እና የግል ውሂብ ባልታወቁ መተግበሪያዎች ለሚፈጸም ጥቃት ይበልጥ ተጋላጭ ናቸው። ከዚህ ምንጭ የመጡ መተግበሪያዎችን በመጫን እነሱን በመጠቀምዎ በስልክዎ ላይ ለሚከሰት ማንኛውም ጉዳት ወይም ለውሂብ መጥፋት ኃላፊነቱን የሚወስዱት እርስዎ መሆኑን ተስማምተዋል።"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"የላቁ ቅንብሮች"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"የስርዓት አገልግለቶት ይቁም?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"ይህን የስርዓት አገልግሎት ለማቆም በእርግጥ ይፈልጋሉ? ከፈለጉ፣ አጥፍተውት እንደገና እስኪያበሩት አንዳንድ የጡባዊዎ ገጽታዎች በትክክል መስራት ያቆማሉ።"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"ይህን አገልግሎት ለማቆም ከፈለግክ አጥፍተህ እንደገና እስክታበራው ድረስ አንዳንድ የስልክህ ገጽታዎች በትክክል መስራት ያቆማሉ ።"</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"ቋንቋዎች፣ ግቤት እና የእጅ ውዝዋዜዎች"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"ቋንቋዎች እና ግቤት"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ቋንቋዎች እና ግቤት"</string>
     <string name="input_assistance" msgid="7577795275222555487">"የግቤት እርዳታ"</string>
@@ -1872,6 +1918,10 @@
       <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="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <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="print_settings_title" msgid="3685449667822217816">"የህትመት አገልግሎቶች"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"ምንም አገልግሎቶች አልተጫኑም"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"ምንም አታሚዎች አልተገኙም"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"ዝርዝሮችን ተጠቀም"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"የኃይል አጠቃቀም አስተካክል"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"የታከሉ አካታቾች"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"መተግበሪያዎች ባትሪ እያሟጠጡ ነው"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"መሣሪያው እንደነቃ እንዲቆይ በማድረግ ላይ"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"በበስተጀርባ መሣሪያውን እንዲነቃ በማድረግ ላይ"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"የመገኛ አካባቢ በተደጋጋሚ በመጠየቅ ላይ"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> መተግበሪያዎች ጥሩ ባህሪ እያሳዩ አይደሉም"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"መተግበሪያ ይቁም?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"<xliff:g id="APP">%1$s</xliff:g> የእርስዎን ስልክ እንደነቃ እንዲቆይ ማድረጉን ስለሚቀጥል ያለ የእርስዎ ስልክ ባትሪን በጤናማ ሁኔታ ማስተዳደር አይችልም።\n\nይህን ችግር ለመፍታት ሙከራ ለማድረግ መተግበሪያውን እንዲቆም ማስገደድ ይችላሉ።\n\nይህ ሁኔታ መፈጠሩን ከቀጠለ፣ የባትሪ አፈጻጸም ብቃትን ለማሻሻል ሲባል መተግበሪያውን እንዲራገፍ ማድረግ ይኖርብዎት ይሆናል።"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"<xliff:g id="APP">%1$s</xliff:g> የእርስዎን ጡባዊ እንደነቃ እንዲቆይ ማድረጉን ስለሚቀጥል ያለ የእርስዎ ጡባዊ ባትሪን በጤናማ ሁኔታ ማስተዳደር አይችልም።\n\nይህን ችግር ለመፍታት ሙከራ ለማድረግ መተግበሪያውን እንዲቆም ማስገደድ ይችላሉ።\n\nይህ ሁኔታ መፈጠሩን ከቀጠለ፣ የባትሪ አፈጻጸም ብቃትን ለማሻሻል ሲባል መተግበሪያውን እንዲራገፍ ማድረግ ይኖርብዎት ይሆናል።"</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"<xliff:g id="APP">%1$s</xliff:g> የእርስዎን መሣሪያ እንደነቃ እንዲቆይ ማድረጉን ስለሚቀጥል ያለ የእርስዎ መሣሪያ ባትሪን በጤናማ ሁኔታ ማስተዳደር አይችልም።\n\nይህን ችግር ለመፍታት ሙከራ ለማድረግ መተግበሪያውን እንዲቆም ማስገደድ ይችላሉ።\n\nይህ ሁኔታ መፈጠሩን ከቀጠለ፣ የባትሪ አፈጻጸም ብቃትን ለማሻሻል ሲባል መተግበሪያውን እንዲራገፍ ማድረግ ይኖርብዎት ይሆናል።"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"መተግበሪያን አስቁም"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"የበስተጀርባ አጠቃቀም ይጥፋ?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"<xliff:g id="APP">%1$s</xliff:g> የእርስዎን ስልክ መቀስቀሱን ስለሚቀጥል ያለ የእርስዎ ስልክ ባትሪን በጤናማ ሁኔታ ማስተዳደር አይችልም።\n\nይህን ችግር ለመፍታት የእርስዎ ስልክ መተግበሪያው በበስተጀርባ እንዳይሠራ መከላከል ይችላል።"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"<xliff:g id="APP">%1$s</xliff:g> የእርስዎን ጡባዊ መቀስቀሱን ስለሚቀጥል ያለ የእርስዎ ጡባዊ ባትሪን በጤናማ ሁኔታ ማስተዳደር አይችልም።\n\nይህን ችግር ለመፍታት የእርስዎ ጡባዊ መተግበሪያው በበስተጀርባ እንዳይሠራ መከላከል ይችላል።"</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"<xliff:g id="APP">%1$s</xliff:g> የእርስዎን መሣሪያ መቀስቀሱን ስለሚቀጥል ያለ የእርስዎ መሣሪያ ባትሪን በጤናማ ሁኔታ ማስተዳደር አይችልም።\n\nይህን ችግር ለመፍታት የእርስዎ መሣሪያ መተግበሪያው በበስተጀርባ እንዳይሠራ መከላከል ይችላል።"</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"አጥፋ"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"የመገኛ አካባቢ ይጥፋ?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"<xliff:g id="APP">%1$s</xliff:g> እርስዎ መተግበሪያውን በማይጠቀሙበት ጊዜ የእርስዎን መገኛ አካባቢ መጠየቁን ስለሚቀጥል የእርስዎ ስልክ ባትሪን በጤናማ ሁኔታ ለማስተዳደር አይችልም።\n\nይህን ችግር ለመፍታት፣ ለዚህ መተግበሪያ የመገኛ አካባቢን ማጥፋት ይችላሉ።"</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"<xliff:g id="APP">%1$s</xliff:g> እርስዎ መተግበሪያውን በማይጠቀሙበት ጊዜ የእርስዎን መገኛ አካባቢ መጠየቁን ስለሚቀጥል የእርስዎ ጡባዊ ባትሪን በጤናማ ሁኔታ ለማስተዳደር አይችልም።\n\nይህን ችግር ለመፍታት፣ ለዚህ መተግበሪያ የመገኛ አካባቢን ማጥፋት ይችላሉ።"</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"<xliff:g id="APP">%1$s</xliff:g> እርስዎ መተግበሪያውን በማይጠቀሙበት ጊዜ የእርስዎን መገኛ አካባቢ መጠየቁን ስለሚቀጥል የእርስዎ መሣሪያ ባትሪን በጤናማ ሁኔታ ለማስተዳደር አይችልም።\n\nይህን ችግር ለመፍታት፣ ለዚህ መተግበሪያ የመገኛ አካባቢን ማጥፋት ይችላሉ።"</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"አጥፋ"</string>
     <string name="power_screen" msgid="3023346080675904613">"ማያ"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"የባትሪ ብርሃን"</string>
     <string name="power_camera" msgid="4976286950934622605">"ካሜራ"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"መተግበሪያዎች"</string>
     <string name="power_service" msgid="1599661212370831780">"አገልግሎቶች"</string>
     <string name="power_system" msgid="8290455327965307383">"ሥርዓት"</string>
-    <string name="power_user" msgid="1889728099253018005">"ተጠቃሚ"</string>
+    <string name="power_user" msgid="3706143225319881667">"ሌሎች ተጠቃሚዎች"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU ጠቅላላ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ቅድመ ገፅ"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ነቃ ብሏል"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ከመጠን በላይ የተቆጠረ የሃይል አጠቃቀም"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"ለ<xliff:g id="TIME">^1</xliff:g> ጥቅም ላይ ውሏል"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"ለ<xliff:g id="TIME">^1</xliff:g> ንቁ"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"የማያ ገጽ አጠቃቀም <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g> ተጠቅሟል"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ከጠቅላላ ባትሪ"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"ፒን ቀይር"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"ማሳወቂያዎች አሳይ"</string>
     <string name="help_label" msgid="6886837949306318591">"እገዛ እና ግብረመልስ"</string>
-    <string name="support_summary" msgid="8276116616493882830">"የእገዛ ጽሑፎች፣ የስልከ እና የውይይት ድጋፍ"</string>
+    <string name="support_summary" msgid="2705726826263742491">"የእገዛ መጣጥፎች፣ ስልክ እና ውይይት፣ ማስጀመሪያ"</string>
     <string name="user_account_title" msgid="1127193807312271167">"መለያ ለይዘት"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"የፎቶ መታወቂያ"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"እጅግ ከፍተኛ አደጋዎች"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="other">%d የተደበቁ ንጥሎችን አሳይ</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"አውታረ መረብ እና በይነመረብ"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi፣ ሞባይል፣ የውሂብ አጠቃቀም፣ የመገናኛ ነጥብ"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ሞባይል"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"የውሂብ አጠቃቀም"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"መገናኛ ነጥብ"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"የተገናኙ መሣሪያዎች"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"ብሉቱዝ፣ Cast፣ NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"ብሉቱዝ፣ Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"መተግበሪያዎች እና ማሳወቂያዎች"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ፈቃዶች፣ ነባሪ መተግበሪያዎች"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"ተጠቃሚዎች እና መለያዎች"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"የጣት ምልክት"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ይክፈሉ፣ መታ ያድርጉ፣ ክፍያዎች"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ምትኬ"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"የእጅ ውዝዋዜ፣ ጫፍ፣ ጎን፣ ንቁ ጎን፣ ጭመቅ፣ ጨብጥ፣ እርዳ፣ ረዳት፣ squeezy፣ ተጨማቂ ፣የሚጨመቅ፣ ok google፣ google ረዳት"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"የእጅ ውዝዋዜ፣ ንቃ፣ ማሳወቂያዎች፣ ማያ ገጽ፣ ማሳያ፣ ማያ ገጽ ጠፍቷል፣ ማያ ገጽ በርቷል፣ ጭመቅ፣ ጫፍ፣ አንቀላፋ፣ ተኛ፣ ጨብጥ"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"የእጅ ውዝዋዜ፣ ጸጥታ፣ አሸልብ፣ ማንቂያ፣ ገቢ ጥሪ፣ ጸጥታ፣ ማሳያ፣ የማያ ገጽ ቆላፊ፣ ጭመቅ፣ ጨብጥ፣ ጫፍ፣ ቁም"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"የWi-Fi NFC መለያ ያዋቅሩ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ጻፍ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ለመጻፍ አንድ መለያ መታ ያድርጉ..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"የመገለጫ ማሳወቂያዎችን በጭራሽ አታሳይ"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"የእርስዎ መሣሪያ የተቆለፈ ሲሆን እንዴት ነው ማሳወቂያዎችዎ እንዲታዩ የሚፈልጉት?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"የመገለጫ ማሳወቂያዎች"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"ማሳወቂያዎች"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"ማሳወቂያዎች"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"የመተግበሪያ ማሳወቂያዎች"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"የማሳወቂያ ምድብ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"አስፈላጊነት"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"መተግበሪያው ይወስን"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"አስቸኳይ"</string>
     <string name="allow_sound" msgid="1820188704793497324">"ድምፅ ይፍቀዱ"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"ድምፅ አታሰማ፣ አትንዘር ወይም እነዚህን ማሳወቂያዎች ወደ የአሁኑ ማያ ገጽ አታሳይ።"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"ዝቅተኛ አስፈላጊነት"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"መካከለኛ አስፈላጊነት"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"ከፍተኛ አስፈላጊነት"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"አስቸኳይ አስፈላጊነት"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"የማሳወቂያ ረዳት"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"የማሳወቂያ መዳረሻ"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"የስራ መገለጫ ማሳወቂያዎች መዳረሻ ታግዷል"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ስዕል-ላይ-ስዕል"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"ስዕል-በስዕል-ውስጥ ፍቀድ"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"ይህ መተግበሪያ ክፍት ሆኖ ሳለ ወይም ከተዉት በኋላ (ለምሳሌ፦ አንድ ቪዲዮ ለመመልከት) የስዕል-በስዕል ውስጥ መስኮት እንዲፈጥር ይፍቀዱለት። ይህ መስኮት እየተጠቀሙባቸው ባሉ ሌሎች መተግበሪያዎች ላይ ያሳያል።"</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"አዎ"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"አይ"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"የአትረብሽ መዳረሻ"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ምንም የተጫኑ መተግበሪያዎች የተጠየቀው አትረብሽ መዳረሻ የላቸውም"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"መተግበሪያዎችን በመጫን ላይ..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ይህ የስራ መገለጫ የሚቀናበረው በ፦"</string>
     <string name="managing_admin" msgid="8843802210377459055">"በ<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> የሚቀናበር"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(የሙከራ)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"የመሣሪያ ዙረት"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"የማያ ገጹን ይዘቶች ያዙሩ"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"በቁም እይታ ላይ ቆይ"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"በወርድ እይታ ላይ ቆይ"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"በአሁኑ አቀማመጠ-ገጽ ላይ ቆይ"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"ደህንነቱ የተጠበቀ አጀማመር"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ቀጥል"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ፒን እንዲጠይቅ በማድረግ ተጨማሪ ጥበቃ ሊያደርጉለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልእክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችሉም። \n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል። መሣሪያዎን ለማስጀመር ፒን ይጠየቅ?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን የይለፍ ቃል እንዲጠይቅ በማድረግ ተጨማሪ ጥበቃ ሊያደርጉለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልእክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችሉም። \n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል። መሣሪያዎን ለማስጀመር የይለፍ ቃል ይጠየቅ?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"መሣሪያዎን ለማስከፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ፒን እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልእክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችልም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል። መሣሪያዎን ለማስጀመር ፒን ይጠየቅ?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"መሣሪያዎን ለማስከፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ስርዓተ-ጥለት እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልእክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችልም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል። መሣሪያዎን ለማስጀመር ስርዓተ-ጥለት ይጠየቅ?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"መሣሪያዎን ለማስከፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ይለፍ ቃል እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልእክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችልም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል። መሣሪያዎን ለማስጀመር የይለፍ ቃል ይጠየቅ&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"መሣሪያዎን ለመክፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ይለፍ ቃል እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልእክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችልም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ያለ የውሂብ ለመጠበቅ ያግዛል። መሣሪያዎን ለማስጀመር የይለፍ ኮድ ይጠየቅ?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"አዎ"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"የለም"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"ፒን ይጠየቅ?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"የአጠቃቀም ማንቂያዎች"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"ሙሉ የመሣሪያ አጠቃቀም አሳይ"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"የመተግበሪያ አጠቃቀም አሳይ"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"ከፍተኛ የኃይል ፍጆታ"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> መተግበሪያዎች ልክ ያልሆነ ባህሪ እያሳዩ ነው</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> መተግበሪያዎች ልክ ያልሆነ ባህሪ እያሳዩ ነው</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">መተግበሪያዎች ባትሪ እያሟጠጡ ነው</item>
+      <item quantity="other">መተግበሪያዎች ባትሪ እያሟጠጡ ነው</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"አልተባም"</string>
     <string name="high_power_on" msgid="6216293998227583810">"አልተባም"</string>
     <string name="high_power_off" msgid="3393904131961263278">"የባትሪ አጠቃቀምን አትባ"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"በሌሎች መተግበሪያዎች ላይ አሳይ"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> ከ<xliff:g id="COUNT_1">%2$d</xliff:g> መተግበሪያዎች በሌሎች መተግበሪያዎች ላይ እንዲያሳዩ ተፈቅዶላቸዋል"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"ፍቃድ ያላቸው መተግበሪያዎች"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"አዎ"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"አይ"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"ይፈቀዳል"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"አይፈቀድም"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"መተግበሪያዎችን ጫን ያልታወቁ ምንጮች"</string>
     <string name="write_settings" msgid="4797457275727195681">"የስርዓት ቅንብሮችን ይቀይራል"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"የስርዓት ቅንብሮችን ጻፍ ቀይር"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"ማያ ገጽ ብርቱካናማ ቅልም አለው። ይሄ እንዲተኙ ሊያግዘዎት ይችላል።"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"የአስተያየት ጥቆማዎች"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> ተጨማሪ"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <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="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <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="suggestion_remove" msgid="904627293892092439">"አስወግድ"</string>
     <string name="color_temperature" msgid="2070126836910615605">"ቀዝቀዝ ያለ የቀለም ሙቀት"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ቀዝቀዝ ያሉ የማሳያ ቀለሞችን ይጠቀሙ"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> የውሂብ ማስጠንቀቂያ"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> የውሂብ ማስጠንቀቂያ / <xliff:g id="ID_2">%2$s</xliff:g> የውሂብ ገደብ"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"የክፍያ አከፋፈል ዑደት"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"ወርሃዊ ዑደት በየወሩ በ<xliff:g id="ID_1">%1$s</xliff:g> ላይ ይጀምራል"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"ከ<xliff:g id="ID_1">%1$s</xliff:g> ጀምሮ በየወሩ"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"ወርሃዊ በዕለት <xliff:g id="ID_1">%1$s</xliff:g> ላይ"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"የአውታረ መረብ ገደቦች"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> ገደቦች</item>
@@ -3316,7 +3408,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> መተግበሪያዎች ውሂብ ቆጣቢ በሚበራበት ጊዜ ያልተገደበ ውሂብን እንዲጠቀሙ ተፈቅዶላቸዋል</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"ውሂብ ቆጣቢ"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"ያልተገደበ የውሂብ መዳረሻ"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"ያልተገደበ ውሂብ"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"የዳራ ውሂብ ጠፍቷል"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"በርቷል"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"ጠፍቷል"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"የማያ ገጽ መቆለፊያ ማሳወቂያዎችን ይቆጣጠሩ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"የማሳወቂያ ይዘት አሳይ ወይም ደብቅ"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"ሁሉም"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"ድጋፍ"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> ዲፒ"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"ድጋፍ እና ጠቃሚ ምክሮች"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"አነስተኛ ስፋት"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ምንም የተጫኑ መተግበሪያዎች የፕሪሚየም ኤስኤምኤስ መዳረሻ አልጠየቁም"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ፕሪሚየም ኤስኤምኤስ ውድ ገንዘብ ሊያስወጣዎት ይችላል፣ እና በአገልግሎት አቅራቢ ክፍያዎ ላይ ሒሳብ ያስጨምርብዎታል። ለመተግበሪያ ፈቃድን ካነቁ ያንን መተግበሪያ በመጠቀም ፕሪሚየም ኤስኤምኤስ መላክ ይችላሉ።"</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ራስ-ሰር"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"በራስ"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"አሁኑኑ ባዶ ቦታ ያስለቅቁ"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"የእጅ ምልክቶች"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"የእጅ ውዝዋዜ አቋራጮች"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"ስልክዎን የሚቆጣጠሩባቸው ፈጣን የጣት ምልክቶች"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"ጡባዊዎን የሚቆጣጠሩባቸው ፈጣን የጣት ምልክቶች"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"መሣሪያዎን የሚቆጣጠሩባቸው ፈጣን የጣት ምልክቶች"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"ወደ ካሜራ ዝለል"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"ካሜራውን በፍጥነት ለመክፈት በቀላሉ የኃይል አዝራሩን ይጫኑት። ከማንኛውም ማያ ገጽ ላይ ይሠራል"</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"ካሜራ በፍጥነት ክፈት"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"ለካሜራ የኃይል አዝራሩን ሁለቴ ይጫኑ"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ካሜራ ወርወር ያድርጉ"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"የራስ ፎቶዎችን በፍጥነት ያንሱ"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"ለራስ ፎቶ ሁነታ ስልክን ሁለቴ ጠምዘዝ ያድርጉ"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"ለራስ ፎቶ ሁነታ ጡባዊን ሁለቴ ጠምዘዝ ያድርጉ"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"ለራስ ፎቶ ሁነታ መሣሪያን ሁለቴ ጠምዘዝ ያድርጉ"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"ስልኩን ለመመልከት ሁለቴ መታ ያድርጉ"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ጡባዊውን ለመመልከት ሁለቴ መታ ያድርጉ"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"መሣሪያውን ለመመልከት ሁለቴ መታ ያድርጉ"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"ማሳወቂያዎችዎን በፍጥነት ለመመልከት የእርስዎ ማያ ገጽን ሁለቴ መታ ያድርጉ"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"ጊዜን፣ የማሳወቂያ አዶዎችን፣ እና ሌላ መረጃን ለመፈተሽ የእርስዎን ማያ ገጽ ሁለቴ መታ ያድርጉት።"</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"ማያ ገጽ በሚጠፋበት ጊዜ ማሳወቂያዎችን ይፈትሹ"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ስልኩን ለማረጋገጥ ያንሱ"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ጡባዊውን ለማረጋገጥ ያንሱ"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"መሣሪያውን ለማረጋገጥ ያንሱ"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"የእርስዎን ማሳወቂያዎች በፍጥነት ለመፈተሽ ስልክዎን ያንሱ"</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"የእርስዎን ማሳወቂያዎች በፍጥነት ለመፈተሽ ጡባዊዎን ያንሱ"</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"የእርስዎን ማሳወቂያዎች በፍጥነት ለመፈተሽ መሣሪያዎን ያንሱ"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"ጊዜን፣ የማሳወቂያ አዶዎችን፣ እና ሌላ መረጃን ለመፈተሽ የእርስዎን ስልክ ያንሱት።"</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"ጊዜን፣ የማሳወቂያ አዶዎችን፣ እና ሌላ መረጃን ለመፈተሽ የእርስዎን ጡባዊ ያንሱት።"</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"ጊዜን፣ የማሳወቂያ አዶዎችን፣ እና ሌላ መረጃን ለመፈተሽ የእርስዎን መሣሪያ ያንሱት።"</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"ማያ ገጽ በሚጠፋበት ጊዜ ማሳወቂያዎችን ይፈትሹ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"ማሳወቂያዎችን ለማግኘት የጣት አሻራን ያንሸራትቱ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"የእርስዎን ማሳወቂያዎች ለመመልከት በስልክዎ ጀርባ ላይ ባለው የጣት አሻራ ዳሳሽ ላይ ወደ ታች ጠረግ ያድርጉት"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"የእርስዎን ማሳወቂያዎች ለመፈተሽ በጡባዊዎ ጀርባ ላይ ባለው የጣት አሻራ ዳሳሽ ላይ ወደ ታች ጠረግ ያድርጉት"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"የእርስዎን ማሳወቂያዎች ለመፈተሽ በመሣሪያዎ ጀርባ ላይ ባለው የጣት አሻራ ዳሳሽ ላይ ወደ ታች ጠረግ ያድርጉት"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"ማሳወቂያዎችን በፍጥነት ይመልከቱ"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"በጣት አሻራ ዳሳሹ ላይ ወደ ታች ያንሸራትቱ"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"ካሜራን ለመክፈት ያንሱት"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"ካሜራውን በራስ-ሰር ለመክፈት ስልክዎን አንስተው የፎቶ ማንሳት አያያዝ ይያዙት (በጎን ወይም በቁም)። ስልክዎ በተኛበት ወይም በተቆለፈበት ጊዜ ይሠራል።"</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"ስልክ ሲተኛ ወይም ሲቆለፍ ፎቶ አንሳ"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"የእጅ ውዝዋዜ ረዳት"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"ትብነት"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"ይህን ቅጽበታዊ መተግበሪያ ማስወገድ ይፈልጋሉ?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"ጨዋታዎች"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"የኦዲዮ ፋይሎች"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"ጥቅም ላይ የዋለው ቦታ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ለተጠቃሚ <xliff:g id="USER">%s</xliff:g> ተራግፏል)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ለተጠቃሚ <xliff:g id="USER">%s</xliff:g> ተሰናክሏል)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"የራስ-ሙላ አገልግሎት"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"ቅጽበታዊ መተግበሪያ"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"የማከማቻ አቀናባሪው ይጥፋ?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"የፊልም እና ቴሌቪዥን መተግበሪያዎች"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"ጥቅም ላይ የዋለው ቦታ"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"የአገልግሎት አቅራቢ አቅርቦት መረጃ"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"የቀስቃሴ አገልግሎት አቅራቢ አቅርቦት"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"ምን አዲስ እና አስደሳች ነገር አለ?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ከፍተኛዎቹን 5 ባህሪያት ይሞክሩዋቸው"</string>
 </resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 61ee07c..a2a7794 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"جيدة"</item>
     <item msgid="8986346415847956850">"ممتازة"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"دومًا"</item>
-    <item msgid="844721238536786870">"عند التوصيل فقط"</item>
-    <item msgid="1986753720941888596">"مطلقًا"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"دومًا"</item>
-    <item msgid="7433294150916905997">"عند التوصيل فقط"</item>
-    <item msgid="1390404486722375028">"مطلقًا"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"آخر ۳۰ يومًا"</item>
     <item msgid="6600989128423965319">"تعيين دورة الاستخدام..."</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ff7663a..7f6cffa 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -34,6 +34,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"لقد أصبحت الآن مطور برامج!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"لا حاجة لذلك، فأنت مطور برامج فعلاً."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"يُرجى تمكين خيارات المطوري أولاً."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"اللاسلكي والشبكات"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"الاتصالات"</string>
     <string name="header_category_device" msgid="4544026001618307754">"الجهاز"</string>
@@ -45,6 +46,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"‏خاضع لإدارة حسابات VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"مكالمات الفيديو متوفِّرة"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"‏اتصال Wifi متوفِّر"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"‏توفير EAB/وجوده مسبقًا"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"طاقة راديو الجوال"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"‏عرض دفتر عناوين SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"عرض أرقام الاتصال الثابت"</string>
@@ -110,10 +112,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"البحث عن أجهزة"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"إعادة تسمية هذا الجهاز"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"إعادة تسمية"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"هل تريد قطع الاتصال؟"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"‏سيؤدي هذا إلى إنهاء الاتصال مع:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"هل تريد قطع الاتصال بالجهاز؟"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"سيتم قطع اتصال هاتفك بجهاز <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"سيتم قطع اتصال جهازك اللوحي بجهاز <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"سيتم قطع الاتصال بجهاز <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"قطع اتصال"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"ليست لديك أذونات لتغيير إعدادات بلوتوث."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"إقران جهاز جديد"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> مرئي للأجهزة القريبة أثناء فتح إعدادات البلوتوث."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"عنوان البلوتوث للهاتف: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"عنوان البلوتوث للجهاز اللوحي: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"عنوان البلوتوث للجهاز: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"هل تريد فصل <xliff:g id="DEVICE_NAME">%1$s</xliff:g>؟"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"البث"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"تعطيل الملف الشخصي؟"</string>
@@ -125,7 +134,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"طلب اقتران البلوتوث"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"طلب اقتران"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"انقر للإقران مع <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"إظهار الملفات المستلمة"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"الملفات التي تم استلامها"</string>
     <string name="device_picker" msgid="4978696506172252813">"اختيار جهاز البلوتوث"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> تشغيل البلوتوث"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> إيقاف البلوتوث"</string>
@@ -161,6 +170,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏يريد %1$s الدخول إلى رسائلك. هل تريد منح %2$s حق الدخول؟"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"‏طلب حق الوصول إلى شريحة SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"‏يريد <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> الوصول إلى شريحة SIM. ويؤدي منح حق الوصول إلى شريحة SIM إلى تعطيل اتصال البيانات على جهازك طوال مدة الاتصال. منح حق الوصول إلى <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"مرئي باسم \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" للأجهزة الأخرى"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"أجهزتك"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"إقران جهاز جديد"</string>
     <string name="date_and_time" msgid="9062980487860757694">"التاريخ والوقت"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"اختيار المنطقة الزمنية"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -337,7 +349,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"الحسابات"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"الموقع"</string>
     <string name="account_settings_title" msgid="626177544686329806">"الحسابات"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"الأمان والموقع"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"الحماية والموقع"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"التشفير وبيانات الاعتماد"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"تم تشفير الهاتف"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"تم تشفير الجهاز"</string>
@@ -366,40 +378,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"إلغاء التأمين باستخدام بصمة الإصبع"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"استخدام بصمة الإصبع"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"كل ما عليك فعله هو لمس مستشعر بصمات الإصبع لإلغاء قفل هاتفك أو السماح بإجراء عمليات الشراء أو تسجيل الدخول إلى التطبيقات. عليك توخي الحذر عند إضافة بصمة الإصبع لأشخاص آخرين؛ فأي بصمة من هذه البصمات يمكن أن تؤدي إلى تنفيذ أي إجراء من الإجراءات السابق ذكرها.\n\nملاحظة: يمكن أن تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"كل ما عليك هو لمس مستشعر بصمات الإصبع للسماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات. وعليك توخي الحذر عند اختيار الأشخاص الذين تضيف بصمة أصابعهم؛ لأن أي بصمة منها تتيح لصاحبها تنفيذ أي إجراء من الإجراءات التالية.\n\nملاحظة: لا يمكنك استخدام بصمة إصبعك لإلغاء تأمين هذا الجهاز. للمزيد من المعلومات، اتصل بمشرف المؤسسة."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"كل ما عليك فعله هو لمس مستشعر بصمات الإصبع لإلغاء قفل هاتفك أو للسماح بإجراء عمليات الشراء أو لتسجيل الدخول إلى التطبيقات. وعليك توخي الحذر عند إضافة بصمة الإصبع لأشخاص آخرين؛ فأي بصمة من هذه البصمات يمكن أن تؤدي إلى تنفيذ أي إجراء من الإجراءات السابق ذكرها.\n\nملاحظة: يمكن أن تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"استخدم بصمة الإصبع لإلغاء قفل هاتفك أو الموافقة على عمليات الشراء.\n\nملاحظة: لا يمكنك استخدم بصمة الإصبع لإلغاء قفل هذا الجهاز. للحصول على المزيد من المعلومات. اتصل بمشرف المؤسسة."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"استخدم بصمة الإصبع لإلغاء قفل هاتفك أو الموافقة على عمليات الشراء.\n\nملاحظة: قد تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"إلغاء"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"متابعة"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"تخطي"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"إضافة بصمة إصبع"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بمقدورك منع الآخرين من استخدام هذا الجهاز اللوحي في حال فقده أو سرقته أو محو بياناته."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بإمكانك منع الآخرين من استخدام هذا الجهاز في حال فقدانه أو سرقته أو محو البيانات عنه."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بمقدورك منع الآخرين من استخدام هذا الهاتف في حال فقده أو سرقته أو محو بياناته."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بإمكانك منع الآخرين من استخدام هذا الجهاز اللوحي في حال فقدانه أو سرقته."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بمقدورك منع الآخرين من استخدام هذا الجهاز في حال فقده أو سرقته."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بمقدورك منع الآخرين من استخدام هذا الهاتف في حال فقده أو سرقته."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"التالي"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الجهاز اللوحي في حالة فقدانه أو سرقته أو إعادة ضبطه."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الجهاز في حالة فقدانه أو سرقته أو إعادة ضبطه."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الهاتف في حالة فقدانه أو سرقته أو إعادة ضبطه."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الجهاز اللوحي في حالة فقدانه أو سرقته."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الجهاز في حالة فقدانه أو سرقته."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الهاتف في حالة فقدانه أو سرقته."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"التخطي على أي حال"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"رجوع"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"العثور على المستشعر"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ضع مستشعر بصمات الإصبع على الجزء الخلفي لهاتفك."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"لمس المستشعر"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"المستشعر موجود على الجزء الخلفي لهاتفك. استخدم إصبع السبابة."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"صورة توضيحية تبرز الجهاز وموقع جهاز استشعار بصمة الإصبع"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"الاسم"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"حسنًا"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"حذف"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"البدء"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"المس المستشعر"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ضع إصبعك على المستشعر وارفعه بعد الشعور بالاهتزاز"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"استمر في المحاولة"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"حرِّك إصبعك قليلاً لإضافة جميع الأجزاء المختلفة لبصمة إصبعك"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"تمت إضافة بصمة إصبع"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"يمكنك استخدام بصمة إصبعك متى رأيت هذا الرمز لتحديد الهوية أو الإذن بعملية شراء."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"لن يلزمك سوى لمس مستشعر بصمات الإصبع لتنشيط الجهاز وإلغاء قفله."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"عندما ترى هذا الرمز، يمكنك أيضًا السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"ارفع، ثم المس مرة أخرى"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"استمر في رفع إصبعك لإضافة الأجزاء المختلفة لبصمة الإصبع"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"تمت إضافة بصمة الإصبع"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"عندما ترى هذا الرمز، استخدم بصمة الإصبع لتحديد الهوية أو للموافقة على عمليات الشراء."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"هل تريد تخطي إعداد بصمة الإصبع؟"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"لقد اخترت استخدام بصمة الإصبع كوسيلة لإلغاء تأمين هاتفك. إذا تخطيت ذلك الآن، فستحتاج إلى إعداده لاحقًا. لن يستغرق منك الإعداد سوى دقيقة تقريبًا."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"إعداد تأمين الشاشة"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"تم"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"عفوًا، هذا ليس جهاز الاستشعار"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"استخدم جهاز استشعار بصمة الإصبع على جهازك."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"المس المستشعر على الجزء الخلفي لهاتفك. استخدم إصبع السبابة."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"لم يكتمل التسجيل"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"تم بلوغ الحد الأقصى لزمن تسجيل بصمة الإصبع. يمكنك إعادة المحاولة."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"تعذّر تسجيل بصمة الإصبع. يُرجى إعادة المحاولة أو استخدام إصبع آخر."</string>
@@ -461,6 +471,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"يمكنك منع الآخرين من استخدام هذا الجهاز بدون إذنك من خلال تنشيط ميزات حماية الجهاز. اختر قفل الشاشة الذي تريد استخدامه."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"يمكنك منع الآخرين من استخدام هذا الهاتف بدون إذنك من خلال تنشيط ميزات حماية الجهاز. اختر قفل الشاشة الذي تريد استخدامه."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"اختيار الطريقة الاحتياطية لقفل الشاشة"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"خيارات قفل الشاشة"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"خيارات قفل الشاشة"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"تأمين الشاشة"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / بعد النوم مباشرة"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> بعد النوم"</string>
@@ -531,13 +543,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"تغيير نقش إلغاء التأمين"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"‏تغيير رمز PIN لإلغاء التأمين"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"تغيير كلمة مرور إلغاء التأمين"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"أعد المحاولة. المحاولة <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> من <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"المحاولة الأخيرة"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"عند إدخال نمط للعمل غير صحيح في هذه المحاولة، ستتم إزالة الملف الشخصي للعمل والبيانات المرتبطة به من هذا الجهاز."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"عند إدخال رقم تعريف شخصي للعمل غير صحيح في هذه المحاولة، ستتم إزالة الملف الشخصي للعمل والبيانات المرتبطة به من هذا الجهاز."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"عند إدخال كلمة مرور للعمل غير صحيحة في هذه المحاولة، ستتم إزالة الملف الشخصي للعمل والبيانات المرتبطة به من هذا الجهاز."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"هناك عدد كبير جدًا من المحاولات غير الصحيحة. ستتم إزالة الملف الشخصي للعمل والبيانات المرتبطة به من هذا الجهاز."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"رفض"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"أعد المحاولة. المحاولة <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> من <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"سيتم حذف بياناتك"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"عند إدخال نقش غير صحيح في المحاولة التالية، سيتم حذف بيانات هذا الجهاز"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"عند إدخال رقم تعريف شخصي غير صحيح في المحاولة التالية، سيتم حذف بيانات هذا الجهاز"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"عند إدخال كلمة مرور غير صحيحة في المحاولة التالية، سيتم حذف بيانات هذا الجهاز"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"عند إدخال نقش غير صحيح في المحاولة التالية، سيتم حذف هذا المستخدم"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"عند إدخال رقم تعريف شخصي غير صحيح في المحاولة التالية، سيتم حذف هذا المستخدم"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"عند إدخال كلمة مرور غير صحيحة في المحاولة التالية، سيتم حذف هذا المستخدم"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"عند إدخال نقش غير صحيح في المحاولة التالية، سيتم حذف ملفك الشخصي للعمل وبياناته"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"عند إدخال رقم تعريف شخصي غير صحيح في المحاولة التالية، سيتم حذف ملفك الشخصي للعمل وبياناته"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"عند إدخال كلمة مرور غير صحيحة في المحاولة التالية، سيتم حذف ملفك الشخصي للعمل وبياناته"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"لقد استنفدت عدد المحاولات غير الصحيحة وسيتم حذف بيانات هذا الجهاز."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"لقد استنفدت عدد المحاولات غير الصحيحة وسيتم حذف هذا المستخدم."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"لقد استنفدت عدد المحاولات غير الصحيحة وسيتم حذف الملف الشخصي للعمل وبياناته."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"تجاهل"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"يجب أن تحتوي كلمة المرور على <xliff:g id="COUNT">%d</xliff:g> من الأحرف على الأقل"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"يجب أن يحتوي رقم التعريف الشخصي على <xliff:g id="COUNT">%d</xliff:g> من الأرقام على الأقل"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"متابعة"</string>
@@ -670,6 +690,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"إعدادات بلوتوث المتقدمة"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"عند تشغيل البلوتوث، يمكن للجهاز التواصل مع أجهزة البلوتوث الأخرى القريبة."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"لتحسين دقة الموقع، سيظل بإمكان تطبيقات وخدمات النظام اكتشاف أجهزة بلوتوث. ويمكنك تغيير ذلك من خلال <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>إعدادات البحث<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"تعذر الاتصال. يُرجى إعادة المحاولة."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"تفاصيل الجهاز"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"عنوان البلوتوث للجهاز: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"هل تريد إلغاء إقران الجهاز؟"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"لن يتم إقران هاتفك بعد الآن بجهاز <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"لن يتم إقران جهازك اللوحي بعد الآن بجهاز <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"لن يتم إقران جهازك بعد الآن بجهاز <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"إلغاء إقران الجهاز"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"الاتصال بـ…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"سيتم إلغاء توصيل <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من صوت الوسائط."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"سيتم إلغاء توصيل <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من صوت السماعة بدون استخدام اليدين."</string>
@@ -822,6 +850,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"عدم التوفير"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"عدم التحقق"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"لم يتم تحديد أية شهادات. لن يكون اتصالك خاصًا."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"اسم الشبكة طويل جدًا."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"يجب تحديد نطاق."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS متاح"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS متاح)"</string>
@@ -857,7 +886,6 @@
       <item quantity="one">شبكة واحدة</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"‏إعدادات Wi-Fi المتقدمة"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"‏تهيئة Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"‏عنوان Mac"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"‏عنوان IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"قناع الشبكة الفرعية"</string>
@@ -894,9 +922,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"حذف هذه المجموعة؟"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"‏نقطة اتصال Wi-Fi المحمولة"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"‏نقطة اتصال Wi‑Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"‏استخدام اتصال الجوّال لتوفير شبكة Wi‑Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"عدم مشاركة الاتصال بالإنترنت لهذا الجهاز اللوحي عبر نقطة الاتصال"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"عدم مشاركة الاتصال بالإنترنت لهذا الهاتف عبر نقطة الاتصال"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"لا تتم مشاركة اتصال الإنترنت أو المحتوى مع الأجهزة الأخرى"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"تتم مشاركة اتصال الإنترنت لهذا الجهاز اللوحي عبر نقطة الاتصال"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"تتم مشاركة اتصال الإنترنت لهذا الهاتف عبر نقطة الاتصال"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"يشارك التطبيق المحتوى. لمشاركة اتصال الإنترنت، يجب إيقاف نقطة الاتصال، ثم تشغيلها."</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"‏اسم شبكة Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"جارٍ تشغيل <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"يمكن توصيل الأجهزة الأخرى بشبكة <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"‏كلمة مرور شبكة Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"‏نطاق AP"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"‏يمكنك استخدام نقطة اتصال لإنشاء شبكة Wi‑Fi لأجهزتك الأخرى. وتوفر نقطة الاتصال اتصال الإنترنت باستخدام اتصال بيانات الجوّال. وقد يتم تطبيق رسوم بيانات الجوّال الإضافية."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"يمكن للتطبيقات إنشاء نقطة اتصال لمشاركة المحتوى مع الأجهزة المجاورة."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"جارٍ تشغيل نقطة الاتصال…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"جارٍ إيقاف نقطة الاتصال…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> نشطة"</string>
@@ -943,6 +979,7 @@
     <item msgid="6200207341126893791">"١"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"‏عند تشغيل الاتصال عبر Wi-Fi، يمكن للهاتف توجيه المكالمات عبر شبكات Wi-Fi أو عبر شبكة مشغّل شبكة الجوّال، حسب تفضيلك وحسب الإشارة الأقوى. وقبل تشغيل هذه الميزة، راجع رسوم مشغل شبكة الجوّال والتفاصيل الأخرى حول شبكة الجوّال."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"تحديث عنوان الطوارئ"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"‏العنوان الذي تستخدمه خدمات الطوارئ على أساس أنه موقعك في حالة إجرائك اتصالاً برقم 911 باستخدام WiFi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"عرض"</string>
@@ -1000,6 +1037,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"ليست هناك نتائج"</string>
     <string name="display_settings" msgid="7965901687241669598">"الشاشة"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"التدوير التلقائي للشاشة"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"ألوان ساطعة"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"تبديل الاتجاه تلقائيًا عند تدوير الجهاز اللوحي"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"تبديل الاتجاه تلقائيًا عند تدوير الهاتف"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"تبديل الاتجاه تلقائيًا عند تدوير الجهاز اللوحي"</string>
@@ -1027,23 +1065,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"يمكنك تحسين مستوى السطوع حسب الإضاءة المتاحة. وعند تشغيل هذه الميزة، سيظل بإمكانك ضبط السطوع مؤقتًا."</string>
     <string name="night_display_title" msgid="2626451512200357686">"إضاءة ليلية"</string>
     <string name="night_display_text" msgid="1837277457033025056">"تؤدي الإضاءة الليلية إلى تلوين الشاشة باللون الكهرماني تلوينًا خفيفًا. ويساعد هذا في تسهيل النظر إلى الشاشة في الإضاءة المعتمة ويمكن أن يساعدك في الشعور بالنعاس بسهولة."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"الجدول الزمني"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"الحالة"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"التشغيل تلقائيًا"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"مطلقًا"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"جدول زمني مخصّص"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"من غروب الشمس إلى شروقها"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"تحديد جدول زمني"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"عدم التشغيل أو الإيقاف مطلقًا"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"تشغيل في وقت مخصص"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"تشغيل من غروب الشمس إلى شروقها"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"وقت البدء"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"وقت الانتهاء"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"الحالة"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"الكثافة"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"تم الإيقاف. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"لن يتم التشغيل تلقائيًا مطلقًا."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"سيتم التشغيل تلقائيًا في <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"سيتم التشغيل تلقائيًا عند غروب الشمس."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"تم التشغيل. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"لن يتم الإيقاف تلقائيًا مطلقًا."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"سيتم الإيقاف تلقائيًا في <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"سيتم الإيقاف تلقائيًا عند شروق الشمس."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"تم التعطيل / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"لن يتم التشغيل تلقائيًا مطلقًا"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"سيتم التشغيل تلقائيًا في <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"سيتم التشغيل تلقائيًا عند غروب الشمس"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"تم التشغيل / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"لن يتم الإيقاف تلقائيًا مطلقًا"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"سيتم الإيقاف تلقائيًا في <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"سيتم الإيقاف تلقائيًا عند شروق الشمس"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"السكون"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"إيقاف الشاشة"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"بعد <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> من عدم النشاط"</string>
@@ -1067,8 +1104,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"إعدادات"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"سطوع تلقائي"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"الرفع لتنبيه الجهاز"</string>
-    <string name="doze_title" msgid="2259176504273878294">"عرض المحيط"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"العرض غير النشط"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"التشغيل دائمًا"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"إشعارات جديدة"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"وقت العرض"</string>
+    <string name="doze_title" msgid="2375510714460456687">"إشعارات جديدة"</string>
     <string name="doze_summary" msgid="3846219936142814032">"تنشيط الشاشة عند تلقي إشعارات"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"التشغيل دائمًا"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"إظهار الوقت ورموز الإشعار والمعلومات الأخرى"</string>
     <string name="title_font_size" msgid="4405544325522105222">"حجم الخط"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"يمكنك تكبير النص أو تصغيره."</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"‏إعدادات تأمين شريحة SIM"</string>
@@ -1324,6 +1367,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"‏لا يمكن أن يكون APN فارغًا."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"‏يجب أن يكون حقل MCC من ثلاثة أرقام."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"‏يجب أن يتكون حقل MNC من رقمين أو ثلاثة أرقام."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"‏لا يسمح مشغّل شبكة الجوّال بإضافة APN من النوع %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"‏جارٍ استعادة إعدادات APN الافتراضية."</string>
     <string name="menu_restore" msgid="8260067415075573273">"إعادة تعيين إلى الإعداد الافتراضي"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"‏اكتملت إعادة تعيين إعدادات APN الافتراضية."</string>
@@ -1357,6 +1401,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"‏محو بطاقة SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"‏محو جميع البيانات على وحدة تخزين USB الداخلية، مثل الموسيقى أو الصور"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"‏محو جميع البيانات على بطاقة SD، مثل الموسيقى أو الصور"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"‏محو بيانات شرائح eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"‏يمكنك محو بيانات كل شرائح eSIM على الهاتف. ولن يؤدي ذلك إلى إلغاء خطة خدمة الجوال."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"‏يمكنك محو بيانات كل شرائح eSIM على الجهاز اللوحي. ولن يؤدي ذلك إلى إلغاء خطة خدمة الجوال."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"إعادة ضبط الجهاز اللوحي"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"إعادة تعيين الهاتف"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"هل تريد محو كل معلوماتك الشخصية وتطبيقاتك التي تم تنزيلها؟ لا يمكنك التراجع عن هذا الإجراء!"</string>
@@ -1379,26 +1426,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"يتعذر توصيل نقاط الاتصال المحمولة أو استخدامها أثناء تشغيل توفير البيانات"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"‏تقييد USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"‏USB متصل، حدد للتقييد"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"مقيّد"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"‏لا يمكن التقييد عندما تكون وحدة تخزين USB قيد الاستخدام"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"‏USB غير متصل"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"توصيل للتشغيل"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"‏خطأ في تقييد USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"‏مشاركة اتصال الإنترنت للجهاز عبر USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"‏مشاركة اتصال الإنترنت للجهاز اللوحي عبر USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ربط البلوتوث"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"مشاركة اتصال الإنترنت في هذا الجهاز عبر بلوتوث"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"مشاركة اتصال الإنترنت في هذا الهاتف عبر بلوتوث"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"مشاركة اتصال الإنترنت في هذا الجهاز اللوحي مع جهاز واحد عبر بلوتوث"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"مشاركة اتصال الإنترنت في هذا الهاتف مع جهاز واحد عبر بلوتوث"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"مشاركة اتصال الإنترنت في هذا الجهاز اللوحي مع <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> جهاز عبر بلوتوث"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"مشاركة اتصال الإنترنت في هذا الهاتف مع <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> جهاز عبر بلوتوث"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"مشاركة اتصال الإنترنت للجهاز اللوحي عبر البلوتوث"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"مشاركة اتصال الإنترنت للهاتف عبر البلوتوث"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"عدم مشاركة اتصال الإنترنت في <xliff:g id="DEVICE_NAME">%1$d</xliff:g> هذا عبر بلوتوث"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"عدم مشاركة اتصال الإنترنت في هذا الجهاز اللوحي عبر بلوتوث"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"عدم مشاركة اتصال الإنترنت في هذا الهاتف عبر بلوتوث"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"غير مرتبط"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"لا يمكن ربط أكثر من <xliff:g id="MAXCONNECTION">%1$d</xliff:g> من الأجهزة."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"سيتم إلغاء ربط <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"يمكنك استخدام نقطة الاتصال والتوصيل لتوفير خدمة الإنترنت في الأجهزة الأخرى من خلال اتصال بيانات الجوّال."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"يمكنك استخدام نقطة الاتصال والتوصيل لتوفير اتصال بالإنترنت للأجهزة الأخرى من خلال اتصال بيانات الجوّال. كما يمكن للتطبيقات إنشاء نقطة اتصال لمشاركة المحتوى مع الأجهزة المجاورة."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"مساعدة"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"شبكة الجوّال"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"خطة الجوّال"</string>
@@ -1431,7 +1467,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"وضع الموقع"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"‏استخدام نظام تحديد المواقع العالمي (GPS) أو شبكة Wi‑Fi أو البلوتوث أو شبكة الجوّال لتحديد الموقع"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"‏استخدام شبكة Wi‑Fi أو بلوتوث وشبكة الجوال لتحديد الموقع"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏استخدام نظام تحديد المواقع العالمي (GPS) في تحديد الموقع"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"‏استخدام نظام تحديد المواقع العالمي (GPS) وأجهزة استشعار الجهاز لتحديد الموقع"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"البحث عن شبكة لاسلكية"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"‏البحث عن Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"‏يمكنك تحسين دقة الموقع من خلال السماح لتطبيقات وخدمات النظام باكتشاف شبكات Wi-Fi في أي وقت."</string>
@@ -1476,8 +1512,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"‏ليس لديك اتصال بيانات. لعرض هذه المعلومات الآن، انتقل إلى %s من أي كمبيوتر متصل بالإنترنت."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"جارٍ التحميل…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"اختيار كلمة المرور"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"لاستخدام بصمة الإصبع، عيّن كلمة مرور"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"اختيار نقشك"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"لاستخدام بصمة الإصبع، عيّن نقشًا"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"‏اختيار رمز PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"لاستخدام بصمة الإصبع، عيّن رقم التعريف الشخصي"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"تأكيد كلمة مرورك"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"تأكيد نقشك"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"‏تأكيد رمز PIN"</string>
@@ -1546,6 +1585,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"إعدادات التطبيق"</string>
     <string name="install_applications" msgid="4872012136210802181">"مصادر غير معروفة"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"السماح بكل مصادر التطبيقات"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"التطبيقات المفتوحة مؤخرًا"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"عرض كل التطبيقات البالغ عددها <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"قبل <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"جهازك اللوحي والبيانات الشخصية عُرضة لهجمات أكثر من قِبل تطبيقات غير معروفة. يعني تثبيت التطبيقات من هذا المصدر أنك توافق على تحملك المسؤولية عن أي ضرر يحدث لجهازك اللوحي أو أي فقد للبيانات ينتج عن استخدامها."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"هاتفك والبيانات الشخصية عُرضة للهجمات من قِبل تطبيقات غير معروفة. يعني تثبيت التطبيقات من هذا المصدر أنك توافق على تحملك المسؤولية عن أي ضرر يحدث لهاتفك أو أي فقد للبيانات ينتج عن استخدامها."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"الإعدادات المتقدمة"</string>
@@ -1718,6 +1760,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"هل تريد إيقاف خدمة النظام؟"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"في حالة إيقاف هذه الخدمة، قد تتوقف بعض ميزات الجهاز اللوحي عن العمل بشكل صحيح حتى توقف تشغيلها، ثم تشغلها مرة أخرى."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"في حالة إيقاف هذه الخدمة، قد تتوقف بعض ميزات الهاتف عن العمل بشكل صحيح حتى توقف تشغيلها، ثم تشغلها مرة أخرى."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"اللغات والإدخال والإيماءات"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"اللغات والإدخال"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"اللغات والإدخال"</string>
     <string name="input_assistance" msgid="7577795275222555487">"المساعدة في الإدخال"</string>
@@ -1956,6 +2002,14 @@
       <item quantity="other">تم تشغيل <xliff:g id="COUNT">%1$d</xliff:g> خدمة طباعة</item>
       <item quantity="one">تم تشغيل خدمة طباعة واحدة</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <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">مهمة طباعة واحدة</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"خدمات الطباعة"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"لم يتم تثبيت أية خدمات"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"لم يتم العثور على طابعات"</string>
@@ -2003,7 +2057,7 @@
     <string name="battery_since_reset" msgid="7464546661121187045">"استخدام البطارية منذ إعادة التعيين"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> على البطارية"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> منذ عدم التوصيل"</string>
-    <string name="battery_stats_charging_label" msgid="4223311142875178785">"جارٍ الشحن"</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"جاري الشحن"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"الشاشة قيد التشغيل"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"‏GPS (نظام تحديد المواقع العالمي) على"</string>
     <string name="battery_stats_camera_on_label" msgid="4935637383628414968">"تشغيل الكاميرا"</string>
@@ -2022,6 +2076,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"استخدام التفاصيل"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"ضبط استخدام الطاقة"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"الحزم المضمنة"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"التطبيقات التي تستنفد شحن البطارية"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"يبقي الجهاز قيد التنشيط"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ينشِّط الجهاز في الخلفية"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"يطلب معرفة الموقع بشكل متكرر"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"يعمل <xliff:g id="NUMBER">%1$d</xliff:g> من التطبيقات بطريقة غير طبيعية"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"هل تريد إيقاف التطبيق؟"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"يتعذّر على هاتفك إدارة شحن البطارية بشكل طبيعي لأن تطبيق <xliff:g id="APP">%1$s</xliff:g> يبقي هاتفك قيد التنشيط باستمرار.\n\nلمحاولة حل هذه المشكلة، يمكنك فرض إيقاف التطبيق.\n\nفي حالة استمرار حدوث ذلك، قد يلزمك إلغاء تثبيت التطبيق لتحسين أداء البطارية."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"يتعذّر على جهازك اللوحي إدارة شحن البطارية بشكل طبيعي لأن تطبيق <xliff:g id="APP">%1$s</xliff:g> يبقي جهازك اللوحي قيد التنشيط باستمرار.\n\nلمحاولة حل هذه المشكلة، يمكنك فرض إيقاف التطبيق.\n\nفي حالة استمرار حدوث ذلك، قد يلزمك إلغاء تثبيت التطبيق لتحسين أداء البطارية."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"يتعذّر على جهازك إدارة شحن البطارية بشكل طبيعي لأن تطبيق <xliff:g id="APP">%1$s</xliff:g> يبقي جهازك قيد التنشيط باستمرار.\n\nلمحاولة حل هذه المشكلة، يمكنك فرض إيقاف التطبيق.\n\nفي حالة استمرار حدوث ذلك، قد يلزمك إلغاء تثبيت التطبيق لتحسين أداء البطارية."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"إيقاف التطبيق"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"هل تريد إيقاف الاستخدام في الخلفية؟"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"يتعذّر على هاتفك إدارة شحن البطارية بشكل طبيعي لأن تطبيق <xliff:g id="APP">%1$s</xliff:g> يبقى الهاتف قيد التنشيط باستمرار.\n\nلمعالجة هذه المشكلة، يمكن منع تشغيل هذا التطبيق في الخلفية على هاتفك."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"يتعذّر على جهازك اللوحي إدارة شحن البطارية بشكل طبيعي لأن تطبيق <xliff:g id="APP">%1$s</xliff:g> يبقى الجهاز اللوحي قيد التنشيط باستمرار.\n\nلمعالجة هذه المشكلة، يمكن منع تشغيل هذا التطبيق في الخلفية على الجهاز اللوحي."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"يتعذّر على جهازك إدارة شحن البطارية بشكل طبيعي لأن تطبيق <xliff:g id="APP">%1$s</xliff:g> يبقى جهازك قيد التنشيط باستمرار.\n\nلمعالجة هذه المشكلة، يمكن منع تشغيل هذا التطبيق في الخلفية على جهازك."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"إيقاف"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"هل تريد إيقاف الموقع؟"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"يتعذّر على هاتفك إدارة شحن البطارية بشكل طبيعي لأن تطبيق <xliff:g id="APP">%1$s</xliff:g> يطلب معرفة موقعك باستمرار عند عدم استخدام التطبيق.\n\nلحل هذه المشكلة، يمكنك إيقاف الموقع لهذا التطبيق."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"يتعذّر على جهازك اللوحي إدارة شحن البطارية بشكل طبيعي لأن تطبيق <xliff:g id="APP">%1$s</xliff:g> يطلب معرفة موقعك باستمرار عند عدم استخدام التطبيق.\n\nلحل هذه المشكلة، يمكنك إيقاف الموقع لهذا التطبيق."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"يتعذّر على جهازك إدارة شحن البطارية بشكل طبيعي لأن تطبيق <xliff:g id="APP">%1$s</xliff:g> يطلب معرفة موقعك باستمرار عند عدم استخدام التطبيق.\n\nلحل هذه المشكلة، يمكنك إيقاف الموقع لهذا التطبيق."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"إيقاف"</string>
     <string name="power_screen" msgid="3023346080675904613">"شاشة العرض"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"الفلاش"</string>
     <string name="power_camera" msgid="4976286950934622605">"الكاميرا"</string>
@@ -2036,7 +2110,7 @@
     <string name="power_apps" msgid="2043554781293951327">"التطبيقات"</string>
     <string name="power_service" msgid="1599661212370831780">"الخدمات"</string>
     <string name="power_system" msgid="8290455327965307383">"النظام"</string>
-    <string name="power_user" msgid="1889728099253018005">"المستخدم"</string>
+    <string name="power_user" msgid="3706143225319881667">"مستخدمون آخرون"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"‏إجمالي استخدام CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏CPU في المقدمة"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ابق متيقظًا"</string>
@@ -2088,6 +2162,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"استخدام زائد عن الحد للطاقة"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> مللي أمبير في الساعة"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"تم استخدامه لمدة <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"نشط لمدة <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"استخدام الشاشة <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> مستخدمة بواسطة <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> من إجمالي شحن البطارية"</string>
@@ -2663,7 +2738,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"‏تغيير رمز PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"إظهار الإشعارات"</string>
     <string name="help_label" msgid="6886837949306318591">"المساعدة والتعليقات"</string>
-    <string name="support_summary" msgid="8276116616493882830">"مقالات مساعدة، دعم عبر الهاتف والدردشة"</string>
+    <string name="support_summary" msgid="2705726826263742491">"مقالات المساعدة، الهاتف والدردشة، البدء"</string>
     <string name="user_account_title" msgid="1127193807312271167">"حساب المحتوى"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"معرف الصورة"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"التهديدات القصوى"</string>
@@ -2757,9 +2832,12 @@
       <item quantity="one">‏عرض %d عنصر مخفي</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"الشبكة والإنترنت"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"‏Wi-Fi، جوّال، استخدام بيانات، نقطة اتصال"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"الجوّال"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"استخدام البيانات"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"نقطة اتصال"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"الأجهزة المرتبطة"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"‏بلوتوث، الإرسال، NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"البلوتوث، الإرسال"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"التطبيقات والإشعارات"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"أذونات، تطبيقات افتراضية"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"المستخدمون والحسابات"</string>
@@ -2812,6 +2890,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"إيماءة"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"دفع، نقر، دفعات"</string>
     <string name="keywords_backup" msgid="470070289135403022">"نسخ احتياطية، نسخة احتياطية"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"‏إيماءة، حافة، جانب، حافة نشطة، ضغط، قَبض، مساعدة، مساعد، squeezy،‏ squeezie،‏ squeezey،‏ squeezee،‏ ok google، مساعد Google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"إيماءة، تنشيط، إشعارات، شاشة، عرض، إيقاف الشاشة، تشغيل الشاشة، ضغط، حافة، في وضع السكون، سكون، قَبض"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"إيماءة، كتم الصوت، تأجيل، تنبيه، مكالمة واردة، سكون، عرض، شاشة تأمين، ضغط، قَبض، حافة، إيقاف"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏إعداد علامة NFC عبر Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"كتابة"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"انقر على كلمة علامة لكتابة..."</string>
@@ -2898,7 +2979,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"عدم عرض إشعارات العمل على الإطلاق"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"ما الطريقة التي تريد استخدامها في عرض إشعارات الملف الشخصي عندما يكون الجهاز في وضع القفل؟"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"إشعارات الملف الشخصي"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"الإشعارات"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"الإشعارات"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"إشعارات التطبيقات"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"فئة الإشعارات"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"الأهمية"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"ترك القرار للتطبيق"</string>
@@ -2913,6 +2995,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"مستوى أهمية ملحّة"</string>
     <string name="allow_sound" msgid="1820188704793497324">"السماح بالصوت"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"لا يُسمح بإصدار تنبيه صوتي أو بالاهتزاز أو بعرض هذه الإشعارات بسرعة على الشاشة الحالية."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"أهمية منخفضة"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"متوسط الأهمية"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"أهمية عالية"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"أهمية ملحَّة"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"مساعد الإشعار"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"الدخول إلى الإشعارات"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"الوصول إلى إشعارات الملف الشخصي للعمل محظور"</string>
@@ -2944,8 +3030,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"صورة داخل صورة"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"السماح بنافذة صورة داخل صورة"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"يمكنك السماح لهذا التطبيق بإنشاء نافذة صورة داخل صورة أثناء فتح التطبيق أو بعد مغادرته (على سبيل المثال، لمتابعة مشاهدة فيديو)، علمًا بأن هذه النافذة تظهر أمام التطبيقات الأخرى التي تستخدمها."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"نعم"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"لا"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"الوصول إلى إعداد \"عدم الإزعاج\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"لم تطلّب أي تطبيقات مثبّتة حق الوصول إلى إعداد \"عدم الإزعاج\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"جارٍ تحميل التطبيقات..."</string>
@@ -3092,11 +3176,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"تتم إدارة الملف الشخصي للعمل هذا بواسطة:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"يديرها <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(تجريبي)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"تدوير الجهاز"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"تدوير محتويات الشاشة"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"الاحتفاظ بالعرض العمودي"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"الاحتفاظ بالعرض الأفقي"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"الاحتفاظ بالاتجاه الحالي"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"تأمين بدء التشغيل"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"متابعة"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"يمكنك حماية هذا الجهاز أكثر من خلال طلب إدخال رقم التعريف الشخصي قبل تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن تلقي مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات.\n\nوهذا يساعد على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال رقم التعريف الشخصي لبدء تشغيل الجهاز؟"</string>
@@ -3104,7 +3183,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"يمكنك حماية هذا الجهاز أكثر من خلال طلب إدخال كلمة المرور قبل تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن تلقي مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات. \n\nوهذا يساعد على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال كلمة المرور لبدء تشغيل الجهاز؟"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"بالإضافة إلى استخدام بصمة إصبعك لإلغاء قفل جهازك، يمكنك حماية هذا الجهاز أكثر من خلال طلب إدخال رقم التعريف الشخصي قبل تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن تلقي مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات.\n\nوهذا يساعد على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال رقم التعريف الشخصي لبدء تشغيل الجهاز؟"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"بالإضافة إلى استخدام بصمة إصبعك لإلغاء قفل جهازك، يمكنك حماية هذا الجهاز أكثر من خلال طلب إدخال النقش قبل تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن تلقي مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات.\n\nوهذا يساعد على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال النقش لبدء تشغيل الجهاز؟"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"بالإضافة إلى استخدام بصمة إصبعك لإلغاء قفل جهازك، يمكنك حماية هذا الجهاز أكثر من خلال طلب إدخال كلمة المرور قبل تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن تلقي مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات.\n\nوهذا يساعد على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال كلمة المرور لبدء تشغيل الجهاز؟"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"بالإضافة إلى استخدام بصمة إصبعك لإلغاء قفل الجهاز، يمكنك رفع مستوى حماية هذا الجهاز من خلال طلب إدخال كلمة المرور قبل بدء تشغيله. ويتعذر على الجهاز - إلى أن يتم تشغيله - استقبال المكالمات أو الرسائل أو الإشعارات بما في ذلك التنبيهات.\n\nيساعد هذا على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال كلمة المرور لبدء تشغيل الجهاز؟"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"نعم"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"لا"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"هل يلزم رقم تعريف شخصي؟"</string>
@@ -3238,6 +3317,23 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"تنبيهات الاستخدام"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"عرض الاستخدام الكامل للجهاز"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"عرض استخدام التطبيق"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"معدّل استخدام مرتفع"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="zero">يعمل <xliff:g id="NUMBER">%2$d</xliff:g> تطبيق بشكل غير طبيعي</item>
+      <item quantity="two">يعمل تطبيقان (<xliff:g id="NUMBER">%2$d</xliff:g>) بشكل غير طبيعي</item>
+      <item quantity="few">تعمل <xliff:g id="NUMBER">%2$d</xliff:g> تطبيقات بشكل غير طبيعي</item>
+      <item quantity="many">يعمل <xliff:g id="NUMBER">%2$d</xliff:g> تطبيقًا بشكل غير طبيعي</item>
+      <item quantity="other">يعمل <xliff:g id="NUMBER">%2$d</xliff:g> تطبيق بشكل غير طبيعي</item>
+      <item quantity="one">يعمل تطبيق واحد (<xliff:g id="APP">%1$s</xliff:g>) بشكل غير طبيعي</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="zero">تطبيقات تستنفد شحن البطارية</item>
+      <item quantity="two">تطبيقان يستنفدان شحن البطارية</item>
+      <item quantity="few">تطبيقات تستنفد شحن البطارية</item>
+      <item quantity="many">تطبيقات تستنفد شحن البطارية</item>
+      <item quantity="other">تطبيقات تستنفد شحن البطارية</item>
+      <item quantity="one">تطبيق واحد (<xliff:g id="APP">%1$s</xliff:g>) يستنفد شحن البطارية</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"بدون تحسين"</string>
     <string name="high_power_on" msgid="6216293998227583810">"بدون تحسين"</string>
     <string name="high_power_off" msgid="3393904131961263278">"يحسِّن من استخدام البطارية"</string>
@@ -3334,8 +3430,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"عرض التطبيق أمام غيره"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"يتم السماح لعدد <xliff:g id="COUNT_0">%1$d</xliff:g> من <xliff:g id="COUNT_1">%2$d</xliff:g> تطبيق بالظهور أمام غيره من التطبيقات"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"التطبيقات التي تحمل أذونات"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"نعم"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"لا"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"مسموح به"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"غير مسموح به"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"تثبيت التطبيقات من مصادر غير معروفة"</string>
     <string name="write_settings" msgid="4797457275727195681">"تعديل إعدادات النظام"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"كتابة تعديل إعدادات النظام"</string>
@@ -3429,6 +3525,23 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"الشاشة ملوّنة بلون كهرماني خفيف، وهذا قد يساعدك على النوم."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"الاقتراحات"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"أكثر من <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"و<xliff:g id="ID_1">%1$d</xliff:g> اقتراح آخر"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <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">اقتراح واحد</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <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">واقتراح واحد آخر</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"إزالة"</string>
     <string name="color_temperature" msgid="2070126836910615605">"ألوان هادئة"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"استخدم ألوان عرض هادئة"</string>
@@ -3447,8 +3560,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> تحذير البيانات"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> تحذير البيانات / <xliff:g id="ID_2">%2$s</xliff:g> حد البيانات"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"دورة الفوترة"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"تبدأ الدورة الشهرية اعتبارًا من <xliff:g id="ID_1">%1$s</xliff:g> كل شهر"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"شهريًا اعتبارًا من <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"شهريًا في يوم <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"قيود الشبكات"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="zero"><xliff:g id="COUNT">%1$d</xliff:g> قيد</item>
@@ -3476,7 +3588,7 @@
       <item quantity="one">هناك تطبيق واحد مسموح له باستخدام البيانات بدون قيود عند تشغيل توفير البيانات</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"توفير البيانات"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"الوصول غير المقيَّد إلى البيانات"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"بيانات غير مقيّدة"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"تم تعطيل بيانات الخلفية."</string>
     <string name="data_saver_on" msgid="6774217590237934709">"تشغيل"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"إيقاف"</string>
@@ -3544,8 +3656,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"التحكم في إشعارات شاشة التأمين"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"إظهار محتوى الإشعار أو إخفاؤه"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"الكل"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"الدعم"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"الدعم والنصائح"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"أصغر عرض"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"‏لم تطلب أي تطبيقات مثبَّتة إمكانية إرسال رسائل قصيرة SMS للخدمات."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"‏يمكن أن تكلفك الرسائل القصيرة SMS للخدمات بعض الرسوم، وستتم إضافة هذه الرسوم إلى فواتير مشغِّل شبكة الجوّال. وفي حالة تمكين الإذن لأحد التطبيقات، ستتمكن من إرسال رسائل قصيرة SMS للخدمات باستخدام هذا التطبيق."</string>
@@ -3622,28 +3733,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"تلقائي"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"يدوي"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"إخلاء بعض المساحة الآن"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"الإيماءات"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"اختصارات الإيماءات"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"إيماءات سريعة للتحكم في الهاتف"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"إيماءات سريعة للتحكم في جهازك اللوحي"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"إيماءات سريعة للتحكم في جهازك"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"الانتقال سريعًا إلى الكاميرا"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"لفتح الكاميرا سريعًا، يمكنك الضغط على زر التشغيل مرتين. ويعمل ذلك في أي شاشة."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"فتح الكاميرا بسرعة"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"الضغط على زر التشغيل مرتين لفتح الكاميرا"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"تقليب الكاميرا"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"التقاط الصور الذاتية بشكل أسرع"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"لف الهاتف مرتين لتشغيل وضع الصورة الذاتية"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"لف الجهاز اللوحي مرتين لتشغيل وضع الصورة الذاتية"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"لف الجهاز مرتين لتشغيل وضع الصورة الذاتية"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"انقر نقرًا مزدوجًا للاطلاع على الهاتف"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"انقر نقرًا مزدوجًا للاطلاع على الجهاز اللوحي"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"انقر نقرًا مزدوجًا للاطلاع على الجهاز"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"للاطلاع على الإشعارات سريعًا، يمكنك النقر نقرًا مزدوجًا على الشاشة."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"للاطلاع على الوقت ورموز الإشعارات والمعلومات الأخرى، انقر نقرًا مزدوجًا على الشاشة."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"التحقق من الإشعارات عند إيقاف الشاشة"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"يمكنك حمل الهاتف للاطلاع عليه"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"يمكنك حمل الجهاز اللوحي للاطلاع عليه"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"يمكنك حمل الجهاز للاطلاع عليه"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"للاطلاع على الإشعارات سريعًا، يمكنك حمل هاتفك."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"للاطلاع على الإشعارات سريعًا، يمكنك حمل جهازك اللوحي."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"للاطلاع على الإشعارات سريعًا، يمكنك حمل جهازك."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"للاطلاع على الوقت ورموز الإشعارات والمعلومات الأخرى، اختر هاتفك."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"للاطلاع على الوقت ورموز الإشعارات والمعلومات الأخرى، اختر جهازك اللوحي."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"للاطلاع على الوقت ورموز الإشعارات والمعلومات الأخرى، اختر جهازك."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"التحقق من الإشعارات عند إيقاف الشاشة"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"تمرير البصمة للحصول على الإشعارات"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"للاطلاع على الإشعارات، مرر سريعًا للأسفل على مستشعر بصمات الإصبع على الجزء الخلفي لهاتفك."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"للاطلاع على الإشعارات، مرر سريعًا للأسفل على مستشعر بصمات الإصبع على الجزء الخلفي من جهازك اللوحي."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"للاطلاع على الإشعارات، مرر سريعًا للأسفل على مستشعر بصمات الإصبع على الجزء الخلفي من جهازك."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"الاطلاع على الإشعارات بسرعة"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"تمرير سريع لأسفل على مستشعر بصمات الإصبع"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"رفع الهاتف إلى أعلى لفتح الكاميرا"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"لفتح الكاميرا تلقائيًا، يمكنك رفع الهاتف في وضع التقاط صورة (بالوضع الأفقي أو الرأسي). تعمل هذه الخاصية عندما يكون الهاتف في وضع السكون أو في وضع القفل."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"التقاط صور عندما يكون الهاتف مقفولاً أو في وضع سكون"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"إيماءة المساعدة"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"الحساسية"</string>
@@ -3775,6 +3899,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"هل تريد إزالة هذا التطبيق الفوري؟"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"الألعاب"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ملفات صوتية"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"المساحة المستخدمة"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(تم إلغاء التثبيت للمستخدم <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(تم التعطيل للمستخدم <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"خدمة الملء التلقائي"</string>
@@ -3788,5 +3913,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"تطبيق فوري"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"هل تريد إيقاف مدير سعة التخزين؟"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"تطبيقات الأفلام والتلفزيون"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"المساحة المستخدمة"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"معلومات توفير خدمة مشغل شبكة الجوال"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"بدء توفير خدمة مشغل شبكة الجوال"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"ما الميزات الجديدة والمثيرة للاهتمام؟"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"الاطلاع على أفضل 5 ميزات"</string>
 </resources>
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index 0f5d59e..5a1f909 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Yaxşı"</item>
     <item msgid="8986346415847956850">"Əla"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Həmişə"</item>
-    <item msgid="844721238536786870">"Yalnız taxılı olduğu zaman"</item>
-    <item msgid="1986753720941888596">"Heç vaxt"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Həmişə"</item>
-    <item msgid="7433294150916905997">"Yalnız qoşulan zaman"</item>
-    <item msgid="1390404486722375028">"Heç vaxt"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Son 30 gün"</item>
     <item msgid="6600989128423965319">"İstifadə siklini əldə edin..."</item>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index dbc830e..12c9736 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Siz indi tərtibatçısınız!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Ehtiyac yoxdur, Siz artı gəlişdiricisiniz."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Əvvəlcə developer seçimlərini aktiv edin."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Simsiz və şəbəkələr"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Əlaqələr"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Cihaz"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE Təmin edildi"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Video Zəngi Təmin Edildi"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi Zəngi Təmin Edildi"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/İştirak Təmin edildi"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Mobil Radio Enerjisi"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM Ünvanları Kitabçasına Baxın"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Stabil Yığım Nömrələrinə Baxın"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Cihaz axtarın"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Bu cihazın adını dəyişin"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Adı dəyişdir"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ayrılsın mı?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Sizin bununla bağlantınızı kəsəcək:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Cihaz ayrılsın?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Telefon <xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazından ayrılacaq."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Planşet <xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazından ayrılacaq."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Cihazınız <xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazından ayrılacaq."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Ayırın"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Bluetooth ayarlarını dəyişməyə icazəniz yoxdur."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Yeni cihazı qoşalaşdırın"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Bluetooth ayarları açıq olarkən <xliff:g id="DEVICE_NAME">%1$s</xliff:g> yaxınlıqdakı cihazlara görünən olur."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Telefonun Bluetooth ünvanı: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Planşetin Bluetooh ünvanı: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Cihazın Bluetooth ünvanı: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ayrılsın?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Yayım"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil deaktiv edilsin?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth bağlantı sorğusu"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"cütlənmə sorğusu göndərildi"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ilə cütlənmək üçün tıklayın"</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Qəbul edilən faylları göstər"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Qəbul edilən fayl"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth cihazını seçin"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> Bluetooth\'u yandırmaq istəyir."</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> Bluetooth\'u söndürmək istəyir"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s sizin mesajlarınıza giriş istəyir. %2$s adlı istifadəçi üçün girişə icazə verilsin?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM girişi sorğusu"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> SIM kartınıza giriş hüququ istəyir. SIM karta giriş hüququnun verilməsi bağlantı müddətində cihazınızda data bağlantını deaktiv edəcək. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> cihazına giriş hüququ verin"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Digər cihazlara \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" kimi görünür"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Cihazlarınız"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Yeni cihazı qoşalaşdırın"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Vaxt və tarix"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Vaxt zonasını seçin"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Hesablar"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Yer"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Hesablar"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Təhlükəsizlik və Məkan"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Təhlükəsizlik &amp; yeri"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Şifrələmə və kredensiallar"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon şifrələnib"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Cihaz şifrələndi"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Barmaq izi ilə kiliddən çıxarın"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Barmaq izinizi istifadə edin"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Telefonunuzu kiliddən çıxarmaq, alışları təsdiqləmək və ya tətbiqlərə daxil olmaq üçün sadəcə barmaq izi sensoruna toxunun. Kimi əlavə etdiyinizə diqqət edin. Hətda əlavə edilmiş bir iz bunlardan hər hansı birini edə bilər.\n\nQeyd: Barmaq iziniz güclü model və ya PİN koddan daha az təhlükəsizdir."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Alışları təsdiqləmək və ya tətbiqlərə daxil olmaq üçün sadəcə barmaq izi sensoruna toxunun. Kimi əlavə etdiyinizə diqqət edin. Hətda əlavə edilmiş bir iz bunlardan hər hansı birini edə bilər.\n\nQeyd: barmaq izinizi bu cihazın kildiini açmaq üçün istifadə edə bilməzsiniz. Ətraflı məlumat üçün, təşkilatın admini ilə əlaqə saxlayın."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Telefonunuzu kiliddən çıxarmaq, alışları təsdiqləmək və ya tətbiqlərə daxil olmaq üçün sadəcə barmaq izi sensoruna toxunun. Kimi əlavə etdiyinizə diqqət edin. Hətda əlavə edilmiş bir iz bunlardan hər hansı birini edə bilər.\n\nQeyd: Barmaq iziniz güclü model və ya PİN koddan daha az təhlükəsizdir."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Ləğv edin"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Davam edin"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Ötürün"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Barmaq izi əlavə edin"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Cihazın qorunması xfunksiyaları aktivləşdirilməyəcəkdir. İtərsə, oğurlanarsa, yaxud silinərsə, başqalarının bu planşetdən istifadəsinə mane ola bilməyəcəksiniz."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Cihazın qorunması xüsusiyyətləri aktivləşdirilməyəcəkdir. İtərsə, oğurlanarsa, yaxud təmizlənərsə, başqalarının bu cihazdan istifadəsinə mane ola bilməyəcəksiniz."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Cihazın qorunması xüsusiyyətləri aktivləşdirilməyəcəkdir. İtərsə, oğurlanarsa, yaxud təmizlənərsə, başqalarının bu telefondan istifadəsinə mane ola bilməyəcəksiniz."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Cihazın qorunması funksiyaları aktivləşməyəcək. İtərsə və ya oğurlanarsa, başqalarının bu planşetdən istifadəsinə mane ola bilməyəcəksiniz."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Cihazın qorunması funksiyaları aktivləşməyəcək. İtərsə və ya oğurlanarsa, başqalarının bu cihazdan istifadəsinə mane ola bilməyəcəksiniz."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Cihazın qorunması funksiyaları aktivləşməyəcək. İtərsə və ya oğurlanarsa, başqalarının bu telefondan istifadəsinə mane ola bilməyəcəksiniz."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Növbəti"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Cihaz qoruma funksiyası aktiv edilməyəcək. Planşet itərsə, oğurlanarsa və ya sıfırlanarsa, başqalarının bu planşetdən istifadəsinin qarşısını ala bilməyəcəksiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Cihaz qoruma funksiyası aktiv edilməyəcək. Cihaz itərsə, oğurlanarsa və ya sıfırlanarsa, başqalarının bu cihazdan istifadəsinin qarşısını ala bilməyəcəksiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Cihaz qoruma funksiyası aktiv edilməyəcək. Telefon itərsə, oğurlanarsa və ya sıfırlanarsa, başqalarının bu telefondan istifadəsinin qarşısını ala bilməyəcəksiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Cihaz qoruma funksiyası aktiv edilməyəcək. Planşet itərsə və ya oğurlanarsa, başqalarının bu planşetdən istifadəsinin qarşısını ala bilməyəcəksiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Cihaz qoruma funksiyaları aktiv edilməyəcək. Bu cihaz itərsə və ya oğurlanarsa, başqalarının bu cihazdan istifadəsinin qarşısını ala bilməyəcəksiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Cihaz qoruma funksiyası aktiv edilməyəcək. Telefon itərsə və ya oğurlanarsa, başqalarının bu telefondan istifadəsinin qarşısını ala bilməyəcəksiniz."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Hər halda atla"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Geri qayıt"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Sensoru tapın"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Barmaq izi sensorunu telefonun arxasında tapın"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Sensora toxunun"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Bu, telefonun arxa hissəsindədir. İkinci barmağınızı istifadə edin."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Cihaz və barmaq izi sensoru ilə illustrasiya"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Ad"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Silin"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Başlayaq"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Sensora toxunun"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Barmağı sensora qoyun və vibrasiyə hiss edənə qədər saxlayın"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Davam edin"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Barmaq izinizi tam əlavə etmək üçün barmağınızı yavaşca hərəkət etdirin"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Barmaq izi əlavə edildi!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Bu piktoqramı nə vaxtsa görsəniz, identifikasiya və ya satın almanı təsdiqləmək üçün barmaq izinizdən istifadə edə bilərsiniz."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Ayılmaq və cihaz kilidini açmaq üçün sadəcə barmaq izi sensoruna toxunun."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Bu ikonanı gördükdə, həmçinin satınalmaları təsdiqləyə və ya tətbiqə daxil ola bilərsiniz."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Qaldırın və təkrar toxunun"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Barmaq izini tam əlavə etmək üçün barmağınızı qaldırmağa davam edin"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Barmaq izi əlavə edildi"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Bu ikonanı görən zaman identifikasiya və ya satınalmaları təsdiq etmək üçün barmaq izindən istifadə edin."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Barmaq izi ayarları ötürülsün?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Telefon kilidini açmaq üçün barmaq izindən istifadə etməyi seçmisiniz. Bunu indi ötürsəniz, bu funksiyanı daha sonra ayarlamalı olacaqsınız. Ayarlamaq bir-iki dəqiqə vaxtınızı aparacaq."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ekran kilidi quraşdırın"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Hazırdır"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, bu sensor deyil"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Cihazınızda barmaq izi sensorundan istifadə edin."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Telefonun arxasındakı sensora toxunun."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Qeydiyyat tamamlanmadı"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Barmaq izi qeydiyyatı üçün vaxt limiti ba çatdı. Yenidən cəhd edin."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Barmaq izi qeydiyyatı işləmədi. Yenidən cəhd edin və ya başqa barmaq istifadə edin."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu cihazdan istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu telefondan istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Yedəkləmə ekranı kilid metodunu seçin"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Ekran kilidi seçimləri"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Ekran kilidi seçimləri"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekran kilidi"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Yuxudan dərhal sonra"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> yuxudan sonra"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Kilidi açma modelini dəyişin"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Kilidi açma PIN\'ini dəyişin"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Kilid parolunu dəyişdirin"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Yenidən cəhd edin. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> cəhddən <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> cəhd."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Son cəhd"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Bu cəhddə yanlış iş modeli daxil etsəniz, iş profiliniz və əlaqədar data bu cihazdan silinəcək."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Bu cəhddə yanlış iş PIN kodu daxil etsəniz, iş profiliniz və əlaqədar data bu cihazdan silinəcək."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Bu cəhddə yanlış iş parolu daxil etsəniz, iş profiliniz və əlaqədar data bu cihazdan silinəcək."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Həddindən çox yanlış cəhd. İş profiliniz və əlaqədar data bu cihazdan silinəcək."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Rədd edin"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Yenidən cəhd edin. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> cəhddən <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> cəhd."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Data silinəcək"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Növbəti cəhddə yanlış nümunə  daxil etsəniz, bu cihazın datası silinəcək"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Növbəti cəhddə yanlış nümunə daxil etsəniz, bu cihazın datası silinəcək"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Növbəti cəhddə yanlış parol daxil etsəniz, bu cihazın datası silinəcək"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Növbəti cəhddə yanlış nümunə daxil etsəniz, bu istifadəçi silinəcək"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Növbəti cəhddə yanlış PIN daxil etsəniz, bu istifadəçi silinəcək"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Növbəti cəhddə yanlış parol daxil etsəniz, bu istifadəçi silinəcək"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Növbəti cəhddə yanlış nümunə daxil etsəniz, iş profili və datası silinəcək"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Növbəti cəhddə yanlış PIN daxil etsəniz, iş profili və datası silinəcək"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Növbəti cəhddə yanlış parol daxil etsəniz, iş profili və datası silinəcək"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Həddindən artıq yanlış cəhd. Bu cihazın datası silinəcək."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Həddindən artıq yanlış cəhd. Bu istifadəçi silinəcək."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Həddindən artıq yanlış cəhd. Bu iş profili və datası silinəcək."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Rədd edin"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Ən az <xliff:g id="COUNT">%d</xliff:g> simvol olmalıdır"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN ən azı <xliff:g id="COUNT">%d</xliff:g> rəqəmli olmalıdır"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Davam"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Gəlişmiş Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth aktiv olan zaman cihazınız yaxınlıqdakı Bluetooth cihazları ilə bağlantı qura bilər."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Yerləşmə dəqiqliyini təkmilləşdirmək üçün sistem tətbiq və xidmətləri hələ də Bluetooth cihazlarını aşkar edə bilər. Bu funksiyanı <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>skan ayarlarından<xliff:g id="LINK_END_1">LINK_END</xliff:g> dəyişə bilərsiniz."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Qoşulmaq mümkün olmadı. Yenidən cəhd edin."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Cihaz məlumatları"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Cihazın Bluetooth ünvanı: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Cihaz unudulsun?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Telefon artıq <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ilə qoşalaşmayacaq"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Planşet artıq <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ilə qoşalaşmayacaq"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Cihaz artıq <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ilə qoşalaşmayacaq"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Cihazı unudun"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Bağlantı yaradılır…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> media audiodan ayrılacaq."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> handsfree audiodan ayrılacaq."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Təmin etməyin"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Düzgünlüyü yoxlamayın"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Sertifikat təyin olunmayıb. Bağlantınız şəxsi olmayacaq."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Şəbəkə adı çox uzundur."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Domen göstərilməlidir."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Əlçatımlı WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS mövcuddur)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 şəbəkə</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Qabaqcıl Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wi-Fi konfiqurasiya edin"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC ünvanı"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP ünvanı"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Alt şəbəkə maskası"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Bu qrup unudulsun?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Portativ Wi-Fi hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi hotspot"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Wi‑Fi şəbəkəsi təmin etmək üçün mobil bağlantı istifadə edin"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Bu planşetin İnternet bağlantısı hotspot üzərindən paylaşılmır"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Bu telefonun İnterneti hotspot ilə paylaşılmır"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"İnternet və ya kontent digər cihazlarla paylaşılmır"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Bu planşetin İnternet bağlantısı hotspot vasitəsilə paylaşılır"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Bu telefonun İnternet bağlantısı hotspot vasitəsilə paylaşılır"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Tətbiq kontenti paylaşır. İnternet bağlantısını paylaşmaq üçün hotspotu deaktiv, sonra aktiv edin"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi adı"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> aktiv edilir..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Digər cihazlar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> şəbəkəsinə qoşula bilər"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi parolu"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Digər cihazlara Wi‑Fi şəbəkəsi yaratmaq üçün hotspot istifadə edin. Hotspot mobil data bağlantısından istifadə edərərk İnternet təmin edir. Əlavə mobil data xərcləri tətbiq edilə bilər."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Tətbiq yaxınlıqdakı cihazlarla kontenti paylaşmaq üçün hotspot yarada bilər."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Hotspot yandırılır..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot söndürülür…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktivdir"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi çağrısı aktiv olan zaman, tərcihinizdən və siqnalın gücündən asılı olaraq telefon Wi-Fi və ya mobil şəbəkə üzərindən çağrı edə bilər. Bu funksiyanı aktivləşdirmədən öncə operatorun tariflərini və digər şeylərini öyrənin."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Fövqəladə Ünvanını yeniləyin"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"WiFi istifadə edərək 911 çağrısı etsəniz, ünvan təcili xidmətlər tərəfindən istifadə olunur"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Göstər"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nəticə yoxdur"</string>
     <string name="display_settings" msgid="7965901687241669598">"Göstər"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Avtodönüşlü ekran"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Canlı rənglər"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Planşetin pozisiyasından asılı olaraq orientasiyanı dəyiş"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Telefonun pozisiyasından asılı olaraq orientasiyanı dəyiş"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Planşetin pozisiyasından asılı olaraq orientasiyanı dəyiş"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Əlçatan işıq üçün parlaqlığı optimallaşdırın. Bu funksiya aktiv olduqda parlaqlığı tənzimləyin."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Gecə işığı"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Gecə İşığı kəhrəba rəngində olur. Bununla da ekrana və ya zəif işıqda qırmızıya baxmaq və yuxuya getmək daha asan olur."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Cədvəl"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Vəziyyət"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Avtomatik aktivləşdirin"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Heç vaxt"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Fərdi cədvəl"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Qürub-günəşin çıxması"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Cədvəl"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Heç biri"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Xüsusi vaxtda aktiv edir"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Qürubdan şəfəqə qədər aktiv edir"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Başlama vaxtı"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Bitmə tarixi"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"İntensivlik"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Deaktiv. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Heç vaxt avtomatik aktivləşdirilməyəcək."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g> saatında avtomatik yandırın."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Qürub vaxtı avtomatik aktivləşdiriləcək."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Aktiv. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Heç vaxt avtomatik deaktiv edilməyəcək."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g> radələrində avtomatik deaktiv ediləcək."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Günəş çıxan vaxt avtomatik deaktiv ediləcək."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"DEAKTİV / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Heç vaxt avtomatik aktiv etməyəcək"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g> radələrində avtomatik aktiv edəcək"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Qürub vaxtı avtomatik aktiv edəcək"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"AKTİV / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Heç vaxt avtomatik deaktiv etməyəcək"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g> radələrində avtomatik deaktiv edəcək"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Şəfəq vaxtı avtomatik deaktiv edəcək"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Yuxu"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekran sönür"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> fəaliyyətsizlikdən sonra"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Ayarlar"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Avtomatik parlaqlıq"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Oyatmaq üçün qaldırın"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Ətraf mühit displeyi"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ətraf mühit displeyi"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Həmişə aktiv"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Yeni bildiriş"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Nə vaxt göstərmək lazımdır"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Yeni bildiriş"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bildirişlər aldığınız zaman ekran oyansın"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Həmişə aktiv"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Vaxt, bildiriş ikonası və digər məlumatları göstərin"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Şrift ölçüsü"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Mətni kiçildin və ya böyüdün"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SİM kart kilidi parametrləri"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN boş ola bilməz."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC sahəsində 3 rəqəm olmalıdır."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC sahəsi 2 və ya 3 rəqəm olmalıdır."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operator %s növündə olan APN-lərin əlavə edilməsinə icazə vermir."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Defolt APN ayarları bərpa olunur."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Sıfırlayın"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Varsayılan APN ayarlarının sıfırlanması tamamlandı."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD kartı sil"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Daxili USB yaddaşında mahnı və ya şəkil kimi bütün datanı sil"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD kartda musiqi və foto kimi bütün məlumatları silin."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM\'ləri silin"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Telefondakı ütün eSIM\'ləri silin. Bununla mobil servis planı ləğv edilməyəcək."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Planşetdəki bütün eSIM\'ləri silin. Bununla mobil servis planı ləğv edilməyəcək."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Planşeti sıfırlayın"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefonu sıfırlayın"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Bütün şəxsi məlumatlarınız və endirilmiş tətbiqlər silinsin? Bu əməliyyatı geri qaytara bilməyəcəksiniz!!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Data Qənaəti aktiv olduqda daşınan hotspotları birləşdirmək və ya istifadə etmək olmur"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB Birləşmə"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB qoşulub, birləşməni yoxlayın"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Qoşulu"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USB yaddaşı istifadə olunarkən birləşmək olmur"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB qoşulmayıb"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Aktivləşdirmək üçün qoşulun"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB bağlantı xətası"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"USB vasitəsilə telefonun İnternet bağlantısını paylaşın"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"USB vasitəsilə planşetin İnternet bağlantısını paylaşın"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth Birləşmə"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Bu planşetin İnterneti Bluetooth ilə paylaşılır"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Bu telefonun İnterneti Bluetooth ilə paylaşılır"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Bu planşetin İnterneti 1 cihazla Bluetooth ilə paylaşılır"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Bu telefonun İnterneti 1 cihazla Bluetooth ilə paylaşılır"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Bu planşetin İnterneti <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> cihazla Bluetooth ilə paylaşılır"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Bu telefonun İnterneti <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> cihazla Bluetooth ilə paylaşılır"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Bluetooth vasitəsilə planşetin İnternet bağlantısını paylaşın"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Bluetooth vasitəsilə telefonun İnternet bağlantısını paylaşın"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g> cihazının İnterneti Bluetooth ilə paylaşılır"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Bu planşetin İnterneti Bluetooth ilə paylaşılmır"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Bu telefonun İnterneti Bluetooth ilə paylaşılmır"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Birləşməyib"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> cihazdan çoxu ilə birləşə bilməz."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> idarəolunmaz olacaq."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Mobil data bağlantısı üzərindən digər cihazlara İnternet təmin etmək üçün hotspot və qoşulma istifadə edin."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Mobil data bağlantısı vasitəsilə digər cihazları İnternetlə təmin etmək üçün hotspot və birləşmədən istifadə edin. Yaxınlıqdakı cihazlarla kontenti paylaşmaq üçün də hotspot yarada bilərsiniz."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Yardım"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobil şəbəkə"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobil plan"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Məkan rejimi"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Məkanı aşkarlamaq üçün GPS, Wi‑Fi, Bluetooth və ya mobil şəbəkə istifadə edin"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Məkanı aşkarlamaq üçün Wi‑Fi, Bluetooth və ya mobil şəbəkə istifadə edin"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Məkanı müəyyən etmək üçün GPS-dən istifadə et"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Məkanı müəyyən etmək üçün GPS və cihaz sensoru istifadə edin"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skan edilir"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi skan edilir"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Sistem tətbiq və xidmətlərinə Wi-Fi şəbəkələrini hər zaman aşkar etməyə icazə verməklə məkanı təkmilləşdirin."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Sizin data bağlantınız yoxdur. Bu informasiyanı indi görüntüləmək üçün, internetə qoşulu olan istənilən kompüterdən %s daxil olun."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Yüklənir…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Parolunuzu seçin"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Barmaq izi üçün parol seçin"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Modelinizi seçin"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Barmaq izi üçün nümunə seçin"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PİN seçin"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Barmaq izi üçün PIN ayarlayın"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Parolu təsdiq edin"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Modeli təsdiq edin"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PİN kodunuzu təsdiq edin"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Tətbiq parametrləri"</string>
     <string name="install_applications" msgid="4872012136210802181">"Naməlum mənbələr"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Tətbiq mənbələrinə icazə verin"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Ən son istifadə edilən tətbiqlər"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Bütün <xliff:g id="COUNT">%1$d</xliff:g> tətbiqə baxın"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> əvvəl"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Planşet və şəxsi datanız naməlum tətbiqlərin hücumuna qarşı daha həssasdır. Bu mənbədən tətbiq quraşdırmaqla planşetinə dəyə biləcək zərər və ya həmin tətbiqlərin istifadəsi nəticəsində baş verən data itkisinə görə məsuliyyət daşıdığınızı qəbul edirsiniz."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefon və şəxsi datanız naməlum tətbiqlərin hücumuna qarşı daha həssasdır. Bu mənbədən tətbiq quraşdırmaqla telefona dəyə biləcək zərər və ya həmin tətbiqlərin istifadəsi nəticəsində baş verən data itkisinə görə məsuliyyət daşıdığınızı qəbul edirsiniz."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Qabaqcıl ayarlar"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Sistem xidməti dayandırılsın?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Bu xidməti dayandırsanız, planşeti yandırıb söndürməyincə onun bəzi funksiyaları işləməyəcək."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Bu xidməti dayandırdığınız halda telefonunuzun bəzi özəllikləri telefonu söndürüb yandıracağınız vaxta qədər düzgün işləməyə bilərlər."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Dil, daxiletmə və jestlər"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Dillər və daxiletmə"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Dillər və daxiletmə"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Daxiletmə yardımı"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> çap xidməti aktivdir</item>
       <item quantity="one">1 çap xidməti aktivdir</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> çap işi</item>
+      <item quantity="one">1 çap işi</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Çap xidmətləri"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Heç bir xidmət quraşdırılmayıb"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Heç bir printer tapılmadı"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Ətraflı istifadə"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Enerji istifadəsini idarə edin"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Daxil edilmiş paketlər"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Tətbiq batareyanı azaldır"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Cihaz oyaq saxlanılır"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Cihaz arxa fonda oyadılır"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Məkan tez-tez təklif edilir"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> tətbiq səhv işləyir"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Tətbiq dayandırılsın?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Telefon batareya istifadəsini normal idarə edə bilmir  çünki <xliff:g id="APP">%1$s</xliff:g> telefonu oyaq saxlamağa davam edir.\n\n Bu problemi həll etməyə cəhd etmək üçün tətbiqi dayanmağa məcbur edə bilərsiniz.\n\nBu baş verməyə davam edərsə, batareya performansını təkmilləşdirmək üçün tətbiqi sistemdən silmək lazım ola bilər."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Planşet batareya istifadəsini normal idarə edə bilmir çünki <xliff:g id="APP">%1$s</xliff:g> planşeti oyaq saxlamağa davam edir.\n\n Bu problemi həll etmək üçün tətbiqi dayanmağa məcbur edə bilərsiniz.\n\nBu baş verməyə davam edərsə, batareya performansını təkmilləşdirmək üçün tətbiqi sistemdən silmək lazım ola bilər."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Cihaz batareya istifadəsini normal idarə edə bilmir çünki <xliff:g id="APP">%1$s</xliff:g> cihazı oyaq saxlamağa davam edir.\n\n Bu problemi həll etməyə cəhd etmək üçün tətbiqi dayanmağa məcbur edə bilərsiniz.\n\nBu baş verməyə davam edərsə, batareya performansını təkmilləşdirmək üçün tətbiqi sistemdən silmək lazım ola bilər."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Tətbiqi dayandırın"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Arxa fon istifadəsi deaktiv edilsin?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Telefon batareya istifadəsini normal idarə edə bilmir çünki <xliff:g id="APP">%1$s</xliff:g> cihazı oyatmağa davam edir.\n\nBu problemi həll etmək üçün telefon bu tətbiqi arxa fonda işləməsini dayandıra bilər."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Planşet batareya istifadəsini normal idarə edə bilmir çünki <xliff:g id="APP">%1$s</xliff:g> cihazı oyatmağa davam edir.\n\nBu problemi həll etmək üçün planşet bu tətbiqi arxa fonda işləməsini dayandıra bilər."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Cihaz batareya istifadəsini normal idarə edə bilmir çünki <xliff:g id="APP">%1$s</xliff:g> cihazı oyatmağa davam edir.\n\nBu problemi həll etmək üçün cihaz bu tətbiqin arxa fonda işləməsini dayandıra bilər."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Deaktiv edin"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Məkan deaktiv edilsin?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Telefon batareya istifadəsini normal idarə edə bilmir çünki tətbiqdən istifadə etmədiyiniz zaman <xliff:g id="APP">%1$s</xliff:g> məkanı təklif etməyə davam edir.\n\nBu problemi həll etmək üçün tətbiq məkanını deaktiv edə bilərsiniz."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Planşet batareya istifadəsini normal idarə edə bilmir çünki tətbiqdən istifadə etmədiyiniz zaman <xliff:g id="APP">%1$s</xliff:g> məkanı təklif etməyə davam edir.\n\nBu problemi həll etmək üçün tətbiq məkanını deaktiv edə bilərsiniz."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Cihaz batareya istifadəsini normal idarə edə bilmir çünki tətbiq istifadə etmədiyiniz zaman <xliff:g id="APP">%1$s</xliff:g> məkanı təklif etməyə davam edir.\n\nBu problemi həll etmək üçün tətbiq məkanını deaktiv edə bilərsiniz."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Deaktiv edin"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ekran"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"İşartı"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Tətbiqlər"</string>
     <string name="power_service" msgid="1599661212370831780">"Xidmətlər"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistem"</string>
-    <string name="power_user" msgid="1889728099253018005">"İstifadəçi"</string>
+    <string name="power_user" msgid="3706143225319881667">"Digər istifadəçilər"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU toplam"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ön plan"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Oyaq saxla"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Artıq hesablanmış enerji istifadəsi"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> üçün istifadə olundu"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"<xliff:g id="TIME">^1</xliff:g> üçün aktiv"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Ekran istifadəsi <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g> batareya istifadə etdi"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> batareya istifadəsi"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN kodu dəyişin"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Bildirişləri göstər"</string>
     <string name="help_label" msgid="6886837949306318591">"Yardım və geri əlaqə"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Yardım haqqında məqalə, telefon və çat dəstəyi"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Yardım haqqında məqalə, telefon və söhbət, başlanılır"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Məzmun üçün hesab"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Foto ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Böyük təhlükə"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">%d gizli element göstərin</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Şəbəkə və İnternet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobil, data istifadəsi, hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobil"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"data istifadəsi"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Qoşulmuş cihazlar"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Yayım, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Yayım"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Tətbiq və bildirişlər"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"İcazələr, defolt tətbiqlər"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"İstifadəçi və hesab"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"jest"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ödəyin, tıklayın, ödəmələr"</string>
     <string name="keywords_backup" msgid="470070289135403022">"yedəkləmə, yedəkləyin"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"jest, kənar, tərəf, aktiv tərəf, sıxmaq, tutmaq, yardım, assistent, sıx, sıxmaq, sıxmaq, sıxmaq, ok google, google assistent"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"jest, oyanmaq, bildiriş, ekran, displey, aktiv ekran, deaktiv ekran, sıxmaq, kənar, yatan, yuxu, tutmaq"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"jest, səssiz, mürgüləmə, siqnal, gələn zəng, sakit, displey, kilid ekranı, sıxmaq, tutmaq, kənar, dayandırmaq"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC Teqi quraşdırın"</string>
     <string name="write_tag" msgid="8571858602896222537">"Yazın"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tazmaq üçü teqə tıklayın..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"İş bildirişlərini heç göstərməyin"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Cihazınız kilidləndiyi zaman profil bildirişlərinin necə göstərilməsini istəyirsiniz?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profil bildirişləri"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Bildirişlər"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Bildirişlər"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Tətbiq bildirişləri"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Bildiriş kateqoriyası"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Əhəmiyyət"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Tətbiqin öhdəsinə buraxın"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Vacib"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Səsə icazə verin"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Səs, vibrasiyanı deaktiv edin və ya bu bildirişlərə cari ekranınızda baxın."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Az əhəmiyyətli"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Orta əhəmiyyətli"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Çox əhəmiyyətli"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Daha çox əhəmiyyətli"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Bildiriş köməkçisi"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Bildiriş girişi"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"İş profili bildirişlərinə giriş blok edilib"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Şəkil-içində-şəkil"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Şəkil içində şəkil icazəsi"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Tətbiq açıq olanda və ya tətbiqdən çıxdıqdan sonra (məsələn, videoya baxmağa davam etmək üçün) bu tətbiqə şəkil içində şəkil pəncərəsi yaratmağa icazə verin. Bu pəncərə istifadə etdiyiniz digər tətbiqlərin üstündə görüntülənəcək."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Bəli"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Xeyr"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"Narahat etməyin\" girişi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Heç bir tətbiq \"Narahat etməyin\" girişi sorğusu göndərməyib"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Tətbiqlər endirilir..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Bu iş profilini idarə edir:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> tərəfindən idarə olunur"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimental)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Cihaz fırlanması"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Ekranın məzmununu çevirin"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Portret görünüşündə qalın"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Landşaft görünüşündə qalın"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"İndiki orientasiyada qalın"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Təhlükəsiz başlama"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Davam et"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Cihazı işə salmadan öncə PIN tələb edərək, onu qoruya bilərsiniz. Cihaz işə salınmadan öncə siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz. \n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün PIN tələb edilsin?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Cihazı işə salmadan öncə parol tələb edərək, onu qoruya bilərsiniz. Cihaz işə salınmadan öncə siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz. \n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün parol tələb edilsin?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Cihazı kiliddən çıxarmaq üçün barmaq izi istifadə etməkdən əlavə, cihazı işə salmadan öncə PIN tələb edərək, onu qoruya bilərsiniz. Cihaz işə salınmadan öncə siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün PIN tələb edilsin?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Cihazı kiliddən çıxarmaq üçün barmaq izi istifadə etməkdən əlavə, cihazı işə salmadan öncə model tələb edərək, onu qoruya bilərsiniz. Cihaz işə salınmadan öncə siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün model tələb edilsin?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Cihazı kiliddən çıxarmaq üçün barmaq izi istifadə etməkdən əlavə, cihazı işə salmadan öncə parol tələb edərək onu qoruya bilərsiniz. Cihaz işə salınmadan öncə siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün parol tələb edin&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Cihazı kiliddən çıxarmaq üçün barmaq izi istifadə etməkdən əlavə, cihazı işə salmadan öncə parol tələb edərək onu qoruya bilərsiniz. Cihaz işə salınmadan öncə siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün parol tələb edilsin?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Bəli"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Xeyr"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PİN  tələb edirsiniz?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"İstifadə siqnalları"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Tam cihaz istifadəsini göstərin"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Tətbiq istifadəsini göstərin"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Yüksək səviyyədə istifadə"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> tətbiq düzgün işləmir</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> düzgün işləmir</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Tətbiq batareyanı azaldır</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> batareyanı azaldır</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Enerjiyə qənaət etmir"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Enerjiyə qənaət etmir"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Batareya istifadəsi optimallaşdırılır"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Tətbiqlər üzərindən görüntüləmə"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"Digər tətbiqlərin üzərindən görüntülənən <xliff:g id="COUNT_1">%2$d</xliff:g> tətbiqdən <xliff:g id="COUNT_0">%1$d</xliff:g> tətbiq"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Icazəsi ilə Apps"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Bəli"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Xeyr"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"İcazə verilib"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"İcazə verilməyib"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"naməlum mənbələrdən tətbiq quraşdırın"</string>
     <string name="write_settings" msgid="4797457275727195681">"Sistem ayarlarında dəyişiklik edin"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"sistem ayarlarını dəyişdirmək yazmaq"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekran kəhrəba rəngi çalarındandır. Bu, yuxuya getməyinizə kömək edə bilər."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Təkliflər"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> daha"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> təklif</item>
+      <item quantity="one"> 1 təklif</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> təklif</item>
+      <item quantity="one">+1 təklif</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Silin"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Sərin rəng temperaturu"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Serinləşdirici ekran rənglərini istifadə edin"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> Data xəbərdarlığı"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> Data xəbərdarlığı / <xliff:g id="ID_2">%2$s</xliff:g> Data limiti"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Hesablama dövrü"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Aylıq dövr hər ayın <xliff:g id="ID_1">%1$s</xliff:g> günündə başlayır"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Aylıq başlanğıc <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"<xliff:g id="ID_1">%1$s</xliff:g> günündə hər ay"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Şəbəkə məhdudiyyətləri"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> məhdudiyyət</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">Data Saver aktiv olduğu zaman 1 tətbiqə məhdudlaşdırılmamış data girişini istifadə etməyə icazə verilir</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Data qənaəti"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Məhdudlaşdırılmamış data girişi"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Məhdudlaşdırılmamış data"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Arxa fon datası deaktiv edilib"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Aktiv"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Deaktiv"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Ekran kilidi bildirişlərinə nəzarət edin"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bildiriş məzmununu göstərin və ya gizlədin"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Bütün"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Dəstək"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Dəstək və məsləhət"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ən kiçik en"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Heç bir quraşdırılmış tətbiq Premium SMS girişi tələb etməyib"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS müəyyən məbləğ tuta bilər və mobil operator fakturasına əlavə oluna bilər. Tətbiq üçün icazəni aktiv etsəniz, həmin tətbiqdən istifadə edərək, Premium SMS göndərə biləcəksiniz."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Avtomatik"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Təlimat"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"İndi yer boşaldın"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Jestlər"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"İşarə qısayolları"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Telefonu idarə etmək üçün cəld jestlər"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Planşeti idarə etmək üçün cəld jestlər"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Cihazı idarə etmək üçün cəld jestlər"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kameraya keçin"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Kameranı cəld açmaq üçün, enerji düyməsinə iki dəfə basın. İstənilən ekranda işləyir."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Kameranı cəld açın"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Yandırıb-söndürmə düyməsinə iki dəfə basın və kameranı açın"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kameranı çevirin"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Cəld selfi çəkin"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Selfi rejimi üçün telefonu iki dəfə burun"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Selfi rejimi üçün planşeti iki dəfə burun"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Selfi rejimi üçün cihazı iki dəfə burun"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Telefonu yoxlamaq üçün iki dəfə tıklayın"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Planşeti yoxlamaq üçün iki dəfə tıklayın"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Cihazı yoxlamaq üçün iki dəfə tıklayın"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Bildirişləri cəld yoxlamaq üçün, ekrana iki dəfə klikləyin."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Vaxt, bildiriş ikonası və digər məlumatı yoxlamaq üçün iki dəfə ekrana klikləyin."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Ekran deaktiv olduğu zaman bildirişləri yoxlayın"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Telefonu yoxlamaq üçün qaldırın"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Planşeti yoxlamaq üçün qaldırın"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Cihazı yoxlamaq üçün qaldırın"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Bildirişləri cəld yoxlamaq üçün, telefonu götürün."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Bildirişləri cəld yoxlamaq üçün, planşeti götürün."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Bildirişləri cəld yoxlamaq üçün, cihazı götürün."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Vaxt, bildiriş ikonası və digər məlumatı yoxlamaq üçün telefonu götürün."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Vaxt, bildiriş ikonası və digər məlumatı yoxlamaq üçün planşeti götürün."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Vaxt, bildiriş ikonası və digər məlumatı yoxlamaq üçün cihazı götürün."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Ekran deaktiv olduğu zaman bildirişləri yoxlayın"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Bildirişlər üçün barmaq izini sürüşdürün"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Bildirişləri yoxlamaq üçün, barmaq sensorunda aşağı sürüşdürün."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Bildirişləri yoxlamaq üçün, planşetin arxasındakı barmaq sensorunda aşağı sürüşdürün."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Bildirişləri yoxlamaq üçün, cihazın arxasındakı barmaq sensorunda aşağı sürüşdürün."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Bildirişlərə cəld baxın"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Barmaq izi sensorunda aşağı sürüşdürün"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Kameranı açmaq üçün qaldırın"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Kameranı avtomatik olaraq açmaq üçün telefonu foto çəkəcəyiniz pozisiyaya qaldırın (mənzərə və ya portret). Telefon, yuxu rejimində və ya kiliddə olan zaman işləyir."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Telefon yuxu rejimində və ya kiliddə olarkən fotolar çəkin"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Köməkçi işarə"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Həssaslıq"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Bu ani tətbiqi silmək istəyirsiniz?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Oyunlar"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio fayllar"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Yaddaş sahəsi istifadə edildi"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> üçün silindi)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> üçün deaktiv edildi)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Avtodoldurma xidməti"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Ani tətbiq"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Yaddaş meneceri deaktiv edilsin?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Film və TV tətbiqləri"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Yaddaş sahəsi istifadə edildi"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Təchizat Məlumatı"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Operator Təchizatlanmasını Tətikləyin"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Yeni və maraqlı olan nədir?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Ən çox istifadə olunan 5 funksiyanı yoxlayın"</string>
 </resources>
diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml
index 7e1c9bd..f5a74d0 100644
--- a/res/values-b+sr+Latn/arrays.xml
+++ b/res/values-b+sr+Latn/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Dobra"</item>
     <item msgid="8986346415847956850">"Odlična"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Uvek"</item>
-    <item msgid="844721238536786870">"Samo kad se puni"</item>
-    <item msgid="1986753720941888596">"Nikad"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Uvek"</item>
-    <item msgid="7433294150916905997">"Samo kad se puni"</item>
-    <item msgid="1390404486722375028">"Nikada"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Poslednjih 30 dana"</item>
     <item msgid="6600989128423965319">"Podesi ciklus potrošnje..."</item>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 990d0a2..48382cc 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -31,6 +31,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Postali ste programer!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nema potrebe, već ste programer."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Prvo omogućite opcije za programera."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Bežična veza i mreže"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Veze"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Uređaj"</string>
@@ -42,6 +43,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Dodeljeno za VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Video pozivanje je dodeljeno"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Pozivanje preko Wifi veze je dodeljeno"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Dodeljeno prisustvo"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Napajanje za radio na mobilnim uređajima"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Prikaži SIM adresar"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Prikaži brojeve za fiksno biranje"</string>
@@ -107,10 +109,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Skeniraj za uređaje"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Preimenuj ovaj uređaj"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Preimenuj"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Želite li da prekinete vezu?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Ovim ćete prekinuti vezu sa uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Prekidate vezu sa uređajem?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Telefon će prekinuti vezu sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Tablet će prekinuti vezu sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Uređaj će prekinuti vezu sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Prekini vezu"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Nemate dozvolu za promenu podešavanja Bluetooth-a."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Upari novi uređaj"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> je vidljiv uređajima u blizini dok su Bluetooth podešavanja otvorena."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Bluetooth adresa telefona: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Bluetooth adresa tableta: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth adresa uređaja: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Želite li da prekinete vezu sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emitovanje"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Želite li da onemogućite profil?"</string>
@@ -122,7 +131,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Zahtev za Bluetooth uparivanje"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Zahtev za uparivanje"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Dodirnite da biste uparili sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Prikaz primljenih datoteka"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Primljene datoteke"</string>
     <string name="device_picker" msgid="4978696506172252813">"Izaberite Bluetooth uređaj"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi da uključi Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi da isključi Bluetooth"</string>
@@ -158,6 +167,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s želi da pristupi porukama. Želite li da odobrite pristup za %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Zahtev za pristup SIM kartici"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> želi da pristupa SIM kartici. Odobravanje pristupa SIM kartici će onemogućiti vezu za prenos podataka na uređaju dok traje povezivanje. Dajte pristup uređaju <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Drugim uređajima vidljiv kao „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Uređaji"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Uparite novi uređaj"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum i vreme"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Izbor vremenske zone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -331,7 +343,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Nalozi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Nalozi"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Bezbednost i lokacija"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Bezbednost i lokacija"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifrovanje i akreditivi"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon je šifrovan"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Uređaj je šifrovan"</string>
@@ -357,40 +369,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Otključajte otiskom prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Koristite otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Samo dodirnite senzor za otisak prsta da biste otključali telefon, ovlastili kupovine ili se prijavili na aplikacije Ovo će biti moguće pomoću svih otisaka prstiju koje dodate, pa budite oprezni koga dodajete.\n\nNapomena: Otisak prsta može da bude manje bezbedan od jakog šablona ili PIN-a."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Samo dodirnite senzor otiska prsta da biste odobrili kupovinu ili se prijavili na aplikacije. Pažljivo birajte čije otiske prstiju dodajete. Čak i samo jedan dodati otisak može da uradi bilo šta od gorenavedenog.\n\nNapomena: Ne možete da koristite otisak prsta za otključavanje ovog uređaja. Za više informacija obratite se administratoru organizacije."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Samo dodirnite senzor za otisak prsta da biste otključali telefon, dali ovlašćenje za kupovine ili da biste se prijavili u aplikacije. Ovo će biti moguće pomoću svih otisaka prstiju koje dodate, pa budite oprezni čije otiske dodajete.\n\nNapomena: Otisak prsta može da bude manje bezbedan od jakog šablona ili PIN-a."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Otkaži"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Nastavi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Preskoči"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Dodaj otisak prsta"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funkcije zaštite uređaja neće biti aktivirane. Nećete moći da sprečite druge da koriste ovaj tablet u slučaju gubitka, krađe ili brisanja."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funkcije zaštite uređaja neće biti aktivirane. Nećete moći da sprečite druge da koriste ovaj uređaj u slučaju gubitka, krađe ili brisanja."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funkcije zaštite uređaja neće biti aktivirane. Nećete moći da sprečite druge da koriste ovaj telefon u slučaju gubitka, krađe ili brisanja."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funkcije zaštite uređaja neće biti aktivirane. Nećete moći da sprečite druge da koriste ovaj tablet u slučaju gubitka ili krađe."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funkcije zaštite uređaja neće biti aktivirane. Nećete moći da sprečite druge da koriste ovaj uređaj u slučaju gubitka ili krađe."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funkcije zaštite uređaja neće biti aktivirane. Nećete moći da sprečite druge da koriste ovaj telefon u slučaju gubitka ili krađe."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Dalje"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funkcije zaštite uređaja neće biti uključene. Nećete moći da sprečite druge ljude da koriste ovaj tablet ako bude izgubljen, ukraden ili resetovan."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funkcije zaštite uređaja neće biti uključene. Nećete moći da sprečite druge ljude da koriste ovaj uređaj ako bude izgubljen, ukraden ili resetovan."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funkcije zaštite uređaja neće biti uključene. Nećete moći da sprečite druge ljude da koriste ovaj telefon ako bude izgubljen, ukraden ili resetovan."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Funkcije zaštite uređaja neće biti uključene. Nećete moći da sprečite druge ljude da koriste ovaj tablet ako bude izgubljen ili ukraden."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Funkcije zaštite uređaja neće biti uključene. Nećete moći da sprečite druge ljude da koriste ovaj uređaj ako bude izgubljen ili ukraden."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Funkcije zaštite uređaja neće biti uključene. Nećete moći da sprečite druge ljude da koriste ovaj telefon ako bude izgubljen ili ukraden."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ipak preskoči"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Vrati se"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Pronađite senzor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Na poleđini uređaja pronađite senzor za otisak prsta."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Dodirnite senzor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Nalazi se na zadnjoj strani telefona. Koristite kažiprst."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustracija sa uređajem i lokacijom senzora za otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Naziv"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Potvrdi"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Izbriši"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Započnimo"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Dodirnite senzor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Stavite prst na senzor i podignite ga kada osetite vibraciju"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Nastavite dalje"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Malo pomerite prst da biste dodali različite delove otiska prsta"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Otisak prsta je dodat!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kada god vidite ovu ikonu, možete da koristite otisak prsta radi identifikacije ili da biste odobrili kupovinu."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Samo dodirnite senzor za otisak prsta da biste aktivirali i otključali uređaj."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Kada vidite ovu ikonu, možete i da odobrite kupovine ili se prijavljujete u aplikacije."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Podignite, pa opet dodirnite"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Nastavite da podižete prst da biste dodali različite delove otiska prsta"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Otisak prsta je dodat"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Kada vidite ovu ikonu, koristite otisak prsta radi identifikacije ili odobravanja kupovina."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Preskočiti podešavanje otiska prsta?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Izabrali ste da koristite otisak prsta kao jedan način za otključavanje telefona. Ako sada preskočite, moraćete kasnije da obavite ovo podešavanje. Za podešavanje je potrebno samo oko minut vremena."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Podesi zaključavanje ekrana"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Gotovo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, to nije senzor"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Koristite senzor za otisak prsta na uređaju."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Dodirnite senzor na zadnjoj strani telefona. Koristite kažiprst."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registracija nije završena"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Vremensko ograničenje za registraciju otiska prsta je isteklo. Probajte ponovo."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Registracija otiska prsta nije uspela. Probajte ponovo ili koristite drugi prst."</string>
@@ -452,6 +462,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Sprečite druge da koriste ovaj uređaj bez dozvole tako što ćete aktivirati funkcije zaštite uređaja. Izaberite zaključavanje ekrana koje želite da koristite."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Sprečite druge da koriste ovaj telefon bez dozvole tako što ćete aktivirati funkcije zaštite uređaja. Izaberite zaključavanje ekrana koje želite da koristite."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Izaberite rezervni način za zaključavanje ekrana"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opcije zaključavanja ekrana"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opcije zaključavanja ekrana"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zaključavanje ekrana"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/odmah posle spavanja"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> posle spavanja"</string>
@@ -522,13 +534,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Promena šablona za otključavanje"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Promena PIN-a za otključavanje"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Promena lozinke za otključavanje"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Probajte ponovo. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. pokušaj od <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Poslednji pokušaj"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Ako u ovom pokušaju unesete netačan šablon za Work, sa ovog uređaja ćemo ukloniti profil za Work i povezane podatke."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Ako u ovom pokušaju unesete netačan PIN za Work, sa ovog uređaja ćemo ukloniti profil za Work i povezane podatke."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Ako u ovom pokušaju unesete netačnu lozinku za Work, sa ovog uređaja ćemo ukloniti profil za Work i povezane podatke."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Previše netačnih pokušaja. Uklonićemo profil za Work i povezane podatke sa ovog uređaja."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Odbaci"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Probajte ponovo. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. pokušaj od <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Izbrisaćemo podatke"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ako u sledećem pokušaju unesete netačan šablon, izbrisaćemo podatke sa ovog uređaja"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ako u sledećem pokušaju unesete netačan PIN, izbrisaćemo podatke sa ovog uređaja"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ako unesete netačnu lozinku pri sledećem pokušaju, izbrisaćemo podatke sa ovog uređaja"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ako u sledećem pokušaju unesete netačan šablon, izbrisaćemo ovog korisnika"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ako u sledećem pokušaju unesete netačan PIN, izbrisaćemo ovog korisnika"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ako u sledećem pokušaju unesete netačnu lozinku, izbrisaćemo ovog korisnika"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ako u sledećem pokušaju unesete netačan šablon, izbrisaćemo profil za Work i njegove podatke"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ako u sledećem pokušaju unesete netačan PIN, izbrisaćemo profil za Work i njegove podatke"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ako u sledećem pokušaju unesete netačnu lozinku, izbrisaćemo profil za Work i njegove podatke"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Previše netačnih pokušaja. Izbrisaćemo podatke sa ovog uređaja."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Previše netačnih pokušaja. Izbrisaćemo ovog korisnika."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Previše netačnih pokušaja. Izbrisaćemo ovaj profil za Work i njegove podatke."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Odbaci"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Minimalan broj znakova je <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Minimalan broj cifara za PIN je <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Nastavi"</string>
@@ -637,6 +657,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Napredni Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kada je Bluetooth uključen, uređaj može da komunicira sa drugim Bluetooth uređajima u blizini."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Da bi poboljšale tačnost lokacije, sistemske aplikacije i usluge će i dalje prepoznavati Bluetooth uređaje, čak i kada je Bluetooth isključen. Ovo možete da promenite u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>podešavanjima skeniranja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Povezivanje nije uspelo. Pokušajte ponovo."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Detalji o uređaju"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Bluetooth adresa uređaja: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Želite li da zaboravite uređaj?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Telefon neće više biti uparen sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Tablet neće više biti uparen sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Uređaj neće više biti uparen sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Zaboravi uređaj"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Povezivanje sa…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g>neće biti povezan na zvuka medija."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> neće biti povezan na hendsfri zvuk."</string>
@@ -789,6 +817,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ne pružaj"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ne proveravaj"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nije naveden nikakav sertifikat. Veza neće biti privatna."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Naziv mreže je predugačak."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Morate da navedete domen."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je dostupan"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je dostupan)"</string>
@@ -821,7 +850,6 @@
       <item quantity="other">%d mreža</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Napredna Wi-Fi podešavanja"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfigurišite Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC adresa"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP adresa"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podmreže"</string>
@@ -858,9 +886,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Želite li da zaboravite ovu grupu?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prenosni Wi-Fi hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi hotspot"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Pruža Wi‑Fi mrežu pomoću mobilne veze"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Internet veza ovog tableta se ne deli preko hotspota"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Internet veza ovog telefona se ne deli preko hotspota"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Ni internet ni sadržaj se ne dele sa drugim uređajima"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internet veza ovog tableta se deli preko hotspota"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internet veza ovog telefona se deli preko hotspota"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikacija deli sadržaj. Da biste delili internet vezu, isključite, pa uključite hotspot"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Naziv Wi‑Fi hotspota"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> se uključuje..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Drugi uređaji mogu da se povežu sa hotspotom <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Lozinka za Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Opseg pristupne tačke"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Koristite hotspot da biste napravili Wi‑Fi mrežu za druge uređaje. Hotspot pruža internet pomoću mreže za mobilne podatke. Možda će važiti dodatne tarife za mobilne podatke."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacije mogu da prave hotspotove za deljenje sadržaja sa obližnjim uređajima."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Uključivanje hotspota…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Isključivanje hotspota..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivan"</string>
@@ -907,6 +943,7 @@
     <item msgid="6200207341126893791">"1."</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Kada je Pozivanje preko Wi-Fi-ja uključeno, telefon može da preusmerava pozive preko Wi-Fi mreža ili mreže mobilnog operatera u zavisnosti od toga koje ste podešavanje izabrali i koji signal je jači. Pre nego što uključite ovu funkciju, informišite se kod mobilnog operatera o naknadama i drugim detaljima."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Ažurirajte adresu za hitne slučajeve"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Adresa koju koriste hitne službe kao vašu lokaciju ako pozovete takvu službu pomoću Wi-Fi mreže."</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Prikaz"</string>
@@ -964,6 +1001,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nema rezultata"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ekran"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatsko rotiranje ekrana"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Živopisne boje"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Promeni položaj automatski prilikom rotiranja tableta"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Automatska promena položaja prilikom rotacije telefona"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Promeni položaj automatski prilikom rotiranja tableta"</string>
@@ -991,23 +1029,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimizujte nivo osvetljenosti prema svetlu. Možete privremeno da podesite osvetljenost i kad je ova opcija uključena."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Noćno svetlo"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Noćno svetlo daje ekranu žutonarandžastu nijansu. To vam omogućava da lakše pregledate sadržaj ekrana pri prigušenom svetlu i da lakše zaspite."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Zakažite"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Automatski uključi"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nikad"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Prilagođeni raspored"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Od zalaska do izlaska sunca"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Zakažite"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ništa"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Uključuje se u željeno vreme"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Uključuje se od sutona do svitanja"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Vreme početka"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Vreme završetka"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intenzitet"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Isključeno. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nikada se ne uključuje automatski."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Uključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Uključuje se automatski kada sunce zađe."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Uključeno. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nikada se ne isključuje automatski."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Isključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Isključuje se automatski kada sunce izađe."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Isključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Nikada se ne uključuje automatski"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Uključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Uključuje se automatski kada sunce zađe"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Uključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Nikada se ne isključuje automatski"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Isključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Isključuje se automatski kada sunce izađe"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Spavanje"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekran se isključuje"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Posle <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
@@ -1031,8 +1068,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Podešavanja"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatski nivo osvetljenosti"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Podigni za aktivaciju"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Ambijentalni ekran"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambijentalni ekran"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Uvek uključeno"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nova obaveštenja"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kada da se prikazuje"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nova obaveštenja"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Probudite ekran kada primite obaveštenja"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Uvek uključeno"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Prikazuje vreme, ikone obaveštenja i druge informacije"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Omogućava da tekst bude veći ili manji"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Zaključavanje SIM kartice"</string>
@@ -1285,6 +1328,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Polje Naziv pristupne tačke ne sme da bude prazno."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Polje MCK mora da sadrži 3 cifre."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC polje mora da sadrži 2 ili 3 cifre."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Mobilni operater ne dozvoljava nazive pristupnih tačaka tipa %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Vraćanje podrazumevanih podešavanja naziva pristupne tačke."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Resetuj podrazumevano"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ponovno postavljanje podrazumevanih podešavanja naziva pristupne tačke je završeno"</string>
@@ -1315,6 +1359,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Izbriši SD karticu"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Obriši sve podatke iz interne USB memorije, kao što su muzika i fotografije."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Izbriši sve podatke sa SD kartice, kao što su muzika ili fotografije"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Obrišite eSIM-ove"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Obrišite sve eSIM-ove na telefonu. Na taj način nećete otkazati mobilni tarifni paket."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Obrišite sve eSIM-ove na tabletu. Na taj način nećete otkazati mobilni tarifni paket."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Vraćanje tableta na podrazumevane vrednosti"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetuj telefon"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Želite li da obrišete sve lične podatke i preuzete aplikacije? Ne možete da opozovete ovu radnju!"</string>
@@ -1337,26 +1384,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Nije moguće privezivanje niti korišćenje prenosivih hotspotova dok je Ušteda podataka uključena"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB povezivanje"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB povezan, proverite za privezivanje"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Povezano"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Privezivanje nije moguće kad se koristi USB memorija"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB nije povezan"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Povežite da biste uključili"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Greška prilikom USB povezivanja"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Deljenje internet veze telefona preko USB-a"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Deljenje internet veze tableta preko USB-a"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth privezivanje"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Internet veza ovog tableta se deli preko Bluetooth-a"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Internet veza ovog telefona se deli preko Bluetooth-a"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Internet veza ovog tableta se deli preko Bluetooth-a sa 1 uređajem"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Internet veza ovog telefona se deli preko Bluetooth-a sa 1 uređajem"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Internet veza ovog tableta se deli preko Bluetooth-a sa <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> uređaja"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Internet veza ovog telefona se deli preko Bluetooth-a sa <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> uređaja"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Delite internet vezu tableta preko Bluetooth-a"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Delite internet vezu telefona preko Bluetooth-a"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Internet veza uređaja <xliff:g id="DEVICE_NAME">%1$d</xliff:g> se deli preko Bluetooth-a"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Internet veza ovog tableta se ne deli preko Bluetooth-a"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Internet veza ovog telefona se ne deli preko Bluetooth-a"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Nije privezano"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Privezivanje na više od <xliff:g id="MAXCONNECTION">%1$d</xliff:g> uređaja nije moguće."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Internet veza sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> će biti prekinuta."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Koristite hotspot i privezivanje da biste obezbedili internet drugim uređajima pomoću veze za prenos podataka preko mobilnog operatera."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Koristite hotspot i privezivanje da biste obezbedili internet drugim uređajima pomoću veze za mobilne podatke. Aplikacije mogu da prave hotspotove i za deljenje sadržaja sa obližnjim uređajima."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoć"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobilna mreža"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Tarifni paket za mobilni uređaj"</string>
@@ -1389,7 +1425,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Režim lokacije"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Koristi GPS, Wi‑Fi, Bluetooth ili mobilne mreže za određivanje lokacije"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Koristi Wi‑Fi, Bluetooth ili mobilne mreže za određivanje lokacije"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Koristi GPS za određivanje lokacije"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Koristi GPS i senzore uređaja za određivanje lokacije"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skeniranje"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi skeniranje"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Unapredite lociranje tako što ćete dozvoliti sistemskim aplikacijama i uslugama da u svakom trenutku prepoznaju Wi‑Fi mreže."</string>
@@ -1434,8 +1470,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nemate vezu za prenos podataka. Da biste odmah pogledali ove informacije, idite na %s sa bilo kog računara koji je povezan sa internetom."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Učitava se…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Odaberite lozinku"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Podesite lozinku da biste koristili otisak"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Izaberite šablon"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Podesite šablon da biste koristili otisak"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Odaberite PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Podesite PIN da biste koristili otisak"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potvrdite lozinku"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrdite šablon"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potvrdite PIN"</string>
@@ -1504,6 +1543,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Podešavanja aplikacije"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nepoznati izvori"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Dozvoli sve izvore aplikacija"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Nedavno otvarane aplikacije"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Prikaži sve aplikacije: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"pre <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tablet i lični podaci su podložniji napadu nepoznatih aplikacija. Instaliranjem aplikacija iz ovog izvora prihvatate da ste odgovorni za oštećenja telefona ili gubitak podataka do kojih može da dođe zbog njihovog korišćenja."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefon i lični podaci su podložniji napadu nepoznatih aplikacija. Instaliranjem aplikacija iz ovog izvora prihvatate da ste odgovorni za oštećenja telefona ili gubitak podataka do kojih može da dođe zbog njihovog korišćenja."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Napredna podešavanja"</string>
@@ -1673,6 +1715,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Želite da zaustavite sistemsku uslugu?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Ako zaustavite ovu uslugu, neke funkcije tableta će možda prestati ispravno da funkcionišu dok ne isključite i ponovo uključite tablet."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ako zaustavite ovu uslugu, neke funkcije telefona će možda prestati ispravno da funkcionišu dok ne isključite i ponovo uključite telefon."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Jezici, unos i pokreti"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Jezici i unos"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Jezici i unos"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Pomoć za unos"</string>
@@ -1893,6 +1939,11 @@
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> usluge štampanja su uključene</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> usluga štampanja je uključeno</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> zadatak za štampanje</item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> zadatka za štampanje</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> zadataka za štampanje</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Usluge štampanja"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nijedna usluga nije instalirana"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nije pronađen nijedan štampač"</string>
@@ -1959,6 +2010,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Korišćenje detalja"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Prilagođavanje korišćenja napajanja"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Sadržani paketi"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplikacije mnogo troše bateriju"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Ne dozvoljavamo da uređaj pređe u stanje spavanja"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Budimo uređaj u pozadini"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Često traži lokaciju"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Neke aplikacije (<xliff:g id="NUMBER">%1$d</xliff:g>) se čudno ponašaju"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Zaustavljate aplikaciju?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Telefon ne može da upravlja baterijom na uobičajen način jer mu <xliff:g id="APP">%1$s</xliff:g> ne dozvoljava da pređe u stanje spavanja.\n\nDa biste probali da rešite ovaj problem, možete prinudno da zaustavite tu aplikaciju.\n\nAko se ovo dešava i dalje, možda treba da deinstalirate aplikaciju da biste poboljšali performanse baterije."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Tablet ne može da upravlja baterijom na uobičajen način jer mu <xliff:g id="APP">%1$s</xliff:g> ne dozvoljava da pređe u stanje spavanja.\n\nDa biste probali da rešite ovaj problem, možete prinudno da zaustavite tu aplikaciju.\n\nAko se ovo dešava i dalje, možda treba da deinstalirate aplikaciju da biste poboljšali performanse baterije."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Uređaj ne može da upravlja baterijom na uobičajen način jer mu <xliff:g id="APP">%1$s</xliff:g> ne dozvoljava da pređe u stanje spavanja.\n\nDa biste probali da rešite ovaj problem, možete prinudno da zaustavite tu aplikaciju.\n\nAko se ovo dešava i dalje, možda treba da deinstalirate aplikaciju da biste poboljšali performanse baterije."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Zaustavi aplikaciju"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Želite li da sprečite korišćenje u pozadini?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Telefon ne može da upravlja baterijom na uobičajen način jer ga <xliff:g id="APP">%1$s</xliff:g> stalno budi.\n\nDa bi rešio ovaj problem, telefon može da spreči da ova aplikacija radi u pozadini."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Tablet ne može da upravlja baterijom na uobičajen način jer ga <xliff:g id="APP">%1$s</xliff:g> stalno budi.\n\nDa bi rešio ovaj problem, tablet može da spreči da ova aplikacija radi u pozadini."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Uređaj ne može da upravlja baterijom na uobičajen način jer ga <xliff:g id="APP">%1$s</xliff:g> stalno budi.\n\nDa bi rešio ovaj problem, uređaj može da spreči da ova aplikacija radi u pozadini."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Isključi"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Želite li da isključite lokaciju?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Telefon ne može da upravlja baterijom na uobičajen način jer aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno traži lokaciju čak i kada ne koristite tu aplikaciju.\n\nDa biste rešili ovaj problem, možete da isključite lokaciju za ovu aplikaciju."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Tablet ne može da upravlja baterijom na uobičajen način jer aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno traži lokaciju čak i kada ne koristite tu aplikaciju.\n\nDa biste rešili ovaj problem, možete da isključite lokaciju za ovu aplikaciju."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Uređaj ne može da upravlja baterijom na uobičajen način jer aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno traži lokaciju čak i kada ne koristite tu aplikaciju.\n\nDa biste rešili ovaj problem, možete da isključite lokaciju za ovu aplikaciju."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Isključi"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ekran"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lampa"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1973,7 +2044,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Aplikacije"</string>
     <string name="power_service" msgid="1599661212370831780">"Usluge"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistem"</string>
-    <string name="power_user" msgid="1889728099253018005">"Korisnik"</string>
+    <string name="power_user" msgid="3706143225319881667">"Ostali korisnici"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Ukupno korišćenje procesora"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Procesor u prednjem planu"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zadrži van stanja spavanja"</string>
@@ -2025,6 +2096,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Prekomerno izračunata potrošnja energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Koristi se <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktivna <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Korišćenje ekrana: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> koristi <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ukupnog kapaciteta baterije"</string>
@@ -2588,7 +2660,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Promeni PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Prikazuj obaveštenja"</string>
     <string name="help_label" msgid="6886837949306318591">"Pomoć i povratne inf."</string>
-    <string name="support_summary" msgid="8276116616493882830">"Članci pomoći, podrška telefonom i ćaskanjem"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Članci pomoći, podrška telefonom i ćaskanjem, početni koraci"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Nalog za sadržaj"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID slike"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ekstremne opasnosti"</string>
@@ -2679,9 +2751,12 @@
       <item quantity="other">Prikaži %d skrivenih stavki</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Mreža i internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobilna mreža, potrošnja podataka, hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilna mreža"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"potrošnja podataka"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Povezani uređaji"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, prebacivanje, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, prebacivanje"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije i obaveštenja"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Dozvole, podrazumevane aplikacije"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Korisnici i nalozi"</string>
@@ -2734,6 +2809,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"pokret"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"platite, dodirnite, plaćanja"</string>
     <string name="keywords_backup" msgid="470070289135403022">"rezervna kopija, praviti rezervnu kopiju"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"pokret, ivica, strana, aktivna ivica, stisnuti, stisak, pomoći, pomoćnik, squeezy, squeezie, squeezey, squeezee, ok google, google pomoćnik"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"pokret, buditi, obaveštenja, ekran, prikaz, isključivanje ekrana, uključivanje ekrana, stisnuti, ivica, spava, spavati, stisak"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"pokret, potpuno utišati, odložiti, alarm, dolazni poziv, tiho, prikaz, zaključani ekran, stisnuti, stisak, ivica, zaustaviti"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Podesite Wi-Fi NFC oznaku"</string>
     <string name="write_tag" msgid="8571858602896222537">"Napiši"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Dodirnite oznaku da biste pisali..."</string>
@@ -2817,7 +2895,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Ne prikazuj nikakva obaveštenja o profilu za Work"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kada je uređaj zaključan, kako želite da se prikazuju obaveštenja o profilu?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Obaveštenja o profilu"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Obaveštenja"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Obaveštenja"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Obaveštenja aplikacija"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorija obaveštenja"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Važnost"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Neka aplikacija odluči"</string>
@@ -2832,6 +2911,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Hitan"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Dozvoli zvuk"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Nema nikakvog zvuka ni vibracije niti se ova obaveštenja nakratko prikazuju na aktuelnom ekranu."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Važnost: niska"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Važnost: srednja"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Važnost: velika"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Važnost: hitno"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Pomoćnik za obaveštenja"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Pristup obaveštenjima"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Pristup obaveštenjima profila za Work je blokiran"</string>
@@ -2860,8 +2943,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Slika u slici"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Dozvoli sliku u slici"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Dozvolite ovoj aplikaciji da pravi prozor slike u slici dok je otvorena ili kada izađete iz nje (na primer, da biste nastavili da gledate neki video). Ovaj prozor se prikazuje preko drugih aplikacija koje koristite."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Da"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Ne"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Pristup opciji Ne uznemiravaj"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nijedna instalirana aplikacija nije zahtevala pristup opciji Ne uznemiravaj"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavaju se aplikacije..."</string>
@@ -2996,11 +3077,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Ovim profilom za Work upravlja:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Upravlja <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentalno)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Rotacija uređaja"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Rotiraj sadržaj ekrana"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Zadrži uspravni prikaz"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Zadrži vodoravni prikaz"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Zadrži aktuelni položaj"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Bezbedno pokretanje"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Nastavi"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Možete dodatno da zaštitite ovaj uređaj tako što ćete ga podesiti da traži PIN pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme. \n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Želite zahtev za PIN pri pokretanju uređaja?"</string>
@@ -3008,7 +3084,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Možete dodatno da zaštitite uređaj tako što ćete ga podesiti da traži lozinku pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke ili obaveštenja, uključujući alarme. \n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Zahtevati lozinku pri pokretanju uređaja?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Pored toga što možete da otključavate uređaj otiskom prsta, možete dodatno da ga zaštitite tako što ćete ga podesiti da traži PIN pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Želite zahtev za PIN pri pokretanju uređaja?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Pored toga što možete da otključavate uređaj otiskom prsta, možete dodatno da ga zaštitite tako što ćete ga podesiti da traži šablon pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Zahtevati šablon pri pokretanju uređaja?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Pored toga što možete da otključavate uređaj otiskom prsta, možete dodatno da ga zaštitite tako što ćete ga podesiti da traži lozinku pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Zahtevati lozinku pri pokretanju uređaja?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Pored toga što možete da otključavate uređaj otiskom prsta, možete dodatno da ga zaštitite tako što ćete ga podesiti da traži lozinke pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Zahtevati lozinku pri pokretanju uređaja?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Da"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ne"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Tražiti PIN?"</string>
@@ -3130,6 +3206,17 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Obaveštenja o korišćenju"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Prikaži kompletno korišćenje uređaja"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Prikaži korišćenje aplikacije"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Intenzivno korišćenje"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacija se ponaša na neuobičajen način</item>
+      <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacije se ponašaju na neuobičajen način</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacija se ponaša na neuobičajen način</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Aplikacije mnogo troše bateriju</item>
+      <item quantity="few">Aplikacije mnogo troše bateriju</item>
+      <item quantity="other">Aplikacije mnogo troše bateriju</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Bez optimizacije"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Bez optimizacije"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizacija korišćenja baterije"</string>
@@ -3223,8 +3310,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Prikaz preko drugih aplikacija"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"Aplikacije sa dozvolom za prikaz preko drugih: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacije sa dozvolom"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Da"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Ne"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Dozvoljeno"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Nije dozvoljeno"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instaliranje aplikacije nepoznati izvori"</string>
     <string name="write_settings" msgid="4797457275727195681">"Menjanje podešavanja sistema"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"upisivati menjati sistem podešavanja"</string>
@@ -3315,6 +3402,17 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekran ima žutonarandžastu nijansu. To može da vam pomogne da zaspite."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Predlozi"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"i još <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> predlog</item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> predloga</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> predloga</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="one">i još <xliff:g id="COUNT">%1$d</xliff:g> predlog</item>
+      <item quantity="few">i još <xliff:g id="COUNT">%1$d</xliff:g> predloga</item>
+      <item quantity="other">i još <xliff:g id="COUNT">%1$d</xliff:g> predloga</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Ukloni"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Hladna temperatura boje"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koristi hladnije boje ekrana"</string>
@@ -3333,8 +3431,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Upozorenje za potrošnju podataka: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Upozorenje za potrošnju podataka: <xliff:g id="ID_1">%1$s</xliff:g>/Ograničenje za potrošnju podataka: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Obračunski ciklus"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Mesečni ciklus počinje svakog <xliff:g id="ID_1">%1$s</xliff:g>. u mesecu"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Svakog meseca od <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Svakog <xliff:g id="ID_1">%1$s</xliff:g>. u mesecu"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Mrežna ograničenja"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> ograničenje</item>
@@ -3356,7 +3453,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija ima dozvolu da koristi neograničenu količinu podataka kada je Ušteda podataka uključena</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Ušteda podataka"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Neograničeni pristup podacima"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Neograničen pristup podacima"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Prenos podataka u pozadini je isključen"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Uključeno"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Isključeno"</string>
@@ -3421,8 +3518,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrolišite obaveštenja na zaklj. ekranu"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Pregledajte ili sakrijte sadržaj obaveštenja"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Sve"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Podrška"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Podrška i saveti"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Najmanja širina"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nijedna instalirana aplikacija nije zahtevala pristup premijum SMS-ovima"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premijum SMS-ovi mogu da koštaju i povećaće račune kod mobilnog operatera. Ako omogućite dozvolu za neku aplikaciju, moći ćete da šaljete premijum SMS-ove pomoću te aplikacije."</string>
@@ -3490,28 +3586,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatska"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ručna"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Oslobodi prostor"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Pokreti"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Prečice pokretima"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Brzi pokreti za kontrolu telefona"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Brzi pokreti za kontrolu tableta"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Brzi pokreti za kontrolu uređaja"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Prelazak na kameru"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Da biste brzo otvorili kameru, dvaput pritisnite dugme za napajanje. Ovo funkcioniše na svakom ekranu."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Brzo otvorite kameru"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Pritisnite dugme za napajanje dvaput da biste otvorili kameru"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Okretanje kamere"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Brže snimajte selfije"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Dvaput zaokrenite telefon za režim za selfije"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Dvaput zaokrenite tablet za režim za selfije"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Dvaput zaokrenite uređaj za režim za selfije"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dvaput dodirnite telefon da biste ga proverili"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dvaput dodirnite tablet da biste ga proverili"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dvaput dodirnite uređaj da biste ga proverili"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Dvaput dodirnite ekran da biste brzo pregledali obaveštenja."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Da biste proverili vreme, ikone obaveštenja i druge informacije, dvaput dodirnite ekran."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Proveravajte obaveštenja kada je ekran isključen"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Podignite telefon da ga proverite"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Podignite tablet da biste ga proverili"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Podignite uređaj da biste ga proverili"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Uzmite telefon da biste brzo pregledali obaveštenja."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Uzmite tablet da biste brzo pregledali obaveštenja."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Uzmite uređaj da biste brzo pregledali obaveštenja."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Da biste proverili vreme, ikone obaveštenja i druge informacije, uzmite telefon."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Da biste proverili vreme, ikone obaveštenja i druge informacije, uzmite tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Da biste proverili vreme, ikone obaveštenja i druge informacije, uzmite uređaj."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Proveravajte obaveštenja kada je ekran isključen"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Prevucite prstom za obaveštenja"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Da biste proverili obaveštenja, prevucite prstom nadole po senzoru za otisak prsta na zadnjoj strani telefona."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Da biste proverili obaveštenja, prevucite prstom nadole po senzoru za otisak prsta na zadnjoj strani tableta."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Da biste proverili obaveštenja, prevucite prstom nadole po senzoru za otisak prsta na zadnjoj strani uređaja."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Brzo pregledajte obaveštenja"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Prevucite nadole na senzoru za otisak prsta"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Podignite telefon da biste otvorili kameru"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Da biste automatski otvorili kameru, postavite telefon u položaj za slikanje (pejzaž ili portret). Funkcioniše kada je telefon u stanju spavanja ili je zaključan."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Slikajte kada je telefon u stanju spavanja ili je zaključan"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Pokret za pomoć"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Osetljivost"</string>
@@ -3622,6 +3731,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Želite li da uklonite ovu instant aplikaciju?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Igre"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio datoteke"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Iskorišćen prostor"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(deinstalirano za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(onemogućeno za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Usluga automatskog popunjavanja"</string>
@@ -3635,5 +3745,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Instant aplikacija"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Želite li da isključite menadžer memorijskog prostora?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplikacije za filmove i TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Iskorišćen prostor"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Informacije o dodeli mobilnog operatera"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Pokretanje dodele mobilnog operatera"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Šta je novo i uzbudljivo?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Pogledajte 5 najpopularnijih funkcija"</string>
 </resources>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index 6cbe699..5b1d2d2 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Добры"</item>
     <item msgid="8986346415847956850">"Выдатны"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Заўсёды"</item>
-    <item msgid="844721238536786870">"Толькі калі падлучаны"</item>
-    <item msgid="1986753720941888596">"Ніколі"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Заўсёды"</item>
-    <item msgid="7433294150916905997">"Толькі калі падлучаны"</item>
-    <item msgid="1390404486722375028">"Ніколі"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Апошнія 30 дзён"</item>
     <item msgid="6600989128423965319">"Заданне цыклу расходу..."</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 1eee604..a977e16 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -32,6 +32,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Цяпер вы - распрацоўшчык!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Не трэба, вы ўжо з\'яўляецеся распрацоўшчыкам."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Спачатку ўключыце параметры распрацоўшчыка."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Бесправадныя сеткі"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Сувязi"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Прылада"</string>
@@ -43,6 +44,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE уключана"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Відэавыклікі забяспечаны"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi-тэлефанія забяспечана"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presence уключана"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Магутнасць радыёсігналу"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Прагляд адраснай кнігі на SIM-карце"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Прагляд фіксаваных нумароў"</string>
@@ -108,10 +110,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Шукаць прылады"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Перайменаваць прыладу"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Перайменаваць"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Адключыцца?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Гэта завершыць вашу сувязь з прыладай &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Адключыць прыладу?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Ваш тэлефон адключыцца ад прылады <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Ваш планшэт адключыцца ад прылады <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Ваша прылада адключыцца ад прылады <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Адключыцца"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"У вас няма дазволу на змяненне налад Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Падлучыце новую прыладу"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Пакуль Bluetooth уключаны, <xliff:g id="DEVICE_NAME">%1$s</xliff:g> бачная для прылад, якія знаходзяцца побач."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Адрас Bluetooth тэлефона: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Адрас Bluetooth планшэта: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Адрас Bluetooth прылады: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Адлучыць <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Перадача даных"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Адключыць профіль?"</string>
@@ -123,7 +132,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Запыт спарвання Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Запыт на спарванне"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Кранiце, каб спалучыцца з прыладай <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Паказаць атрыманыя файлы"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Атрыманыя файлы"</string>
     <string name="device_picker" msgid="4978696506172252813">"Выберыце прыладу Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> хоча ўключыць Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> хоча адключыць Bluetooth"</string>
@@ -159,6 +168,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s спрабуе атрымаць доступ да вашых паведамленняў. Дазволіць доступ да %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Запыт доступу да SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> спрабуе атрымаць доступ да вашай SIM-карты. Прадастаўленне доступу да SIM-карты адключыць перадачу даных на прыладзе на час падлучэння. Даць доступ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Бачная для іншых прылад як прылада \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\""</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Вашы прылады"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Падлучыце новую прыладу"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Дата і час"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Вылучыце гадзінны пояс"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -333,7 +345,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Уліковыя запісы"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Месцазнаходжанне"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Уліковыя запісы"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Бяспека і месцазнаходжанне"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Бяспека і месца"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шыфраванне і ўліковыя даныя"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Тэлефон зашыфраваны"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Прылада зашыфравана"</string>
@@ -360,40 +372,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Разблакірав. адбіткам пальца"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Выкарыстоўв. адбітак пальца"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Проста дакранайцеся да датчыка адбіткаў пальцаў, каб разблакіраваць свой тэлефон, аўтарызаваць куплі або ўваходзіць у праграмы. Уважліва сачыце за тым, чые адбіткі пальцаў вы дадаяце. Любое з гэтых дзеянняў будзе даступнае для ўладальніка нават аднаго з адбіткаў пальцаў.\n\nЗаўвага. Выкарыстанне адбітка пальца можа быць менш бяспечным, чым складаны ўзор або PIN-код."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Проста дакранайцеся да датчыка адбіткаў пальцаў, каб аўтарызаваць куплі або ўваходзіць у праграмы. Уважліва сачыце за тым, чые адбіткі пальцаў вы дадаяце. Любое з гэтых дзеянняў будзе даступнае для ўладальніка нават аднаго з адбіткаў пальцаў.\n\nЗаўвага. Вы не можаце выкарыстоўваць адбітак пальца для разблакіроўкі гэтай прылады. Для атрымання дадатковай інфармацыі звяжыцеся з адміністратарам арганізацыі."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Проста дакранайцеся да датчыка адбіткаў пальцаў, каб разблакіраваць свой тэлефон, аўтарызаваць куплі або ўваходзіць у праграмы. Уважліва сачыце за тым, чые адбіткі пальцаў вы дадаяце. Любое з гэтых дзеянняў будзе даступнае для ўладальніка нават аднаго з адбіткаў пальцаў.\n\nЗаўвага. Выкарыстанне адбітка пальца можа быць менш бяспечным, чым складаны ўзор або PIN-код."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Для ўхвалення купляў ці разблакіроўкі тэлефона можна карыстацца адбіткам пальца.\n\nЗаўвага. Вы не можаце выкарыстоўваць адбітак пальца для разблакіроўкі гэтай прылады. Для атрымання дадатковай інфармацыі звяжыцеся з адміністратарам арганізацыі."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Для ўхвалення купляў ці разблакіроўкі тэлефона можна карыстацца адбіткам пальца.\n\nЗаўвага. Выкарыстанне адбітка пальца можа быць менш бяспечным, чым складаны ўзор разблакіроўкі або PIN-код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Скасаваць"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Далей"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Прапусціць"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Дадаць адбітак пальца"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Абарона прылады не будзе актываваная. Калі вы згубіце свой планшэт, яго ўкрадуць ці сатруць усе даныя, ім змогуць карыстацца іншыя людзі."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Абарона прылады не будзе актываваная. Калі вы згубіце сваю прыладу, яе ўкрадуць ці сатруць усе даныя, ёй змогуць карыстацца іншыя людзі."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Абарона прылады не будзе актываваная. Калі вы згубіце свой тэлефон, яго ўкрадуць ці сатруць усе даныя, ім змогуць карыстацца іншыя людзі."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Функцыі Абароны прылады не будуць актываваны. Вы не зможаце прадухіліць выкарыстанне гэтага планшэта ў выпадку страты або крадзяжу."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Абарона прылады не будзе актываваная. Калі вы згубіце сваю прыладу ці яе ўкрадуць, ёй змогуць карыстацца іншыя людзі."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Абарона прылады не будзе актываваная. Калі вы згубіце свой тэлефон ці яго ўкрадуць, ім змогуць карыстацца іншыя людзі."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Далей"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Функцыі абароны прылады не будуць уключаны. Вы не зможаце забараніць іншым карыстацца гэтым планшэтам у выпадку згубы, крадзяжу ці скіду налад."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Функцыі абароны прылады не будуць уключаны. Вы не зможаце забараніць іншым карыстацца гэтай прыладай у выпадку згубы, крадзяжу ці скіду налад."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Функцыі абароны прылады не будуць уключаны. Вы не зможаце забараніць іншым карыстацца гэтым тэлефонам у выпадку згубы, крадзяжу ці скіду налад."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Функцыі абароны прылады не будуць уключаны. Вы не зможаце забараніць іншым карыстацца гэтым планшэтам у выпадку згубы ці крадзяжу."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Функцыі абароны прылады не будуць уключаны. Вы не зможаце забараніць іншым карыстацца гэтай прыладай у выпадку згубы ці крадзяжу."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Функцыі абароны прылады не будуць уключаны. Вы не зможаце забараніць іншым карыстацца гэтым тэлефонам у выпадку згубы ці крадзяжу."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Усё роўна прапусціць"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Назад"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Знайдзіце сэнсар"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Знайдзіце датчык адбіткаў пальцаў на задняй панэлі тэлефона."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Дакраніцеся да сэнсара"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Ён на задняй панэлі тэлефона. Карыстайцеся ўказальным пальцам."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Малюнак, які паказвае, дзе размяшчаецца датчык адбіткаў пальцаў на прыладзе"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Імя"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ОК"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Выдаліць"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Прыступім"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Дакраніцеся да сэнсара"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Прыкладзіце палец да сэнсара і ўтрымлівайце яго, пакуль не адчуеце вібрацыю"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Працягвайце"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Злёгку паварушыце пальцам, каб дадаць усе часткі вашага пальца"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Адбітак пальца дададзены!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Калі вы бачыце гэты значок, гэта значыць, што вы можаце выкарыстоўваць адбіткі пальцаў для ідэнтыфікацыі або аўтарызацыі пакупак."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Проста дакраніцеся да сэнсара адбіткаў пальцаў, каб абудзіць і разблакіраваць сваю прыладу."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Калі вы бачыце гэты значок, вы таксама можаце аўтарызаваць куплі ці ўваходзіць у праграмы."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Падыміце і дакраніцеся зноў"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Дакраніцеся некалькі разоў, каб дадаць усе часткі адбітка вашага пальца"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Адбітак пальца дададзены"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Калі вы бачыце гэты значок, вы можаце выкарыстоўваць адбіткі пальцаў для ідэнтыфікацыі або ўхвалення купляў."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Прапусціць усталёўку адбітка пальца?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Вы вырашылі выкарыстоўваць свой адбітак пальца як адзін са спосабоў разблакіроўкі тэлефона. Калі вы прапусціце гэты крок зараз, вам трэба будзе ўсталяваць гэты спосаб пазней. Усталёўка займае ўсяго каля хвіліны."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Наладзіць блакіроўку экрана"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Гатова"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ой, гэта не датчык"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Скарыстайце сэнсар адбіткаў пальцаў на прыладзе."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Указальным пальцам дакраніцеся да сэнсара на задняй панэлі тэлефона."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Рэгістрацыя адбітка не была завершана"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Час на рэгістрацыю адбіткаў скончыўся. Паспрабуйце яшчэ раз."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Рэгістрацыя адбітка не атрымалася. Калі ласка, паўтарыце спробу або выкарыстайце іншы палец."</string>
@@ -455,6 +465,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Прадухіліце выкарыстанне гэтай прылады без вашага дазволу, актываваўшы функцыі абароны прылады. Выберыце спосаб блакіроўкі экрана, які вы хочаце выкарыстоўваць."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Прадухіліце выкарыстанне гэтага тэлефона без вашага дазволу, актываваўшы функцыі абароны прылады. Выберыце спосаб блакіроўкі экрана, які вы хочаце выкарыстоўваць."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Выберыце дадатковы спосаб блакіроўкі экрана"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Параметры экрана блакіроўкі"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Параметры экрана блакіроўкі"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блакіроўка экрана"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / адразу пасля сну"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> пасля сну"</string>
@@ -525,13 +537,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Змяніць шаблон разблакоўкі"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Змяніць PIN-код разблакавання"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Змяніць пароль разблакоўкі"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Паспрабуйце яшчэ раз. Спроба <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> з <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Апошняя спроба"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Калі вы зараз увядзеце няправільны рабочы графічны ключ, ваш рабочы профіль і звязаныя з імі даныя будуць выдалены з гэтай прылады."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Калі вы зараз увядзеце няправільны рабочы PIN-код, ваш рабочы профіль і звязаныя з імі даныя будуць выдалены з гэтай прылады."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Калі вы зараз увядзеце няправільны рабочы пароль, ваш рабочы профіль і звязаныя з імі даныя будуць выдалены з гэтай прылады."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Занадта шмат няўдалых спробаў. Ваш рабочы профіль і звязаныя з імі даныя будуць выдалены з гэтай прылады."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Адхіліць"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Паўтарыце спробу. Спроба <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> з дапушчальных <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Вашы даныя будуць выдалены"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Калі вы яшчэ раз уведзяце няправільны графічны ключ, даныя з гэтай прылады будуць выдалены"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Калі вы яшчэ раз уведзяце няправільны PIN-код, даныя з гэтай прылады будуць выдалены"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Калі вы яшчэ раз уведзяце няправільны пароль, даныя з гэтай прылады будуць выдалены"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Калі вы яшчэ раз уведзяце няправільны графічны ключ, гэты карыстальнік будзе выдалены"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Калі вы яшчэ раз уведзяце няправільны PIN-код, гэты карыстальнік будзе выдалены"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Калі вы яшчэ раз уведзяце няправільны пароль, гэты карыстальнік будзе выдалены"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Калі вы яшчэ раз уведзяце няправільны графічны ключ, ваш рабочы профіль і звязаныя з ім даныя будуць выдалены"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Калі вы яшчэ раз уведзяце няправільны PIN-код, ваш рабочы профіль і звязаныя з ім даныя будуць выдалены"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Калі вы яшчэ раз уведзяце няправільны пароль, ваш рабочы профіль і звязаныя з ім даныя будуць выдалены"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Занадта шмат няўдалых спроб. Даныя з гэтай прылады будуць выдалены."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Занадта шмат няўдалых спроб. Гэты карыстальнік будзе выдалены."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Занадта шмат няўдалых спроб. Гэты рабочы профіль і звязаныя з ім даныя будуць выдалены."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Адхіліць"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Павінен змяшчаць не менш за наступную колькасць сімвалаў: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN-код павінен змяшчаць не менш за наступную колькасць лічбаў: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Працягнуць"</string>
@@ -648,6 +668,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Пашыраны Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Калі Bluetooth уключаны, ваша прылада можа звязвацца з іншымі прыладамі з Bluetooth, якія знаходзяцца побач."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Для паляпшэння дакладнасці вызначэння месцазнаходжання сістэмныя праграмы і службы могуць знаходзіць прылады Bluetooth. Вы можаце змяніць гэта ў <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>наладах сканіравання<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Не атрымалася ўсталяваць злучэнне. Паўтарыце спробу."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Звесткі пра прыладу"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Адрас Bluetooth прылады: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Выдаліць прыладу?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Ваш тэлефон больш не будзе злучаны з прыладай <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Ваш планшэт больш не будзе злучаны з прыладай <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Ваша прылада больш не будзе злучана з прыладай <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Выдаліць прыладу"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Злучыцца з..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Прылада <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будзе адключаная ад аўдыёфайлаў."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Прылада <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будзе адключаная ад аудыёгарнітуры."</string>
@@ -800,6 +828,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Не даваць"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Не правяраць"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Сертыфікат не пазначаны. Ваша падлучэнне не будзе прыватным."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Імя сеткі занадта доўгае."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Неабходна ўказаць дамен."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS даступная"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS даступная)"</string>
@@ -833,7 +862,6 @@
       <item quantity="other">%d сеткі</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Пашыраны Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Канфігурацыя Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-адрас"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-адрас"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска падсеткі"</string>
@@ -870,9 +898,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Iгнараваць гэту групу?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Кропка доступу Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Пункт доступу Wi-Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Выкарыстоўваць мабільнае падключэнне для працы сеткі Wi‑Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Не абагульваць падключэнне да інтэрнэту гэтага планшэта праз хот-спот"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Няма доступу да інтэрнэту гэтага тэлефона праз кропку доступу"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Не ідзе абагульванне змесціва ці падключэння да інтэрнэту з іншымі прыладамі"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Не абагульваць падключэнне да інтэрнэту гэтага планшэта праз хот-спот"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Няма доступу да інтэрнэту гэтага тэлефона праз хот-спот"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Праграма абагульвае змесціва. Каб абагульваць інтэрнэт, адключыце, а потом зноў уключыце хот-спот"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Назва Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Ідзе ўключэнне <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Іншыя прылады могуць падключацца да <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Пароль Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Дыяпазон для пунктаў доступу"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Выкарыстоўвайце хот-спот для стварэння сеткі Wi‑Fi для іншых прылад. Хот-спот дае доступ да інтэрнэту праз падключэнне да мабільнай перадачы даных. Мабільным аператарам можа спаганяцца дадатковая плата."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Праграмы могуць ствараць хот-спот для абагульвання змесціва з прыладамі паблізу."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Уключэнне кропкi доступу..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Выключэнне кропкi доступу..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"Сетка <xliff:g id="NETWORK_SSID">%1$s</xliff:g> актыўная"</string>
@@ -919,6 +955,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Калі ўключана Wi-Fi-тэлефанія, ваш тэлефон можа накіроўваць выклікі праз сеткі Wi-Fi або сетку вашага аператара, у залежнасці ад вашых пераваг і таго, які сігнал мацней. Перад уключэннем гэтай функцыі пракансультуйцеся з вашым аператарам наконт аплаты і іншай падрабязнай інфармацыі."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Абнавіць экстранны адрас"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Адрас, які аварыйна-выратавальныя службы прымаюць за ваша месцазнаходжанне пры выкліку 911 праз Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Экран"</string>
@@ -977,6 +1014,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Вынікаў няма"</string>
     <string name="display_settings" msgid="7965901687241669598">"Дысплэй"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Аўтаматычны паварот экрана"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Насычаныя колеры"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Аўтаматычна змяняць арыентацыю экрана пры павароце планшэта"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Аўтаматычна змяняць арыентацыю экрана пры павароце тэлефона"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Аўтаматычна змяняць арыентацыю экрана пры павароце планшэта"</string>
@@ -1004,23 +1042,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Аптымізуйце ўзровень яркасці ў залежнасці ад асвятлення. Калі гэта функцыя ўключана, вы па-ранейшаму можаце часова задаваць яркасць."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Начная падсветка"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Функцыя \"Начная падсветка\" дадае вашаму экрану бурштынавае адценне. Глядзець на экран або чытаць пры слабым святле становіцца лягчэй, і гэта можа дапамагчы вам хутчэй засынаць."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Графік"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Стан"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Уключаць аўтаматычна"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Ніколі"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Карыстальніцкі расклад"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Ад світання да захаду сонца"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Расклад"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ніколі"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Уключаецца ў вызначаны час"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Уключаецца ад захаду да ўсходу"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Час пачатку"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Час заканчэння"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Стан"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Інтэнсіўнасць"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Выкл. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Ніколі не ўключыцца аўтаматычна."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Уключыцца аўтаматычна ў <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Уключыцца аўтаматычна на захадзе сонца."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Укл. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Ніколі не выключыцца аўтаматычна."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Выключыцца аўтаматычна ў <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Выключыцца аўтаматычна на світанні."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Выкл. / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Ніколі не ўключыцца аўтаматычна"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Уключыцца аўтаматычна ў <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Уключыцца аўтаматычна на захадзе сонца"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Укл. / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Ніколі не выключыцца аўтаматычна"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Выключыцца аўтаматычна ў <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Выключыцца аўтаматычна на ўсходзе сонца"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Рэжым сну"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Экран выключаецца"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Пасля бяздзейнасці: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1044,8 +1081,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Налады"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Аўтаматычная яркасць"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Абуджэнне пры падняцці"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Аўтаматычнае ўключэнне экрана"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Аўтаматычнае ўключэнне экрана"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Заўсёды ўключана"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Новыя апавяшчэнні"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Калі паказваць"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Новыя апавяшчэнні"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Абуджаць экран, калі вы атрымліваеце апавяшчэнні"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Заўсёды ўключана"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Паказваць значкі часу, памедамленняў і іншыя даныя"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Памер шрыфта"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Павялічыць або паменшыць тэкст"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Налады блакіроўкі SIM-карты"</string>
@@ -1299,6 +1342,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Значэнне APN не можа быць пустым."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"У полі MCC павінна быць 3 сімвалы."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"У полі MCC павінна быць 2 ці 3 сімвала."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Аператар не дазваляе дадаваць APN тыпу %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Аднаўленне параметраў APN па змаўчанні"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Аднавіць налады па змаўчанні"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Скід налад кропкі доступу па змаўчанні завершаны."</string>
@@ -1330,6 +1374,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Сцерці SD-карту"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Выдаліць з унутранага USB-назапашвальнiка ўсе дадзеныя, напрыклад музыку i фатаграфіі"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Выдаліць з SD-карты ўсе дадзеныя, напрыклад музыку i фатаграфіі."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Сцерці даныя eSIM-карт"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Сцерці даныя ўсіх eSIM-карт на тэлефоне. У выніку гэтага ваш тарыфны план мабільнай перадачы даных не будзе скасаваны."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Сцерці даныя ўсіх eSIM-карт на планшэце. У выніку гэтага ваш тарыфны план мабільнай перадачы даных не будзе скасаваны."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Перазапусціць планшэт"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Скід тэлефона"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Выдалiць усю вашу асабістую інфармацыю і спампаваныя дадаткі? Гэта дзеянне нельга адмянiць!"</string>
@@ -1352,26 +1399,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"У рэжыме эканоміі трафіку нельга падключацца да кропак доступу"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-мадэм"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB падлучаны, выберыце, каб уключыць мадэм"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Прывязаны"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Немагчыма выкарыстоўваць мадэм, калі выкарыстоўваецца USB-назапашвальнік"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB не падлучаны"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Падлучыце, каб уключыць"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Памылка USB-мадэма"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Абагуліць падключэнне да інтэрнэту гэтага тэлефона праз USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Абагуліць падключэнне да інтэрнэту гэтага планшэта праз USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-мадэм"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Абагул. падкл. да інтэрн. гэт. планш. па Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Абагул. падключ. да інтэрн. гэт. тэл. па Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Абаг. падкл. да інтэрн. гэт. планш. для 1 прыл. па Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Абагул. падкл. да інтэрн. гэт. тэл. для 1 прыл. па Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Абагул. падкл. да інт. гэт. планш. для прыл. (<xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>) па Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Абагул. падкл. да інт. гэтага тэл. для прыл. (<xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>) па Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Абагуліць падключэнне да інтэрнэту планшэта праз Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Абагуліць падключэнне да інтэрнэту тэлефона праз Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Абагульв. падключ. да інтэрн. прыл. <xliff:g id="DEVICE_NAME">%1$d</xliff:g> па Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Не абаг. падкл. гэт. планш. да інтэр. па Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Няма доступу да інтэрнэту праз Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Немагчыма злучыцца"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Немагчыма падлучыць больш прылад, чым <xliff:g id="MAXCONNECTION">%1$d</xliff:g>."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Адбудзецца адключэнне прылады <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Выкарыстоўвайце кропку доступу і рэжым мадэма для падключэння да інтэрнэту іншых прылад праз мабільную перадачу даных."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Выкарыстоўвайце хот-спот і рэжым мадэма для падключэння да інтэрнэту іншых прылад праз мабільную перадачу даных. Праграмы таксама могуць ствараць хот-спот для абагульвання змесціва з прыладамі паблізу."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Даведка"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Мабільная сетка"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Тарыфны план"</string>
@@ -1404,7 +1440,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Рэжым вызначэння месцазнаходж."</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Выкарыстоўваць GPS, Wi-Fi, Bluetooth або мабільныя сеткі для вызначэння месцазнаходжання"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Выкарыстоўваць Wi‑Fi, Bluetooth або мабільныя сеткі для вызначэння месцазнаходжання"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Выкарыстоўваць GPS для вызначэння месцазнаходжання"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Выкарыстоўваць GPS і датчыкі прылады для вызначэння месцазнаходжання"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Сканіраванне"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Сканіраванне Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Палепшыце функцыю вызначэння месцазнаходжання, дазволіўшы сістэмным праграмам і службам знаходзіць сеткі Wi-Fi у любы час."</string>
@@ -1449,8 +1485,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Падлучэнне да Iнтэрнэту адсутнiчае. Каб прагледзець гэтую інфармацыю зараз, наведайце %s з любога камп\'ютара, падлучанага да Iнтэрнэту."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Загрузка..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Выберыце пароль"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Перш чым карыстацца адбіткам пальца, задайце пароль"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Выберыце ўзор разблакіроўкі"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Перш чым карыстацца адбіткам пальца, задайце ўзор разблакіроўкі"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Выберыце PIN-код"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Каб карыст. адбіт. пальца, задайце PIN-код"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Пацвердзіце пароль"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Пацвердзіце ўзор"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Пацвердзіце PIN-код"</string>
@@ -1519,6 +1558,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Налады прыкладання"</string>
     <string name="install_applications" msgid="4872012136210802181">"Невядомыя крыніцы"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Дазволіць усе крыніцы дадаткаў"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Нядаўна адкрытыя праграмы"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Паказаць усе праграмы (<xliff:g id="COUNT">%1$d</xliff:g> шт.)"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> таму"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Ваш планшэт і асабістыя даныя больш уразлівыя для нападаў невядомых праграм. Пры ўсталёўцы праграм з гэтай крыніцы вы згаджаецеся, што несяце адказнасць за любыя пашкоджанні планшэта ці страту даных, якія могуць адбыцца ў выніку выкарыстання гэтых праграм."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Ваш тэлефон і асабістыя даныя больш уразлівыя для нападаў невядомых праграм. Пры ўсталёўцы праграм з гэтай крыніцы вы згаджаецеся, што несяце адказнасць за любыя пашкоджанні тэлефона ці страту даных, якія могуць адбыцца ў выніку выкарыстання гэтых праграм."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Пашыраныя налады"</string>
@@ -1689,6 +1731,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Спыніць абслугоўванне сістэмы?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Калі вы спыніце гэту сiстэмную службу, некаторыя функцыi планшэта могуць працаваць няправільна, пакуль вы не выключыце i зноў не ўключыце яе."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Калі вы спыніце гэтую службу, некаторыя функцыі тэлефона могуць перастаць працаваць правільна, пакуль вы не выключыце і зноў не ўключыце яго."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Мовы, увод і жэсты"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Мовы і ўвод"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Мовы і ўвод"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Дапамога па ўводзе"</string>
@@ -1915,6 +1961,12 @@
       <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="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <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="print_settings_title" msgid="3685449667822217816">"Службы друку"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Няма ўсталяваных службаў"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Прынтараў не знойдзена"</string>
@@ -1981,6 +2033,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Падрабязнасці выкарыстання"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Адрэгуляваць спажыванне энергіі"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Уключаныя пакеты"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Праграмы, якія разраджаюць акумулятар"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Падтрымлівае прыладу ў актыўным рэжыме"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Выводзіць прыладу з рэжыму сну ў фонавым рэжыме"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Запытвае месцазнаходжанне занадта часта"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> праграм паводзяць сябе незвычайна"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Спыніць праграму?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Ваш тэлефон не можа нармальна кіраваць акумулятарам, бо <xliff:g id="APP">%1$s</xliff:g> падтрымлівае яго ў актыўным рэжыме.\n\nВырашыць гэту праблему можна, прымусова спыніўшы праграму.\n\nКалі гэта не дапамагло, трэба выдаліць праграму, каб палепшыць выкарыстанне акумулятара."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Ваш планшэт не можа нармальна кіраваць акумулятарам, бо <xliff:g id="APP">%1$s</xliff:g> падтрымлівае яго ў актыўным рэжыме.\n\nВырашыць гэту праблему можна, прымусова спыніўшы праграму.\n\nКалі гэта не дапамагло, трэба выдаліць праграму, каб палепшыць выкарыстанне акумулятара."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Ваша прылада не можа нармальна кіраваць акумулятарам, бо <xliff:g id="APP">%1$s</xliff:g> падтрымлівае прыладу ў актыўным рэжыме.\n\nВырашыць гэту праблему можна, прымусова спыніўшы праграму.\n\nКалі гэта не дапамагло, трэба выдаліць праграму, каб палепшыць выкарыстанне акумулятара."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Спыніць праграму"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Адключыць працу ў фонавым рэжыме?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Ваш тэлефон не можа нармальна кіраваць акумулятарам, бо <xliff:g id="APP">%1$s</xliff:g> выводзіць яго з рэжыму сну.\n\nВырашыць гэту праблему можна, забараніўшы гэтай праграме працаваць у фонавым рэжыме."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Ваш планшэт не можа нармальна кіраваць акумулятарам, бо <xliff:g id="APP">%1$s</xliff:g> выводзіць яго з рэжыму сну.\n\nВырашыць гэту праблему можна, забараніўшы гэтай праграме працаваць у фонавым рэжыме."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Ваша прылада не можа нармальна кіраваць акумулятарам, бо <xliff:g id="APP">%1$s</xliff:g> выводзіць яе з рэжыму сну.\n\nВырашыць гэту праблему можна, забараніўшы гэтай праграме працаваць у фонавым рэжыме."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Адключыць"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Адключыць функцыю вызначэння месцазнаходжання?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Ваш тэлефон не можа нармальна кіраваць акумулятарам, бо <xliff:g id="APP">%1$s</xliff:g> запытвае ваша месцазнаходжанне, калі вы не карыстаецеся праграмай.\n\nВырашыць гэту праблему можна, адключыўшы функцыю вызначэння месцазнаходжання для гэтай праграмы."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Ваш планшэт не можа нармальна кіраваць акумулятарам, бо <xliff:g id="APP">%1$s</xliff:g> запытвае ваша месцазнаходжанне, калі вы не карыстаецеся праграмай.\n\nВырашыць гэту праблему можна, адключыўшы функцыю вызначэння месцазнаходжання для гэтай праграмы."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Ваша прылада не можа нармальна кіраваць акумулятарам, бо <xliff:g id="APP">%1$s</xliff:g> запытвае ваша месцазнаходжанне, калі вы не карыстаецеся праграмай.\n\nВырашыць гэту праблему можна, адключыўшы функцыю вызначэння месцазнаходжання для гэтай праграмы."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Адключыць"</string>
     <string name="power_screen" msgid="3023346080675904613">"Экран"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Ліхтарык"</string>
     <string name="power_camera" msgid="4976286950934622605">"Камера"</string>
@@ -1995,7 +2067,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Праграмы"</string>
     <string name="power_service" msgid="1599661212370831780">"Сэрвісы"</string>
     <string name="power_system" msgid="8290455327965307383">"Сістэма"</string>
-    <string name="power_user" msgid="1889728099253018005">"Карыстальнік"</string>
+    <string name="power_user" msgid="3706143225319881667">"Iншыя карыстальнікi"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"ЦП – усяго"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Асноўнае выкарыстанне працэсару"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Не ўвах. у рэжым сна"</string>
@@ -2047,6 +2119,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Няўлічанае спажыванне энергіі"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мАг"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Выкарыстана на працягу <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Актыўны на працягу <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Выкарыстанне экрана: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> выкарыстана праграмай <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ад усяго зараду"</string>
@@ -2614,7 +2687,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Змяніць PIN-код"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Паказваць паведамленні"</string>
     <string name="help_label" msgid="6886837949306318591">"Даведка і водгукі"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Артыкулы даведкі, тэлефон і падтрымка ў чаце"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Артыкулы даведкі, тэлефон і падтрымка ў чаце пры наладцы"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Уліковы запіс для змесціва"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Iдэнтыфiкатар фота"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Надзвычайныя пагрозы"</string>
@@ -2706,9 +2779,12 @@
       <item quantity="other">Паказаць %d схаванага элемента</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Сетка і інтэрнэт"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, мабільны, выкарыстанне трафіка, хот-спот"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мабільная сетка"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"выкарыстанне трафіка"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"хот-спот"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Падключаныя прылады"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Праграмы і апавяшчэнні"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Дазволы, стандартныя праграмы"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Карыстальнікі і ўліковыя запісы"</string>
@@ -2761,6 +2837,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"жэст"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"плаціць, дакранацца, плацяжы"</string>
     <string name="keywords_backup" msgid="470070289135403022">"рэзервовае капіраванне, стварыць рэзервовую копію"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"жэст, край, бок, актыўны край, сціснуць, ухапіць, дапамагчы, памочнік, паціскаць, націснуць, уціснуць, прыціснуць, ok google, памочнік google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"жэст, абудзіць, апавяшчэнні, экран, дысплэй, выключыць экран, уключыць экран, сціснуць, край, у рэжыме сну, рэжым сну, ухапіць"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"жэст, адключыць гук, адкласці, будзільнік, уваходны выклік, ціха, дысплэй, экран блакіроўкі, сціснуць, ухапіць, край, прыпыніць"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Усталяваць Wi-Fi NFC-метку"</string>
     <string name="write_tag" msgid="8571858602896222537">"Запісаць"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Для завяршэння дакраніцеся да меткі..."</string>
@@ -2845,7 +2924,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Увогуле не паказваць апавяшчэнні працоўнага профілю"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Як павінны паказвацца апавяшчэнні профілю, калі прылада заблакіравана?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Апавяшчэнні профілю"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Апавяшчэнні"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Апавяшчэнні"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Апавяшчэнні дадаткаў"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Катэгорыя апавяшчэнняў"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Важнасць"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Дазволіць праграме прымаць рашэнне"</string>
@@ -2860,6 +2940,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Тэрміновая"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Дазволіць прайграванне гуку"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Не прайграваць гук, не вібрыраваць і не паказваць гэтыя апавяшчэнні хутка ў полі зроку на бягучым экране."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Нізкая важнасць"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Сярэдняя важнасць"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Высокая важнасць"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Пільная важнасць"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Памочнік па апавяшчэннях"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Доступ да апавяшчэнняў"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Доступ да апавяшчэнняў працоўнага профілю заблакіраваны"</string>
@@ -2889,8 +2973,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Відарыс у відарысе"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Дазволіць відарыс у відарысе"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Дазволіць гэтай праграме ствараць акно відарыса ў відарысе, калі праграма адкрыта або пасля таго, як вы выйдзеце з яе (напрыклад, каб працягнуць прагляд відэа). Гэта акно паказваецца паверх іншых праграм, якія вы выкарыстоўваеце."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Так"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Не"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Доступ да рэжыму «Не турбаваць»"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Запытаў доступу да рэжыму «Не турбаваць» ад усталяваных дадаткаў не паступала"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Загрузка дадаткаў..."</string>
@@ -3029,11 +3111,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Гэты рабочы профіль знаходзіцца пад кіраваннем:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Пад кіраваннем <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Эксперыментальныя)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Пераварочванне прылады"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Паварочваць экран"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Захоўваць партрэтную арыентацыю"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Захоўваць альбомную арыентацыю"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Захоўваць бягучую арыентацыю"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Бяспечны запуск"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Далей"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Вы можаце абараніць сваю прыладу яшчэ надзейней, наладзіўшы функцыю патрабавання PIN-кода пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка. \n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць PIN-код для запуску вашай прылады?"</string>
@@ -3041,7 +3118,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Вы можаце абараніць сваю прыладу яшчэ надзейней, наладзіўшы функцыю патрабавання пароля пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка. \n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць пароль для запуску вашай прылады?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання PIN-кода пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць PIN-код для запуску вашай прылады?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання ўзору пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць узор для запуску вашай прылады?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання пароля пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць пароль для запуску вашай прылады?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання пароля пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць пароль для запуску вашай прылады?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Так"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Не"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Запытваць PIN-код?"</string>
@@ -3168,6 +3245,19 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Абвесткі аб выкарыстанні"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Паказаць поўнае выкарыстанне прылады"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Паказаць спажыванне праграмамі"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Высокае спажыванне"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> праграма паводзіць сябе незвычайна</item>
+      <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> праграмы паводзяць сябе незвычайна</item>
+      <item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> праграм паводзяць сябе незвычайна</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> праграмы паводзяць сябе незвычайна</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Праграм разраджаюць акумулятар</item>
+      <item quantity="few">Праграмы разраджаюць акумулятар</item>
+      <item quantity="many">Праграм разраджаюць акумулятар</item>
+      <item quantity="other">Праграмы разраджаюць акумулятар</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Не аптымізаваныя"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Не аптымізавана"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Аптымізацыя выкарыстання акумулятара"</string>
@@ -3262,8 +3352,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Паказваць паверх іншых праграм"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> з <xliff:g id="COUNT_1">%2$d</xliff:g> праграм(-ы) дазволена паказвацца паверх іншых праграм"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Дадаткі з дазволам"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Так"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Не"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Дазволена"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Забаронена"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"усталёўваць праграмы з невядомых крыніц"</string>
     <string name="write_settings" msgid="4797457275727195681">"Змена сістэмных налад"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"напісаць, змяніць сістэмныя налады"</string>
@@ -3355,6 +3445,19 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Экран мае адценне бурштынавага колеру. Гэта можа дапамагчы вам заснуць."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Прапановы"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"яшчэ +<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <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="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <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="suggestion_remove" msgid="904627293892092439">"Выдаліць"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Халодная каляровая тэмпература"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Выкарыстоўваць больш халодныя колеры экрана"</string>
@@ -3373,8 +3476,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Папярэджанне пра трафік - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Папярэджанне пра трафік - <xliff:g id="ID_1">%1$s</xliff:g> / Ліміт трафіку - <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Разліковы цыкл"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Штомесячны цыкл пачынаецца <xliff:g id="ID_1">%1$s</xliff:g> чысла кожнага месяца"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Штомесячна пачынаючы з <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Штомесяц у наступны дзень: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Сеткавыя абмежаванні"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> абмежаванне</item>
@@ -3398,7 +3500,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> праграмы могуць выкарыстоўваць трафік неабмежавана, калі ўключана Эканомія трафіку</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Эканомія трафіку"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Неабмежаваны доступ да даных"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Неабмежаваныя даныя"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Фонавая перадача даных выключана"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Уключана"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Выключана"</string>
@@ -3464,8 +3566,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Кіраванне апавяшчэннямі экрана блакір."</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Паказваць ці хаваць змесціва апавяшчэнняў"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Усе"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Падтрымка"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Падтрымка і парады"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Найменшая шырыня"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Няма праграм з доступам да платных SMS"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"За прэміум SMS-доступ з вас можа спаганяцца аплата, гэта можа павялічыць вашыя рахункі за паслугі аператара. Калі вы ўключыце дазвол для праграмы, вы будзеце мець магчымасць адпраўляць прэміум SMS з гэтай праграмы."</string>
@@ -3536,28 +3637,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Аўтаматычна"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Уручную"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Вызваліць месца"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Жэсты"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Ярлыкі жэстаў"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Хуткія жэсты для кіравання вашым тэлефонам"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Хуткія жэсты для кіравання вашым планшэтам"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Хуткія жэсты для кіравання вашай прыладай"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Перайсці да камеры"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Каб хутка адкрыць камеру, двойчы націсніце кнопку сілкавання. Працуе на любым экране."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Хуткае адкрыццё камеры"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Каб адкрыць камеру, двойчы націсніце на кнопку сілкавання"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Змена камеры"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Рабіце сэлфі хутчэй"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Каб перакл. на франтальную камеру, двойчы павярніце тэлефон"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Каб перакл. на франтальную камеру, двойчы павярніце планшэт"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Каб перакл. на франтальную камеру, двойчы павярніце прыладу"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Двойчы дакраніцеся, каб праверыць тэлефон"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Двойчы дакраніцеся, каб праверыць планшэт"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Двойчы дакраніцеся, каб праверыць прыладу"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Каб хутка праверыць апавяшчэнні, двойчы дакраніцеся да экрана."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Каб праверыць час, значкі памедамленняў і іншыя даныя, двойчы націсніце на экран."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Правяраць апавяшчэнні, калі экран выключаны"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Падняць тэлефон, каб праверыць яго"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Падніміце планшэт, каб праверыць яго"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Падніміце прыладу, каб праверыць яе"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Каб хутка праверыць апавяшчэнні, вазьміце тэлефон у рукі."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Каб хутка праверыць апавяшчэнні, вазьміце свой планшэт у рукі."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Каб хутка праверыць апавяшчэнні, вазьміце сваю прыладу ў рукі."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Каб праверыць час, значкі памедамленняў і іншыя даныя, вазьміце свой тэлефон у рукі."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Каб праверыць час, значкі памедамленняў і іншыя даныя, вазьміце свой планшэт у рукі."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Каб праверыць час, значкі памедамленняў і іншыя даныя, вазьміце сваю прыладу ў рукі."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Правяраць апавяшчэнні, калі экран выключаны"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Правядзіце пальцам, каб убачыць апавяшчэнні"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Каб праверыць апавяшчэнні, правядзіце пальцам уніз па сканеры адбіткаў пальцаў на заднім боку тэлефона."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Каб праверыць апавяшчэнні, правядзіце пальцам уніз па сканеры адбіткаў пальцаў на заднім боку планшэта."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Каб праверыць апавяшчэнні, правядзіце пальцам уніз па сканеры адбіткаў пальцаў на заднім боку прылады."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Хуткі прагляд апавяшчэнняў"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Правядзіце пальцам уніз па сканеры адбіткаў пальцаў"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Падыміце, каб адкрыць камеру"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Каб аўтаматычна адкрыць камеру, размясціце тэлефон у пазіцыі для здымкі (пейзажу ці партрэта). Працуе, калі тэлефон знаходзіцца ў рэжыме сну ці заблакіраваны."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Рабіце фота, калі тэлефон заблакіраваны або ў рэжыме сну"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Жэст для Памочніка"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Адчувальнасць"</string>
@@ -3675,6 +3789,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Хочаце выдаліць гэту імгненную праграму?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Гульні"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аўдыяфайлы"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Занятае месца"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(выдалена для карыстальніка <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(адключана для карыстальніка <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Сэрвіс аўтазапаўнення"</string>
@@ -3688,5 +3803,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Імгненная праграма"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Выключыць менеджар сховішча?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Праграмы для фільмаў і ТБ"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Занятае месца"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Інфармацыя аператара"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Уключыць/выключыць забеспячэнне аператарам"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Што новага і цікавага?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Азнаёмцеся з 5 лепшымі функцыямі"</string>
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 297e349..40d14ba 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Добър"</item>
     <item msgid="8986346415847956850">"Отличен"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Винаги"</item>
-    <item msgid="844721238536786870">"Само при включено захранване"</item>
-    <item msgid="1986753720941888596">"Никога"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Винаги"</item>
-    <item msgid="7433294150916905997">"Само при включено захранване"</item>
-    <item msgid="1390404486722375028">"Никога"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Последните 30 дни"</item>
     <item msgid="6600989128423965319">"Цикъл на пренос..."</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index e58c8ed..8a123df 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Вече сте програмист!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Не е необходимо – вече сте програмист."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Моля, първо активирайте опциите за програмисти."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Кабелни и безжични мрежи"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Връзки"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Устройство"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Обезпечено за VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Видеообажданията са обезпечени"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Обажданията през Wi-Fi са обезпечени"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Обезпечено за EAB/присъствие"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Мощност на мобилното радио"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Преглед на указателя на SIM картата"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Преглед на фиксирани номера за набиране"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Сканиране за устройства"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Преименуване на устройството"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Преименуване"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Да се изключи ли?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Това ще прекрати връзката ви със:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Прекр. на връзката с у-вото?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Връзката между телефона ви и „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ ще бъде прекратена."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Връзката между таблета ви и „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ ще бъде прекратена."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Връзката между устройството ви и „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ ще бъде прекратена."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Прекрат."</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Нямате разрешение да променяте настройките за Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Сдвояване на ново устройство"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"При отворени настройки за Bluetooth устройствата в района ще виждат „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Bluetooth адрес на телефона: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Bluetooth адрес на таблета: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth адрес на устройството: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Да се прекрати ли връзката с/ъс <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Излъчване"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Да се деактивира ли потребит. профил?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Заявка за сдвояване чрез Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Заявка за сдвояване"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Докоснете за сдвояване с/ъс „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Показване на получени файлове"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Получени файлове"</string>
     <string name="device_picker" msgid="4978696506172252813">"Изберете устройство"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> иска да включи Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> иска да изключи Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s иска достъп до съобщенията ви. Ще предоставите ли достъп до %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Заявка за достъп до SIM картата"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> иска да получи достъп до SIM картата ви. Предоставянето му ще деактивира мобилните данни на устройството ви за продължителността на връзката. Разрешаване на достъпа до <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Видимо като „<xliff:g id="DEVICE_NAME">^1</xliff:g>“ за другите устройства"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Вашите устройства"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Сдвояване на ново устройство"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Дата и час"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Избор на часова зона"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Профили"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Местоположение"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Профили"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Сигурност и местоположение"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Сигурност и местоположение"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифроване и идентификационни данни"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Телефонът е шифрован"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Устройството е шифровано"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Отключване с отпечатък"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Използване на отпечатъка ви"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Трябва само да докоснете сензора за отпечатъци, за да отключите телефона си, да оторизирате покупки или да влизате в приложения. Внимавайте чии отпечатъци добавяте – с всеки един от тях ще могат да се извършват изброените действия.\n\nЗабележка: Отпечатъкът ви може да е по-малко сигурен в сравнение с надеждна фигура или ПИН код."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Трябва само да докоснете сензора за отпечатъци, за да оторизирате покупка или да влезете в приложение. Внимавайте чии отпечатъци добавяте – с всеки един от тях ще могат да се извършват изброените действия.\n\nЗабележка: Не можете да отключвате това устройство с отпечатъка си. За повече информация се свържете с администратора на организацията си."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Трябва само да докоснете сензора за отпечатъци, за да отключите телефона си, да оторизирате покупки или да влизате в приложения. Внимавайте чии отпечатъци добавяте – с всеки един от тях ще могат да се извършват изброените действия.\n\nЗабележка: Отпечатъкът ви може да е по-малко сигурен в сравнение с надеждна фигура или ПИН код."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Използвайте отпечатъка си, за да отключвате телефона си или да одобрявате покупки.\n\nЗабележка: Не можете да отключвате това устройство с отпечатъка си. За повече информация се свържете с администратора на организацията си."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Използвайте отпечатъка си, за да отключвате телефона си или да одобрявате покупки.\n\nЗабележка: Отпечатъкът ви може да е по-малко сигурен в сравнение с надеждна фигура или ПИН код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Отказ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Напред"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Пропускане"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Добавяне на отпечатък"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Функциите за защита на устройството няма да бъдат активирани. Няма да можете да предотвратите използването на този таблет от други хора, ако бъде изгубен, откраднат или данните му бъдат изтрити."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Функциите за защита на устройството няма да бъдат активирани. Няма да можете да предотвратите използването му от други хора, ако бъде изгубено, откраднато или данните му бъдат изтрити."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Функциите за защита на устройството няма да бъдат активирани. Няма да можете да предотвратите използването на този телефон от други хора, ако бъде изгубен, откраднат или данните му бъдат изтрити."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Функциите за защита на устройството няма да бъдат активирани. Няма да можете да предотвратите използването на този таблет от други хора, ако бъде изгубен или откраднат."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Функциите за защита на устройството няма да бъдат активирани. Няма да можете да предотвратите използването му от други хора, ако бъде изгубено или откраднато."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Функциите за защита на устройството няма да бъдат активирани. Няма да можете да предотвратите използването на този телефон от други хора, ако бъде изгубен или откраднат."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Напред"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Функциите за защита на таблета няма да бъдат включени. Няма да можете да предотвратите използването му от други хора, ако бъде загубен, откраднат или нулиран."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Функциите за защита на устройството няма да бъдат включени. Няма да можете да предотвратите използването му от други хора, ако бъде загубено, откраднато или нулирано."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Функциите за защита на телефона няма да бъдат включени. Няма да можете да предотвратите използването му от други хора, ако бъде загубен, откраднат или нулиран."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Функциите за защита на таблета няма да бъдат включени. Няма да можете да предотвратите използването му от други хора, ако бъде загубен или откраднат."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Функциите за защита на устройството няма да бъдат включени. Няма да можете да предотвратите използването му от други хора, ако бъде загубено или откраднато."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Функциите за защита на телефона няма да бъдат включени. Няма да можете да предотвратите използването му от други хора, ако бъде загубен или откраднат."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Пропускане въпреки това"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Назад"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Намиране на сензора"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Намерете сензора за отпечатък на гърба на телефона си."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Докоснете сензора"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Намира се на гърба на телефона ви. Използвайте показалеца си."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Илюстрация с устройството и местоположението на сензора за отпечатък"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Име"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ОK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Изтриване"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Да започваме"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Докоснете сензора"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Поставете пръста си върху сензора и го вдигнете, след като усетите вибриране"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Продължавайте"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Движете пръста си леко, за да добавите всички различни части от отпечатъка си"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Отпечатъкът е добавен!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Когато видите тази икона, можете да използвате отпечатъка си за идентификация или за оторизиране на покупка."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Трябва само да докоснете сензора за отпечатъци, за да „събудите“ и отключите устройството си."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Когато видите тази икона, можете също да оторизирате покупки или да влизате в приложения."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Вдигнете пръст и докоснете пак"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Продължавайте да вдигате пръста си, за да добавите различните части от отпечатъка си"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Отпечатъкът е добавен"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Когато видите тази икона, използвайте отпечатъка си за идентификация или за одобряване на покупки."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Пропуск. на настройването на отпечатък?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Избрахте да използвате отпечатъка си като един от начините за отключване на телефона си. Ако пропуснете сега, ще трябва да настроите по-късно. Настройването отнема около минута."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Заключване на екрана: Настройване"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Готово"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ами сега! Това не е сензорът"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Ползвайте сензора за отпечатък на устр. си."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"С показалеца си докоснете сензора на гърба на телефона."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Регистрирането не бе завършено"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Времевото ограничение за регистриране на отпечатък бе достигнато. Опитайте отново."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Регистрирането на отпечатък не проработи. Опитайте отново или използвайте друг пръст."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Предотвратете използването на това устройство от други хора без разрешението ви, като активирате функциите за защитата му. Изберете опцията за заключване на екрана, която искате да използвате."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Предотвратете използването на този телефон от други хора без разрешението ви, като активирате функциите за защита на устройството. Изберете опцията за заключване на екрана, която искате да използвате."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Изберете резервния си начин на заключване на екрана"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Опции за заключване на екрана"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Опции за заключване на екрана"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Заключване на екрана"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/непосредствено след преминаване в спящ режим"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> след преминаване в спящ режим"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Промяна на фигурата за отключване"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промяна на PIN кода за отключване"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Промяна на паролата за отключване"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Опитайте отново. Опит <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> от <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Последен опит"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Ако въведете неправилна фигура при този опит, служебният ви потребителски профил и свързаните с него данни ще бъдат премахнати от това устройство."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Ако въведете неправилен ПИН код при този опит, служебният ви потребителски профил и свързаните с него данни ще бъдат премахнати от това устройство."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Ако въведете неправилна парола при този опит, служебният ви потребителски профил и свързаните с него данни ще бъдат премахнати от това устройство."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Твърде много неправилни опити. Служебният ви потребителски профил и свързаните с него данни ще бъдат премахнати от това устройство."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Отхвърляне"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Опитайте отново. Опит <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> от <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Данните ви ще бъдат изтрити"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ако въведете неправилна фигура при следващия опит, данните от това устройство ще бъдат изтрити."</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ако въведете неправилен ПИН код при следващия опит, данните от това устройство ще бъдат изтрити."</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ако въведете неправилна парола при следващия опит, данните от това устройство ще бъдат изтрити."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ако въведете неправилна фигура при следващия опит, този потребител ще бъде изтрит."</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ако въведете неправилен ПИН код при следващия опит, този потребител ще бъде изтрит."</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ако въведете неправилна парола при следващия опит, този потребител ще бъде изтрит."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ако въведете неправилна фигура при следващия опит, служебният ви потребителски профил и данните в него ще бъдат изтрити."</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ако въведете неправилен ПИН код при следващия опит, служебният ви потребителски профил и данните в него ще бъдат изтрити."</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ако въведете неправилна парола при следващия опит, служебният ви потребителски профил и данните в него ще бъдат изтрити."</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Твърде много неправилни опити. Данните от това устройство ще бъдат изтрити."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Твърде много неправилни опити. Този потребител ще бъде изтрит."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Твърде много неправилни опити. Този служебен потребителски профил и данните в него ще бъдат изтрити."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Отхвърляне"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Трябва да съдържа поне <xliff:g id="COUNT">%d</xliff:g> знака"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"ПИН кодът трябва да съдържа поне <xliff:g id="COUNT">%d</xliff:g> цифри"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Напред"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Разширени настр. за Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"При включен Bluetooth устройството ви може да се свързва с други устройства с Bluetooth в района."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"С цел подобряване на точността на местоположението системните приложения и услуги пак ще могат да откриват устройства с Bluetooth. Можете да промените това от <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>настройките за сканиране<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Не можа да се установи връзка. Опитайте отново."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Подробности за устройството"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Bluetooth адрес на устройството: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Да се забрави ли устройството?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Телефонът ви вече няма да бъде сдвоен с/ъс „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Таблетът ви вече няма да бъде сдвоен с/ъс „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Устройството ви вече няма да бъде сдвоено с/ъс „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Забравяне на устройството"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Свързване с/ъс..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Връзката между <xliff:g id="DEVICE_NAME">%1$s</xliff:g> и мултимедийното аудио ще бъде прекъсната."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Връзката между <xliff:g id="DEVICE_NAME">%1$s</xliff:g> и аудиото от „свободни ръце“ ще бъде прекъсната."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Без предоставяне"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Без удостоверяване"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Не е посочен сертификат. Връзката ви няма да бъде частна."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Името на мрежата е твърде дълго."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Трябва да посочите домейн."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Налице е WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Налице е WPS)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 мрежа</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi‑Fi: разширени настр."</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Конфигуриране на Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC адрес"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP адрес"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Подмрежова маска"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Да се забрави ли тази група?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Преносима точка за достъп до Wi‑Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Точка за достъп до Wi‑Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Използване на мобилната връзка като Wi‑Fi мрежа"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Връзката с интернет на този таблет не се споделя през точка за достъп"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Връзката с интернет на този телефон не се споделя през точка за достъп"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Не споделяте с други устройства нито връзката с интернет, нито съдържание"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Връзката с интернет на този таблет се споделя през точка за достъп"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Връзката с интернет на този телефон се споделя през точка за достъп"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Приложението споделя съдържание. За да споделите връзката с интернет, изключете точката за достъп и я включете отново"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Име на точката за Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"„<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“ се включва..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Други устройства могат да се свързват към „<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Парола за точката за Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Честота на точката за достъп"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Използвайте точка за достъп, за да създадете Wi‑Fi мрежа за другите си устройства. Точката осигурява достъп до интернет посредством мобилната ви връзка за данни. Може да бъдете таксувани допълнително за пренос на мобилни данни."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Приложенията могат да създават точки за достъп, за да споделят съдържание с устройства в близост."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Точката за достъп се включва…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Точката за достъп се изключва…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"Мрежата „<xliff:g id="NETWORK_SSID">%1$s</xliff:g>“ е активна"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Когато функцията за обаждания през Wi-Fi е включена, телефонът ви може да маршрутизира обажданията през Wi-Fi мрежи или мрежата на оператора ви в зависимост от предпочитанието ви и от това, кой сигнал е по-силен. Преди да включите тази функция, потърсете от оператора си информация относно таксите и други подробности."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Актуализиране на адреса за спешни случаи"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Адресът, който спешните служби ще използват като ваше местоположение, ако се обадите на 112 посредством Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Няма резултати"</string>
     <string name="display_settings" msgid="7965901687241669598">"Дисплей"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Авт. завъртане на екрана"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Ярки цветове"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Автоматично превключване на ориентацията при завъртане на таблета"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Автоматично превключване на ориентацията при завъртане на телефона"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Автоматично превключване на ориентацията при завъртане на таблета"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Нивото на яркостта се оптимизира спрямо околната светлина. Пак можете да го коригирате временно."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Нощно осветление"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Функцията „Нощно осветление“ придава кехлибареножълт нюанс на екрана. Това подобрява видимостта му и четенето на него при слаба светлина и може да ви помогне да заспите по-лесно."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Насрочване"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Състояние"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Автоматично включване"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Никога"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Персонализиран график"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"От залез до изгрев"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"График"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Няма"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Включва се в избран час"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Включва се от залез до изгрев"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Начален час"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Краен час"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Състояние"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Наситеност"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Изключено. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Няма да се включи автоматично."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Ще се включи автоматично в <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Ще се включи автоматично при залез."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Включено. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Няма да се изключи автоматично."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Ще се изключи автоматично в <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Ще се изключи автоматично при изгрев."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Изключено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Няма да се включи автоматично"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Ще се включи автоматично в <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Ще се включи автоматично при залез"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Включено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Няма да се изключи автоматично"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Ще се изключи автоматично в <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Ще се изключи автоматично при изгрев"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Спящ режим"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Екранът се изключва"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"След <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Настройки"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яркост"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Събуждане при повдигане"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Дисплей, открояващ важни неща"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Дисплей, открояващ важни неща"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Винаги включено"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Нови известия"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Кога да се показва"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Нови известия"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Включване на екрана при получаване на известия"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Винаги включено"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Показване на часа, иконите за известия и друга информация"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Размер на шрифта"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Уголемяване или намаляване на текст"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Заключване на SIM картата"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Името на точката за достъп (APN) трябва да се попълни."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Полето за мобилен код на държавата трябва да е 3 цифри."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Полето за код на мобилна мрежа (MNC) трябва да е с 2 или 3 цифри"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Операторът не позволява добавянето на имена на точки за достъп (APN) от типа „%s“."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Стандартните настройки за името на точката за достъп (APN) се възстановяват."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Възстановяване на стандартни"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Възстановяването на стандартните настройките за името на точката за достъп (APN) завърши."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Изтриване на SD картата"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Изтриване на всички данни във вътрешното USB хранилище, като музика или снимки"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Да се изтриват всички данни в SD картата, като музика или снимки"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Изтриване на ел. SIM карти"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Изтрийте всички електронни SIM карти на телефона. Това действие няма да анулира плана ви за мобилна услуга."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Изтрийте всички електронни SIM карти на таблета. Това действие няма да анулира плана ви за мобилна услуга."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Възстановяване на таблета"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Нулиране на телефона"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Да се изтрият ли цялата ви лична информация и всички изтеглени приложения? Не можете да отмените това действие!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"При включена Икономия на данни не можете да активирате функцията за тетъринг, нито да използвате преносими точки за достъп"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Тетъринг през USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Връзка през USB, проверете за тетъринг"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Извършен тетъринг"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Не може да се извърши тетъринг, когато USB хранилището се използва"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB не е свързано"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Установете връзка, за да включите"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Грешка в тетъринг през USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Споделете връзката с интернет на телефона през USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Споделете връзката с интернет на таблета през USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Тетъринг през Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Връзката с интернет се споделя през Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Връзката с интернет се споделя през Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Връзката с интернет се споделя през Bluetooth с 1 устройство"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Връзката с интернет се споделя през Bluetooth с 1 устройство"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Връзката с интернет се споделя през Bluetooth с/ъс <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> устройства"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Връзката с интернет се споделя през Bluetooth с/ъс <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> устройства"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Споделете връзката с интернет на таблета през Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Споделете връзката с интернет на телефона през Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Връзката с интернет на <xliff:g id="DEVICE_NAME">%1$d</xliff:g> се споделя през Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Връзката с интернет не се споделя през Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Връзката с интернет не се споделя през Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Няма връзка с тетъринг"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Не може да се извърши тетъринг с над <xliff:g id="MAXCONNECTION">%1$d</xliff:g> устройства."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Тетърингът на <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ще бъде прекъснат."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Използвайте точка за достъп и тетъринг, за да предоставите достъп до интернет на други устройства чрез мобилната си връзка за данни."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Използвайте точка за достъп и тетъринг, за да предоставите достъп до интернет на други устройства чрез мобилната си връзка за данни. Приложенията могат също да създават точки за достъп, за да споделят съдържание с устройства в близост."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Помощ"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Мобилна мрежа"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Мобилен план"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Определяне на местоположението посредством GPS, Wi‑Fi, Bluetooth или мобилни мрежи"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Определяне на местоположението посредством Wi‑Fi, Bluetooth или мобилни мрежи"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Използване на GPS за определяне на местоположението"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Определяне на местоположението посредством GPS и сензорите на устройството"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Сканиране"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Сканиране за Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Подобряване на местоположението чрез разрешаване на системните приложения и услуги да откриват Wi‑Fi мрежи по всяко време."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Нямате връзка за данни. За да видите тази информация сега, отворете %s от всеки компютър, свързан с интернет."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Зарежда се…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Изберете паролата си"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Задайте парола, за да ползвате отпечатък"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Изберете фигурата си"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Задайте фигура, за да ползвате отпечатък"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Изберете своя ПИН"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Задайте ПИН, за да ползвате отпечатък"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Потвърдете паролата си"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Потвърдете фигурата си"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Потвърдете ПИН кода си"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Настройки за приложения"</string>
     <string name="install_applications" msgid="4872012136210802181">"Неизвестни източници"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Всички източници: Разрешаване"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Наскоро отворени приложения"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Преглед на всички приложения (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"Преди <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Таблетът и личните ви данни са по-уязвими към атаки от неизвестни приложения. С инсталирането на приложения от този източник приемате, че вие носите отговорност в случай на повреда на устройството ви или при загуба на данни вследствие използването на такива приложения."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Телефонът и личните ви данни са по-уязвими към атаки от неизвестни приложения. С инсталирането на приложения от този източник приемате, че вие носите отговорност в случай на повреда на устройството ви или при загуба на данни вследствие използването на такива приложения."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Разширени настройки"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Да се спре ли системната услуга?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Ако спрете тази услуга, е възможно някои функции на таблета ви да спрат да работят правилно, докато не го изключите и включите отново."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ако спрете тази услуга, е възможно някои функции на телефона ви да спрат да работят правилно, докато не го изключите и включите отново."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Езици, въвеждане и жестове"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Езици и въвеждане"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Езици и въвеждане"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Съдействие при въвеждане"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> услуги за отпечатване са включени</item>
       <item quantity="one">1 услуга за отпечатване е включена</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> задания за отпечатване</item>
+      <item quantity="one">1 задание за отпечатване</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Услуги за отпечатване"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Няма инсталирани услуги"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Няма намерени принтери"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Подробности"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Настройване на захранването"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Включени пакети"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Приложения, които изтощават батерията"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Устройството се поддържа в активно състояние"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Устройството се активира на заден план"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Чести заявки за местоположение"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> приложения не функционират правилно"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Да се спре ли приложението?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Телефонът ви не може да управлява батерията нормално, защото <xliff:g id="APP">%1$s</xliff:g> го поддържа в активно състояние.\n\nЗа да опитате да решите този проблем, можете да спрете принудително приложението.\n\nАко това не помогне, може да се наложи да деинсталирате приложението, за да подобрите ефективността на батерията."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Таблетът ви не може да управлява батерията нормално, защото <xliff:g id="APP">%1$s</xliff:g> го поддържа в активно състояние.\n\nЗа да опитате да решите този проблем, можете да спрете принудително приложението.\n\nАко това не помогне, може да се наложи да деинсталирате приложението, за да подобрите ефективността на батерията."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Устройството ви не може да управлява батерията нормално, защото <xliff:g id="APP">%1$s</xliff:g> го поддържа в активно състояние.\n\nЗа да опитате да решите този проблем, можете да спрете принудително приложението.\n\nАко това не помогне, може да се наложи да деинсталирате приложението, за да подобрите ефективността на батерията."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Спиране на приложението"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Да се изключи ли използването на заден план?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Телефонът ви не може да управлява батерията нормално, защото <xliff:g id="APP">%1$s</xliff:g> постоянно го активира.\n\nЗа да решите проблема, можете да попречите на това приложение да се изпълнява на заден план."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Таблетът ви не може да управлява батерията нормално, защото <xliff:g id="APP">%1$s</xliff:g> постоянно го активира.\n\nЗа да решите проблема, можете да попречите на това приложение да се изпълнява на заден план."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Устройството ви не може да управлява батерията нормално, защото <xliff:g id="APP">%1$s</xliff:g> постоянно го активира.\n\nЗа да решите проблема, можете да попречите на това приложение да се изпълнява на заден план."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Изключване"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Да се изключи ли местоположението?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Телефонът ви не може да управлява батерията нормално, защото <xliff:g id="APP">%1$s</xliff:g> постоянно изисква достъп до местоположението ви, когато не използвате приложението.\n\nЗа да решите проблема, можете да изключите местоположението за това приложение."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Таблетът ви не може да управлява батерията нормално, защото <xliff:g id="APP">%1$s</xliff:g> постоянно изисква достъп до местоположението ви, когато не използвате приложението.\n\nЗа да решите проблема, можете да изключите местоположението за това приложение."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Устройството ви не може да управлява батерията нормално, защото <xliff:g id="APP">%1$s</xliff:g> постоянно изисква достъп до местоположението ви, когато не използвате приложението.\n\nЗа да решите проблема, можете да изключите местоположението за това приложение."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Изключване"</string>
     <string name="power_screen" msgid="3023346080675904613">"Екран"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Светкавица"</string>
     <string name="power_camera" msgid="4976286950934622605">"Камера"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Приложения"</string>
     <string name="power_service" msgid="1599661212370831780">"Услуги"</string>
     <string name="power_system" msgid="8290455327965307383">"Система"</string>
-    <string name="power_user" msgid="1889728099253018005">"Потребител"</string>
+    <string name="power_user" msgid="3706143225319881667">"Други потребители"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Процесор, общо"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Процесор, на преден план"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Оставяне в будно състояние"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Отчетено в повече захранване"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мАч"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Използвано за <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Активност в продължение на <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Използване на екрана: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"Използван капацитет от <xliff:g id="APP">%2$s</xliff:g>: <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> от общия капацитет на батерията"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Промяна на ПИН кода"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Известия: Показване"</string>
     <string name="help_label" msgid="6886837949306318591">"Помощ и отзиви"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Помощни статии, поддръжка по телефон и чрез чат"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Помощни статии, телефон и чат, първи стъпки"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Профил за съдържание"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Идент. № на снимката"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Извънредни заплахи"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Показване на %d скрит елемент</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Мрежа и интернет"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, мобилна мрежа, пренос на данни, точка за достъп"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобилна мрежа"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"пренос на данни"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"точка за достъп"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Свързани устройства"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, предаване, КБП"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, предаване"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Приложения и известия"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Разрешения, приложения по подразбиране"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Потребители и профили"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"жест"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"плащане, докосване, плащания"</string>
     <string name="keywords_backup" msgid="470070289135403022">"резервно копие, създаване на резервно копие"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"жест, ръб, страна, активен ръб, стискане, хващане, помощно приложение, асистент, squeezy, squeezie, squeezey, squeezee, ok google, google асистент"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"жест, активиране, известия, екран, дисплей, изключен екран, включен екран, стискане, ръб, неактивно, спящ режим, хващане"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"жест, заглушаване, отлагане, будилник, входящо обаждане, тихо, дисплей, заключен екран, стискане, хващане, ръб, спиране"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Маркер за КБП за Wi-Fi: Настр."</string>
     <string name="write_tag" msgid="8571858602896222537">"Записване"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"За записване докоснете маркер..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Без показване на служебните известия"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Как искате да се показват известията от потребителския профил, когато устройството ви е заключено?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Известия от потр. профил"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Известия"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Известия"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Известия за прилож."</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Категория с известия"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Важност"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Нека приложението да реши"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Неотложна важност"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Разрешаване на звуковия сигнал"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Без издаване на звук, вибриране или показване на тези известия на текущия екран."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Малка важност"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Средна важност"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Голяма важност"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Неотложна важност"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Помощник за известия"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Достъп до известията"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Достъпът до известията в служебния потребителски профил е блокиран"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Картина в картина"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Разрешаване на режима „Картина в картина“"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Разрешете на това приложение да създава прозорец в режима „Картина в картина“, докато е отворено или след излизане от него (например, за да продължите да гледате видеоклип). Съответният прозорец ще се показва върху другите приложения, които използвате."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Да"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Не"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Достъп до „Не безпокойте“"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Никое инсталирано приложение не е заявило достъп до „Не безпокойте“"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Приложенията се зареждат..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Този служебен потребителски профил се управлява от:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Управлява се от <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментално)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Завъртане на устройството"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Завъртане на съдържанието на екрана"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Оставане във вертикален изглед"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Оставане в хоризонтален изглед"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Оставане в текущата ориентация"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Надеждно стартиране"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Напред"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Можете да осигурите допълнителен защитен слой за това устройство, като зададете ПИН кодът ви да се изисква при стартиране. Преди въвеждането му няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Можете да осигурите допълнителен защитен слой за това устройство, като зададете паролата ви да се изисква при стартиране. Преди въвеждането й няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"В допълнение към отключването посредством отпечатък можете да осигурите допълнителен защитен слой за това устройство, като зададете ПИН кодът ви да се изисква при стартиране. Преди въвеждането му няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"В допълнение към отключването посредством отпечатък можете да осигурите допълнителен защитен слой за това устройство, като зададете фигурата ви да се изисква при стартиране. Преди въвеждането й няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"В допълнение към отключването посредством отпечатък можете да осигурите допълнителен защитен слой за това устройство, като зададете паролата ви да се изисква при стартиране. Преди въвеждането й няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"В допълнение към отключването посредством отпечатък можете да осигурите допълнителен защитен слой за това устройство, като зададете паролата ви да се изисква при стартиране. Преди въвеждането й няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Да"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Не"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Да се изисква ли ПИН код?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Сигнали за употребата"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Цялостно използване на у-вото: Показване"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Употреба на прилож.: Показване"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Висок разход"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other">Поведението на <xliff:g id="NUMBER">%2$d</xliff:g> приложения е необичайно</item>
+      <item quantity="one">Поведението на <xliff:g id="APP">%1$s</xliff:g> е необичайно</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Приложения, които изтощават батерията</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> изтощава батерията</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Без оптимизиране"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Без оптимизиране"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Разходът на батерията се оптимизира"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Показв. върху други приложения"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> от <xliff:g id="COUNT_1">%2$d</xliff:g> приложения имат разрешение да се показват върху други"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Приложения с разрешение"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Да"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Не"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Разрешено"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Не е разрешено"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"инсталиране приложения неизвестни източници"</string>
     <string name="write_settings" msgid="4797457275727195681">"Промяна на сист. настройки"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"запис промяна системни настройки"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Екранът е с кехлибареножълт нюанс. Това може да ви помогне да заспите."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Предложения"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+ още <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> предложения</item>
+      <item quantity="one">1 предложение</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+ <xliff:g id="COUNT">%1$d</xliff:g> предложения</item>
+      <item quantity="one">+ 1 предложение</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Премахване"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Студена цветова гама"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Използване на по-студени цветове за дисплея"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Предупреждение за данните: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Предупреждение за данните: <xliff:g id="ID_1">%1$s</xliff:g>/ограничение за данните: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Цикъл на таксуване"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Месечният платежен цикъл започва на <xliff:g id="ID_1">%1$s</xliff:g> число всеки месец"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Ежемесечно от <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Всеки месец на <xliff:g id="ID_1">%1$s</xliff:g>. число"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Мрежови ограничения"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ограничения</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 приложение може да използва неограничено количество данни при включена Икономия на данни</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Икономия на данни"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Неограничен достъп до данни"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Неограничен достъп до данни"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Данните на заден план са изключени"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Включено"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Изключено"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Известия на заключения екран: Управление"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Показване или скриване на съдържанието на известията"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Всички"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Поддръжка"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Поддръжка и съвети"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Най-малката ширина"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Няма инсталирани приложения, които са заявили достъп до SMS съобщения, за които се таксува получателят"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS съобщенията, за които се таксува получателят, може да ви въвлекат в разходи и ще увеличат сметката към оператора ви. Ако дадете разрешението на дадено приложение, ще можете да изпращате такива съобщения чрез него."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Автоматично"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ръчни"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Освободете място сега"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Жестове"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Жестове: Преки пътища"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Бързи жестове за контролиране на телефона ви"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Бързи жестове за контролиране на таблета ви"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Бързи жестове за контролиране на устройството ви"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Бързо отваряне на камерата"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"За да отворите бързо камерата, натиснете два пъти бутона за захранване – това работи от всеки екран."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Бързо отваряне на камерата"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Натиснете бутона за захранване 2 пъти за достъп до камерата"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Превключване на камерата със завъртане"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"По-бързо правене на селфи"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Завъртете телефона два пъти за режим за селфи"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Завъртете таблета два пъти за режим за селфи"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Завъртете устройството два пъти за режим за селфи"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Двукратно докосване за проверка на телефона"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Двукратно докосване за проверка на таблета"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Двукратно докосване за проверка на устройството"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"За да проверите бързо известията си, докоснете двукратно екрана."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"За да проверите часа, иконите за известия и друга информация, докоснете екрана два пъти."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Проверявайте известията при изключен екран"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Повдигане на телефона за проверка"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Повдигане за проверка на таблета"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Повдигане за проверка на устройството"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"За да проверите бързо известията си, повдигнете телефона си."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"За да проверите бързо известията си, повдигнете таблета си."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"За да проверите бързо известията си, повдигнете устройството си."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"За да проверите часа, иконите за известия и друга информация, вземете телефона си в ръка."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"За да проверите часа, иконите за известия и друга информация, вземете таблета си в ръка."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"За да проверите часа, иконите за известия и друга информация, вземете устройството си в ръка."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Проверявайте известията при изключен екран"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Преглед на известията с плъзване на пръст през сензора за отпечатъци"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"За да проверите известията си, плъзнете пръст надолу през сензора за отпечатъци на гърба на телефона си."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"За да проверите известията си, плъзнете пръст надолу през сензора за отпечатъци на гърба на таблета си."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"За да проверите известията си, плъзнете пръст надолу през сензора за отпечатъци на гърба на устройството си."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Бърз преглед на известията"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Прекарайте пръст надолу през сензора за отпечатъци"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Вдигнете, за да отворите камерата"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"За да отворите автоматично камерата, вдигнете телефона си и го задръжте както при правене на снимка (хоризонтално или вертикално). Функцията работи, когато устройството ви е в спящ режим или е заключено."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Правете снимки, когато телефонът е заключен или в спящ режим"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Помощен жест"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Чувствителност"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Искате ли да премахнете това мигновено приложение?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Игри"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудиофайлове"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Използвано място"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(деинстал. за потребителя <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(деактивирано за потребителя <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Услуга за автоматично попълване"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Мигновено приложение"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Да се изключи ли мениджърът на хранилището?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Приложения за филми и телевизионни предавания"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Използвано място"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Carrier Provisioning Info"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Задействане на обезпечаването от оператора"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Нови и вълнуващи неща"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Вижте водещите 5 функции"</string>
 </resources>
diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml
index 677e7c2..cca163c 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"ভাল"</item>
     <item msgid="8986346415847956850">"খুব ভাল"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"সবসময়"</item>
-    <item msgid="844721238536786870">"কেবলমাত্র যখন প্লাগ ইন তখন"</item>
-    <item msgid="1986753720941888596">"কখনো নয়"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"সবসময়"</item>
-    <item msgid="7433294150916905997">"কেবলমাত্র যখন প্লাগ ইন তখন"</item>
-    <item msgid="1390404486722375028">"কখনই নয়"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"গত ৩০ দিন"</item>
     <item msgid="6600989128423965319">"ব্যবহার চক্র সেট করুন..."</item>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 78d6508..00cb52b 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"আপনি এখন একজন বিকাশকারী!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"কোনো প্রয়োজন নেই, আপনি ইতিমধ্যেই একজন বিকাশকারী।"</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"প্রথমে ডেভেলপারের বিকল্পগুলি সক্রিয় করুন।"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"ওয়্যারলেস ও নেটওয়ার্ক"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"সংযোগগুলি"</string>
     <string name="header_category_device" msgid="4544026001618307754">"ডিভাইস"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE প্রস্তুত"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ভিডিও কলিং এর ব্যবস্থা আছে"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"ওয়াই ফাই কলিং এর ব্যবস্থা আছে"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/উপস্থিতির বন্দোবস্ত"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"মোবাইল রেডিওর গুণমান"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"সিম ঠিকানা বই দেখুন"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"স্থায়ী ডায়াল নম্বরগুলি দেখুন"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"ডিভাইসগুলির জন্য স্ক্যান করুন"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"এই ডিভাইসটির পুনঃনামকরণ করুন"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"আবার নামকরণ করুন"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"সংযোগ বিচ্ছিন্ন করবেন?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"এটি আপনার সঙ্গে:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;\'র সংযোগ বিচ্ছিন্ন করবে"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"ডিভাইসের সংযোগ বিচ্ছিন্ন করবেন?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> থেকে আপনার ফোনের সংযোগ বিচ্ছিন্ন হবে।"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> থেকে আপনার ট্যাবলেটের সংযোগ বিচ্ছিন্ন হবে।"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> থেকে আপনার ডিভাইসের সংযোগ বিচ্ছিন্ন হবে।"</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"সংযোগ বিচ্ছিন্ন করুন"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"আপনার কাছে ব্লুটুথ সেটিংস পরিবর্তন করার অনুমতি নেই৷"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"নতুন ডিভাইস যুক্ত করুন"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"ব্লুটুথ সেটিংস খোলা থাকা অবস্থায় <xliff:g id="DEVICE_NAME">%1$s</xliff:g> কাছাকাছি ডিভাইসগুলির কাছে দৃশ্যমান হয়৷"</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"ফোনের ব্লুটুথ ঠিকানা: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"ট্যাবলেটের ব্লুটুথ ঠিকানা: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"ডিভাইসের ব্লুটুথ ঠিকানা: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> এর সংযোগ বিচ্ছিন্ন করবেন?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"সম্প্রচার করা হচ্ছে"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"প্রোফাইল অক্ষম করবেন?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"ব্লুটুথ যুক্ত করার অনুরোধ"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"যুক্ত করার অনুরোধ"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> এর সঙ্গে যুক্ত করতে আলতো চাপুন৷"</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"পাওয়া ফাইলগুলি দেখান"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"ফাইল গ্রহণ করা হয়েছে"</string>
     <string name="device_picker" msgid="4978696506172252813">"ব্লুটুথ ডিভাইস বাছুন"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ব্লুটুথ চালু করতে চাইছে"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ব্লুটুথ বন্ধ করতে চাইছে"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s আপনার বার্তাগুলি অ্যাক্সেস করতে ইচ্ছুক। %2$s এ অ্যাক্সেস দেবেন?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"সিম অ্যাক্সেস করার অনুরোধ"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> আপনার সিম কার্ড অ্যাক্সেস করতে চায়। এই সিম কার্ড অ্যাক্সেসের অনুমোদন দিলে তা সংযোগের সময়ে আপনার ডিভাইসে ডেটা সংযোগ অক্ষম করবে। <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> -এ অ্যাক্সেস দিন"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"অন্য ডিভাইসে <xliff:g id="DEVICE_NAME">^1</xliff:g> নামে দেখা যাবে"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"আপনার ডিভাইসগুলি"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"নতুন ডিভাইস যুক্ত করুন"</string>
     <string name="date_and_time" msgid="9062980487860757694">"দিন ও তারিখ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"সময় অঞ্চল বেছে নিন"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"অ্যাকাউন্টগুলি"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"অবস্থান"</string>
     <string name="account_settings_title" msgid="626177544686329806">"অ্যাকাউন্টগুলি"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"নিরাপত্তা এবং অবস্থান"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"এনক্রিপশান ও শংসাপত্র"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ফোন এনক্রিপশন"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"ডিভাইসটি এনক্রিপ্টেড"</string>
@@ -354,40 +367,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"আঙ্গুলের ছাপ দিয়ে আনলক করুন"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"আঙ্গুলের ছাপ ব্যবহার করুন"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"আপনার ফোন আনলক করতে, কেনাকাটা অনুমোদন, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করতে শুধু আঙ্গুলের ছাপ নেওয়ার সেন্সরে স্পর্শ করুন৷ আপনি কাদের আঙ্গুলের ছাপ যোগ করছেন সেই বিষয়ে সতর্ক থাকুন৷ এমনকি যাদের আঙ্গুলের ছাপ যোগ করা হবে তারা এই জিনিসগুলি করতে পারবে।\n\nদ্রষ্টব্য: আপনার আঙ্গুলের ছাপ একটি জটিল প্যাটার্ন বা PIN এর চাইতে কম নিরাপদ হতে পারে।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"কেনাকাটার অনুমোদন দিতে বা অ্যাপ্সে সাইন ইন করতে শুধু আঙ্গুলের ছাপ নেওয়ার সেন্সরে স্পর্শ করুন৷ আপনি কাদের আঙ্গুলের ছাপ যোগ করছেন সেই বিষয়ে সতর্ক থাকুন৷ এমনকি যাদের আঙ্গুলের ছাপ যোগ করা হবে তারা এই জিনিসগুলি করতে পারবেন।\n\nদ্রষ্টব্য: এই ডিভাইসটিকে আনলক করতে আপনি আপনার আঙ্গুলের ছাপ ব্যবহার করতে পারবেন না৷ আরো তথ্যের জন্য আপনার প্রতিষ্ঠানের প্রশাসকের সাথে যোগাযোগ করুন৷"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"আপনার ফোন আনলক, কেনাকাটায় অনুমোদন, বা অ্যাপ্সে সাইন ইন করতে শুধু আঙ্গুলের ছাপ নেওয়ার সেন্সরে স্পর্শ করুন৷ আপনি কাদের আঙ্গুলের ছাপ যোগ করছেন সেই বিষয়ে সতর্ক থাকুন৷ এমনকি যাদের আঙ্গুলের ছাপ যোগ করা হবে তারা এই জিনিসগুলি করতে পারবেন।\n\nদ্রষ্টব্য: আপনার আঙ্গুলের ছাপ একটি জটিল প্যাটার্ন বা PIN এর চাইতে কম নিরাপদ হতে পারে।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"আপনার ফোন আনলক বা কেনাকাটাগুলির অনুমোদন করতে আপনার আঙ্গুলের ছাপ ব্যবহার করুন। \n\nদ্রষ্টব্য: আপনি এই ডিভাইসটি আনলক করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহার করতে পারবেন না। আরও তথ্যের জন্য, আপনার প্রতিষ্ঠানের প্রশাসকের সাথে যোগাযোগ করুন।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"আপনার ফোন আনলক বা কেনাকাটাগুলি অনুমোদন করতে আপনার আঙ্গুলের ছাপ ব্যবহার করুন।\n\nদ্রষ্টব্য: একটি দৃঢ় বা সুরক্ষিত প্যাটার্ন বা পিনের তুলনায় আপনার আঙ্গুলের ছাপ কম সুরক্ষিত হতে পারে।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"বাতিল করুন"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"চালিয়ে যান"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"এড়িয়ে যান"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"আঙ্গুলের ছাপ যোগ করুন"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করা হয়নি৷ যদি এই ট্যাবলেটটি হারিয়ে যায়, চুরি হয়ে যায় বা মুছে যায় তখনও আপনি অন্যদের দ্বারা এটির ব্যবহার আটকাতে পারবেন না৷"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করা হয়নি৷ যদি এই ডিভাইসটি হারিয়ে যায়, চুরি হয়ে যায় বা মুছে যায় তখনও আপনি অন্যদের দ্বারা এটির ব্যবহার আটকাতে পারবেন না৷"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করা হয়নি৷ যদি এই ফোনটি হারিয়ে যায়, চুরি হয়ে যায় বা মুছে যায় তখনও আপনি অন্যদের দ্বারা এটির ব্যবহার আটকাতে পারবেন না৷"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করা যাবে না৷ যদি এই ট্যাবলেটটি হারিয়ে যায় বা চুরি হয়ে যায় তখনও আপনি অন্যদের দ্বারা এটির ব্যবহার আটকাতে পারবেন না৷"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করা যাবে না৷ যদি এই ডিভাইসটি হারিয়ে যায় বা চুরি হয়ে যায় তখনও আপনি অন্যদের দ্বারা এটির ব্যবহার আটকাতে পারবেন না৷"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করা যাবে না৷ যদি এই ফোনটি হারিয়ে যায় বা চুরি হয়ে যায় তখনও আপনি অন্যদের দ্বারা এটির ব্যবহার আটকাতে পারবেন না৷"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"পরবর্তী"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি চালু করা হবে না। এই ট্যাবলেটটি হারিয়ে গেলে, চুরি হয়ে গেলে অথবা রিসেট করা হলে সেটি অন্যদের ব্যবহার করতে আপনি আটকাতে পারবেন না।"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি চালু করা হবে না। এই ডিভাইসটি হারিয়ে গেলে, চুরি হয়ে গেলে অথবা রিসেট করা হলে সেটি অন্যদের ব্যবহার করতে আপনি আটকাতে পারবেন না।"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি চালু করা হবে না। এই ফোনটি হারিয়ে গেলে, চুরি হয়ে গেলে অথবা রিসেট করা হলে সেটি অন্যদের ব্যবহার করতে আপনি আটকাতে পারবেন না।"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি চালু করা হবে না। এই ট্যাবলেটটি হারিয়ে গেলে অথবা চুরি হয়ে গেলে সেটি অন্যদের ব্যবহার করতে আপনি আটকাতে পারবেন না।"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি চালু করা হবে না। এই ডিভাইসটি হারিয়ে গেলে অথবা চুরি হয়ে গেলে সেটি অন্যদের ব্যবহার করতে আপনি আটকাতে পারবেন না।"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"ডিভাইসের সুরক্ষা বৈশিষ্ট্যগুলি চালু করা হবে না। এই ফোনটি হারিয়ে গেলে অথবা চুরি হয়ে গেলে সেটি অন্যদের ব্যবহার করতে আপনি আটকাতে পারবেন না।"</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"তবুও এড়িয়ে যান"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"ফিরে যান"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"সেন্সরটি খুঁজুন"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"আপনার ফোনের পিছনে আঙ্গুলের ছাপ সেন্সরের অবস্থান নির্ণয় করুন৷"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"সেন্সর স্পর্শ করুন"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"এটি আপনার ফোনের পিছনে আছে। আপনার তর্জনী ব্যবহার করুন।"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ডিভাইস এবং আঙ্গুলের ছাপ সেন্সরের অবস্থানের সাথে চিত্রালংকরণ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"নাম"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ঠিক আছে"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"মুছুন"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"এখন শুরু করা যাক"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"সেন্সর স্পর্শ করুন"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"সেন্সরে আপনার আঙ্গুল রাখুন এবং আপনি একটি কম্পন অনুভব করার পর সরিয়ে নিন"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"করতে থাকুন"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"আপনার আঙ্গুলের ছাপের সমস্ত অংশগুলি যোগ করতে আপনার আঙ্গুল সামান্য সরান"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"আঙ্গুলের ছাপ যোগ করা হয়েছে!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"যখন আপনি এই আইকন দেখতে পাবেন তখনই আপনি সনাক্ত করার জন্য অথবা একটি ক্রয় করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহার করতে পারেন৷"</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"আপনার ডিভাইসকে জাগাতে এবং আনলক করতে শুধুমাত্র আঙ্গুলের ছাপ সেন্সরে স্পর্শ করুন৷"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"আপনি যখন এই আইকনটি দেখতে পান, তখন আপনি কেনাকাটাগুলিতে অনুমোদন এবং অ্যাপ্লিকেশানগুলিতে প্রবেশ করতে পারবেন৷"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"আঙ্গুল তুলুন, তারপর আবার স্পর্শ করুন"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"আপনার আঙ্গুলের ছাপের বিভিন্ন অংশ যোগ করার জন্য বারবার আঙুল তুলে আবার স্পর্শ করতে থাকুন"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"আঙ্গুলের ছাপ যোগ করা হয়েছে"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"যখন আপনি এই আইকনটি দেখতে পাবেন তখন শনাক্ত করার জন্য অথবা কেনাকাটাগুলি অনুমোদন করতে আপনার আঙ্গুলের ছাপ ব্যবহার করুন।"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"আঙ্গুলের ছাপ সেট আপ করা এড়িয়ে যাবেন?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"আপনি আপনার ফোন আনলক করার একটি উপায় হিসেবে আপনার আঙ্গুলের ছাপ ব্যবহারের ব্যবস্থাটিকে বেছে নিয়েছেন। আপনি যদি এখনই এটিকে এড়িয়ে যান, তাহলে আপনাকে পরে আবার এটি সেট আপ করতে হবে। সেট আপ করতে মাত্র এক মিনিট এর মত সময় লাগতে পারে।"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"স্ক্রীন লক সেট আপ করুন"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"সম্পন্ন"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ওহো, সেটি সেন্সর ছিল না"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"আপনার ডিভাইসে আঙ্গুলের ছাপ নেওয়ার সেন্সর ব্যবহার করুন৷"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"আপনার ফোন এর পিছনে থাকা সেন্সর স্পর্শ করুন। আপনার তর্জনী ব্যবহার করুন।"</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"তালিকাভুক্তি সম্পন্ন করা যায়নি"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"আঙ্গুলের ছাপ তালিকাভুক্তির সময়সীমা শেষ হয়েছে। আবার চেষ্টা করুন৷"</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"আঙ্গুলের ছাপ তালিকাভুক্তিকরণ কাজ করেনি৷ আবার চেষ্টা করুন অথবা আলাদা কোনো আঙুল ব্যবহার করুন৷"</string>
@@ -449,6 +460,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করার দ্বারা আপনার অনুমতি ছাড়া অন্যদের এই ডিভাইসটি ব্যবহার করা থেকে আটকান৷ আপনি ব্যবহার করতে চান এমন স্ক্রীন লক বেছে নিন৷"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করার দ্বারা আপনার অনুমতি ছাড়া অন্যদের এই ফোনটি ব্যবহার করা থেকে আটকান৷ আপনি ব্যবহার করতে চান এমন স্ক্রীন লক বেছে নিন৷"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"আপনার ব্যাক আপ স্ক্রীন লক পদ্ধতি নির্বাচন করুন"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"স্ক্রিন লক এর বিকল্প"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"স্ক্রিন লক এর বিকল্পগুলি"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"স্ক্রীন লক"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / ঘুমোনোর পর অবিলম্বে"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / ঘুমোনোর <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> পর"</string>
@@ -519,13 +532,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"আনলক প্যাটার্ন পরিবর্তন করুন"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"আনলক পিন পরিবর্তন করুন"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"আনলক পাসওয়ার্ড পরিবর্তন করুন"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"আবার  চেষ্টা করুন৷ <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>টির মধ্যে <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> নম্বর প্রচেষ্টা৷"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"শেষ চেষ্টা"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"আপনি যদি এই প্রচেষ্টায় কোনো ভুল কাজের প্যার্টান দেন তাহলে আপনার কর্মস্থলের প্রোফাইল এবং সম্পর্কিত ডেটা এই ডিভাইস থেকে সরানো হবে৷"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"আপনি যদি এই প্রচেষ্টায় কোনো ভুল কাজের পিন দেন তাহলে আপনার কর্মস্থলের প্রোফাইল এবং সম্পর্কিত ডেটা এই ডিভাইস থেকে সরানো হবে৷"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"আপনি যদি এই প্রচেষ্টায় কোনো ভুল কাজের পাসওয়ার্ড দেন তাহলে আপনার কর্মস্থলের প্রোফাইল এবং সম্পর্কিত ডেটা এই ডিভাইস থেকে সরানো হবে৷"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"অনেক বার ভুল প্রচেষ্টা করা হয়েছে৷ আপনার কর্মস্থলের প্রোফাইল এবং সম্পর্কিত ডেটা এই ডিভাইস থেকে সরানো হবে৷"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"খারিজ করুন"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"আবার চেষ্টা করুন৷ <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>টি প্রচেষ্টার মধ্যে <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> নম্বর৷"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"আপনার ডেটা মুছে দেওয়া হবে"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"আপনি যদি পরের বারেও ভুল প্যাটার্ন আঁকেন, তাহলে এই ডিভাইসের ডেটা মুছে দেওয়া হবে"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"আপনি যদি পরের বারেও ভুল পিন দেন, তাহলে এই ডিভাইসের ডেটা মুছে দেওয়া হবে"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"আপনি যদি পরের বারেও ভুল পাসওয়ার্ড দেন, তাহলে এই ডিভাইসের ডেটা মুছে দেওয়া হবে"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"আপনি যদি পরের বারেও ভুল প্যাটার্ন আঁকেন, তাহলে ব্যবহারকারীর তালিকা থেকে আপনাকে মুছে দেওয়া হবে"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"আপনি যদি পরের বারেও ভুল পিন দেন, তাহলে ব্যবহারকারীর তালিকা থেকে আপনাকে মুছে দেওয়া হবে"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"আপনি যদি পরের বারেও ভুল পাসওয়ার্ড দেন, তাহলে ব্যবহারকারীর তালিকা থেকে আপনাকে মুছে দেওয়া হবে"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"আপনি যদি পরের বারেও ভুল প্যাটার্ন আঁকেন, তাহলে আপনার কর্মস্থলের প্রোফাইল এবং প্রোফাইলের ডেটা মুছে দেওয়া হবে"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"আপনি যদি পরের বারেও ভুল পিন দেন, তাহলে আপনার কর্মস্থলের প্রোফাইল এবং প্রোফাইলের ডেটা মুছে দেওয়া হবে"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"আপনি যদি পরের বারেও ভুল পাসওয়ার্ড দেন, তাহলে আপনার কর্মস্থলের প্রোফাইল এবং প্রোফাইলের ডেটা মুছে দেওয়া হবে"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"বহুবার ভুল ইনপুট দিয়েছেন। এই ডিভাইসের ডেটা মুছে দেওয়া হবে।"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"বহুবার ভুল ইনপুট দিয়েছেন। ব্যবহারকারীর তালিকা থেকে আপনাকে মুছে দেওয়া হবে।"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"বহুবার ভুল ইনপুট দিয়েছেন। এই কর্মস্থলের প্রোফাইল এবং প্রোফাইলের ডেটা মুছে দেওয়া হবে।"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"খারিজ করুন"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"কমপক্ষে <xliff:g id="COUNT">%d</xliff:g>টি অক্ষর থাকতে হবে"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"পিন কমপক্ষে <xliff:g id="COUNT">%d</xliff:g>টি সংখ্যার হতে হবে"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"চালিয়ে যান"</string>
@@ -626,6 +647,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"উন্নত ব্লুটুথ"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"যখন ব্লুটুথ চালু করা হয়, তখন আপনার অন্যান্য কাছাকাছির ব্লুটুথ ডিভাইসগুলির সাথে যোগাযোগ করতে পারে৷"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"অবস্থানের যথার্থতা উন্নত করতে, সিস্টেম অ্যাপ্লিকেশান এবং পরিষেবাগুলি এখনও ব্লুটুথ ডিভাইসগুলিকে সনাক্ত করতে পারবে৷ আপনি এটিকে <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>স্ক্যানিং সেটিংস<xliff:g id="LINK_END_1">LINK_END</xliff:g> এর মধ্যে পরিবর্তন করতে পারেন।"</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"সংযোগ করা যায়নি। আবার চেষ্টা করুন।"</string>
+    <string name="device_details_title" msgid="6576953269221085300">"ডিভাইসের বিবরণ"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"ডিভাইসের ব্লুটুথ ঠিকানা: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"ডিভাইসটি কি ভুলে যাবেন?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> এর সাথে আপনার ফোনটি আর যুক্ত থাকবে না"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> এর সাথে আপনার ট্যাবলেটটি আর যুক্ত থাকবে না"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> এর সাথে আপনার ডিভাইসটি আর যুক্ত থাকবে না"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"ডিভাইসটি ভুলে যান"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"এতে সংযুক্ত করুন..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> মিডিয়া অডিও থেকে সংযোগ বিচ্ছিন্ন হয়ে যাবে।"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> হ্যান্ডসফ্রি অডিও থেকে সংযোগ বিচ্ছিন্ন হয়ে যাবে।"</string>
@@ -778,6 +807,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"প্রদান করবেন না"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"যাচাই করবেন না"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"কোনো শংসাপত্র নির্দিষ্ট করা নেই৷ আপনার সংযোগ ব্যক্তিগত করা হবে না৷"</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"নেটওয়ার্কের নাম খুব বড়।"</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"একটি ডোমেন উল্লেখ করা আবশ্যক৷"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS উপলব্ধ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS উপলব্ধ)"</string>
@@ -809,7 +839,6 @@
       <item quantity="other">%dটি নেটওয়ার্ক</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"উন্নত ওয়াই-ফাই"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"ওয়াই-ফাই কনফিগার করুন"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC ঠিকানা"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP ঠিকানা"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"সাবনেট মাস্ক"</string>
@@ -846,9 +875,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"এই গোষ্ঠীটি ভুলে যান?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"পোর্টেবল  ওয়াই-ফাই হটস্পট"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"ওয়াই-ফাই হটস্পট"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"ওয়াই ফাই নেটওয়ার্কের জন্য মোবাইল সংযোগ ব্যবহার করুন"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"হটস্পটের মাধ্যমে এই ট্যাবলেটের ইন্টারনেট সংযোগ শেয়ার করা হচ্ছে না"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"হটস্পটের মাধ্যমে এই ফোনের ইন্টারনেট সংযোগ শেয়ার করা হচ্ছে না"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"অন্য ডিভাইসের সাথে ইন্টারনেট অথবা কন্টেন্ট শেয়ার করা হচ্ছে না"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"হটস্পটের মাধ্যমে এই ট্যাবলেটের ইন্টারনেট সংযোগ শেয়ার করা হচ্ছে"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"হটস্পটের মাধ্যমে এই ফোনের ইন্টারনেট সংযোগ শেয়ার করা হচ্ছে"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"অ্যাপ কন্টেন্ট শেয়ার করছে। ইন্টারনেট সংযোগ শেয়ার করতে হটস্পট বন্ধ করে তারপর আবার চালু করুন"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"ওয়াই-ফাই এর নাম"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> চালু করা হচ্ছে..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> এর সাথে অন্য ডিভাইস সংযুক্ত হতে পারে"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"ওয়াই-ফাই পাসওয়ার্ড"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"আপনার অন্য ডিভাইসের জন্য একটি ওয়াই-ফাই নেটওয়ার্ক তৈরি করার জন্য হটস্পট ব্যবহার করুন। হটস্পট আপনার মোবাইলের ডেটা ব্যবহার করে ইন্টারনেট সংযোগ প্রদান করে। মোবাইলের ডেটার জন্য অতিরিক্ত চার্জ লাগতে পারে।"</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"অ্যাপগুলি আশেপাশের ডিভাইসের সাথে কন্টেন্ট শেয়ার করার জন্য হটস্পট তৈরি করতে পারে।"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"হটস্পট চালু হচ্ছে..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"হটস্পট বন্ধ হচ্ছে..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> সক্রিয় আছে"</string>
@@ -895,6 +932,7 @@
     <item msgid="6200207341126893791">"১"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ওয়াই-ফাই কলিং চালু থাকার সময়ে, আপনার পছন্দ এবং কোন সিগন্যাল বেশী শক্তিশালী তার উপর নির্ভর করে আপনার ফোন ওয়াই-ফাই নেটওয়ার্ক বা আপনার পরিষেবা প্রদানকারীর নেটওয়ার্কের মাধ্যমে আপনার কলের রুট তৈরি করে। এই বৈশিষ্ট্যটি চালু করার আগে, আপনার পরিষেবা প্রদানকারীর কাছে ফি-গুলি এবং অন্যান্য বিশদ বিবরণ সম্বন্ধে পরীক্ষা করুন।"</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"জরুরী ঠিকানা আপডেট করুন"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"আপনি যদি ওয়াই ফাই ব্যবহার করে ৯১১ এ কল করেন তাহলে জরুরি পরিষেবাগুলি  আপনার অবস্থান হিসাবে আপনার ঠিকানাকে ব্যবহার করে৷"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"প্রদর্শন"</string>
@@ -952,6 +990,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"কোনো ফলাফল নেই"</string>
     <string name="display_settings" msgid="7965901687241669598">"প্রদর্শন"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"স্বতঃ ঘূর্ণায়মান স্ক্রীন"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"উজ্জ্বল রঙ"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"যখন ট্যাবলেট ঘোরানো হবে তখন স্থিতিবিন্যাস স্বয়ংক্রিয়ভাবে পরিবর্তন করুন"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"যখন ফোন ঘোরানো হবে তখন স্থিতি বিন্যাস স্বয়ংক্রিয়ভাবে পরিবর্তন করুন"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"যখন ট্যাবলেট ঘোরানো হবে তখন স্থিতিবিন্যাস স্বয়ংক্রিয়ভাবে পরিবর্তন করুন"</string>
@@ -979,23 +1018,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"উপলব্ধ আলোর জন্য মানানসই উজ্জ্বলতার স্তর। যখন এই বৈশিষ্ট্যটি চালু থাকবে, তখনও অস্থায়ীভাবে আপনি উজ্জ্বলতা নিয়ন্ত্রণ করতে পারবেন।"</string>
     <string name="night_display_title" msgid="2626451512200357686">"নাইট লাইট"</string>
     <string name="night_display_text" msgid="1837277457033025056">"নাইট লাইট আপনার স্ক্রীনকে হলুদাভ বাদামি দেয়৷ এটি আপনাকে অস্পষ্ট আলোয় স্ক্রীনের দিকে স্বচ্ছন্দে তাকানোর সুবিধা দেয় এবং খুব সহজে ঘুমিয়ে পড়তে সহায়তা করে৷"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"সময়সূচী"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"স্থিতি"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"স্বয়ংক্রিয়ভাবে চালু করুন"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"কখনই নয়"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"কাস্টম সময়সূচী"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"সূর্যাস্ত থেকে সূর্যোদয়"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"সময়সূচী"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"কোনো কিছুই নয়"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"কাস্টম সময়ে চালু করুন"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"সূর্যাস্ত থেকে সূর্যোদয়ের সময়ে চালু করুন"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"শুরুর সময়"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"সমাপ্তি সময়"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"স্ট্যাটাস"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"প্রাবল্য"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"বন্ধ আছে৷ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"কখনই স্বয়ংক্রিয়ভাবে চালু হবে না৷"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g>টায় স্বয়ংক্রিয়ভাবে চালু হবে৷"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"সূর্যাস্তকালে স্বয়ংক্রিয়ভাবে চালু হবে৷"</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"চালু রয়েছে৷ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"কখনই স্বয়ংক্রিয়ভাবে বন্ধ হবে না৷"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g>টায় স্বয়ংক্রিয়ভাবে বন্ধ হবে৷"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"সূর্যোদয়কালে স্বয়ংক্রিয়ভাবে বন্ধ হবে৷"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"বন্ধ আছে / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"কখনই স্বয়ংক্রিয়ভাবে চালু হবে না"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g> এর সময় স্বয়ংক্রিয়ভাবে চালু হবে"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"সূর্যাস্তের সময়ে স্বয়ংক্রিয়ভাবে চালু হবে"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"চালু আছে / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"কখনই স্বয়ংক্রিয়ভাবে বন্ধ হবে না"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g> এর সময় স্বয়ংক্রিয়ভাবে বন্ধ হবে"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"সূর্যোদয়ের সময় স্বয়ংক্রিয়ভাবে বন্ধ হবে"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"নিষ্ক্রিয় রয়েছে"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"স্ক্রীন বন্ধ হয়"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ধরে নিষ্ক্রিয়তার পরে"</string>
@@ -1019,8 +1057,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"সেটিংস"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"স্বয়ংক্রিয় উজ্জ্বলতা"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"সক্রিয় করতে লিফ্ট করুন"</string>
-    <string name="doze_title" msgid="2259176504273878294">"অ্যামবিয়েন্ট প্রদর্শন"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"অ্যাম্বিয়েন্ট ডিসপ্লে"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"সর্বদা চালু"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"নতুন বিজ্ঞপ্তি"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"কখন দেখানো হবে"</string>
+    <string name="doze_title" msgid="2375510714460456687">"নতুন বিজ্ঞপ্তি"</string>
     <string name="doze_summary" msgid="3846219936142814032">"যখন আপনি বিজ্ঞপ্তিগুলি পাবেন তখন স্ক্রীন জাগায়"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"সর্বদা চালু"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"সময়, বিজ্ঞপ্তির আইকন ও অন্যান্য তথ্য দেখানো হবে"</string>
     <string name="title_font_size" msgid="4405544325522105222">"হরফের আকার"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"পাঠ্য বড় বা ছোট করুন"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"সিম কার্ড লক সেটিংস"</string>
@@ -1272,6 +1316,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN খালি থাকতে পারে না।"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC ফিল্ড ৩ ডিজিটের হতে হবে।"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC ফিল্ড ২ অথবা ৩ সংখ্যার হতে হবে।"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"পরিষেবা প্রদানকারী %s এর মতো APN যোগ করার অনুমতি দেয়নি।"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"ডিফল্ট APN সেটিংস পুনরুদ্ধার করা হচ্ছে।"</string>
     <string name="menu_restore" msgid="8260067415075573273">"ডিফল্টে আবার সেট করুন"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ডিফল্ট APN সেটিংস আবার সেট করা সম্পন্ন হয়েছে।"</string>
@@ -1301,6 +1346,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD কার্ড মুছে ফেলুন"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"অভ্যন্তরীণ USB সঞ্চয়স্থানের সমস্ত ডেটা মুছে দিন, যেমন সঙ্গীত বা ফটো"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD কার্ডের সমস্ত তথ্য মুছে দিন, যেমন সঙ্গীত এবং ফটো"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"ই-সিম মুছুন"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"আপনার ফোন থেকে সব ই-সিম মুছে দিন। মুছে দিলেও আপনার মোবাইল পরিষেবার প্ল্যান বাতিল হবে না।"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"আপনার ট্যাবলেট থেকে সব ই-সিম মুছে দিন। মুছে দিলেও আপনার মোবাইল পরিষেবার প্ল্যান বাতিল হবে না।"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ট্যাবলেট আবার সেট করুন"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ফোন আবার সেট করুন"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"আপনার সমস্ত ব্যক্তিগত তথ্য এবং ডাউনলোড করা অ্যাপ্লিকেশানগুলি মুছে দিতে চান? আপনি এই প্রক্রিয়াটি পূর্বাবস্থায় ফেরাতে পারবেন না!"</string>
@@ -1323,26 +1371,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ডেটা সেভার চালু থাকা অবস্থায় টেদার করা যাবে না বা পোর্টেবল হটস্পট ব্যবহার করা যাবে না"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB টেদারিং"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB সংযুক্ত, টেদার করতে চেক করুন"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"টেদার করা রয়েছে"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USB সঞ্চয়স্থান ব্যবহারে থাকাকালীন টেদার করা যাবে না"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB সংযুক্ত নয়"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"চালু করতে সংযোগ করুন"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB টেদারিং ত্রুটি"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"USB এর মাধ্যমে ফোনের ইন্টারনেট সংযোগ শেয়ার করুন"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"USB এর মাধ্যমে ট্যাবলেটের ইন্টারনেট সংযোগ শেয়ার করুন"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ব্লুটুথ টেদারিং"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"ট্যাবলেটের ইন্টারনেট সংযোগ ব্লুটুথে শেয়ার হচ্ছে"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"এই ফোনের ইন্টারনেট সংযোগ ব্লুটুথে শেয়ার করা হচ্ছে"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"ট্যাবলেটের ইন্টারনেট সংযোগ ব্লুটুথে ১টি ডিভাইসে শেয়ার হচ্ছে"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"ফোনের ইন্টারনেট সংযোগ ব্লুটুথে ১টি ডিভাইসের সাথে শেয়ার হচ্ছে"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"ট্যাবলেটের ইন্টারনেট সংযোগ ব্লুটুথে <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>টি ডিভাইসে শেয়ার হচ্ছে"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"ফোনের ইন্টারনেট সংযোগ ব্লুটুথে <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>টি ডিভাইসের সাথে শেয়ার হচ্ছে"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"ব্লুটুথ এর মাধ্যমে ট্যাবলেটের ইন্টারনেট সংযোগ শেয়ার করুন"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"ব্লুটুথ এর মাধ্যমে ফোনের ইন্টারনেট সংযোগ শেয়ার করুন"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"এই <xliff:g id="DEVICE_NAME">%1$d</xliff:g> এর ইন্টারনেট সংযোগ ব্লুটুথে শেয়ার করা হচ্ছে"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"ট্যাবলেটের ইন্টারনেট সংযোগ ব্লুটুথে শেয়ার হচ্ছে না"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"ফোনের ইন্টারনেট সংযোগ ব্লুটুথে শেয়ার করা হচ্ছে না"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"টেদার করা নেই"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> ডিভাইসের থেকে বেশি ডিভাইসে টেদার করা যাবে না।"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> আনটেদার্ড হয়ে যাবে।"</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"আপনার মোবাইল ডেটা সংযোগের মাধ্যমে অন্য ডিভাইসে ইন্টারনেট সংযোগ দিতে হটস্পট এবং টিথারিং ব্যবহার করুন।"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"আপনার মোবাইল ডেটা সংযোগ মাধ্যমে অন্যান্য ডিভাইসে ইন্টারনেট সংযোগ দিতে হটস্পট এবং টিথারিং ব্যবহার করুন। অ্যাপগুলিও আশেপাশের ডিভাইসের সাথে কন্টেন্ট শেয়ার করার জন্য হটস্পট তৈরি করতে পারে।"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"সহায়তা"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"মোবাইল নেটওয়ার্ক"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"মোবাইল প্ল্যান"</string>
@@ -1375,7 +1412,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"অবস্থান মোড"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"অবস্থান নির্ধারণ করতে জিপিএস, ওয়াই ফাই, ব্লুটুথ, বা মোবাইল নেটওয়ার্ক ব্যবহার করুন"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"অবস্থান নির্ধারণ করতে ওয়াই ফাই, ব্লুটুথ, বা মোবাইল নেটওয়ার্ক ব্যবহার করুন"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"অবস্থান নির্ণয় করতে GPS ব্যবহার করুন"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"অবস্থান নির্ণয় করতে GPS এবং ডিভাইস সেন্সর ব্যবহার করুন"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"স্ক্যান করা হচ্ছে"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"ওয়াই-ফাই স্ক্যানিং"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"যে কোনো সময়ে ওয়াই-ফাই নেটওয়ার্কগুলিকে সনাক্ত করার জন্য সিস্টেম অ্যাপ্লিকেশান এবং পরিষেবাগুলিকে অনুমতি দিয়ে অবস্থান উন্নত করুন।"</string>
@@ -1420,8 +1457,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"আপনার কোনো ডেটা সংযোগ নেই। এখন এই তথ্য দেখতে, ইন্টারনেটের সাথে সংযুক্ত যে কোনো কম্পিউটার থেকে %s এ যান।"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"লোড হচ্ছে..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"আপনার পাসওয়ার্ড বাছুন"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"আঙ্গুলের ছাপ ব্যবহার করার জন্য পাসওয়ার্ড সেট করুন"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"আপনার প্যাটার্ন বেছে নিন"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"আঙ্গুলের ছাপ ব্যবহার করার জন্য প্যাটার্ন সেট করুন"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"আপনার পিন বাছুন"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"আঙ্গুলের ছাপ ব্যবহার করার জন্য পিন সেট করুন"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"আপনার পাসওয়ার্ড নিশ্চিত করুন"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"আপনার প্যাটার্ন নিশ্চিত করুন"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"আপনার পিন নিশ্চিত করুন"</string>
@@ -1490,6 +1530,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"অ্যাপ্লিকেশান সেটিংস"</string>
     <string name="install_applications" msgid="4872012136210802181">"অজানা উৎসগুলি"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"সব অ্যাপ্লিকেশান উৎসকে অনুমতি দিন"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"সম্প্রতি চালু করা অ্যাপ"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"<xliff:g id="COUNT">%1$d</xliff:g>টি অ্যাপের সবকটি দেখুন"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> আগে"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"অজানা অ্যাপের দ্বারা আপনার ট্যাবলেট এবং ব্যক্তিগত তথ্য আক্রান্ত হওয়ার সম্ভাবনা সবচেয়ে বেশি। এই উৎস থেকে আসা অ্যাপগুলি ইনস্টল করে আপনি সম্মত হচ্ছেন যে সেগুলি ব্যবহারের ফলে আপনার ট্যাবলেটের কোনো ক্ষতি হলে বা ডেটা হারিয়ে গেলে তার জন্য আপনিই দায়ী থাকবেন।"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"অজানা অ্যাপের দ্বারা আপনার ফোন এবং ব্যক্তিগত তথ্য আক্রান্ত হওয়ার সম্ভাবনা সবচেয়ে বেশি। এই উৎস থেকে আসা অ্যাপগুলি ইনস্টল করে আপনি সম্মত হচ্ছেন যে সেগুলি ব্যবহারের ফলে আপনার ফোনের কোনো ক্ষতি হলে বা ডেটা হারিয়ে গেলে তার জন্য আপনিই দায়ী থাকবেন।"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"উন্নত সেটিংস"</string>
@@ -1658,6 +1701,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"সিস্টেমের পরিষেবা বন্ধ করবেন?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"আপনি যদি এই পরিষেবা বন্ধ করেন তাহলে আপনার ট্যাবলেটের পাওয়ার বন্ধ করে আবার চালু না করা পর্যন্ত কিছু বৈশিষ্ট্য সঠিকভাবে কাজ করা বন্ধ করে দিতে পারে।"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"আপনি যদি এই পরিষেবা বন্ধ করেন তাহলে আপনার ফোনের পাওয়ার বন্ধ করে আবার চালু না করা পর্যন্ত কিছু বৈশিষ্ট্য সঠিকভাবে কাজ করা বন্ধ করে দিতে পারে।"</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"ভাষা, ইনপুট ও অঙ্গভঙ্গি"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"ভাষা এবং ইনপুট"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ভাষা এবং ইনপুট"</string>
     <string name="input_assistance" msgid="7577795275222555487">"ইনপুট সহায়তা"</string>
@@ -1872,6 +1919,10 @@
       <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="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <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="print_settings_title" msgid="3685449667822217816">"প্রিন্ট পরিষেবাগুলি"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"কোনো পরিষেবা ইনস্টল করা নেই"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"কোনো মুদ্রক পাওয়া যায়নি"</string>
@@ -1938,6 +1989,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"বিবরণ ব্যবহার করুন"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"বিদ্যুতের ব্যবহার সামঞ্জস্য করুন"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"অন্তর্ভুক্ত প্যাকেজগুলি"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"অ্যাপ চলার কারণে ব্যাটারি কমে যাচ্ছে"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"ডিভাইসটিকে সক্রিয় রাখা হচ্ছে"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ডিভাইসটিকে পটভূমিতে সক্রিয় করা হচ্ছে"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"বারবার অবস্থানের অনুরোধ করা হচ্ছে"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g>টি অ্যাপে অস্বাভাবিক কার্যকলাপ দেখা যাচ্ছে"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"অ্যাপটি বন্ধ করবেন?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"আপনার ফোন স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না কারণ <xliff:g id="APP">%1$s</xliff:g> আপনার ফোনকে সক্রিয় রাখছে।\n\nএই সমস্যার সমাধান করতে আপনি এই অ্যাপটি বন্ধ করতে পারেন।\n\nযদি সেটি ঘটতেই থাকে তাহলে ব্যাটারির পারফরম্যান্সের উন্নতি করতে এই অ্যাপটি আনইনস্টলও করতে পারেন।"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"আপনার ট্যাবলেট স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না কারণ <xliff:g id="APP">%1$s</xliff:g> আপনার ট্যাবলেটকে সক্রিয় রাখছে।\n\nএই সমস্যার সমাধান করতে আপনি এই অ্যাপটি বন্ধ করতে পারেন।\n\nযদি সেটি ঘটতেই থাকে তাহলে ব্যাটারির পারফরম্যান্সের উন্নতি করতে এই অ্যাপটি আনইনস্টলও করতে পারেন।"</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"আপনার ডিভাইস স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না কারণ <xliff:g id="APP">%1$s</xliff:g> আপনার ডিভাইসকে সক্রিয় রাখছে।\n\nএই সমস্যার সমাধান করতে আপনি এই অ্যাপটি বন্ধ করতে পারেন।\n\nযদি সেটি ঘটতেই থাকে তাহলে ব্যাটারির পারফরম্যান্সের উন্নতি করতে এই অ্যাপটি আনইনস্টলও করতে পারেন।"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"অ্যাপ বন্ধ করুন"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"পটভূমিতে ব্যবহার বন্ধ করবেন?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"আপনার ফোন স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না কারণ <xliff:g id="APP">%1$s</xliff:g> আপনার ফোনকে সক্রিয় রাখছে।\n\nএই সমস্যার সমাধান করতে, আপনার ফোন এই অ্যাপটি পটভূমিতে চলা বন্ধ করে দিতে পারে।"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"আপনার ট্যাবলেট স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না কারণ <xliff:g id="APP">%1$s</xliff:g> আপনার ট্যাবলেটকে সক্রিয় রাখছে।\n\nএই সমস্যার সমাধান করতে, আপনার ট্যাবলেট এই অ্যাপটি পটভূমিতে চলা বন্ধ করে দিতে পারে।"</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"আপনার ডিভাইস স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না কারণ <xliff:g id="APP">%1$s</xliff:g> আপনার ডিভাইসকে সক্রিয় রাখছে।\n\nএই সমস্যার সমাধান করতে, আপনার ডিভাইস এই অ্যাপটি পটভূমিতে চলা বন্ধ করে দিতে পারে।"</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"বন্ধ করুন"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"অবস্থান বিকল্প বন্ধ করবেন?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"আপনার ফোন স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না কারণ আপনি যখন <xliff:g id="APP">%1$s</xliff:g> ব্যবহার করেন না তখনও এই অ্যাপটি আপনার অবস্থানের অনুরোধ করতে থাকে।\n\nএই সমস্যার সমাধান করতে আপনি এই অ্যাপের অবস্থান বিকল্পটি বন্ধ করে দিতে পারেন।"</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"আপনার ট্যাবলেট স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না কারণ আপনি যখন <xliff:g id="APP">%1$s</xliff:g> ব্যবহার করেন না তখনও এই অ্যাপটি আপনার অবস্থানের অনুরোধ করতে থাকে।\n\nএই সমস্যার সমাধান করতে আপনি এই অ্যাপের অবস্থান বিকল্পটি বন্ধ করে দিতে পারেন।"</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"আপনার ডিভাইস স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না কারণ আপনি যখন <xliff:g id="APP">%1$s</xliff:g> ব্যবহার করেন না তখনও এই অ্যাপটি আপনার অবস্থানের অনুরোধ করতে থাকে।\n\nএই সমস্যার সমাধান করতে আপনি এই অ্যাপের অবস্থান বিকল্পটি বন্ধ করে দিতে পারেন।"</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"বন্ধ করুন"</string>
     <string name="power_screen" msgid="3023346080675904613">"স্ক্রীন"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"ফ্ল্যাশলাইট"</string>
     <string name="power_camera" msgid="4976286950934622605">"ক্যামেরা"</string>
@@ -1952,7 +2023,7 @@
     <string name="power_apps" msgid="2043554781293951327">"অ্যাপগুলি"</string>
     <string name="power_service" msgid="1599661212370831780">"পরিষেবাগুলি"</string>
     <string name="power_system" msgid="8290455327965307383">"সিস্টেম"</string>
-    <string name="power_user" msgid="1889728099253018005">"ব্যবহারকারী"</string>
+    <string name="power_user" msgid="3706143225319881667">"অন্যান্য ব্যবহারকারী"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU মোট"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ফোরগ্রাউন্ড"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"জাগ্রত রাখুন"</string>
@@ -2004,6 +2075,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"নির্ধারিত শক্তির থেকে বেশী শক্তির ব্যবহার"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> এর জন্য ব্যবহার করা হয়েছে"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"<xliff:g id="TIME">^1</xliff:g> এর জন্য সক্রিয় রয়েছে"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"স্ক্রিনের ব্যবহার <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> এর দ্বারা <xliff:g id="PERCENT">%1$s</xliff:g> ব্যবহার করা হয়েছে"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"সামগ্রিক ব্যাটারির <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2563,7 +2635,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"পিন পরিবর্তন করুন"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"বিজ্ঞপ্তিগুলি প্রদর্শন করুন"</string>
     <string name="help_label" msgid="6886837949306318591">"সহায়তা এবং প্রতিক্রিয়া"</string>
-    <string name="support_summary" msgid="8276116616493882830">"সহায়তার নিবন্ধ, ফোন এবং চ্যাট সহায়তা"</string>
+    <string name="support_summary" msgid="2705726826263742491">"সহায়তা বিষয়ক নিবন্ধ, ফোন এবং চ্যাট, শুরু করার জন্য টিপ্স"</string>
     <string name="user_account_title" msgid="1127193807312271167">"সামগ্রীর জন্য অ্যাকাউন্ট"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ফটো ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"চরম হুমকি"</string>
@@ -2653,9 +2725,12 @@
       <item quantity="other">%dটি লুকানো আইটেম দেখান</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"নেটওয়ার্ক ও ইন্টারনেট"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"ওয়াই ফাই, মোবাইল, ডেটার ব্যবহার, হটস্পট"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"মোবাইল"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ডেটার ব্যবহার"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"হটস্পট"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"সংযুক্ত ডিভাইস"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"ব্লুটুথ, কাস্ট, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"ব্লুটুথ, কাস্ট করা"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"অ্যাপ্স &amp; বিজ্ঞপ্তি"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"অনুমতিগুলি, ডিফল্ট অ্যাপ্স"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"ব্যবহারকারী এবং অ্যাকাউন্টগুলি"</string>
@@ -2708,6 +2783,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"অঙ্গভঙ্গি"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"অর্থপ্রদান, আলতো চাপা, পেমেন্ট"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ব্যাকআপ, ব্যাক আপ"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"অঙ্গভঙ্গি, প্রান্ত, পার্শ্ব, সক্রিয় প্রান্ত, স্কুইজ, মুঠো করে ধরা, সহায়তা, সহায়ক, স্কুইজি, স্কুইজি, স্কুইজি, স্কুইজি, ওকে Google, Google সহায়ক"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"অঙ্গভঙ্গি, সক্রিয়, বিজ্ঞপ্তি, স্ক্রিন, ডিসপ্লে, স্ক্রিন বন্ধ, স্ক্রিন চালু, স্কুইজ, প্রান্ত, ঘুমানো, মুঠো করে ধরা"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"অঙ্গভঙ্গি, নীরবতা, মনে করিয়ে দেওয়া, অ্যালার্ম, ইনকামিং কল, নীরব, ডিসপ্লে, লকস্ক্রিন, স্কুইজ, মুঠো করে ধরা, প্রান্ত, বন্ধ করা"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ওয়াই-ফাই NFC ট্যাগ সেটআপ করুন"</string>
     <string name="write_tag" msgid="8571858602896222537">"লিখুন"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"লিখতে একটি ট্যাগে আলতো চাপুন..."</string>
@@ -2790,7 +2868,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"কোনো কর্মস্থলের বিজ্ঞপ্তি দেখাবেন না"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"আপনার ডিভাইস লক করা অবস্থায় আপনি কিভাবে প্রোফাইল বিজ্ঞপ্তিগুলি প্রদর্শন করতে চান?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"প্রোফাইল বিজ্ঞপ্তিগুলি"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"বিজ্ঞপ্তিগুলি"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"বিজ্ঞপ্তি"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"অ্যাপ বিজ্ঞপ্তিগুলি"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"বিজ্ঞপ্তির বিভাগ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"গুরুত্ব"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"অ্যাপটিকে সিদ্ধান্ত নিতে দিন"</string>
@@ -2805,6 +2884,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"জরুরি"</string>
     <string name="allow_sound" msgid="1820188704793497324">"আওয়াজের অনুমতি দিন"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"শব্দ, কম্পন করে না বা বর্তমান স্ক্রীনে এই বিজ্ঞপ্তিগুলিকে দেখানো হয় না৷"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"কম গুরুত্ব"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"মাঝারি গুরুত্ব"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"উচ্চ গুরুত্ব"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"সর্বাধিক গুরুত্ব"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"বিজ্ঞপ্তি সহায়ক"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"বিজ্ঞপ্তির অ্যাক্সেস"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"কর্মস্থলের প্রোফাইলের বিজ্ঞপ্তিতে অ্যাক্সেস ব্লক করা হয়েছে"</string>
@@ -2832,8 +2915,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ছবির-মধ্যে-ছবি"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"ছবির-মধ্যে-ছবি তৈরির অনুমতি দিন"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"অ্যাপটি খোলা থাকার সময় অথবা আপনি এটি ছেড়ে বেরিয়ে গেলে (যেমন, কোনো ভিডিও দেখার জন্য) এটিকে একটি ছবির-মধ্যে-ছবি সমেত উইন্ডো তৈরি করার অনুমতি দিন। চালু থাকা অন্যান্য অ্যাপের উপরে এই উইন্ডোটি দেখা যাবে।"</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"হ্যাঁ"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"না"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"বিরক্ত করবেন না অ্যাক্সেস করুন"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ইনস্টল করা নেই এমন অ্যাপগুলি বিরক্ত করবেন না অ্যাক্সেস করুন এর অনুরোধ জানিয়েছে"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"অ্যাপ্লিকেশানগুলি লোড করা হচ্ছে..."</string>
@@ -2964,11 +3045,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"এর দ্বারা এই কাজের প্রোফাইলটি পরিচালিত হয়:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> এর দ্বারা পরিচালিত"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(পরীক্ষামূলক)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"ডিভাইসের ঘূর্ণন"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"স্ক্রীনের সামগ্রীগুলি ঘোরান"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"প্রতিকৃতি দৃশ্যে থাকুন"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ভূদৃশ্য দৃশ্যে থাকুন"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"বর্তমান সজ্জায় থাকুন"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"নিরাপদ স্টার্ট-আপ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"অবিরত থাকুন"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"এই ডিভাইসটি চালু হওয়ার আগে সেটি আপনার পিন চাইবে এমন পদ্ধতির মাধ্যমে আরো সুরক্ষিত করতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত সেটিতে কল, বার্তা বা অ্যালার্ম সহ বিজ্ঞপ্তি আসবে না।\n\nআপনার ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলে এটি ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে। আপনার ডিভাইসটি চালু করার জন্য পিন দরকার?"</string>
@@ -2976,7 +3052,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"এই ডিভাইসটি চালু হওয়ার আগে সেটি আপনার পাসওয়ার্ড চাইবে এমন পদ্ধতির মাধ্যমে আরো সুরক্ষিত করতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত সেটিতে কল, বার্তা বা অ্যালার্ম সহ বিজ্ঞপ্তি আসবে না।\n\nআপনার ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলে এটি ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে। আপনার ডিভাইসটি চালু করার জন্য পাসওয়ার্ড দরকার?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"আপনার ডিভাইস আনলক করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহার করা ছাড়াও, এটি চালু হওয়ার আগে আপনার পিন চাওয়ার মাধ্যমে আপনি ডিভাইসটিকে আরো সুরক্ষিত করতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত সেটিতে কল, বার্তা বা অ্যালার্ম সহ বিজ্ঞপ্তি আসবে না।\n\nআপনার ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলে এটি ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে। আপনার ডিভাইসটি চালু করার জন্য পিন দরকার?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"আপনার ডিভাইস আনলক করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহার করা ছাড়াও, এটি চালু হওয়ার আগে আপনার প্যাটার্ন চাওয়ার মাধ্যমে আপনি ডিভাইসটিকে আরো সুরক্ষিত করতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত সেটিতে কল, বার্তা বা অ্যালার্ম সহ বিজ্ঞপ্তি আসবে না।\n\nআপনার ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলে এটি ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে। আপনার ডিভাইসটি চালু করার জন্য প্যাটার্ন দরকার?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"আপনার ডিভাইস আনলক করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহার করা ছাড়াও, এটি চালু হওয়ার আগে আপনার পাসওয়ার্ড চাওয়ার মাধ্যমে আপনি ডিভাইসটিকে আরো সুরক্ষিত করতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত সেটিতে কল, বার্তা বা অ্যালার্ম সহ বিজ্ঞপ্তি আসবে না।\n\nআপনার ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলে এটি ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে। আপনার ডিভাইসটি চালু করার জন্য পাসওয়ার্ড দরকার?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"আপনার ডিভাইস আনলক করার জন্য আঙ্গুলের ছাপ ব্যবহার করা ছাড়াও ডিভাইসটি চালু হওয়ার সময় পাসওয়ার্ড দেওয়ার মাধ্যমে আপনি এটিকে আরো সুরক্ষিত রাখতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত এতে কল, বার্তা, বা অ্যালার্ম সহ বিজ্ঞপ্তি আসবে না।\n\nএর ফলে ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলেও আপনার ডেটা সুরক্ষিত থাকবে। চালু করার সময় পাসওয়ার্ড দেওয়ার ব্যবস্থা রাখতে চান?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"হ্যাঁ"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"না"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"পিন-এর প্রয়োজন?"</string>
@@ -3094,6 +3170,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"ব্যবহারের সতর্কতা"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"সম্পূর্ণ ডিভাইসের ব্যবহার দেখান"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"অ্যাপের ব্যবহার দেখান"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"অনেক বেশি ব্যাটারি ব্যবহার করে"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g>টি অ্যাপে অস্বাভাবিক কার্যকলাপ দেখা যাচ্ছে</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g>টি অ্যাপে অস্বাভাবিক কার্যকলাপ দেখা যাচ্ছে</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">অ্যাপ চলতে থাকার জন্য ব্যাটারি শেষ হচ্ছে</item>
+      <item quantity="other">অ্যাপ চলতে থাকার জন্য ব্যাটারি শেষ হচ্ছে</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"অপ্টিমাইজ করা নেই"</string>
     <string name="high_power_on" msgid="6216293998227583810">"অপ্টিমাইজ করা নেই"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ব্যাটারির ব্যবহার অপ্টিমাইজ করা হচ্ছে"</string>
@@ -3186,8 +3271,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"অন্য অ্যাপের উপরে দেখুন"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g>টির মধ্যে <xliff:g id="COUNT_0">%1$d</xliff:g>টি অ্যাপকে বাকিগুলির উপরে দেখতে পাওয়া যাবে"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"অনুমতি সহ অ্যাপ্লিকেশানগুলি"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"হ্যাঁ"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"না"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"অনুমোদিত"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"অনুমোদিত নয়"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"অজানা উৎস থেকে আসা অ্যাপ ইনস্টল করুন"</string>
     <string name="write_settings" msgid="4797457275727195681">"সিস্টেম সেটিংস সংশোধন করুন"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"সিস্টেম সেটিংস সংশোধন করা লেখা"</string>
@@ -3277,6 +3362,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"স্ক্রীন হলুদাভ বাদামি আভা ধারণ করে৷ এটি আপনাকে ঘুমিয়ে পড়তে সহায়তা করতে পারে৷"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"প্রস্তাবনাগুলি"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>টি"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+ আরও <xliff:g id="ID_1">%1$d</xliff:g>টি"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <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="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <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="suggestion_remove" msgid="904627293892092439">"সরান"</string>
     <string name="color_temperature" msgid="2070126836910615605">"কুল রঙের টেম্পারেচার"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"কুলার প্রদর্শনী রঙগুলি ব্যবহার করুন"</string>
@@ -3295,8 +3389,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> ডেটা সতর্কতা"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> ডেটা সতর্কতা / <xliff:g id="ID_2">%2$s</xliff:g> ডেটা সীমা"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"বিলিং চক্র"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"প্রতি মাসের <xliff:g id="ID_1">%1$s</xliff:g> তারিখে মাসিক বিল শুরু হয়"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"মাসিক বিল <xliff:g id="ID_1">%1$s</xliff:g> তরিখ থেকে শুরু হয়"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"প্রতি মাসের <xliff:g id="ID_1">%1$s</xliff:g> তারিখে"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"নেটওয়ার্ক সীমাবদ্ধতা"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g>টি সীমাবদ্ধতা</item>
@@ -3316,7 +3409,7 @@
       <item quantity="other">ডেটা সেভার চালু থাকার সময় <xliff:g id="COUNT">%1$d</xliff:g>টি অ্যাপ্লিকেশানকে অবাধ ডেটা ব্যবহারের অনুমতি দেওয়া হয়েছে</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"ডেটা সেভার"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"অবাধ ডেটা অ্যাক্সেস"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"অবাধ ডেটা"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"পটভূমির ডেটা বন্ধ রয়েছে"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"চালু আছে"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"বন্ধ আছে"</string>
@@ -3380,8 +3473,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"লক স্ক্রীন বিজ্ঞপ্তিগুলি নিয়ন্ত্রণ করুন"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"বিজ্ঞপ্তির সামগ্রী দেখান বা লুকান"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"সমস্ত"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"সহায়তা"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"সহায়তা এবং টিপ্স"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"সবচেয়ে কম প্রস্থ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ইনস্টল করা কোনো অ্যাপ্লিকেশানই প্রিমিয়াম SMS অ্যাক্সেসের অনুরোধ করেনি"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"প্রিমিয়াম SMS এর জন্য অর্থ খরচ হতে পারে এবং আপনার পরিষেবা প্রদানকারীর বিলে যোগ করা হবে৷ আপনি যদি কোনো অ্যাপ্লিকেশানের জন্য অনুমতি সক্ষম করেন তাহলে আপনি সেই অ্যাপ্লিকেশানটি ব্যবহার করে প্রিমিয়াম SMS পাঠাতে পারবেন৷"</string>
@@ -3446,28 +3538,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"স্বয়ংক্রিয়"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ম্যানুয়াল"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"এখনই স্থান খালি করুন"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"অঙ্গভঙ্গিগুলি"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"অঙ্গভঙ্গির শর্টকাট"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"আপনার ফোন নিয়ন্ত্রণ করতে দ্রুত অঙ্গভঙ্গিগুলি"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"আপনার ট্যাবলেট নিয়ন্ত্রণ করার দ্রুত অঙ্গভঙ্গি"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"আপনার ডিভাইস নিয়ন্ত্রণ করার দ্রুত অঙ্গভঙ্গি"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"ক্যামেরাতে সরাসরি যান"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"ক্যামেরা দ্রুত খুলতে, পাওয়ার বোতামে দুবার আলতো চাপ দিন৷ যে কোনো স্ক্রীন থেকে কাজ করে৷"</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"ক্যামেরাটি তাড়াতাড়ি খুলুন"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"ক্যামেরা খোলার জন্য পাওয়ার বোতামটি দুবার টিপুন"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ক্যামেরা ফ্লিপ করুন"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"তাড়াতাড়ি সেলফি তুলুন"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"সেলফি মোডে যাওয়ার জন্য ফোনটি ডবল টুইস্ট করুন"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"সেলফি মোডে যাওয়ার জন্য ট্যাবলেটটি ডবল টুইস্ট করুন"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"সেলফি মোডে যাওয়ার জন্য ডিভাইসটি ডবল টুইস্ট করুন"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"ফোন চেক করতে দুবার আলতো চাপুন"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ট্যাবলেট চেক করতে দুবার আলতো চাপুন"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"ডিভাইস চেক করতে দুবার আলতো চাপুন"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"আপনার বিজ্ঞপ্তিগুলিকে দ্রুত চেক করতে আপনার স্ক্রীনে দুবার আলতো চাপুন৷"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"সময়, বিজ্ঞপ্তির আইকন, এবং অন্যান্য তথ্য দেখতে আপনার স্ক্রিনে ডবল ট্যাপ করুন।"</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"স্ক্রিন বন্ধ থাকলেও বিজ্ঞপ্তি দেখুন"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"চেক করতে ফোনটিকে হাতে নিন"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"চেক করতে ট্যাবলেটটিকে হাতে নিন"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"চেক করতে ডিভাইসটিকে হাতে নিন"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"আপনার বিজ্ঞপ্তিগুলিকে দ্রুত চেক করতে আপনার ফোনটিকে হাতে তুলে নিন"</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"আপনার বিজ্ঞপ্তিগুলিকে দ্রুত চেক করতে আপনার ট্যাবলেটটিকে হাতে তুলে নিন"</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"আপনার বিজ্ঞপ্তিগুলিকে দ্রুত চেক করতে আপনার ডিভাইসটিকে হাতে তুলে নিন"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"সময়, বিজ্ঞপ্তির আইকন, এবং অন্যান্য তথ্য দেখতে আপনার ফোনটি তুলে নিন।"</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"সময়, বিজ্ঞপ্তির আইকন, এবং অন্যান্য তথ্য দেখতে আপনার ট্যাবলেটটি তুলে নিন।"</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"সময়, বিজ্ঞপ্তির আইকন, এবং অন্যান্য তথ্য দেখতে আপনার ডিভাইসটি তুলে নিন।"</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"স্ক্রিন বন্ধ থাকলেও বিজ্ঞপ্তি দেখুন"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"বিজ্ঞপ্তির জন্য আঙ্গুলের ছাপ সোয়াইপ করুন"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"আপনার বিজ্ঞপ্তিগুলি চেক করতে, আপনার ফোনের পিছনে আঙ্গুলের ছাপ নেওয়ার সেন্সরে নিচের দিকে সোয়াইপ করুন৷"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"আপনার বিজ্ঞপ্তিগুলি চেক করতে, আপনার ট্যাবলেটের পিছনে আঙ্গুলের ছাপ নেওয়ার সেন্সরে নিচের দিকে সোয়াইপ করুন৷"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"আপনার বিজ্ঞপ্তিগুলি চেক করতে, আপনার ডিভাইসের পিছনে আঙ্গুলের ছাপ নেওয়ার সেন্সরে নিচের দিকে সোয়াইপ করুন৷"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"বিজ্ঞপ্তিগুলি দ্রুত দেখুন"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"আঙ্গুলের ছাপ নেওয়ার সেন্সরে নিচের দিকে সোয়াইপ করুন"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"ক্যামেরা চালু করতে তুলে ধরুন"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"স্বয়ংক্রিয়ভাবে ক্যামেরা খুলতে, যেভাবে ফটো তুলতে চান (ল্যান্ডস্ক্যাপ অথবা পোর্ট্রেট) থি সেইভাবে আপনার ফোনটিকে তুলে ধরুন। যখন আপনার ফোনটি স্লিপিং মোডে বা লক থাকবে তখন কাজ করবে।"</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"ফোন স্লিপ মোডে অথবা লক করা থাকলেও ফটো তুলুন"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"সহায়ক সঙ্কেত"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"সংবেদনশীলতা"</string>
@@ -3571,6 +3676,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"আপনি কি এই ঝটপট অ্যাপটি সরাতে চান?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"গেম্স"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"অডিও ফাইলগুলি"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"সঞ্চয়স্থান ব্যবহার হয়েছে"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ইউজার <xliff:g id="USER">%s</xliff:g> এর জন্য আনইনস্টল হয়েছে)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ইউজার <xliff:g id="USER">%s</xliff:g> এর জন্য অক্ষম হয়েছে)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"আপনাআপনি পূরণ করার পরিষেবা"</string>
@@ -3584,5 +3690,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"ঝটপট অ্যাপ"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"সঞ্চয়স্থান পরিচালক বন্ধ করবেন?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"সিনেমা এবং TV অ্যাপগুলি"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"সঞ্চয়স্থান ব্যবহার হয়েছে"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"পরিষেবা প্রদানকারীর ব্যবস্থামূলক তথ্য"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ট্রিগার পরিষেবা প্রদানকারীর ব্যবস্থা"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"নতুন এবং উত্তেজনাপূর্ণ আর কি আছে?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"সেরা ৫টি বৈশিষ্ট্য ব্যবহার করে দেখুন"</string>
 </resources>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 35a2249..e0a99bd 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Dobar"</item>
     <item msgid="8986346415847956850">"Odličan"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Uvijek"</item>
-    <item msgid="844721238536786870">"Samo kada je priključen na napajanje"</item>
-    <item msgid="1986753720941888596">"Nikada"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Uvijek"</item>
-    <item msgid="7433294150916905997">"Samo kada je priključen na napajanje"</item>
-    <item msgid="1390404486722375028">"Nikada"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Posljednjih 30 dana"</item>
     <item msgid="6600989128423965319">"Podesi ciklus korištenja…"</item>
@@ -162,7 +152,7 @@
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Vrijeme korištenja"</item>
     <item msgid="4796160515314745154">"Zadnji put korišteno"</item>
-    <item msgid="2502754479975776899">"Naziv aplikacije"</item>
+    <item msgid="2502754479975776899">"Ime aplikacije"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
     <item msgid="8615575908717909498">"PEAP"</item>
@@ -279,7 +269,7 @@
     <item msgid="8374996688066472414">"čitaj međumemoriju"</item>
     <item msgid="3045529469061083747">"mijenjaj međumemoriju"</item>
     <item msgid="5124443975763747838">"dugmad za upravljanje medijima"</item>
-    <item msgid="4547883971364273343">"aplikacija sa dozvolom za reproduciranje zvuka"</item>
+    <item msgid="4547883971364273343">"aplikacija sa odobrenjem za reproduciranje zvuka"</item>
     <item msgid="2603878814882344450">"centar za upravljanje zvukom"</item>
     <item msgid="7136963238377062018">"jačina glasa"</item>
     <item msgid="4270236897655923007">"jačina zvona"</item>
@@ -296,8 +286,8 @@
     <item msgid="1091168669714823370">"projektuj sadržaj medija"</item>
     <item msgid="485564189219029300">"aktiviraj VPN"</item>
     <item msgid="7155384795265164395">"ispisana pozadinska slika"</item>
-    <item msgid="1835836196806147034">"pomoćnik za podešavanje strukture"</item>
-    <item msgid="5989890403088155055">"pomoćnik za snimak ekrana"</item>
+    <item msgid="1835836196806147034">"asistent za podešavanje strukture"</item>
+    <item msgid="5989890403088155055">"asistent za snimak ekrana"</item>
     <item msgid="8582699692765917557">"čitaj podatke o stanju telefona"</item>
     <item msgid="1474039653814954902">"dodaj govornu poštu"</item>
     <item msgid="7222837656938871633">"koristi SIP"</item>
@@ -363,8 +353,8 @@
     <item msgid="4992007785575926253">"Projektuj sadržaj medija"</item>
     <item msgid="2482631530338029480">"Aktiviraj VPN"</item>
     <item msgid="1662979573471871926">"Ispisana pozadinska slika"</item>
-    <item msgid="5964768335278263478">"Pomoćnik za podešavanje strukture"</item>
-    <item msgid="2657138701132782702">"Pomoćnik za snimak ekrana"</item>
+    <item msgid="5964768335278263478">"Asistent za podešavanje strukture"</item>
+    <item msgid="2657138701132782702">"Asistent za snimak ekrana"</item>
     <item msgid="8571369610363539266">"Čitaj podatke o stanju telefona"</item>
     <item msgid="4542463358215230845">"Dodaj govornu poštu"</item>
     <item msgid="864565065016166003">"Koristi SIP"</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index aabf86d..082f40f 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -31,6 +31,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Sada ste programer!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nema potrebe, već ste programer."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Prvo omogućite opcije za programere."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Bežična veza i mreže"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Veze"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Uređaj"</string>
@@ -42,6 +43,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Video poziv obezbijeđen"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi poziv obezbijeđen"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Omogućeno prisustvo"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Snaga mobilnog radija"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Prikaži SIM adresar"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Prikaži brojeve fiksnog biranja"</string>
@@ -107,10 +109,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Potraži uređaje"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Preimenuj ovaj uređaj"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Preimenuj"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Prekinuti vezu?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Time će se okončati vaša veza s uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Želite li prekinuti vezu s uređajem?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Vaš telefon će prekinuti vezu s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Vaš tablet će prekinuti vezu s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Vaš uređaj će prekinuti vezu s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Prekini vezu"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Nemate dozvolu da mijenjate postavke za Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Uparivanje novog uređaja"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je vidljiv uređajima u blizini, dok su postavke Bluetootha otvorene."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Bluetooth adresa telefona: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Bluetooth adresa tableta: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth adresa uređaja: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Želite li prekinuti vezu sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emitovanje"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Onemogućiti profil?"</string>
@@ -122,7 +131,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Zahtjev za Bluetooth uparivanje"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Zahtjev za uparivanje"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Dodirnite za spajanje s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Prikaži primljene datoteke"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Primljeni fajlovi"</string>
     <string name="device_picker" msgid="4978696506172252813">"Izaberi Bluetooth uređaj"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti Bluetooth"</string>
@@ -158,6 +167,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s želi pristupiti svojim porukama. Dozvoliti pristup za %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Zahtjev za pristup SIM-u"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> želi pristupiti vašoj SIM kartici. Odobrenje pristupa SIM kartici će onemogućiti vezu za prijenos podataka na vašem uređaju za vrijeme trajanja veze. Odobri pristup uređaju <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Uređaj je vidljiv drugim uređajima kao \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaši uređaji"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Uparivanje novog uređaja"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum i vrijeme"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Odaberite vremensku zonu"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -332,7 +344,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Računi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Sigurnost i lokacija"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifriranje i akreditivi"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon je šifriran"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Uređaj je šifriran"</string>
@@ -358,40 +371,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Otključavanje otiskom prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Koristite otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Samo dodirnite senzor za otisak prsta da otključate telefon, odobrite kupovinu ili da se prijavite u aplikaciju. Pazite čije otiske prsta dodajete. Samo jedan dodani otisak može izvršiti sve navedeno.\n\nNapomena: Vaš otisak prsta može biti manje siguran od jakog uzorka ili PIN kôda."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Samo dodirnite senzor za otisak prsta da odobrite kupovinu ili se prijavite u aplikacije. Pazite čije otiske dodajete. Jedan jedini dodani otisak može izvršiti sve gore navedeno.\n\nNapomena: Ne možete koristiti svoj otisak prsta 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="3635924459027832861">"Samo dodirnite senzor za otisak prsta za otključavanje telefona, odobravanje kupovina ili prijavljivanje u aplikacije. Pazite čije otiske prstiju dodajete. Jedan jedini dodani otisak može izvršiti sve gore navedeno.\n\nNapomena: Vaš otisak prsta može biti manje siguran od jakog uzorka ili PIN kôda."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"Pomoću otiska prsta otključavajte telefon ili odobravajte kupovinu.\n\nNapomena: otisak vašeg prsta može biti manje siguran od jakog uzorka ili PIN koda."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Otkaži"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Nastavi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Preskoči"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Dodaj otisak prsta"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete biti u mogućnosti spriječiti druge osobe da koriste ovaj tablet ukoliko bude izgubljen, ukraden ili njegov sadržaj bude potpuno izbrisan."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete moći spriječiti upotrebu uređaja u slučaju gubitka, krađe ili brisanja podataka s njega."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete biti u mogućnosti spriječiti druge osobe da koriste ovaj telefon ukoliko bude izgubljen, ukraden ili njegov sadržaj bude potpuno izbrisan."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete biti u mogućnosti spriječiti druge osobe da koriste ovaj tablet ako ga izgubite ili vam ga ukradu."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete biti u mogućnosti spriječiti druge osobe da koriste ovaj uređaj ako ga izgubite ili vam ga ukradu."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete biti u mogućnosti spriječiti druge osobe da koriste ovaj telefon ako ga izgubite ili vam ga ukradu."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Naprijed"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj tablet ako ga izgubite, ako vam ga ukradu ili ga vratite na početne postavke."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj uređaj ako ga izgubite, ako vam ga ukradu ili ga vratite na početne postavke."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj telefon ako ga izgubite, ako vam ga ukradu ili ga vratite na početne postavke."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj tablet ako ga izgubite ili vam ga ukradu."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj uređaj ako ga izgubite ili vam ga ukradu."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj telefon ako ga izgubite ili vam ga ukradu."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ipak preskoči"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Nazad"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Pronađite senzor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Pronađite senzor za otisak prsta na stražnjem dijelu telefona."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Dodirnite senzor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Nalazi se na poleđini telefona. Koristite kažiprst."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustracija sa uređajem i lokacijom senzora za otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Ime"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"U redu"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Izbriši"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Počnimo!"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Dodirnite senzor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Stavite prst na senzor i podignite ga kad osjetite vibraciju"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Nastavite"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Lagano pomjerajte prst kako biste dodali različite dijelove otiska prsta"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Otisak prsta je dodan!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kad god vidite ovu ikonu, možete koristiti otisak prsta za identifikaciju ili odobravanje kupovine."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Samo dodirnite senzor za otisak prsta da biste probudili i otključali uređaj."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Kada vidite ovu ikonu, možete ovlastiti kupovine ili se prijaviti u aplikacije."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Podignite i ponovo dodirnite"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Nastavite podizati prst da dodate različite segmente otiska"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Dodan je otisak prsta"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Kada vidite ovu ikonu, koristite otisak prsta za identifikaciju ili odobravanje kupovine."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Preskočiti postavljanje otiska prsta?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Odabrali ste da koristite otisak prsta kao jedan od načina za otključavanja telefona. Ukoliko sada preskočite ovaj korak, morat ćete ga postaviti kasnije. Postavka traje otprilike samo jednu minutu."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Postavi zaključavanje ekrana"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Gotovo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, to nije senzor"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Koristite senzor za otisak prsta na uređaju."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Dodirnite senzor na poleđini telefona. Koristite kažiprst."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Upis nije dovršen"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Vrijeme za uzimanje otiska prsta je isteklo. Pokušajte ponovo."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Upis otiska prsta nije uspio. Pokušajte ponovo ili koristite drugi prst."</string>
@@ -453,6 +464,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Spriječite da druge osobe koriste ovaj uređaj bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Izaberite koji način zaključavanja ekrana želite koristiti."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Spriječite da druge osobe koriste ovaj telefon bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Izaberite koji način zaključavanja ekrana želite koristiti."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Izaberite rezervni metod zaključavanja ekrana"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opcije za Zaključani ekran"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opcije zaključavanja ekrana"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zaključavanje ekrana"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / odmah nakon izlaska iz stanja mirovanja"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> nakon izlaska iz stanja mirovanja"</string>
@@ -523,13 +536,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Promijeni uzorak za otključavanje"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Prom. PIN za otključ."</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Promijeni lozinku za otključavanje"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Pokušati ponovo. Pokušaj <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> od <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Posljednji pokušaj"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Ako ovaj put unesete pogrešan uzorak, vaš poslovni profil i povezani podaci bit će uklonjeni sa ovog uređaja."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Ako ovaj put unesete pogrešan PIN, vaš poslovni profil i povezani podaci bit će uklonjeni sa ovog uređaja."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Ako ovaj put unesete pogrešnu lozinku, vaš poslovni profil i povezani podaci bit će uklonjeni sa ovog uređaja."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Previše neispravnih pokušaja. Vaš poslovni profil i povezani podaci bit će uklonjeni sa ovog uređaja."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Odbaci"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Pokušajte ponovo. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. od <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> pokušaja."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Vaši podaci će se izbrisati"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ako u sljedećem pokušaju unesete neispravan obrazac, podaci ovog uređaja će se izbrisati"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ako u sljedećem pokušaju unesete neispravan PIN kôd, podaci ovog uređaja će se izbrisati"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ako u sljedećem pokušaju unesete neispravnu lozinku, podaci ovog uređaja će se izbrisati"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ako u sljedećem pokušaju unesete neispravan obrazac, ovaj korisnik će se izbrisati"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ako u sljedećem pokušaju unesete neispravan PIN kôd, ovaj korisnik će se izbrisati"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ako u sljedećem pokušaju unesete neispravnu lozinku, ovaj korisnik će se izbrisati"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ako u sljedećem pokušaju unesete neispravan obrazac, vaš radni profil i njegovi podaci će se izbrisati"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ako u sljedećem pokušaju unesete neispravan PIN kôd, vaš radni profil i njegovi podaci će se izbrisati"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ako u sljedećem pokušaju unesete neispravnu lozinku, vaš radni profil i njegovi podaci će se izbrisati"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Previše je neispravnih pokušaja. Podaci ovog uređaja će se izbrisati."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Previše je neispravnih pokušaja. Ovaj korisnik će se izbrisati."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Previše je neispravnih pokušaja. Ovaj poslovni profil i njegovi podaci će se izbrisati."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Odbaci"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Broj znakova mora biti najmanje <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Broj cifara u PIN-u mora biti najmanje <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Nastavi"</string>
@@ -638,6 +659,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Napredni Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kada je Bluetooth uključen, uređaj može komunicirati sa drugim uređajima s Bluetoothom u blizini."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Radi poboljšanja preciznosti lociranja, sistemske aplikacije i usluge i dalje mogu detektirati uređaje s Bluetoothom. Ovo možete promijeniti u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>postavkama skeniranja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Nije povezan. Pokušajte ponovo."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Detalji o uređaju"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Bluetooth adresa uređaja: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Želite li zaboraviti uređaj?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Vaš telefon neće više biti uparen s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Vaš tablet neće više biti uparen s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Vaš uređaj neće više biti uparen s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Zaboravi uređaj"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Poveži se na…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Veza uređaja <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sa zvukom medija će biti prekinuta."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Veza uređaja <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sa handsfree zvukom će biti prekinuta."</string>
@@ -790,6 +819,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ne navodi"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ne potvrđuj valjanost"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nije naveden certifikat. Veza neće biti privatna."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Naziv mreže je predug."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Morate navesti domenu."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dostupan"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dostupan)"</string>
@@ -822,7 +852,6 @@
       <item quantity="other">%d mreža</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Napredni Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfiguriraj Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC adresa"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP adresa"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podmreže"</string>
@@ -859,9 +888,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Zaboraviti ovu grupu?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prijenosna Wi-Fi pristupna tačka"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi hotspot"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Koristite mobilnu vezu za pružanje Wi-Fi mreže"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Internetska veza ovog tableta ne dijeli se putem pristupne tačke"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Internetska veza telefona ne dijeli se putem pristupne tačke"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Nema dijeljenja interneta ili sadržaja s drugim uređajima"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internetska veza ovog tableta dijeli se putem pristupne tačke"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internetska veza ovog telefona dijeli se putem pristupne tačke"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikacija dijeli sadržaj. Za dijeljenje internetske veze isključite pa uključite pristupnu tačku"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Naziv Wi‑Fi mreže"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Uključivanje pristupne tačke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Drugi uređaji se mogu povezati na pristupnu tačku <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi lozinka"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP opseg"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Koristite pristupnu tačku da kreirate Wi‑Fi mrežu za ostale svoje uređaje. Pristupna tačka pruža internet koristeći vaš mobilni prijenos podataka. Mogu se naplaćivati dodatni troškovi za mobilni prijenos podataka."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacije mogu kreirati pristupnu tačku za dijeljenje sadržaja s uređajima u blizini."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Uključivanje pristupne tačke…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Isključivanje pristupne tačke…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivna"</string>
@@ -908,6 +945,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Kada je opcija Wi-Fi pozivanje uključena, telefon može preusmjeravati pozive preko Wi-Fi mreža ili mreže vašeg operatera, u zavisnosti od toga kakve su vaše postavke i koji signal je jači. Prije nego što uključite ovu funkciju, raspitajte se o naknadi i drugim informacijama kod operatera."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Ažuriraj adresu za hitne slučajeve"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Adresa koju hitna služba koristi kao vašu lokaciju ukoliko pozovete 911 (hitnu službu) koristeći Wi-Fi mrežu"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Prikaz"</string>
@@ -966,6 +1004,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nema rezultata"</string>
     <string name="display_settings" msgid="7965901687241669598">"Prikaz"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatsko rotiranje ekrana"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Izražene boje"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Automatski promijeni orijentaciju prilikom rotiranja tableta"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Automatski promijeni orijentaciju prilikom rotiranja telefona"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Automatski promijeni orijentaciju prilikom rotiranja tableta"</string>
@@ -993,23 +1032,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimizirajte nivo osvjetljenja prema dostupnom svjetlu. Kada je ova funkcija uključena i dalje možete privremeno podešavati nivo osvjetljenja."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Noćno svjetlo"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Noćno svjetlo oboji ekran u žutosmeđe. Tako je lakše gledati u ekran ili čitati pod prigušenim svjetlom, a može vam pomoći da lakše zaspite."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Raspored"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Automatski uključi"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nikad"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Prilagođeni raspored"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Od sutona do svitanja"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Raspored"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ništa"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Uključuje se u zadano vrijeme"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Uključeno od sumraka do svitanja"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Vrijeme početka"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Vrijeme završetka"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intenzitet"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Isključeno. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nikad se neće automatski uključiti."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Automatski će se uključiti u <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Automatski će se uključiti u suton."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Uključeno. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nikada se neće automatski isključiti."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Automatski će se isključiti u <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Automatski će se isključiti u svitanje."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Isključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Neće se nikada automatski uključiti"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Automatski će se uključiti u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Automatski će se uključiti u sumrak"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Uključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Neće se nikada automatski isključiti"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Automatski će se isključiti u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Automatski će se isključiti u svitanje"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Mirovanje"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekran se isključuje"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
@@ -1033,8 +1071,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Postavke"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatsko osvjetljenje"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Podignite za buđenje"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Ambijentalni prikaz"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambijentalni prikaz"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Uvijek uključeno"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nova obavještenja"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kada prikazati"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nova obavještenja"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ekran se aktivira kada primite obavještenja"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Uvijek uključeno"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Prikaži vrijeme, ikone obavještenja i druge informacije"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Povećavanje ili umanjivanje teksta"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Postavke zaključavanja SIM kartice"</string>
@@ -1289,6 +1333,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Naziv pristupne tačke ne može biti prazan."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC polje mora imati 3 cifre."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC polje mora imati 2 ili 3 cifre."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operater ne dozvoljava dodavanje APN-a tipa %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Obnavljanje zadanih postavki za APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Vrati na zadane vrijednosti"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Obnavljanje zadanih postavki za APN dovršeno."</string>
@@ -1319,6 +1364,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Izbriši SD karticu"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Izbrišite sve podatke na internoj USB pohrani, poput muzike ili fotografija"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Izbrišite sve podatke na SD kartici, poput muzike ili fotografija"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Izbriši eSIM kartice"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Obrišite sve eSIMs kartice na telefonu. Time se neće otkazati vaš plan mobilne usluge."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Obrišite sve eSIMs kartice na tabletu. Time se neće otkazati vaš plan mobilne usluge."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Ponovo pokreni tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Vrati telefon na zadano"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Izbrisati sve vaše lične podatke i preuzete aplikacije? Ovu radnju ne možete poništiti!"</string>
@@ -1341,26 +1389,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Dok je upaljena Ušteda podataka nije moguće povezati uređaj niti koristiti prijenosne pristupne tačke"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Dijeljenje USB veze"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB povezan, označite za povezivanje putem mobitela"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Veza podijeljena"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Ne može se uparivati kada se koristi USB memorija"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB nije povezan"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Da uključite, povežite se"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Greška u dijeljenju USB veze"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Dijeljenje internetske veze telefona putem USB-a"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Dijeljenje internetske veze tableta putem USB-a"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Dijeljenje Bluetooth veze"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Dijeljenje internetske veze tableta putem Bluetootha"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Dijeljenje internetske veze telefona putem Bluetootha"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Dijeljenje internetske veze tableta putem Bluetootha s 1 uređajem"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Dijeljenje internetske veze telefona putem Bluetootha s 1 uređajem"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Broj uređaja s kojima tablet dijeli internetsku vezu putem Bluetootha: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Broj uređaja s kojima telefon dijeli internetsku vezu putem Bluetootha: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Dijeljenje internetske veze tableta putem Bluetootha"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Dijeljenje internetske veze telefona putem Bluetootha"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Dijeljenje internetske veze uređaja <xliff:g id="DEVICE_NAME">%1$d</xliff:g> putem Bluetootha"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Internetska veza telefona se ne dijeli putem Bluetootha."</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Internetska veza telefona ne dijeli se putem Bluetootha"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Veza se ne dijeli"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Ne može se povezati sa više od <xliff:g id="MAXCONNECTION">%1$d</xliff:g> uređaja."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Prestat će se dijeliti veza s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Koristite pristupnu tačku i povezivanje putem mobitela za pružanje interneta drugim uređajima putem mobilne mreže za prijenos podataka."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Koristite pristupnu tačku i dijeljenje veze za pružanje interneta drugim uređajima putem mobilnog prijenosa podataka. Aplikacije također mogu kreirati pristupne tačke za dijeljenje sadržaja s uređajima u blizini."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoć"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobilna mreža"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Paket mobilne usluge"</string>
@@ -1393,7 +1430,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Način otkrivanja lokacije"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Koristi GPS, Wi-Fi, Bluetooth ili mobilne mreže za određivanje lokacije"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Koristi Wi-Fi, Bluetooth ili mobilnu mrežu za određivanje lokacije"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Koristi GPS za određivanje lokacije"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Koristi GPS i senzore uređaja za određivanje lokacije"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skeniranje"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Skeniranje Wi‑Fi mreže"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Poboljšajte utvrđivanje lokacije tako da dozvolite sistemskim aplikacijama i uslugama da detektiraju Wi-Fi mreže u bilo kom trenutku."</string>
@@ -1439,8 +1476,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nemate podatkovnu vezu. Da biste odmah vidjeli ove informacije, idite na %s sa bilo kojeg računara povezanog na Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Učitavanje…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Odaberite svoju lozinku"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Da koristite otisak prsta, postavite lozinku"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Odaberite uzorak"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Da koristite otisak prsta, postavite uzorak"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Izaberite PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Da koristite otisak prsta, postavite PIN kôd"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potvrdite lozinku"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrdite uzorak"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potvrdite PIN"</string>
@@ -1509,6 +1549,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Postavke aplikacije"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nepoznati izvori"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Dopusti sve izvore aplikacija"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Nedavno otvarane aplikacije"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Vidite sve aplikacije, ukupno <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"Prije <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Vaši podaci na tabletu i lični podaci su više izloženi napadima aplikacija iz nepoznatih izvora. Instaliranjem aplikacija iz takvih izvora, saglasni ste da ste vi odgovorni za bilo kakvu štetu na telefonu ili gubitak podataka koji mogu nastati korištenjem tih aplikacija."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Vaši podaci na telefonu i lični podaci više su izloženi napadima aplikacija iz nepoznatih izvora. Instaliranjem aplikacija iz takvih izvora, saglasni ste da ste vi odgovorni za bilo kakvu štetu na telefonu ili gubitak podataka koji mogu nastati korištenjem tih aplikacija."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Napredne postavke"</string>
@@ -1678,6 +1721,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Zaustaviti sistemsku uslugu?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Ako zaustavite ovu uslugu, neke funkcije tableta će možda prestati pravilno funkcionirati sve dok ne isključite i zatim ponovo uključite tablet."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ako zaustavite ovu uslugu, neke funkcije telefona će možda prestati pravilno funkcionirati sve dok ne isključite i zatim ponovo uključite tablet."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Jezici, unos i pokreti"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Jezici i unos"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Jezici i unos"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Pomoć pri unosu"</string>
@@ -1898,6 +1945,11 @@
       <item quantity="few">Uključene su <xliff:g id="COUNT">%1$d</xliff:g> usluge štampanja</item>
       <item quantity="other">Uključeno je <xliff:g id="COUNT">%1$d</xliff:g> usluga štampanja</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> zadatak za štampanje</item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g>zadatka za štampanje</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g>zadataka za štampanje</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Usluge štampanja"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nema instaliranih usluga"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nije pronađen nijedan pisač"</string>
@@ -1965,6 +2017,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Detalji o upotrebi"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Podesite potrošnju energije"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Uključeni paketi"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplikacije koje prazne bateriju"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Uređaj ne ulazi u stanje mirovanja"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Podizanje uređaja iz stanja mirovanja u pozadini"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Učestalo zahtijevanje lokacije"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Ukupno aplikacija koje se ne ponašaju kako treba: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Želite li zaustaviti aplikaciju?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Vaš telefon ne može pravilno upravljati baterijom jer aplikacija <xliff:g id="APP">%1$s</xliff:g> drži telefon u aktivnom stanju.\n\nProblem možete riješiti prisilnim zaustavljanjem aplikacije.\n\nAko se problem nastavi ponavljati, trebat ćete deinstalirati aplikaciju radi poboljšanja performansi baterije."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Vaš tablet ne može pravilno upravljati baterijom jer aplikacija <xliff:g id="APP">%1$s</xliff:g> drži tablet u aktivnom stanju.\n\nProblem možete riješiti prisilnim zaustavljanjem aplikacije.\n\nAko se problem nastavi ponavljati, trebat ćete deinstalirati aplikaciju radi poboljšanja performansi baterije."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Vaš uređaj ne može pravilno upravljati baterijom jer aplikacija <xliff:g id="APP">%1$s</xliff:g> drži uređaj u aktivnom stanju.\n\nProblem možete riješiti prisilnim zaustavljanjem aplikacije.\n\nAko se problem nastavi ponavljati, trebat ćete deinstalirati aplikaciju radi poboljšanja performansi baterije."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Zaustavi aplikaciju"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Želite li isključiti korištenje u pozadini?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Vaš telefon ne može ispravno upravljati baterijom jer ga aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno podiže iz stanja mirovanja.\n\nProblem se može riješiti ako tablet spriječi rad aplikacije u pozadini."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Vaš tablet ne može ispravno upravljati baterijom jer ga aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno podiže iz stanja mirovanja.\n\nProblem se može riješiti ako tablet spriječi rad aplikacije u pozadini."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Vaš uređaj ne može pravilno upravljati baterijom jer ga aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno podiže iz stanja mirovanja.\n\nProblem se može riješiti ako uređaj spriječi rad aplikacije u pozadini."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Isključi"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Želite li isključiti uslugu lokacije?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Vaš telefon ne može pravilno upravljati baterijom jer aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno zahtjeva vašu lokaciju kada ne koristite aplikaciju.\n\nProblem možete riješiti isključivanjem usluge lokacije za aplikaciju."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Vaš tablet ne može pravilno upravljati baterijom jer aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno zahtjeva vašu lokaciju kada ne koristite aplikaciju.\n\nProblem možete riješiti isključivanjem usluge lokacije za aplikaciju."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Vaš uređaj ne može pravilno upravljati baterijom jer aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno zahtjeva vašu lokaciju kada ne koristite aplikaciju.\n\nProblem možete riješiti isključivanjem usluge lokacije za aplikaciju."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Isključi"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ekran"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Svjetiljka"</string>
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparat"</string>
@@ -1979,7 +2051,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Aplikacije"</string>
     <string name="power_service" msgid="1599661212370831780">"Usluge"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistem"</string>
-    <string name="power_user" msgid="1889728099253018005">"Korisnik"</string>
+    <string name="power_user" msgid="3706143225319881667">"Drugi korisnici"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Ukupno CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU u prvom planu"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Drži aktivnim"</string>
@@ -2031,6 +2103,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Prekoračenje potrošnje energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Korišteno <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktivna već <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Korištenje ekrana <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"Aplikacija <xliff:g id="APP">%2$s</xliff:g> koristi <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ukupne baterije"</string>
@@ -2601,7 +2674,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Promijeni PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Prikaži obavještenja"</string>
     <string name="help_label" msgid="6886837949306318591">"Pomoć i pov. inform."</string>
-    <string name="support_summary" msgid="8276116616493882830">"Članci za pomoć, podrška putem telefona i chata"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Članci za pomoć, telefon i chat, prvi koraci"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Račun za sadržaj"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografije"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ekstremne prijetnje"</string>
@@ -2692,9 +2765,12 @@
       <item quantity="other">Prikaži %d skrivenih stavki</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Mreža i internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobilni, prijenos podataka, pristupna tačka"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilna mreža"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"prijenos podataka"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"pristupna tačka"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Povezani uređaji"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, emitiranje, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije i obavještenja"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Odobrenja, zadane aplikacije"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Korisnici i računi"</string>
@@ -2747,6 +2823,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"pokret"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"plati, dodir, plaćanja"</string>
     <string name="keywords_backup" msgid="470070289135403022">"sigurnosna kopija"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"pokreti, ivica, strana, aktivna ivica, stisnuti, držanje, pomoć, asistent, stišljiv, ok google, google asistent"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"pokreti, podizanje iz stanja mirovanja, obavještenja, ekran, prikaz, isključeni ekran, uključeni ekran, stisnuti, ivica, mirovanje, stanje mirovanja, držanje"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"pokret, utišavanje, drijemanje, alarm, dolazni poziv, mirovanje, prikaz, zaključani ekran, stisnuti, držanje, ivica, zaustavljanje"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Postavljanje Wi-Fi NFC taga"</string>
     <string name="write_tag" msgid="8571858602896222537">"Pisati"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Dodirnite oznaku da biste pisali..."</string>
@@ -2830,7 +2909,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Uopće ne prikazuj poslovna obavještenja"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kada je uređaj zaključan, na koji način želite da se prikazuju obavještenja profila?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Obavještenja profila"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Obavještenja"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Obavještenja"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Obavještenja o aplikaciji"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorija obavještenja"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Značaj"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Neka aplikacija odluči"</string>
@@ -2845,6 +2925,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Hitno"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Dozvoli zvuk"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Ne oglašavaj ova obavještenja zvukom, vibriranjem niti kratkim prikazom na aktuelnom ekranu."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Manje važno"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Srednje važno"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Veoma važno"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Hitno"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Asistent za obavještenja"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Pristup obavještenjima"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Pristup obavještenjima radnog profila je blokiran"</string>
@@ -2873,8 +2957,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Slika u slici"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Dozvoli način rada Slika u slici"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Dozvoli ovoj aplikaciji da kreira prozor u načinu rada Slika u slici dok je aplikacija otvorena ili nakon što je napustite (naprimjer, da nastavite gledati videozapis). Ovaj videozapis se prikazuje preko drugih aplikacija koje koristite."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Da"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Ne"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Pristup opciji Ne ometaj"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nijedna instalirana aplikacija nije zatražila pristup za Ne ometaj"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavaju se aplikacije..."</string>
@@ -3009,11 +3091,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Ovim profilom za Work upravlja:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Profilom upravlja <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentalno)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Rotacija uređaja"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Rotiraj sadržaj ekrana"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Zadrži uspravni prikaz"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Ostani u vodoravnom prikazu"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ostani u trenutnoj orijentaciji"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Sigurno pokretanje"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Nastavi"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Uređaj možete dodatno zaštiti tako što ćete tražiti PIN kôd prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme. \n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja traži PIN kôd?"</string>
@@ -3021,7 +3098,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Uređaj možete dodatno zaštiti tako što ćete tražiti lozinku prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme. \n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja traži lozinka?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Osim korištenja otiska prsta za otključavanje, uređaj možete dodatno zaštiti zahtijevanjem PIN-a prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme. \n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja traži PIN?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Osim korištenja otiska prsta za otključavanje, uređaj možete dodatno zaštiti tako što ćete tražiti unošenje uzorka prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme. \n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja traži unošenje uzorka?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Pored korištenja otiska prsta za otključavanje, uređaj možete dodatno zaštiti tako što ćete tražiti lozinku prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme. \n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja traži lozinka?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Osim korištenja otiska prsta za otključavanje, uređaj možete dodatno zaštiti tako što ćete tražiti lozinku prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme.\n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja traži lozinka?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Da"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ne"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Zahtijevati PIN?"</string>
@@ -3144,6 +3221,17 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Obavještenja o upotrebi"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Prikaži kompletno korištenje uređaja"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Prikaži korištenje aplikacije"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Velika potrošnja"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacija se ne ponaša kako treba</item>
+      <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacije se ne ponašaju kako treba</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacija se ne ponaša kako treba</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Aplikacije prazne bateriju</item>
+      <item quantity="few">Aplikacije prazne bateriju</item>
+      <item quantity="other">Aplikacije prazne bateriju</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Bez optimizacije"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nije optimiziran"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizacija potrošnje baterije"</string>
@@ -3237,8 +3325,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Prikaz preko drugih aplikacija"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"Aplikacije s odobrenjem za prikaz preko drugih aplikacija: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacije s odobrenjem"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Da"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Ne"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Dozvoljeno"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Nije dozvoljeno"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instaliranje aplikacije nepoznati izvori"</string>
     <string name="write_settings" msgid="4797457275727195681">"Izmjena postavki sistema"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"pisati izmijeniti sistemske postavke"</string>
@@ -3329,6 +3417,17 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekran je obojen u žutosmeđu nijansu. To vam može pomoći da zaspite."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Prijedlozi"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"još <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"Još <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> prijedlog</item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> prijedloga</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> prijedloga</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="one">još <xliff:g id="COUNT">%1$d</xliff:g> prijedlog</item>
+      <item quantity="few">još <xliff:g id="COUNT">%1$d</xliff:g> prijedloga</item>
+      <item quantity="other">još <xliff:g id="COUNT">%1$d</xliff:g> prijedloga</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Ukloni"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Hladna temperatura boje"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koristite hladnije boje prikaza"</string>
@@ -3347,8 +3446,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Upozorenje o podacima <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Upozorenje o podacima <xliff:g id="ID_1">%1$s</xliff:g> / Ograničenje podataka <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Obračunski ciklus"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Mjesečni ciklus počinje svakog <xliff:g id="ID_1">%1$s</xliff:g>. u mjesecu"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Svakog mjeseca od <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Mjesečno, na dan: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Mrežna ograničenja"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> ograničenje</item>
@@ -3370,7 +3468,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija smije upotrebljavati neograničene podatke kada je Ušteda podataka uključena</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Ušteda podataka"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Neograničen pristup podacima"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Neograničeni podaci"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Pozadinski podaci su isključeni"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Uključeno"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Isključeno"</string>
@@ -3435,8 +3533,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrola obavještenja zaključanog ekrana"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Pokaži ili sakrij sadržaj obavještenja"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Sve"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Podrška"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Podrška i savjeti"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Najmanja širina"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nijedna instalirana aplikacija nije zatražila pristup premijum SMS-ovima"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Usluga Premium SMS se možda dodatno plaća te će trošak biti na računu koji dobijate od operatera. Ukoliko aplikaciji date dozvolu, moći ćete slati premium SMS poruke putem te aplikacije."</string>
@@ -3504,28 +3601,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatski"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ručno"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Oslobodite prostor odmah"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Pokreti"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Prečice za pokrete"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Brzi pokreti za kontrolu nad telefonom"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Brzi pokreti za kontrolu nad tableta"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Brzi pokreti za kontrolu uređaja"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Prelazak na Kameru"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Dodirivanje dvaput na dugme za uključivanje za brzo otvaranje kamere. Funkcionira na svakom ekranu."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Brzo otvorite kameru"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Dodirnite dugme za napajanje dvaput da otvorite kameru"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Okretanje kamere"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Snimajte selfije brže"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Uvrnite telefon dvaput za selfi način rada"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Uvrnite tablet dvaput za selfi način rada"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Uvrnite uređaj dvaput za selfi način rada"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Kliknite dvaput za provjeru telefona"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Kliknite dvaput za provjeru tableta"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Kliknite dvaput za provjeru uređaja"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Dodirivanje ekrana dvaput za brzu provjeru obavještenja."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Da provjerite vrijeme, ikone obavještenja i druge informacije, dodirnite ekran dvaput."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Provjera obavještenja kada je ekran isključen"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Provjera telefona kad se podigne"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Podignite za provjeru tableta"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Podignite za provjeru uređaja"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Podizanje telefona za brzu provjeru obavještenja."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Podizanje tableta za brzu provjeru obavještenja."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Podizanje uređaja za brzu provjeru obavještenja."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Da provjerite vrijeme, ikone obavještenja i druge informacije, podignite telefon."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Da provjerite vrijeme, ikone obavještenja i druge informacije, podignite tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Da provjerite vrijeme, ikone obavještenja i druge informacije, podignite uređaj."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Provjerite obavještenja dok je ekran isključen"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Prevlačenje prstom za obavještenja"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Provjera obavještenja prevlačenjem prstom prema dolje po senzoru za otisak prsta na poleđini telefona."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Provjera obavještenja prevlačenjem prstom prema dolje po senzoru za otisak prsta na poleđini tableta."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Provjera obavještenja prevlačenjem prstom prema dolje po senzoru za otisak prsta na poleđini uređaja."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Brzo pregledajte obavještenja"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Prevucite prstom prema dolje na senzoru za otisak prsta"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Podignite da otvorite kameru"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Za automatsko otvaranje kamere, podignite telefon u položaj za fotografiranje (pejzaž ili portret). Funkcionira kada je telefon u stanju mirovanja ili je zaključan."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Fotografirajte dok je telefon u stanju mirovanja ili zaključan"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Pokret za pomoć"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Osjetljivost"</string>
@@ -3636,6 +3746,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Želite li ukloniti ovu instant-aplikaciju?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Igre"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio fajlovi"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Iskorišteni prostor"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(deinstalirano za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(onemogućeno za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Usluga automatskog popunjavanja"</string>
@@ -3649,5 +3760,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Instant-aplikacija"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Želite li isključiti upravitelja pohranom?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplikacije za filmove i TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Iskorišteni prostor"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Operater koji pruža informacije"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktiviranje dodjele resursa operatera"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Šta je novo i uzbudljivo?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Pogledajte 5 najboljih funkcija"</string>
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 0006c92..4efc4cf 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Bona"</item>
     <item msgid="8986346415847956850">"Excel·lent"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Sempre"</item>
-    <item msgid="844721238536786870">"Només quan s\'estigui carregant"</item>
-    <item msgid="1986753720941888596">"Mai"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Sempre"</item>
-    <item msgid="7433294150916905997">"Només quan s\'estigui carregant"</item>
-    <item msgid="1390404486722375028">"Mai"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Els darrers 30 dies"</item>
     <item msgid="6600989128423965319">"Defineix el cicle d\'ús..."</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index e1e3a41..aefe1c6 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Ara ja ets un desenvolupador"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"No és necessari, ja ets un desenvolupador"</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Primer activa les opcions per a desenvolupadors."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Connexions sense fil i xarxes"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Connexions"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Dispositiu"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE administrada"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Es proporcionen videotrucades"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Es proporcionen trucades per Wi-Fi"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/presència proporcionats"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Potència de la ràdio mòbil"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Mostra la llibreta d\'adreces de la SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Mostra els números de marcatge fix"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Cerca dispositius"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Canvia el nom del dispositiu"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Canvia el nom"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vols desconnectar-te?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Això posarà fi a la teva connexió amb:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Desconnectar el dispositiu?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"El telèfon es desconnectarà de: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"La tauleta es desconnectarà de: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"El dispositiu es desconnectarà de: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Desconnecta"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"No tens permís per canviar la configuració del Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Vincula un dispositiu nou"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> serà visible per a dispositius propers mentre la configuració de Bluetooth estigui oberta."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Adreça Bluetooth del telèfon: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Adreça Bluetooth de la tauleta: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Adreça Bluetooth del dispositiu: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vols desconnectar el dispositiu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emissió"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vols desactivar el perfil?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Sol·licitud de vinculació de Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Sol·licitud de vinculació"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Toca per vincular amb el dispositiu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostra els fitxers rebuts"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Fitxers rebuts"</string>
     <string name="device_picker" msgid="4978696506172252813">"Tria un dispositiu Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> vol activar el Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> vol desactivar el Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vol accedir als teus missatges. Vols donar-li accés a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Sol·licitud d\'accés a la SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vol accedir a la targeta SIM. Si hi concedeixes accés, es desactivarà la connectivitat de dades al dispositiu mentre duri la connexió. Dona accés a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible com a <xliff:g id="DEVICE_NAME">^1</xliff:g> per a altres dispositius"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Els teus dispositius"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Vincula un dispositiu nou"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data i hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selecció de la zona horària"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Comptes"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Ubicació"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Comptes"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Seguretat i ubicació"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Seguretat i ubicació"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encriptació i credencials"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telèfon encriptat"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Dispositiu encriptat"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloqueig amb empremta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Utilitzar l\'empremta digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Només cal que toquis el sensor d\'empremtes digitals per desbloquejar el telèfon, autoritzar compres o iniciar la sessió en aplicacions. Vés amb compte amb les empremtes digitals d\'altres persones que hi afegeixis, perquè totes podran dur a terme aquestes accions.\n\nNota: fer servir l\'empremta digital pot ser menys segur que utilitzar un patró o un PIN complets."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Només cal que toquis el sensor d\'empremtes digitals per autoritzar una compra o iniciar la sessió en una aplicació. Vés amb compte a l\'hora d\'afegir-hi empremtes digitals; tingues present que totes les que hi afegeixis podran dur a terme totes aquestes accions.\n\nNota: no pots fer servir l\'empremta digital per desbloquejar el dispositiu. Per obtenir més informació, contacta amb l\'administrador de l\'organització."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Només cal que toquis el sensor d\'empremtes digitals per desbloquejar el telèfon, autoritzar compres o iniciar la sessió en aplicacions. Vés amb compte amb les empremtes digitals d\'altres persones que hi afegeixis, perquè totes podran dur a terme aquestes accions.\n\nNota: fer servir l\'empremta digital pot ser menys segur que utilitzar un patró o un PIN complets."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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 patró o un PIN complets."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancel·la"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continua"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Omet"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Afegeix empremta digital"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones facin servir la tauleta si la perds, si te la roben o se n\'esborren les dades."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones el facin servir si el perds, te\'l roben o se n\'esborren les dades."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones facin servir el telèfon si el perds, te\'l roben o se n\'esborren les dades."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones utilitzin la tauleta si la perds o te la roben."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones utilitzin el dispositiu si el perds o te\'l roben."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones utilitzin el telèfon si el perds o te\'l roben."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Següent"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Les funcions de protecció del dispositiu no s\'activaran. Si perds la tauleta, te la roben o se\'n restableixen les dades de fàbrica, no podràs evitar que altres persones la utilitzin."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Les funcions de protecció del dispositiu no s\'activaran. Si perds el dispositiu, te\'l roben o se\'n restableixen les dades de fàbrica, no podràs evitar que altres persones l\'utilitzin."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Les funcions de protecció del dispositiu no s\'activaran. Si perds el telèfon, te\'l roben o se\'n restableixen les dades de fàbrica, no podràs evitar que altres persones l\'utilitzin."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Les funcions de protecció del dispositiu no s\'activaran. Si perds la tauleta o te la roben, no podràs evitar que altres persones la utilitzin."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Les funcions de protecció del dispositiu no s\'activaran. Si perds el dispositiu o te\'l roben, no podràs evitar que altres persones l\'utilitzin."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Les funcions de protecció del dispositiu no s\'activaran. Si perds el telèfon o te\'l roben, no podràs evitar que altres persones l\'utilitzin."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Omet de totes maneres"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Enrere"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Cerca el sensor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Cerca el sensor d\'empremtes digitals a la part posterior del telèfon."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Toca el sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Es troba a la part posterior del telèfon. Utilitza el dit índex."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Il·lustració amb la ubicació del sensor d\'empremtes digitals i de dispositiu"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nom"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"D\'acord"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Suprimeix"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Comencem"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Toca el sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Col·loca el dit al sensor i aixeca\'l quan notis una vibració"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Fes-ho un altre cop"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mou el dit lleugerament perquè es pugui captar l’empremta digital sencera"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Empremta dig. afegida"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quan vegis aquesta icona, pots fer servir la teva empremta digital per identificar-te o per autoritzar una compra."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Toca el sensor d\'empremtes digitals per activar i desbloquejar el dispositiu."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Quan vegis aquesta icona, també podràs autoritzar compres o iniciar la sessió a les aplicacions."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Aixeca\'l i toca el sensor"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Ves aixecant el dit perquè es puguin afegir les diferents parts de l\'empremta digital"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Empremta digital afegida"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Quan vegis aquesta icona, podràs fer servir l\'empremta digital per identificar-te o aprovar compres."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Sortir de configuració d\'empremta digital?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Has triat utilitzar la teva empremta digital per desbloquejar el telèfon. Si omets aquest pas ara, hauràs de fer aquesta configuració més endavant. Aquest procés només triga un parell de minuts."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configura el bloqueig de pantalla"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Fet"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Això no és el sensor"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utilitza el sensor d\'empremtes del dispositiu."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Toca el sensor situat a la part posterior amb el dit índex."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"No s\'ha completat la inscripció"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"S\'ha esgotat el temps d\'espera per inscriure l\'empremta digital. Torna-ho a provar."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"La inscripció de l\'empremta digital no ha funcionat. Torna-ho a provar o fes servir un altre dit."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa les funcions de protecció del dispositiu per impedir que altres persones el facin servir sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa les funcions de protecció del dispositiu per impedir que altres persones utilitzin aquest telèfon sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Tria un mètode de bloqueig de pantalla alternatiu"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opcions de bloqueig de pantalla"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opcions de bloqueig de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueig de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Immediatament després d\'activar el repòs"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> després d\'activar el repòs"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Canvia el patró de desbloqueig"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Canvia el PIN de desbloqueig"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Canvia la contrasenya de desbloqueig"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Torna-ho a provar. Intent número <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> (<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> en total)."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Última oportunitat"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Si tornes a introduir un patró incorrecte, el teu perfil professional i les dades associades se suprimiran del dispositiu."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Si tornes a introduir un PIN incorrecte, el teu perfil professional i les dades associades se suprimiran del dispositiu."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Si tornes a introduir una contrasenya incorrecta, el teu perfil professional i les dades associades se suprimiran del dispositiu."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Has superat el nombre d\'intents incorrectes permesos. El teu perfil professional i les dades associades se suprimiran del dispositiu."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Ignora"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Torna-ho a provar. Intent <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Se suprimiran les teves dades"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Si tornes a introduir un patró incorrecte, se suprimiran les dades del dispositiu"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Si tornes a introduir un PIN incorrecte, se suprimiran les dades del dispositiu"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Si tornes a introduir una contrasenya incorrecta, se suprimiran les dades del dispositiu"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Si tornes a introduir un patró incorrecte, se suprimirà l\'usuari"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Si tornes a introduir un PIN incorrecte, se suprimirà l\'usuari"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Si tornes a introduir una contrasenya incorrecta, se suprimirà l\'usuari"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Si tornes a introduir un patró incorrecte, se suprimirà el perfil professional i les dades que contingui"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Si tornes a introduir un PIN incorrecte, se suprimirà el perfil professional i les dades que contingui"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Si tornes a introduir una contrasenya incorrecta, se suprimirà el perfil professional i les dades que contingui"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Has superat el nombre d\'intents incorrectes permesos. Se suprimiran les dades del dispositiu."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Has superat el nombre d\'intents incorrectes permesos. Se suprimirà l\'usuari."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Has superat el nombre d\'intents incorrectes permesos. Se suprimirà el perfil professional i les dades que contingui."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ignora"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Ha de tenir com a mínim <xliff:g id="COUNT">%d</xliff:g> caràcters"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"El PIN ha de tenir com a mínim <xliff:g id="COUNT">%d</xliff:g> dígits"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continua"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Config. avançada de Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Amb el Bluetooth activat, el dispositiu pot connectar amb més dispositius Bluetooth a prop."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Per millorar la precisió de la ubicació, les aplicacions i els serveis del sistema poden continuar detectant els dispositius Bluetooth. Pots canviar aquesta opció a la <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuració de cerca<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"No s\'ha pogut connectar. Torna-ho a provar."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Detalls del dispositiu"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Adreça Bluetooth del dispositiu: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Vols esborrar el dispositiu?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"El telèfon es desvincularà de: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"La tauleta es desvincularà de: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"El teu dispositiu es desvincularà de: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Esborra el dispositiu"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Connecta\'t a..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà de l\'àudio del mitjà."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà de l\'àudio de mans lliures."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"No proporcionis un certificat d\'usuari"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"No validis el servidor d\'EAP"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"No s\'ha especificat cap certificat. La connexió no serà privada."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"El nom de la xarxa és massa llarg."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Has d\'especificar un domini."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 xarxa</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Config. avançada de Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configura la Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adreça MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adreça IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Màscara de la subxarxa"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vols esborrar aquest grup?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Punt d\'accés Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Punt d\'accés Wi-Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Utilitza la connexió mòbil amb el punt d\'accés Wi‑Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"No s\'està compartint la connexió a Internet d\'aquesta tauleta mitjançant el punt d\'accés Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"No s\'està compartint la connexió a Internet d\'aquest telèfon mitjançant el punt d\'accés Wi-Fi"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"No s\'està compartint Internet o contingut amb altres dispositius"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"S\'està compartint la connexió a Internet de la tauleta mitjançant el punt d\'accés Wi-Fi"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"S\'està compartint la connexió a Internet del telèfon mitjançant el punt d\'accés Wi-Fi"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"L\'aplicació està compartint contingut. Per compartir la connexió a Internet, desactiva el punt d\'accés Wi-Fi i torna\'l a activar."</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nom de la Wi-Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"S\'està activant <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Altres dispositius es poden connectar a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Contrasenya de la Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda AP"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Utilitza el punt d\'accés Wi-Fi per crear una xarxa Wi-Fi per a altres dispositius. El punt d\'accés Wi-Fi proporciona Internet mitjançant la teva connexió de dades mòbils. És possible que s\'hi apliquin càrrecs addicionals per l\'ús de dades mòbils."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Les aplicacions poden crear un punt d\'accés Wi-Fi per compartir contingut amb els dispositius que es trobin a prop."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"S\'està activant el punt d\'accés Wi-Fi…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"S\'està desactivant el punt d\'accés Wi-Fi…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> està actiu"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Quan les trucades per Wi-Fi estan activades, el telèfon pot dirigir trucades per les xarxes Wi-Fi o per la xarxa de l\'operador de telefonia mòbil segons la teva preferència i la intensitat del senyal. Abans d\'activar aquesta funció, comprova amb l\'operador si hi ha cap càrrec i altres detalls."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Actualitza l\'adreça per a les emergències"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Adreça utilitzada pels serveis d\'emergència com la teva ubicació si truques al 911 mitjançant la Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"No s\'ha trobat cap resultat"</string>
     <string name="display_settings" msgid="7965901687241669598">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Gira pantalla automàticament"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Colors vius"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Canvia l\'orientació automàticament en girar la tauleta"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Canvia d\'orientació automàticament en girar el telèfon"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Canvia l\'orientació automàticament en girar la tauleta"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimitza la brillantor segons la llum. Quan aquesta funció està activada, pots ajustar la brillantor temporalment."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Llum nocturna"</string>
     <string name="night_display_text" msgid="1837277457033025056">"La llum nocturna acoloreix la pantalla de groc. D\'aquesta manera, costa menys mirar-la o llegir-hi amb poca llum i és més fàcil adormir-se."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Planifica"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Estat"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Activa automàticament"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Mai"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Programació personalitzada"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"De la posta de sol a l\'alba"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Planifica"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Cap"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"S\'activa a una hora determinada"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"S\'activa del vespre a l\'alba"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Hora d’inici"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de finalització"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Estat"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensitat"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Desactivat. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"No s\'activarà mai automàticament."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"S\'activarà automàticament a les <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"S\'activarà automàticament quan es pongui el sol."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Activat. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"No es desactivarà mai automàticament."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Es desactivarà automàticament a les <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Es desactivarà automàticament quan surti el sol."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Desactivada / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"No s\'activarà mai automàticament"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"S\'activarà automàticament a les <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"S\'activarà automàticament quan es pongui el sol"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Activada / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"No es desactivarà mai automàticament"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Es desactivarà automàticament a les <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Es desactivarà automàticament quan surti el sol"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Repòs"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"La pantalla s\'apaga"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Configuració"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillantor automàtica"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aixeca el dispositiu per activar-lo"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Pantalla Ambient"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Pantalla ambient"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Sempre activat"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Notificacions noves"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quan es mostra"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Notificacions noves"</string>
     <string name="doze_summary" msgid="3846219936142814032">"La pantalla s\'activa quan arriben notificacions"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre activat"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostra l\'hora, les icones de notificació i altres dades"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Mida de la lletra"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Amplia o redueix el text"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Config. de bloqueig de SIM"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"L\'APN no pot estar buit."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"El camp MCC ha de tenir 3 dígits."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"El camp MNC ha de tenir 2 o 3 dígits."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"L\'operador no permet afegir APN de tipus %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"S\'està restaurant la configuració predeterminada d\'APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Restableix valors predeterminats"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"S\'ha restablert la configuració predeterminada d\'APN."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Esborra la targeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Esborra totes les dades de l\'emmagatzematge USB intern, com ara música o fotos"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Esborra totes les dades de la targeta SD, com ara música o fotos"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Esborra les eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Esborra les dades de totes les eSIM del telèfon. No es cancel·larà el teu pla de servei mòbil."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Esborra les dades de totes les eSIM de la tauleta. No es cancel·larà el teu pla de servei mòbil."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restableix la tauleta"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restableix el telèfon"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Vols esborrar tota la informació personal i les aplicacions baixades? Aquesta acció no es pot desfer."</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"No es pot compartir la xarxa ni utilitzar punts d\'accés Wi-Fi mentre la funció Economitzador de dades està activada"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Compartició de xarxa per USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB connectat, marca per compartir la xarxa"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Xarxa compartida"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"No es pot compartir la xarxa si l\'emmagatzematge USB està en ús"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB no connectat"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Connecta un USB per activar la funció."</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Error en compartir la xarxa per USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Comparteix la connexió a Internet del telèfon per USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Comparteix la connexió a Internet de la tauleta per USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Compartició de xarxa per Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"S\'està compartint la connexió a Internet d\'aquesta tauleta per Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"S\'està compartint la connexió a Internet d\'aquest telèfon per Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"S\'està compartint la connexió a Internet d\'aquesta tauleta amb 1 dispositiu per Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"S\'està compartint la connexió a Internet d\'aquest telèfon amb 1 dispositiu per Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"S\'està compartint la connexió a Internet d\'aquesta tauleta amb <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositius per Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"S\'està compartint la connexió a Internet d\'aquest telèfon amb <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositius per Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Comparteix la connexió a Internet de la tauleta per Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Comparteix la connexió a Internet del telèfon per Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"S\'està compartint la connexió a Internet de <xliff:g id="DEVICE_NAME">%1$d</xliff:g> per Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"No s\'està compartint la connexió a Internet d\'aquesta tauleta per Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"No s\'està compartint la connexió a Internet d\'aquest telèfon per Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Xarxa no compartida"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"No es pot compartir la xarxa amb més de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositius."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Es desactivarà la compartició de xarxa per a: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Utilitza el punt d\'accés Wi-Fi i la compartició de xarxa per proporcionar Internet a altres dispositius mitjançant la teva connexió de dades mòbils."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Utilitza el punt d\'accés Wi-Fi i la compartició de xarxa per proporcionar Internet a altres dispositius mitjançant la teva connexió de dades mòbils. Les aplicacions també poden crear un punt d\'accés Wi-Fi per compartir contingut amb els dispositius que es trobin a prop."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Xarxa mòbil"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Pla mòbil"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode d\'ubicació"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Utilitza el GPS, la Wi-Fi, el Bluetooth o les xarxes de telefonia mòbil per determinar la ubicació"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Utilitza la Wi‑Fi, el Bluetooth o les xarxes de telefonia mòbil per determinar la ubicació"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utilitza el GPS per determinar la ubicació"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Utilitza el GPS i els sensors del dispositiu per determinar la ubicació"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Cerca"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Cerca de xarxes Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Millora la ubicació permetent que les aplicacions i els serveis del sistema detectin les xarxes Wi‑Fi en qualsevol moment."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"No tens cap connexió de dades. Per visualitzar aquesta informació ara, dirigeix-te a %s des d\'un equip connectat a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"S\'està carregant…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Tria una contrasenya"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Defineix una contrasenya"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Tria el teu patró"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Defineix un patró"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Selecciona un PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Defineix un PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirma la teva contrasenya"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma el patró"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirma el teu PIN"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Configuració de l\'aplicació"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fonts desconegudes"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Permet totes les fonts d\'apl."</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Aplicacions obertes fa poc"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Mostra totes les aplicacions (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"Fa <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"La tauleta i les dades personals són més vulnerables a atacs d\'aplicacions desconegudes. En instal·lar aplicacions d\'aquesta font, acceptes que ets responsable de qualsevol dany a la tauleta i qualsevol pèrdua de dades que es pugui produir per l\'ús d\'aquestes aplicacions."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"El telèfon i les dades personals són més vulnerables a atacs d\'aplicacions desconegudes. En instal·lar aplicacions d\'aquesta font, acceptes que ets responsable de qualsevol dany al telèfon i qualsevol pèrdua de dades que es pugui produir per l\'ús d\'aquestes aplicacions."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configuració avançada"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Vols aturar el servei del sistema?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Si atures aquest servei, hi ha funcions de la tauleta que és possible que deixin de funcionar correctament fins que no l\'apaguis i la tornis a engegar."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Si atures aquest servei, és possible que hi hagi funcions del telèfon que deixin de funcionar correctament fins que no l\'apaguis i el tornis a engegar."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Idiomes, introducció de text i gestos"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Idiomes i introducció de text"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Idiomes i introducció de text"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Assistència per a introducció de text"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> serveis d\'impressió activats</item>
       <item quantity="one">1 servei d\'impressió activat</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tasques d\'impressió</item>
+      <item quantity="one">1 tasca d\'impressió</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Serveis d\'impressió"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No hi ha cap servei instal·lat"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"No s\'ha trobat cap impressora"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Detalls d\'ús"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Redueix l\'ús de la bateria"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Paquets inclosos"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplicacions que consumeixen molta bateria"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"L\'aplicació està mantenint el dispositiu actiu"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"L\'aplicació està activant el dispositiu en segon pla"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"L\'aplicació sol·licita la ubicació amb massa freqüència"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplicacions no funcionen correctament"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Vols aturar l\'aplicació?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"El telèfon no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> el manté actiu.\n\nPer intentar solucionar el problema, pots forçar l\'aturada de l\'aplicació.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"La tauleta no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> la manté activa.\n\nPer intentar solucionar el problema, pots forçar l\'aturada de l\'aplicació.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"El dispositiu no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> el manté actiu.\n\nPer intentar solucionar el problema, pots forçar l\'aturada de l\'aplicació.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Atura l\'aplicació"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Vols desactivar l\'ús en segon pla?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"El telèfon no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> el manté actiu.\n\nPer solucionar el problema, el telèfon pot evitar que l\'aplicació s\'executi en segon pla."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"La tauleta no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> la manté activa.\n\nPer solucionar el problema, la tauleta pot evitar que l\'aplicació s\'executi en segon pla."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"El dispositiu no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> el manté actiu.\n\nPer solucionar el problema, el dispositiu pot evitar que l\'aplicació s\'executi en segon pla."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Desactiva"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Vols desactivar la ubicació?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"El telèfon no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> segueix sol·licitant la ubicació quan no fas servir l\'aplicació.\n\nPer solucionar el problema, pots desactivar la ubicació per a aquesta aplicació."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"La tauleta no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> segueix sol·licitant la ubicació quan no fas servir l\'aplicació.\n\nPer solucionar el problema, pots desactivar la ubicació per a aquesta aplicació."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"El dispositiu no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> segueix sol·licitant la ubicació quan no fas servir l\'aplicació.\n\nPer solucionar el problema, pots desactivar la ubicació per a aquesta aplicació."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Desactiva"</string>
     <string name="power_screen" msgid="3023346080675904613">"Pantalla"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Llanterna"</string>
     <string name="power_camera" msgid="4976286950934622605">"Càmera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Aplicacions"</string>
     <string name="power_service" msgid="1599661212370831780">"Serveis"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
-    <string name="power_user" msgid="1889728099253018005">"Usuari"</string>
+    <string name="power_user" msgid="3706143225319881667">"Altres usuaris"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total de CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer pla de la CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantén actiu"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consum d\'energia comptabilitzat més d\'una vegada"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"En ús durant <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Activa durant <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Ús de la pantalla: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilitzat per <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> d\'ús de la bateria"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Canvia el PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostra les notificacions"</string>
     <string name="help_label" msgid="6886837949306318591">"Ajuda i suggeriments"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Articles d\'ajuda, assistència per telèfon i per xat"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Articles d\'ajuda, telèfon i xat, com començar"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Compte per al contingut"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Identificador de la foto"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Amenaces extremes"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Mostra %d element amagat</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Xarxa i Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mòbil, ús de dades i punt d\'accés Wi-Fi"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"xarxa de telefonia mòbil"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ús de dades"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"punt d\'accés Wi-Fi"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositius connectats"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, emissió, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, emissió"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicacions i notificacions"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permisos, aplicacions predeterminades"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Usuaris i comptes"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gest"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"paga, toca, pagaments"</string>
     <string name="keywords_backup" msgid="470070289135403022">"còpia de seguretat, crear una còpia de seguretat"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gest, vora, costat, vora activa, pressionar, agafar, assistència, assistent, funció de pressionar, pressionat, pressionant, que es pot pressionar, ok google, assistent de google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gest, activar, notificacions, visualització, pantalla, pantalla desactivada, pantalla activada, pressionar, vora, inactiu, repòs, agafar"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gest, silenci, posposar, alarma, trucada entrant, baix, pantalla, pantalla de bloqueig, pressionar, agafar, vora, aturar"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configura l\'etiqueta d\'NFC per a Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escriu-hi"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toca una etiqueta per escriure..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"No mostris cap notificació professional"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Com vols que es mostrin les notificacions del perfil quan el dispositiu estigui bloquejat?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notificacions del perfil"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Notificacions"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Notificacions"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notificacions d\'aplicacions"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria de les notificacions"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importància"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Deixa que ho decideixi l\'aplicació"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgent"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Permet el so"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"No reprodueix cap so, no vibra ni mostra aquestes notificacions a la pantalla actual."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Poc important"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Mitjanament important"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Molt important"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgent"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Assistent de notificacions"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Accés a les notificacions"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"S\'ha bloquejat l\'accés a les notificacions del perfil professional"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Imatge en imatge"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permet el mode d\'imatge en imatge"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permet que aquesta aplicació creï una finestra d\'imatge en imatge mentre l\'aplicació està oberta o després de sortir-ne (per exemple, per seguir veient un vídeo). Aquesta finestra es mostra sobre altres aplicacions que estàs utilitzant."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Sí"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"No"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accés a No molestis"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Cap aplicació instal·lada no ha sol·licitat accés a No molestis."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"S\'estan carregant les aplicacions..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"L\'administrador d\'aquest perfil professional és:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Gestionat per <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Rotació del dispositiu"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Gira el contingut de la pantalla"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Continua en mode vertical"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Continua amb l\'orientació horitzontal"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Continua amb l\'orientació actual"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Inici segur"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continua"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Per augmentar la protecció del dispositiu, pots configurar-lo perquè demani un PIN abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que demani un PIN per iniciar-se?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Per millorar la protecció del dispositiu, pots configurar-lo perquè sol·liciti una contrasenya abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que sol·liciti una contrasenya en iniciar-se?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"A més de fer servir l\'empremta digital per desbloquejar el dispositiu, pots augmentar-ne la protecció configurant-lo perquè demani un PIN abans d\'iniciar-se. Fins que el dispositiu no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que demani un PIN per iniciar-se?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"A més de fer servir l\'empremta digital per desbloquejar el dispositiu, pots augmentar-ne la protecció configurant-lo perquè demani un patró abans d\'iniciar-se. Fins que el dispositiu no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que demani un patró per iniciar-se?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"A més de fer servir l\'empremta digital per desbloquejar el dispositiu, pots augmentar-ne la protecció configurant-lo perquè demani una contrasenya abans d\'iniciar-se. Fins que el dispositiu no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que demani una contrasenya per iniciar-se?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Per millorar la protecció del dispositiu, a més de fer servir la teva empremta digital per desbloquejar-lo, pots configurar-lo perquè sol·liciti una contrasenya abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nAixò permet protegir les dades en cas de pèrdua o robatori del dispositiu. Vols que sol·liciti una contrasenya en iniciar-se?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sí"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Vols demanar el PIN?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertes d\'ús"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Mostra l\'ús complet del dispositiu"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Mostra l\'ús de l\'aplicació"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Ús elevat"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplicacions s\'estan comportant de manera anòmala</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> s\'està comportant de manera anòmala</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Hi ha aplicacions que consumeixen molta bateria</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> consumeix molta bateria</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Sense optimitzar"</string>
     <string name="high_power_on" msgid="6216293998227583810">"No optimitzen la bateria"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimitza l\'ús de la bateria"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Mostra sobre altres aplicacions"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> aplicacions que poden mostrar-se sobre altres aplicacions"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplicacions amb permís"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Sí"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"No"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Amb permís"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Sense permís"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instal·lar aplicacions fonts desconegudes"</string>
     <string name="write_settings" msgid="4797457275727195681">"Modificar configuració sistema"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"modifica la configuració del sistema i hi escriu"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"La pantalla té un to groguenc; això t\'ajudarà a adormir-te."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggeriments"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> més"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> suggeriments</item>
+      <item quantity="one">1 suggeriment</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> suggeriments</item>
+      <item quantity="one">+1 suggeriment</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Suprimeix"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de color freda"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilitza colors de pantalla més freds"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Advertiment de dades: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Advertiment de dades: <xliff:g id="ID_1">%1$s</xliff:g> / Límit de dades: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Cicle de facturació"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Cicle mensual a partir del dia <xliff:g id="ID_1">%1$s</xliff:g> de cada mes"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mensual a partir del dia <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Cada mes el dia <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Restriccions de xarxa"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restriccions</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 aplicació pot utilitzar dades sense restricció quan l\'Economitzador de dades està activat</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Economitzador de dades"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Accés a dades sense restricció"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Dades sense restricció"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Les dades en segon pla estan desactivades"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Activat"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Desactivat"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controla notificacions de pantalla bloq."</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostra o oculta el contingut de la notificació"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Tots"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Assistència"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Ajuda i consells"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Amplada més petita"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Cap aplicació instal·lada no ha sol·licitat accés a SMS prèmium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Els SMS prèmium et poden costar diners, i aquest import s\'afegirà a la facturació de l\'operador de telefonia mòbil. Si actives el permís en una aplicació, podràs enviar SMS prèmium utilitzant-la."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automàtica"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Allibera espai ara"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestos"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Dreceres gestuals"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gestos ràpids per controlar el telèfon"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gestos ràpids per controlar la tauleta"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gestos ràpids per controlar el dispositiu"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Accés ràpid a la càmera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Per obrir ràpidament la càmera, prem el botó d\'engegada dues vegades. Funciona des de qualsevol pantalla."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Obre la càmera ràpidament"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Prem el botó d\'engegada dues vegades per obrir la càmera"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Canvia de càmera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Fes selfies més de pressa"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Gira el telèfon dues vegades per activar el mode selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Gira la tauleta dues vegades per activar el mode selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Gira el dispositiu dues vegades per activar el mode selfie"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Per consultar el telèfon, fes-hi doble toc"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Per consultar la tauleta, fes-hi doble toc"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Per consultar el dispositiu, fes-hi doble toc"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Per consultar ràpidament les notificacions, fes doble toc a la pantalla."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Per veure l\'hora, les icones de notificació i altres dades, fes doble toc a la pantalla"</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Consulta les notificacions amb la pantalla apagada"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Aixeca el dispositiu per consultar-lo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Per consultar la tauleta, aixeca-la"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Aixeca el dispositiu per consultar-lo"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Agafa el telèfon per consultar ràpidament les notificacions."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Per consultar ràpidament les notificacions, agafa la tauleta."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Per consultar ràpidament les notificacions, agafa el dispositiu."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Per veure l\'hora, les icones de notificació i altres dades, agafa el telèfon"</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Per veure l\'hora, les icones de notificació i altres dades, agafa la tauleta"</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Per veure l\'hora, les icones de notificació i altres dades, agafa el dispositiu."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Consulta les notificacions amb la pantalla apagada"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Llisca per veure notificacions"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Per consultar les notificacions, llisca cap avall al sensor d\'empremtes digitals de la part posterior del telèfon."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Per consultar les notificacions, llisca cap avall al sensor d\'empremtes digitals situat a la part posterior de la tauleta"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Per consultar les notificacions, llisca cap avall al sensor d\'empremtes digitals situat a la part posterior del dispositiu"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Consulta les notificacions més de pressa"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Llisca cap avall al sensor d\'empremtes digitals"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Aixeca el dispositiu per obrir la càmera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Per obrir la càmera automàticament, aixeca el telèfon fins a una posició per fer fotos, en horitzontal o en vertical. Funciona quan el telèfon està inactiu o bloquejat."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Fes fotos quan el telèfon estigui inactiu o bloquejat"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gest per obrir Assistència"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilitat"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Vols suprimir aquesta aplicació instantània?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Jocs"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Fitxers d\'àudio"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Espai utilitzat"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstal·lat per a <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desactivat per a <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Servei d\'emplenament automàtic"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Aplicació instantània"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Vols desactivar el gestor d\'emmagatzematge?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplicacions de pel·lícules i TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Espai utilitzat"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Informació de serveis de l\'operador de telefonia mòbil"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Activa els serveis de l\'operador de telefonia mòbil"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Quines són les novetats més importants?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Dona un cop d\'ull a les 5 funcions principals"</string>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 76620c8..8ead7f6 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Dobrý"</item>
     <item msgid="8986346415847956850">"Vynikající"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Vždy"</item>
-    <item msgid="844721238536786870">"Pouze při nabíjení"</item>
-    <item msgid="1986753720941888596">"Nikdy"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Vždy"</item>
-    <item msgid="7433294150916905997">"Pouze při nabíjení"</item>
-    <item msgid="1390404486722375028">"Nikdy"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Posledních 30 dní"</item>
     <item msgid="6600989128423965319">"Zadat cyklus počítání..."</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ea4d925..cbffa64 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -32,6 +32,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Voilà! Stal se z vás vývojář."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Není potřeba, již jste vývojář."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Nejprve prosím aktivujte možnosti pro vývojáře."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Bezdrátová připojení a sítě"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Připojení"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Zařízení"</string>
@@ -43,6 +44,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Poskytnutí VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Zajištění videohovoru"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Zajištění volání přes Wi-Fi"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Zajištění EAB/přítomnosti"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Výkon mobilního přijímače"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Zobrazit adresář SIM karty"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Zobrazit povolená telefonní čísla"</string>
@@ -108,10 +110,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Vyhledat zařízení"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Přejmenovat toto zařízení"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Přejmenovat"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Odpojit?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tímto způsobem ukončíte připojení k zařízení:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Odpojit zařízení?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Telefon se odpojí od zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Tablet se odpojí od zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Zařízení se odpojí od zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Odpojit"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Nemáte oprávnění měnit nastavení Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Spárovat nové zařízení"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Při zapnutém připojení Bluetooth je zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> viditelné pro zařízení v okolí."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Adresa Bluetooth telefonu: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Adresa Bluetooth tabletu: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Adresa Bluetooth zařízení: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Odpojit zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Vysílání"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Deaktivovat profil?"</string>
@@ -123,7 +132,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Požadavek na párování zařízení Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Požadavek na párování"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Klepnutím spárujete se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Zobrazit přijaté soubory"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Přijaté soubory"</string>
     <string name="device_picker" msgid="4978696506172252813">"Vybrat zařízení Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnout Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> chce vypnout Bluetooth"</string>
@@ -159,6 +168,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Zařízení %1$s žádá o přístup k vašim zprávám. Povolit přístup zařízení %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Žádost o přístup k SIM kartě"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Zařízení <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> žádá o přístup k SIM kartě. Po dobu přístupu zařízení k SIM kartě bude datové připojení ve vašem zařízení vypnuto. Chcete zařízení <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> povolit přístup?"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Viditelné pro ostatní zařízení jako „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaše zařízení"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Spárovat nové zařízení"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum a čas"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Vybrat časové pásmo"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -333,7 +345,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Účty"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Poloha"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Účty"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Zabezpečení a poloha"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Zabezpečení a poloha"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifrování a identifikační údaje"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon je zašifrován"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Zařízení je zašifrováno"</string>
@@ -360,40 +372,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Odemknutí otiskem prstu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Použití otisku prstu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Odemykejte telefon, autorizujte nákupy a přihlašujte se do aplikací pouhým klepnutím na senzor 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ů.\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_message_unlock_disabled" msgid="4193477159493347679">"Autorizujte nákupy a přihlašujte se do aplikací pouhým klepnutím na senzor 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ů.\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="3635924459027832861">"Odemykejte telefon, autorizujte nákupy a přihlašujte se do aplikací pouhým klepnutím na senzor 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ů.\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_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Zrušit"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Pokračovat"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Přeskočit"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Přidat otisk prstu"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Nebudou aktivovány funkce ochrany zařízení. V případě ztráty, odcizení nebo vymazání tabletu nebudete moci ostatním zabránit v jeho používání."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Nebudou aktivovány funkce ochrany zařízení. V případě ztráty, odcizení nebo vymazání zařízení nebudete moci ostatním zabránit v jeho používání."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Nebudou aktivovány funkce ochrany zařízení. V případě ztráty, odcizení nebo vymazání telefonu nebudete moci ostatním zabránit v jeho používání."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Nebudou aktivovány funkce ochrany zařízení. V případě ztráty nebo odcizení tabletu nebudete moci ostatním zabránit v jeho používání."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Nebudou aktivovány funkce ochrany zařízení. V případě ztráty nebo odcizení zařízení nebudete moci ostatním zabránit v jeho používání."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Nebudou aktivovány funkce ochrany zařízení. V případě ztráty nebo odcizení telefonu nebudete moci ostatním zabránit v jeho používání."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Další"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Nebudou zapnuty funkce ochrany zařízení. V případě ztráty, odcizení nebo resetování tabletu nebudete moci ostatním zabránit v jeho používání."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Nebudou zapnuty funkce ochrany zařízení. V případě ztráty, odcizení nebo resetování zařízení nebudete moci ostatním zabránit v jeho používání."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Nebudou zapnuty funkce ochrany zařízení. V případě ztráty, odcizení nebo resetování telefonu nebudete moci ostatním zabránit v jeho používání."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Nebudou zapnuty funkce ochrany zařízení. Pokud tablet ztratíte nebo vám jej někdo ukradne, nebudete lidem moci zabránit v jeho používání."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Nebudou zapnuty funkce ochrany zařízení. Pokud zařízení ztratíte nebo vám jej někdo ukradne, nebudete lidem moci zabránit v jeho používání."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Nebudou zapnuty funkce ochrany zařízení. Pokud telefon ztratíte nebo vám jej někdo ukradne, nebudete lidem moci zabránit v jeho používání."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Přeskočit"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Zpět"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Najděte senzor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Najděte senzor otisků prstů na zadní straně telefonu."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Dotkněte se senzoru"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Je na zadní straně telefonu. Použijte ukazováček."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustrace se zařízením a polohou senzoru otisků prstů"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Jméno"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Smazat"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Začínáme"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Dotkněte se senzoru"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Umístěte prst na senzor. Až ucítíte vibraci, zvedněte jej."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Pokračujte"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Lehce pohněte prstem, aby se zaznamenaly všechny části otisku"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Otisk byl přidán!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kdykoli se zobrazí tato ikona, můžete se identifikovat nebo autorizovat nákup pomocí svého otisku prstu."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Probuďte a odemkněte zařízení klepnutím na senzor otisků prstů."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Když se zobrazí tato ikona, můžete také autorizovat nákupy nebo se přihlásit do aplikací."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Zvedněte prst a dotkněte se znovu"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Opakovaně prst zvedněte, aby se zaznamenaly různé části otisku"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Otisk byl přidán"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Když je zobrazena tato ikona, můžete se identifikovat nebo schválit nákup otiskem prstu."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Přeskočit nastavení otisku prstu?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Jako jeden ze způsobů odemknutí telefonu jste se rozhodli používat otisk prstu. Pokud nastavení přeskočíte, bude třeba jej dokončit později. Nastavení trvá jen chviličku."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Nastavit zámek obrazovky"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Hotovo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Jejda, to není senzor."</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Použijte senzor otisků prstů na zařízení."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Dotkněte se senzoru na zadní straně telefonu. Použijte ukazováček."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registrace nebyla dokončena"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Bylo dosaženo časového limitu registrace otisku prstu. Zkuste to znovu."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Registrace otisku prstu nefungovala. Zkuste to znovu nebo použijte jiný prst."</string>
@@ -455,6 +465,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v jeho používání bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v používání telefonu bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Zvolte záložní metodu zámku obrazovky"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Možnosti zámku obrazovky"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Možnosti zámku obrazovky"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zámek obrazovky"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Ihned po spánku"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> po spánku"</string>
@@ -525,13 +537,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Změna bezpečnostního gesta"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Změna bezpečnostního kódu PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Změnit bezpečnostní heslo"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Zkuste to znovu. Pokus <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> z <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Poslední pokus"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Pokud při tomto pokusu zadáte nesprávné gesto pracovního účtu, váš pracovní profil a přidružená data z tohoto zařízení budou odstraněna."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Pokud při tomto pokusu zadáte nesprávný PIN pracovního účtu, váš pracovní profil a přidružená data z tohoto zařízení budou odstraněna."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Pokud při tomto pokusu zadáte nesprávné heslo pracovního účtu, váš pracovní profil a přidružená data z tohoto zařízení budou odstraněna."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Příliš mnoho neplatných pokusů. Váš pracovní profil a přidružená data z tohoto zařízení budou odstraněna."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Zavřít"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Zkuste to znovu. Pokus <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> z <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Vaše data budou smazána"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Pokud při příštím pokusu zadáte nesprávné gesto, data v tomto zařízení budou smazána"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Pokud při příštím pokusu zadáte nesprávný PIN, data v tomto zařízení budou smazána"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Pokud při příštím pokusu zadáte nesprávné heslo, data v tomto zařízení budou smazána"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Pokud při příštím pokusu zadáte nesprávné gesto, tento uživatel bude smazán"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Pokud při příštím pokusu zadáte nesprávný PIN, tento uživatel bude smazán"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Pokud při příštím pokusu zadáte nesprávné heslo, tento uživatel bude smazán"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Pokud při příštím pokusu zadáte nesprávné gesto, váš pracovní profil a přidružená data budou smazána"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Pokud při příštím pokusu zadáte nesprávný PIN, váš pracovní profil a přidružená data budou smazána"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Pokud při příštím pokusu zadáte nesprávné heslo, váš pracovní profil a přidružená data budou smazána"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Příliš mnoho neplatných pokusů. Data v tomto zařízení budou smazána."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Příliš mnoho neplatných pokusů. Tento uživatel bude smazán."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Příliš mnoho neplatných pokusů. Tento pracovní profil a přidružená data budou smazána."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Zavřít"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Minimální počet znaků: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Minimální počet čísel kódu PIN: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Pokračovat"</string>
@@ -648,6 +668,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Rozšířené nastavení Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Když je zapnuté připojení Bluetooth, zařízení může komunikovat s ostatními zařízeními Bluetooth v okolí."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Za účelem zvýšení přesnosti určování polohy mohou systémové aplikace a služby neustále vyhledávat zařízení Bluetooth. Toto chování můžete změnit v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastavení vyhledávání<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Nelze se připojit. Zkuste to znovu."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Podrobnosti o zařízení"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Adresa Bluetooth zařízení: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Zapomenout zařízení?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Telefon již nebude spárován se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Tablet již nebude spárován se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Zařízení již nebude spárováno se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Zapomenout zařízení"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Připojit k síti…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno od zvuku médií."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno od zvuku sady handsfree."</string>
@@ -800,6 +828,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Neposkytovat"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Neověřovat"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Není určen žádný certifikát. Připojení nebude soukromé."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Název sítě je příliš dlouhý."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Je třeba zadat doménu."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je k dispozici"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je k dispozici)"</string>
@@ -833,7 +862,6 @@
       <item quantity="one">1 síť</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Rozšířené nastavení"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfigurace Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresa MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP adresa"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podsítě"</string>
@@ -870,9 +898,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Odstranit tuto skupinu?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Přenosný hotspot Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi hotspot"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Poskytovat připojení k síti Wi-Fi pomocí mobilního připojení"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Internetové připojení tohoto tabletu není sdíleno pomocí hotspotu"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Internetové připojení tohoto telefonu není sdíleno pomocí hotspotu"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Internet ani obsah není sdílen s dalšími zařízeními"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internetové připojení tohoto tabletu je sdíleno pomocí hotspotu"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internetové připojení tohoto telefonu je sdíleno pomocí hotspotu"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikace sdílí obsah. Chcete-li sdílet připojení k internetu, vypněte hotspot a znovu jej zapněte"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Název Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Zapínám hotspot <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Ostatní zařízení se mohou připojit k hostpotu <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Heslo k Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pásmo přístupového bodu"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Pomocí hotspotu můžete vytvořit síť Wi‑Fi pro další zařízení. Hotspot poskytuje připojení k internetu pomocí vašeho mobilního datového připojení. Může to vést k dodatečným poplatkům za mobilní data."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikace mohou vytvořit hotspot ke sdílení obsahu s okolními zařízeními."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Zapínání hotspotu…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Vypínání hotspotu…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"Síť <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivní"</string>
@@ -919,6 +955,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Je-li zapnuto volání přes Wi-Fi, telefon může hovory v závislosti na zadaných nastaveních a na tom, který signál je silnější, směrovat přes sítě Wi-Fi nebo přes sítě operátora. Než tuto funkci zapnete, zeptejte se operátora na možné poplatky a další podrobnosti."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Aktualizace tísňové adresy"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Adresa, kterou tísňové služby použijí jako vaši polohu, pokud zavoláte 112 přes Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Obrazovka"</string>
@@ -976,6 +1013,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Žádné výsledky"</string>
     <string name="display_settings" msgid="7965901687241669598">"Obrazovka"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Autom. otočení obrazovky"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Živé barvy"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Při otáčení tabletu automaticky přepínat orientaci"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Při otáčení telefonu automaticky přepínat orientaci"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Při otáčení tabletu automaticky přepínat orientaci"</string>
@@ -1003,23 +1041,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimalizovat jas podle okolního světla. I když je tato funkce zapnutá, můžete jas dočasně upravit."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Noční režim"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Noční režim obrazovku zbarví do oranžova. Čtení a sledování obrazovky při tlumeném osvětlení tak bude snazší a bude se vám lépe usínat."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Plán"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Stav"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Zapnout automaticky"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nikdy"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Vlastní plán"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Od soumraku do úsvitu"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Plán"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Žádné"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Zapne se ve zvoleném čas"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Zapne se od soumraku do úsvitu"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Čas zahájení"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Čas ukončení"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Stav"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intenzita"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Vypnuto. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nikdy se automaticky nezapne."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Zapne se automaticky v <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Zapne se automaticky za soumraku."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Zapnuto. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nikdy se automaticky nevypne."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Vypne se automaticky v <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Vypne se automaticky za úsvitu."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Vypnuto / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Nikdy se automaticky nezapne"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Zapne se automaticky v <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Zapne se automaticky za soumraku"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Zapnuto / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Nikdy se automaticky nevypne"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Vypne se automaticky v <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Vypne se automaticky za úsvitu"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Režim spánku"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Vypnutí obrazovky"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Doba nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1043,8 +1080,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Nastavení"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Probudit zvednutím zařízení"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Ambientní displej"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambientní displej"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Vždy zapnuto"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nová oznámení"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kdy zobrazit"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nová oznámení"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Probudit obrazovku, když dostanete oznámení"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Vždy zapnuto"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Zobrazovat čas, ikony oznámení a další informace"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost písma"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Umožňuje zvětšit nebo zmenšit text"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavení zámku SIM karty"</string>
@@ -1298,6 +1341,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Název přístupového bodu nesmí být prázdný."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Pole MCC musí obsahovat 3 číslice."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Pole MNC musí obsahovat 2 nebo 3 číslice."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operátor přidání přístupových bodů typu %s neumožňuje."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Obnovování výchozích nastavení přístupového bodu"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Obnovit výchozí"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Výchozí nastavení přístupového bodu bylo obnoveno."</string>
@@ -1329,6 +1373,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Smazat kartu SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Smazat všechna data v interním úložišti USB, například hudbu a fotografie."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Smazat všechna data na kartě SD, například hudbu a fotografie."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Vymazat eSIM karty"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Vymazat všechny eSIM karty v telefonu. Tímto krokem nebude zrušen mobilní tarif."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Vymazat všechny eSIM karty v tabletu. Tímto krokem nebude zrušen mobilní tarif."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Resetovat tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetovat telefon"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Chcete vymazat všechny osobní údaje a stažené aplikace? Tuto akci nelze vrátit zpět."</string>
@@ -1351,26 +1398,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Když je zapnutý Spořič obrazovky, nelze sdílet datové připojení ani používat přenosné hotspoty"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Připojení přes USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Připojeno přes USB. Zapnutím této volby vytvoříte sdílené připojení."</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Sdíleno"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Nelze sdílet datové připojení, pokud se používá úložiště USB"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Připojení USB není k dispozici"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Chcete-li úložiště USB zapnout, připojte jej"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Chyba sdíleného připojení přes USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Sdílet připojení telefonu k internetu prostřednictvím rozhraní USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Sdílet připojení tabletu k internetu prostřednictvím rozhraní USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Připojení přes Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Internetové připojení tohoto tabletu je sdíleno přes Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Internetové připojení tohoto telefonu je sdíleno přes Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Internetové připojení tabletu je přes Bluetooth sdíleno s 1 zařízením"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Internetové připojení telefonu je přes Bluetooth sdíleno s 1 zařízením"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Internetové připojení tabletu je přes Bluetooth sdíleno s <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> zařízeními"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Internetové připojení telefonu je přes Bluetooth sdíleno s <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> zařízeními"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Sdílet připojení tabletu k internetu přes Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Sdílet připojení telefonu k internetu přes Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Internetové připojení tohoto zařízení <xliff:g id="DEVICE_NAME">%1$d</xliff:g> je sdíleno přes Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Internetové připojení tohoto tabletu není sdíleno přes Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Internetové připojení tohoto telefonu není sdíleno přes Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Není sdíleno"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Připojení lze sdílet s nejvýše <xliff:g id="MAXCONNECTION">%1$d</xliff:g> zařízeními."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"U zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude ukončeno sdílené připojení."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Hotspot a tethering umožňuje poskytovat připojení k internetu přes mobilní datové připojení dalším zařízením."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Hotspot a tethering umožňují poskytovat připojení k internetu přes mobilní datové připojení dalším zařízením. Aplikace také mohou vytvořit hotspot ke sdílení obsahu s okolními zařízeními."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Nápověda"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobilní síť"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilní tarif"</string>
@@ -1403,7 +1439,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Určování polohy"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"K určování polohy používat GPS, Wi-Fi, Bluetooth nebo mobilní sítě"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"K určování polohy používat Wi-Fi, Bluetooth nebo mobilní sítě"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"K určování polohy používat GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"K určování polohy používat GPS a senzory zařízení"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skenování"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Vyhledávání Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Umožňuje zlepšit přesnost určování polohy tím, že systémové aplikace a služby budou vyhledávat sítě Wi-Fi neustále."</string>
@@ -1448,8 +1484,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Datové připojení momentálně není k dispozici. Chcete-li tyto informace zobrazit, přejděte z libovolného počítače připojeného k internetu na stránku %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Načítání..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Zvolte heslo"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Otisk vyžaduje nastavení hesla"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Vyberte gesto"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Otisk vyžaduje nastavení gesta"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Zvolte kód PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Otisk vyžaduje nastavení PINu"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potvrďte heslo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrďte své gesto"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potvrďte kód PIN"</string>
@@ -1518,6 +1557,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Nastavení aplikace"</string>
     <string name="install_applications" msgid="4872012136210802181">"Neznámé zdroje"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Povolit všechny zdroje aplikací"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Nedávno otevřené aplikace"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Zobrazit všechny aplikace (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"Před <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tablet a osobní údaje jsou zranitelnější vůči útoku ze strany neznámých aplikací. Instalací aplikací z tohoto zdroje vyjadřujete souhlas s tím, že nesete odpovědnost za případné poškození tabletu nebo ztrátu dat, které jejich používání může způsobit."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefon a osobní údaje jsou zranitelnější vůči útoku ze strany neznámých aplikací. Instalací aplikací z tohoto zdroje vyjadřujete souhlas s tím, že nesete odpovědnost za případné poškození telefonu nebo ztrátu dat, které jejich používání může způsobit."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Upřesnit nastavení"</string>
@@ -1688,6 +1730,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Zastavit systémovou službu?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Pokud tuto službu zastavíte, může se stát, že některé funkce telefonu nebudou fungovat správně, dokud telefon nevypnete a opět nezapnete."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Pokud tuto službu zastavíte, může se stát, že některé funkce tabletu nebudou fungovat správně, dokud telefon nevypnete a opět nezapnete."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Jazyky, vstup a gesta"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Jazyky a zadávání"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Jazyky a zadávání"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Pomoc se zadáváním"</string>
@@ -1914,6 +1960,12 @@
       <item quantity="other">Je zapnuto <xliff:g id="COUNT">%1$d</xliff:g> tiskových služeb</item>
       <item quantity="one">Je zapnutá 1 tisková služba</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> tiskové úlohy</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> tiskové úlohy</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tiskových úloh</item>
+      <item quantity="one">1 tisková úloha</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Tiskové služby"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Žádná služba není nainstalována"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nebyly nalezeny žádné tiskárny"</string>
@@ -1980,6 +2032,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Podrobnosti využívání"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Upravit spotřebu energie"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Zahrnuté balíčky"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplikace vybíjejí baterii"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Bránění přechodu do režimu spánku"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Buzení zařízen na pozadí"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Časté žádosti o polohu"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Počet aplikací, které se nechovají správně: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Zastavit aplikaci?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Telefon nemůže normálně šetřit baterii, protože mu aplikace <xliff:g id="APP">%1$s</xliff:g> znemožňuje přejít do režimu spánku.\n\nTento problém můžete zkusit vyřešit tím, že vynutíte ukončení aplikace.\n\nPokud se to bude dít neustále, možná aplikaci kvůli prodloužení výdrže baterie bude nutné odinstalovat."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Tablet nemůže normálně šetřit baterii, protože mu aplikace <xliff:g id="APP">%1$s</xliff:g> znemožňuje přejít do režimu spánku.\n\nTento problém můžete zkusit vyřešit tím, že vynutíte ukončení aplikace.\n\nPokud se to bude dít neustále, možná aplikaci kvůli prodloužení výdrže baterie bude nutné odinstalovat."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Zařízení nemůže normálně šetřit baterii, protože mu aplikace <xliff:g id="APP">%1$s</xliff:g> znemožňuje přejít do režimu spánku.\n\nTento problém můžete zkusit vyřešit tím, že vynutíte ukončení aplikace.\n\nPokud se to bude dít neustále, možná aplikaci kvůli prodloužení výdrže baterie bude nutné odinstalovat."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Zastavit aplikaci"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Vypnout používání na pozadí?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Telefon nemůže normálně šetřit baterii, protože jej aplikace <xliff:g id="APP">%1$s</xliff:g> neustále budí.\n\nTento problém lze vyřešit tím, že telefon aplikaci zabrání v běhu na pozadí."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Tablet nemůže normálně šetřit baterii, protože jej aplikace <xliff:g id="APP">%1$s</xliff:g> neustále budí.\n\nTento problém lze vyřešit tím, že tablet aplikaci zabrání v běhu na pozadí."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Zařízení nemůže normálně šetřit baterii, protože jej aplikace <xliff:g id="APP">%1$s</xliff:g> neustále budí.\n\nTento problém lze vyřešit tím, že zařízení aplikaci zabrání v běhu na pozadí."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Vypnout"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Vypnout přístup k poloze?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Telefon nemůže normálně šetřit baterii, protože aplikace <xliff:g id="APP">%1$s</xliff:g> neustále vyžaduje informace o poloze, i když ji zrovna nepoužíváte.\n\nTento problém můžete vyřešit tím, že aplikaci zakážete přístup k poloze."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Tablet nemůže normálně šetřit baterii, protože aplikace <xliff:g id="APP">%1$s</xliff:g> neustále vyžaduje informace o poloze, i když ji zrovna nepoužíváte.\n\nTento problém můžete vyřešit tím, že aplikaci zakážete přístup k poloze."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Zařízení nemůže normálně šetřit baterii, protože aplikace <xliff:g id="APP">%1$s</xliff:g> neustále vyžaduje informace o poloze, i když ji zrovna nepoužíváte.\n\nTento problém můžete vyřešit tím, že aplikaci zakážete přístup k poloze."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Vypnout"</string>
     <string name="power_screen" msgid="3023346080675904613">"Displej"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Svítilna"</string>
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparát"</string>
@@ -1994,7 +2066,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Aplikace"</string>
     <string name="power_service" msgid="1599661212370831780">"Služby"</string>
     <string name="power_system" msgid="8290455327965307383">"Systém"</string>
-    <string name="power_user" msgid="1889728099253018005">"Uživatel"</string>
+    <string name="power_user" msgid="3706143225319881667">"Další uživatelé"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Doba provozu procesoru"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU v popředí"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zakázat režim spánku"</string>
@@ -2046,6 +2118,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Nadhodnocení spotřeby energie"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Využíváno <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktivní <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Využití obrazovky: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> bylo použito aplikací <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> z celkové kapacity baterie"</string>
@@ -2613,7 +2686,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Změnit PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Zobrazovat oznámení"</string>
     <string name="help_label" msgid="6886837949306318591">"Nápověda a zpětná vazba"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Články nápovědy, podpora přes telefon a chat"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Články nápovědy, telefon a chat, začínáme"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Účet pro obsah"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografie"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Extrémní ohrožení"</string>
@@ -2705,9 +2778,12 @@
       <item quantity="one">Zobrazit %d skrytou položku</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Síť a internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobilní data, využití dat, sdílení datového připojení"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilní síť"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"využití dat"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Připojená zařízení"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikace a oznámení"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Oprávnění, výchozí aplikace"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Uživatelé a účty"</string>
@@ -2760,6 +2836,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"platit, klepnout, platby"</string>
     <string name="keywords_backup" msgid="470070289135403022">"záloha, zálohování"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gesto, okraj, strana, aktivní okraj, zmáčknout, uchopit, asistence, asistent, squeezy, squeezie, squeezey, squeezee, zmáčknutí, ok google, asistent google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gesto, probudit, oznámení, obrazovka, displej, vypnutí obrazovky, zapnutí obrazovky, zmáčknout, okraj, spánek, režim spánku, uchopit"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gesto, ticho, odložit, budík, příchozí hovor, tichý, displej, obrazovka uzamčení, zmáčknout, uchopit, okraj, zastavit"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavení štítku NFC pro Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapsat"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Klepnutím na štítek zahájíte zápis..."</string>
@@ -2844,7 +2923,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Pracovní oznámení vůbec nezobrazovat"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Jak chcete zobrazovat profilová oznámení, když bude zařízení uzamčeno?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profilová oznámení"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Oznámení"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Oznámení"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Oznámení"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorie oznámení"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Důležitost"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Ponechat rozhodnutí na aplikaci"</string>
@@ -2859,6 +2939,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Naléhavá"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Povolit zvuk"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Na tato oznámení nebudete upozorněni zvukem ani vibrací, ani se nebude zobrazovat jejich náhled na aktuální obrazovce."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Nízká důležitost"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Střední důležitost"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Vysoká důležitost"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgentní důležitost"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Asistent oznámení"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Přístup k oznámením"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Přístup k oznámením pracovního profilu je zablokován"</string>
@@ -2888,8 +2972,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Obraz v obraze"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Povolit obraz v obraze"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Povolí této aplikaci vytvořit okno obrazu v obrazu, když je otevřená, nebo poté, co ji opustíte (například abyste mohli pokračovat ve sledování videa). Toto okno se zobrazuje nad ostatními aplikacemi, které používáte."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Ano"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Ne"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Přístup při nastavení Nerušit"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"O přístup při nastavení Nerušit nepožádaly žádné nainstalované aplikace"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Načítání aplikací..."</string>
@@ -3028,11 +3110,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Tento pracovní profil je spravován pomocí aplikace:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Spravováno aplikací <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimentální)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Otočení zařízení"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Otočit obsah obrazovky"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Zachovat orientaci na výšku"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Zachovat orientaci na šířku"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Zachovat aktuální orientaci"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Bezpečné spuštění"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Pokračovat"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Toto zařízení můžete dále ochránit tím, že před jeho spuštěním bude požadován PIN. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků. \n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadován PIN?"</string>
@@ -3040,7 +3117,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Toto zařízení můžete dále ochránit tím, že před jeho spuštěním bude požadováno heslo. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků. \n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadováno heslo?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Kromě odemykání otiskem prstu můžete toto zařízení dále ochránit tím, že před jeho spuštěním bude požadován PIN. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadován PIN?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Kromě odemykání otiskem prstu můžete toto zařízení dále ochránit tím, že před jeho spuštěním bude požadováno gesto. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadováno gesto?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Kromě odemykání otiskem prstu můžete toto zařízení dále ochránit tím, že před jeho spuštěním bude požadováno heslo. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Při spuštění zařízení požadovat heslo&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Kromě odemykání otiskem prstu můžete toto zařízení dále ochránit tím, že před jeho spuštěním bude požadováno heslo. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadováno heslo?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ano"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ne"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Požadovat kód PIN?"</string>
@@ -3166,6 +3243,19 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Upozornění na využití"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Zobrazit úplné využití zařízení"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Zobrazit využití aplikace"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Vysoké využití"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> aplikace se chovají neobvykle</item>
+      <item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> aplikace se chová neobvykle</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikací se chová neobvykle</item>
+      <item quantity="one">Aplikace <xliff:g id="APP">%1$s</xliff:g> se chová neobvykle</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="few">Aplikace vybíjejí baterii</item>
+      <item quantity="many">Aplikace vybíjejí baterii</item>
+      <item quantity="other">Aplikace vybíjejí baterii</item>
+      <item quantity="one">Aplikace <xliff:g id="APP">%1$s</xliff:g> vybíjí baterii</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Neoptimalizováno"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Neoptimalizováno"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimalizace využívání baterie"</string>
@@ -3260,8 +3350,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Zobrazit přes ostatní aplikace"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"Aplikace s povolením k zobrazení přes ostatní aplikace: <xliff:g id="COUNT_0">%1$d</xliff:g> z <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikace s oprávněním"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Ano"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Ne"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Povoleno"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Nepovoleno"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instalace aplikace neznámé zdroje"</string>
     <string name="write_settings" msgid="4797457275727195681">"Změny nastavení systému"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"zápis a změna nastavení systému"</string>
@@ -3353,6 +3443,19 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Obrazovka je tónována oranžově. Možná vám to pomůže usnout."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Návrhy"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"a další (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> návrhy</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> návrhu</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> návrhů</item>
+      <item quantity="one">1 návrh</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="few">a <xliff:g id="COUNT">%1$d</xliff:g> návrhy</item>
+      <item quantity="many">a <xliff:g id="COUNT">%1$d</xliff:g> návrhu</item>
+      <item quantity="other">a <xliff:g id="COUNT">%1$d</xliff:g> návrhů</item>
+      <item quantity="one">a 1 návrh</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Odstranit"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Studené barvy"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Použijí se studenější barvy zobrazení"</string>
@@ -3371,8 +3474,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Upozornění na data: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Upozornění na data: <xliff:g id="ID_1">%1$s</xliff:g> / limit dat: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Fakturační cyklus"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Měsíční cyklus začíná <xliff:g id="ID_1">%1$s</xliff:g>. den každého měsíce"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Měsíčně od <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Měsíčně (<xliff:g id="ID_1">%1$s</xliff:g>. den)"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Omezení sítě"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> omezení</item>
@@ -3396,7 +3498,7 @@
       <item quantity="one">1 aplikace má povoleno využívat neomezená data, i když je zapnutý spořič dat</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Spořič dat"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Neomezený přístup k datům"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Neomezená data"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Data na pozadí jsou vypnuta"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Zapnuto"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Vypnuto"</string>
@@ -3462,8 +3564,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Správa oznámení na obrazovce uzamčení"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Zobrazit nebo skrýt obsah oznámení"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Vše"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Podpora"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Podpora a tipy"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Minimální šířka"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Žádné nainstalované aplikace o přístup k prémiovým SMS nepožádaly"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Prémiové SMS mohou být zpoplatněny a jejich cena se přičte k fakturaci operátora. Pokud aplikaci udělíte příslušné oprávnění, budete pomocí této aplikace moci odesílat prémiové SMS."</string>
@@ -3534,28 +3635,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automaticky"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ruční"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Uvolnit místo"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gesta"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Akce prováděné gesty"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Rychlá gesta k ovládání telefonu"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Rychlá gesta k ovládání tabletu"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Rychlá gesta k ovládání zařízení"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Spuštění fotoaparátu"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Chcete-li rychle spustit fotoaparát, dvakrát stiskněte vypínač. Funguje to na všech obrazovkách."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Otevírejte fotoaparát rychle"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Otevírejte fotoaparát dvojím stisknutím vypínače"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Přepnutí fotoaparátu"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Foťte selfie rychleji"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Aktivujte režim selfie dvojím otočením telefonu"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Aktivujte režim selfie dvojím otočením tabletu"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Aktivujte režim selfie dvojím otočením zařízení"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Kontrola telefonu dvojitým klepnutím"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Kontrola tabletu dvojitým klepnutím"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Kontrola zařízení dvojitým klepnutím"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Oznámení můžete rychle zkontrolovat dvojitým klepnutím na obrazovku."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Chcete-li zobrazit čas, ikony oznámení a další informace, dvakrát klepněte na obrazovku."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Čtěte oznámení při vypnuté obrazovce"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Kontrola telefonu zvednutím"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Kontrola tabletu zvednutím"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Kontrola zařízení zvednutím"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Oznámení můžete rychle zkontrolovat tak, že telefon zvednete."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Oznámení můžete rychle zkontrolovat tak, že tablet zvednete."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Oznámení můžete rychle zkontrolovat tak, že zařízení zvednete."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Chcete-li zobrazit čas, ikony oznámení a další informace, zvedněte telefon."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Chcete-li zobrazit čas, ikony oznámení a další informace, zvedněte tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Chcete-li zobrazit čas, ikony oznámení a další informace, zvedněte zařízení."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Čtěte oznámení při vypnuté obrazovce"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Otisk prstu pro oznámení"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Chcete-li zkontrolovat oznámení, přejeďte prstem dolů po snímači otisků prstů na zadní straně telefonu."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Chcete-li zkontrolovat oznámení, přejeďte prstem dolů po snímači otisků prstů na zadní straně tabletu."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Chcete-li zkontrolovat oznámení, přejeďte prstem dolů po snímači otisků prstů na zadní straně zařízení."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Zobrazujte oznámení rychle"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Přejeďte dolů po snímači otisků prstů"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Otevřít fotoaparát, když zvednete zařízení"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Chcete-li automaticky spustit fotoaparát, zvedněte telefon do polohy pro focení (na výšku nebo na šířku). Funguje, i když je telefon v režimu spánku nebo uzamčený."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Foťte, i když je telefon v režimu spánku nebo uzamčený"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto asistence"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Citlivost"</string>
@@ -3673,6 +3787,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Chcete tuto okamžitou aplikaci odstranit?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Hry"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Zvukové soubory"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Využitý prostor"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(pro uživatele <xliff:g id="USER">%s</xliff:g> odinstalováno)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(pro uživatele <xliff:g id="USER">%s</xliff:g> nedostupné)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Služba automatického vyplňování"</string>
@@ -3686,5 +3801,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Okamžitá aplikace"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Chcete vypnout správce úložiště?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplikace pro filmy a TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Využitý prostor"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Informace o zprovoznění služby u operátora"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Spustit zprovoznění služby u operátora"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Co je nové a zajímavé?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Vyzkoušejte 5 nejpopulárnějších funkcí"</string>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index e939775..c54b814 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"God"</item>
     <item msgid="8986346415847956850">"Fremragende"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Altid"</item>
-    <item msgid="844721238536786870">"Kun når tilsluttet strøm"</item>
-    <item msgid="1986753720941888596">"Aldrig"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Altid"</item>
-    <item msgid="7433294150916905997">"Kun når tilsluttet strøm"</item>
-    <item msgid="1390404486722375028">"Aldrig"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"De seneste 30 dage"</item>
     <item msgid="6600989128423965319">"Angiv cyklus for brug..."</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index e335d0b..1dd0c6f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Nu er du udvikler."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Det behøver du ikke. Du er allerede udvikler."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Aktivér Indstillinger for udviklere først."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Trådløs og netværk"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Forbindelser"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Enhed"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE er aktiveret"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videoopkald aktiveret"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi-opkald aktiveret"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/tilstedeværelse aktiveret"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Mobilsendestyrke"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Vis adressebog på SIM-kortet"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Vis numre til begrænset opkald"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Søg efter enheder"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Omdøb denne enhed"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Omdøb"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vil du afbryde?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Dette vil afslutte din forbindelse med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Afbryd forbindelse til enhed?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Telefonen afbryder forbindelsen fra <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Din tablet afbryder forbindelsen fra <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Enheden afbryder forbindelsen fra <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Afbryd"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Du har ikke tilladelse til at ændre Bluetooth-indstillinger."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Par ny enhed"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> er synlig for enheder i nærheden, når Bluetooth-indstillingerne er åbne."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Telefonens Bluetooth-adresse: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Bluetooth-adresse for tablet: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Enhedens Bluetooth-adresse: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vil du afbryde <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Dataudveksling"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vil du deaktivere profilen?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Anmodning om Bluetooth-parring"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Anmodning om parring"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Tryk for at parre med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Vis modtagne filer"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Modtagne filer"</string>
     <string name="device_picker" msgid="4978696506172252813">"Vælg Bluetooth-enhed"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker at aktivere Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker at deaktivere Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vil gerne have adgang til dine beskeder. Vil du give %2$s adgang?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Anmodning om SIM-adgang"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vil have adgang til dit SIM-kort. Hvis du giver adgang til SIM-kortet, deaktiveres dataforbindelsen på din enhed, så længe den anden enhed er forbundet. Giv adgang til <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Vises som \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" på andre enheder"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Dine enheder"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Par ny enhed"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dato og klokkeslæt"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Vælg tidszone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Konti"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Placering"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konti"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Sikkerhed og placering"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Sikkerhed og placering"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Kryptering og loginoplysninger"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefonen er krypteret"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Enheden er krypteret"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Lås op med fingeraftryk"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Brug dit fingeraftryk"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"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. Selv ét fingeraftryk, der føjes til din telefon, kan gøre disse ting.\n\nBemærk! Dit fingeraftryk kan være mindre sikkert end et stærkt mønster eller en stærk pinkode."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Du trykker blot på fingeraftrykslæseren for at godkende køb eller logge ind på apps. Vær forsigtig med, hvis fingeraftryk du tilføjer. Hvis du føjer en persons fingeraftryk til din telefon, kan denne person med blot ét fingeraftryk også gøre disse ting.\n\nBemærk! Du kan ikke bruge dit fingeraftryk til at låse enheden op. Kontakt din organisations administrator for at få flere oplysninger."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"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. Hvis du føjer en persons fingeraftryk til din telefon, kan denne person med blot ét fingeraftryk også gøre disse ting.\n\nBemærk! Adgang via fingeraftryk kan være mindre sikkert end adgang via et stærkt mønster eller en stærk pinkode."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Annuller"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Fortsæt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Spring over"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Tilføj fingeraftryk"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne tablet, hvis du mister den eller den bliver stjålet eller ryddet."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne enhed, hvis du mister den, eller den bliver stjålet eller ryddet."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne telefon, hvis du mister den, eller den bliver stjålet eller ryddet."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne tablet, hvis du mister den, eller hvis den bliver stjålet."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne enhed, hvis du mister den, eller hvis den bliver stjålet."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne telefon, hvis du mister den, eller hvis den bliver stjålet."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Næste"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne tablet, hvis du mister den, eller hvis den bliver stjålet eller nulstillet."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne enhed, hvis du mister den, eller hvis den bliver stjålet eller nulstillet."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne telefon, hvis du mister den, eller hvis den bliver stjålet eller nulstillet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne tablet, hvis du mister den, eller hvis den bliver stjålet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne enhed, hvis du mister den, eller hvis den bliver stjålet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Funktionerne til enhedsbeskyttelse aktiveres ikke. Du vil ikke kunne forhindre andre i at bruge denne telefon, hvis du mister den, eller hvis den bliver stjålet."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Spring over alligevel"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Gå tilbage"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Find sensoren"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Find fingeraftrykssensoren på bagsiden af ​​telefonen."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Tryk på sensoren"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Den findes på bagsiden af telefonen. Brug pegefingeren."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustration med enhed og placering af sensor til registrering af fingeraftryk"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Navn"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Slet"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Lad os komme i gang"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Tryk på sensoren"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Placer fingeren på sensoren, og løft, når du mærker en vibration"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Bliv ved"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Bevæg fingeren en smule for at få hele fingeraftrykket med"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingeraftryk tilføjet!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Når du ser dette ikon, kan du bruge dit fingeraftryk til brugeridentifikation eller til at godkende et køb."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Tryk på fingeraftrykssensoren for at vække din enhed og låse den op."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Når du ser dette ikon, kan du også godkende køb eller logge ind i apps."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Løft, og tryk igen"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Bliv ved med at løfte fingeren for at få hele fingeraftrykket med"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Fingeraftryk tilføjet"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Når du ser dette ikon, kan du bruge dit fingeraftryk til identifikation eller til at godkende køb."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Vil du springe registrering af fingeraftryk over?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Du har valgt at bruge fingeraftryk som en metode til at låse din telefon op. Hvis du springer det over nu, skal du konfigurere dette senere. Konfigurationen tager kun omkring et minut."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Konfigurer skærmlås"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Udfør"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hov! Dette er ikke sensoren"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Brug fingeraftrykssensoren på din enhed."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Tryk på sensoren bagpå med pegefingeren."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registreringen kunne ikke gennemføres"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Tidsgrænsen for registrering af fingeraftryk blev overskredet. Prøv igen."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Registrering af fingeraftryk virkede ikke. Prøv igen, eller brug en anden finger."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Du kan forhindre andre i at bruge denne enhed uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelser. Vælg den skærmlås, du vil bruge."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Du kan forhindre andre i at bruge denne telefon uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelse. Vælg den skærmlås, du vil bruge."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Vælg din alternative metode til skærmlåsning"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Valgmuligheder for skærmlås"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Valgmuligheder for skærmlås"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skærmlås"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/med det samme efter dvale"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> efter dvale"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Skift oplåsningsmønster"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Skift pinkode til oplåsning"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Skift adgangskode til oplåsning"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Prøv igen. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. forsøg ud af <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Sidste forsøg"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Hvis du indtaster et forkert mønster til din arbejdsprofil i dette forsøg, fjernes din profil og de tilhørende data fra denne enhed."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Hvis du indtaster en forkert pinkode til din arbejdsprofil i dette forsøg, fjernes din profil og de tilhørende data fra denne enhed."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Hvis du indtaster en forkert adgangskode til din arbejdsprofil i dette forsøg, fjernes din profil og de tilhørende data fra denne enhed."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"For mange forkerte forsøg. Din arbejdsprofil og de tilhørende data fjernes fra denne enhed."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Luk"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Prøv igen. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. forsøg ud af <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Dine data bliver slettet"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Hvis du angiver et forkert mønster i næste forsøg, slettes dataene på denne enhed"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Hvis du angiver en forkert pinkode i næste forsøg, slettes dataene på denne enhed"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Hvis du angiver en forkert adgangskode i næste forsøg, slettes dataene på denne enhed"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Hvis du angiver et forkert mønster i næste forsøg, slettes denne bruger"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Hvis du angiver en forkert pinkode i næste forsøg, slettes denne bruger"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Hvis du angiver en forkert adgangskode i næste forsøg, slettes denne bruger"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Hvis du angiver et forkert mønster i næste forsøg, slettes din arbejdsprofil og de tilhørende data"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Hvis du angiver en forkert pinkode i næste forsøg, slettes din arbejdsprofil og de tilhørende data"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Hvis du angiver en forkert adgangskode i næste forsøg, slettes din arbejdsprofil og de tilhørende data"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"For mange forkerte forsøg. Dataene på denne enhed slettes."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"For mange forkerte forsøg. Denne bruger slettes."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"For mange forkerte forsøg. Denne arbejdsprofil og de tilhørende data slettes."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Luk"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Skal være på mindst <xliff:g id="COUNT">%d</xliff:g> tegn"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Pinkoden skal være på mindst <xliff:g id="COUNT">%d</xliff:g> cifre"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsæt"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Avanceret Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Når Bluetooth er aktiveret, kan enheden kommunikere med andre Bluetooth-enheder i nærheden."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"For at forbedre placeringsnøjagtigheden kan systemapps og -tjenester stadig registrere Bluetooth-enheder. Du kan ændre dette i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>indstillingerne for scanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Det lykkedes ikke at oprette forbindelse. Prøv igen."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Enhedsoplysninger"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Enhedens Bluetooth-adresse: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Vil du glemme denne enhed?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Din telefon vil ikke længere være parret med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Din tablet vil ikke længere være parret med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Din enhed vil ikke længere være parret med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Glem enhed"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Opret forbindelse til..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> afbrydes fra medielyd."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> afbrydes fra håndfri lyd."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Angiv ikke"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Bekræft ikke"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Der er ikke angivet noget certifikat. Din forbindelse er ikke privat."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Netværksnavnet er for langt."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Domæne skal angives."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS er tilgængelig"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS er tilgængelig)"</string>
@@ -809,7 +838,6 @@
       <item quantity="other">%d netværk</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Avanceret Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfigurer Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-adresse"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-adresse"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Undernetmaske"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vil du glemme denne gruppe?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Wi-Fi-hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi-hotspot"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Brug mobilforbindelsen til at levere Wi-Fi-netværk"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Deler ikke din tablets internetforbindelse via hotspot"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Deler ikke telefonens internetforbindelse via hotspot"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Deler ikke internet eller indhold med andre enheder"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Deler denne tablets internetforbindelse via hotspot"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Deler telefonens internetforbindelse via hotspot"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Appen deler indhold. Hvis du vil dele internetforbindelsen, skal du deaktivere hotspot og derefter aktivere det"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi-Fi-navn"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Aktiverer <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Andre enheder kan oprette forbindelse til <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-adgangskode"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-bånd"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Brug hotspot til at oprette et Wi-Fi-netværk til dine andre enheder. Hotspot leverer internet via din mobildataforbindelse. Yderligere mobildatagebyrer kan forekomme."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Apps kan oprette et hotspot for at dele indhold med enheder i nærheden."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Aktiverer hotspot..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Deaktiverer hotspot..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> er aktivt"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Når Wi-Fi-opkald er slået til, kan telefonen dirigere opkald via Wi-Fi-netværk eller dit mobilselskabs netværk, afhængigt af hvad du foretrækker, og hvor signalet er stærkest. Inden du slår denne funktion til, skal du kontakte dit mobilselskab angående gebyrer og andre oplysninger."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Opdater alternativ adresse"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Den adresse, der anvendes af nødtjenester som din placering, hvis du ringer op til 112 via Wi-Fi."</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skærm"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Ingen resultater"</string>
     <string name="display_settings" msgid="7965901687241669598">"Skærm"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Roter skærm automatisk"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Levende farver"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Skift automatisk retning, når tabletcomputeren drejes"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Skift automatisk retning, når telefonen drejes"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Skift automatisk retning, når tabletcomputeren drejes"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimer lysstyrken til det omgivende lys. Når denne funktion er slået til, kan du stadig justere lysstyrken midlertidigt."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Nattelys"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Med Nattelys er farvetonen på skærmen gul. Det gør din skærm mere behagelig at se på i svag belysning og kan gøre det nemmere at falde i søvn."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Planlæg"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Aktivér automatisk"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Aldrig"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Tilpasset plan"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Fra solnedgang til solopgang"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Planlæg"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ingen"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Aktiveres på tilpasset tidspunkt"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Aktiveres fra sol ned til sol op"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Starttidspunkt"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Sluttidspunkt"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensitet"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Fra. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Aktiveres aldrig automatisk."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Aktiveres automatisk kl. <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Aktiveres automatisk ved solnedgang."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Til. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Deaktiveres aldrig automatisk."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Deaktiveres automatisk kl. <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Deaktiveres automatisk ved solopgang."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Fra/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Aktiveres aldrig automatisk"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Aktiveres automatisk kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Aktiveres automatisk ved solnedgang"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Til/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Deaktiveres aldrig automatisk"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Deaktiveres automatisk kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Deaktiveres automatisk ved solopgang"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Dvale"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skærmen slukker"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Indstillinger"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Løft enheden for at vække den"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Aktiv låseskærm"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Inaktiv skærm"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Altid aktiveret"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nye underretninger"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Hvornår skal det vises"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nye underretninger"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Væk skærmen, når du modtager underretninger"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Altid aktiveret"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Vis klokkeslæt, underretningsikoner og andre oplysninger"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Gør teksten større eller mindre"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Indstillinger for låst SIM-kort"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Du skal angive et adgangspunkt."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC-feltet skal indeholde 3 tal."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC-feltet skal indeholde 2 eller 3 tal."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Mobilselskabet tillader ikke, at du tilføjer adgangspunkter af typen %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Gendannelse af standardindstillingerne for adgangspunktet."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Nulstil til standard"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Standardindstillingerne for adgangspunktet er nulstillet."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Formatér SD-kort"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Slet alle data på det interne USB-lager, f.eks. musik eller billeder"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Formatér alle data på SD-kortet, f.eks. musik eller billeder"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Slet eSIM-kort"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Slet alle eSIM-kort på telefonen. Det medfører ikke, at dit mobilabonnement opsiges."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Slet alle eSIM-kort på din tablet. Det medfører ikke, at dit mobilabonnement opsiges."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Nulstil tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Nulstil telefon"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Vil du slette alle dine personlige oplysninger og downloadede apps? Du kan ikke fortryde denne handling."</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Der kan ikke bruges netdeling eller hotspots, når Datasparefunktion er aktiveret"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Netdeling via USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB tilsluttet. Aktivér for at bruge netdeling"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Netdeling anvendt"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Netdeling kan ikke anvendes, når USB-lager er i brug"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB ikke tilsluttet"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Tilslut for at tænde"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Fejl ved netdeling via USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Del telefonens internetforbindelse via USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Del denne tablets internetforbindelse via USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Netdeling via Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Deler din tablets forbindelse via Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Deler telefonens internetforbindelse via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Deler din tablets forbindelse med 1 enhed via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Deler telefonens forbindelse med 1 enhed via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Deler din tablets forbindelse med <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> enheder via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Deler telefonens forbindelse med <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> enheder via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Del din tablets internetforbindelse via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Del telefonens internetforbindelse via Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Deler internetforbindelsen for <xliff:g id="DEVICE_NAME">%1$d</xliff:g> via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Deler ikke din tablets forbindelse via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Deler ikke telefonens forbindelse via Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Ikke netdelt"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Netdeling kan ikke bruges til mere end <xliff:g id="MAXCONNECTION">%1$d</xliff:g> enheder."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Netdelingen med <xliff:g id="DEVICE_NAME">%1$s</xliff:g> vil blive afbrudt."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Du kan bruge hotspot og netdeling til at give andre enheder adgang til internettet via din mobildataforbindelse."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Brug hotspot og netdeling til at give andre enheder adgang til internettet via din mobildataforbindelse. Apps kan også oprette et hotspot for at dele indhold med enheder i nærheden."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjælp"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobilnetværk"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilabonnement"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Placeringstilstand"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Brug GPS, Wi-Fi, Bluetooth eller mobilnetværk til at fastslå placeringen"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Brug Wi-Fi, Bluetooth eller mobilnetværk til at fastslå placering"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Brug GPS-signal til at fastslå din placering"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Brug GPS og enhedssensorer til at fastslå placering"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanning"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi-scanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Du kan forbedre placeringsnøjagtigheden ved at give systemapps og -tjenester tilladelse til at registrere Wi-Fi-netværk når som helst."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Du har ingen dataforbindelse. Se disse oplysninger nu ved at gå til %s på en computer, der har forbindelse til internettet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Indlæser..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Vælg din adgangskode"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Angiv adgangskode for at bruge fingeraftryk"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Vælg dit mønster"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Angiv mønster for at bruge fingeraftryk"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Vælg din pinkode"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Angiv pinkode for at bruge fingeraftryk"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Bekræft din adgangskode"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bekræft dit mønster"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bekræft din pinkode"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Indstillinger for app"</string>
     <string name="install_applications" msgid="4872012136210802181">"Ukendte kilder"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Tillad alle appkilder"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Senest åbnede apps"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Se alle <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"For <xliff:g id="TIME">^1</xliff:g> siden"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Din tablet og dine personlige data er mere sårbare over for angreb fra ukendte apps. Når du installerer apps fra denne kilde, accepterer du, at du er ansvarlig for skader på din tablet eller tab af data, der kan skyldes brug af disse apps."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Din telefon og dine personlige data er mere sårbare over for angreb fra ukendte apps. Når du installerer apps fra denne kilde, accepterer du, at du er ansvarlig for skader på din telefon eller tab af data, der kan skyldes brug af disse apps."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Avancerede indstillinger"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Stop systemtjeneste?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Hvis du stopper denne tjeneste, kan nogle af funktionerne på din tablet holde op med at fungere korrekt, indtil du slukker og tænder den igen."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Hvis du stopper denne tjeneste, kan nogle af funktionerne på din tablet holde op med at fungere korrekt, indtil du slukker og derefter tænder den igen."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Sprog, indtastning og bevægelser"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Sprog og indtastning"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Sprog og indtastning"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Hjælp til indtastning"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> udskrivningstjeneste er slået til</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> udskrivningstjenester er slået til</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> udskriftjob</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> udskriftjobs</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Udskrivningstjenester"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Der er ikke installeret nogen tjenester"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Der blev ikke fundet nogen printere"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Brugsdetaljer"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Juster strømforbrug"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Inkluderede pakker"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps, der dræner batteriet"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Holder enheden aktiv"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Aktiverer enheden i baggrunden"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Anmoder ofte om placering"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps fungerer ikke korrekt"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Vil du standse appen?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Din telefon kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> holder telefonen aktiv.\n\nDu kan prøve at løse problemet ved at tvinge appen til at standse.\n\nHvis problemet vedvarer, skal du muligvis afinstallere appen for at forbedre batteriets ydeevne."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Din tablet kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> holder din tablet aktiv.\n\nDu kan prøve at løse problemet ved at tvinge appen til at standse.\n\nHvis problemet vedvarer, skal du muligvis afinstallere appen for at forbedre batteriets ydeevne."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Din enhed kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> holder enheden aktiv.\n\nDu kan prøve at løse problemet ved at tvinge appen til at standse.\n\nHvis problemet vedvarer, skal du muligvis afinstallere appen for at forbedre batteriets ydeevne."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Stands app"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Vil du slå baggrundsforbrug fra?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Din telefon kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> bliver ved med at aktivere telefonen.\n\nProblemet kan løses ved at få din telefon til at forhindre appen i at køre i baggrunden."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Din tablet kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> bliver ved med at aktivere din tablet.\n\nProblemet kan løses ved at få din tablet til at forhindre appen i at køre i baggrunden."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Din enhed kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> bliver ved med at aktivere enheden.\n\nProblemet kan løses ved at få din enhed til at forhindre appen i at køre i baggrunden."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Slå fra"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Vil du slå placering fra?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Din telefon kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> bliver ved med at anmode om din placering, når du ikke bruger appen.\n\nProblemet kan løses ved at slå placering fra for denne app."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Din tablet kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> bliver ved med at anmode om din placering, når du ikke bruger appen.\n\nProblemet kan løses ved at slå placering fra for denne app."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Din enhed kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> bliver ved med at anmode om din placering, når du ikke bruger appen.\n\nProblemet kan løses ved at slå placering fra for denne app."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Slå fra"</string>
     <string name="power_screen" msgid="3023346080675904613">"Skærm"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lommelygte"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
     <string name="power_service" msgid="1599661212370831780">"Tjenester"</string>
     <string name="power_system" msgid="8290455327965307383">"System"</string>
-    <string name="power_user" msgid="1889728099253018005">"Bruger"</string>
+    <string name="power_user" msgid="3706143225319881667">"Andre brugere"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU i alt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU forgrund"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Lås ikke"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Overvurderet strømforbrug"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Har været aktiv i <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktiv i <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Skærmtid <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> anvendt af <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> af det samlede batteriforbrug"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Skift pinkode"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Vis underretninger"</string>
     <string name="help_label" msgid="6886837949306318591">"Hjælp og feedback"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Artikler i Hjælp, telefon- og chatsupport"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Artikler i Hjælp, telefon- og chatsupport, kom godt i gang"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Konto til indhold"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-id"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ekstreme trusler"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="other">Vis %d skjulte elementer</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Netværk og internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobil, dataforbrug, hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilnetværk"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"dataforbrug"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Forbundne enheder"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps og underretninger"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Tilladelser, standardapps"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Brugere og konti"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"bevægelse"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"betal, tryk, betalinger"</string>
     <string name="keywords_backup" msgid="470070289135403022">"sikkerhedskopiering, sikkerhedskopiér"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"bevægelse, kant, side, aktiv kant, klem, greb, assistance, assistent, squeezy, squeezie, squeezey, squeezee, ok google, google assistent"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"bevægelse, vække, underretninger, skærm, visning, skærm fra, skærm til, klem, kant, sove, dvale, greb"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"bevægelse, lydløs, udsæt, alarm, indgående opkald, stille, skærm, låseskærm, klem, greb, kant, stop"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfigurer NFC-tag for Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tryk på et tag for at skrive..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Vis slet ingen arbejdsunderretninger"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Hvordan skal profilunderretninger vises, når din enhed er låst?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profilunderretninger"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Underretninger"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Underretninger"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Appunderretninger"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Underretningskategori"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Vigtighed"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Lad appen bestemme"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Haster"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Tillad lyd"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Undlad at give lyd, vibrere eller vise disse underretninger på den aktuelle skærm."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Lille vigtighed"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Middel vigtighed"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Stor vigtighed"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Presserende vigtighed"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Underretningsassistent"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Adgang til underretninger"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Adgangen til underretninger fra arbejdsprofilen er blokeret"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Integreret billede"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Tillad integreret billede"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Giv tilladelse til at oprette et vindue med integreret billede, mens appen er åben, eller efter du lukker den (f.eks. for at fortsætte med at se en video). Dette vindue vises oven på andre apps, du bruger."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Ja"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Nej"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Adgang til \"Forstyr ikke\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ingen installerede apps har anmodet om adgang, når indstillingen \"Forstyr ikke\" er aktiveret."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Indlæser apps..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Denne arbejdsprofil administreres af:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Administreret af <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentel)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Enhedsrotation"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Roter skærmindholdet"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Bliv i stående format"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Behold liggende format"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Behold den aktuelle orientering"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Sikker opstart"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Fortsæt"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Du kan beskytte denne enhed yderligere ved at kræve, at din pinkode skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer. \n\nDette hjælper med at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en pinkode, før enheden kan starte op?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Du kan beskytte denne enhed yderligere ved at kræve, at din adgangskode skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer. \n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en adgangskode, før din enhed kan starte op?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Ud over at låse din enhed op ved hjælp af dit fingeraftryk kan du beskytte din enhed yderligere ved at kræve, at din pinkode skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en pinkode, før din enhed kan starte op?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Ud over at låse din enhed op ved hjælp af dit fingeraftryk kan du beskytte din enhed yderligere ved at kræve, at dit mønster skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives et mønster, før din enhed kan starte op?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Ud over at låse din enhed op ved hjælp af dit fingeraftryk kan du beskytte din enhed yderligere ved at kræve, at din adgangskode skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en adgangskode, før din enhed kan starte op?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Ud over at kræve fingeraftryk til oplåsning kan du beskytte din enhed yderligere ved at kræve, at din adgangskode angives før opstart. Enheden kan ikke modtage opkald, beskeder eller underretninger, herunder alarmer, før den er startet op.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en adgangskode, før din enhed kan starte op?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ja"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nej"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Kræv pinkode?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Underretninger om forbrug"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Vis brug af enheden siden fuld opladning"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Vis appforbrug"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Højt forbrug"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> app opfører sig unormalt</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apps opfører sig unormalt</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">App, der dræner batteriet</item>
+      <item quantity="other">Apps, der dræner batteriet</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Ikke-optimeret"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Ikke-optimeret"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimeret batteriforbrug"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Vis oven på andre apps"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> af <xliff:g id="COUNT_1">%2$d</xliff:g> apps må vises oven på andre apps"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Apps med tilladelse"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Ja"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Nej"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Tilladt"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Ikke tilladt"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"installer apps fra ukendte kilder"</string>
     <string name="write_settings" msgid="4797457275727195681">"Rediger systemindstillinger"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"redigere ændre systemindstillinger"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Farvetonen på skærmen er gul. Dette kan hjælpe dig med at falde i søvn."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Forslag"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"Mere end <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"<xliff:g id="ID_1">%1$d</xliff:g> andre"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> forslag</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> forslag</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> andet forslag</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> andre forslag</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Fjern"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Kølig farvetemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Brug køligere skærmfarver"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Dataadvarsel ved <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Dataadvarsel ved <xliff:g id="ID_1">%1$s</xliff:g> / Datagrænse på <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Faktureringscyklus"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Den månedlige cyklus starter den <xliff:g id="ID_1">%1$s</xliff:g>. i hver måned"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Hver måned fra og med den <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Den <xliff:g id="ID_1">%1$s</xliff:g>. i hver måned"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Netværksbegrænsninger"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> begrænsning</item>
@@ -3316,7 +3408,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apps har tilladelse til at anvende ubegrænset data, når datasparefunktionen er slået til</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Datasparefunktion"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Ubegrænset dataadgang"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Ubegrænset dataadgang"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Baggrundsdata er slået fra"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Til"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Fra"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Konfigurer underretninger for låseskærm"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Vis eller skjul indhold i underretninger"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Alle"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Support"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Support og tips"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Mindste bredde"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ingen installerede apps har anmodet om adgang til overtakseret sms"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Overtakseret sms kan koste dig penge, som opkræves via din mobilregning. Hvis du aktiverer tilladelsen for en app, kan du sende overtakserede sms-beskeder ved hjælp af denne app."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatisk"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuel"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Frigør plads nu"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Bevægelser"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Genveje til bevægelser"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Styr din telefon med hurtige bevægelser"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Styr din tablet med hurtige bevægelser"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Styr din enhed med hurtige bevægelser"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Gå til kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Du kan åbne dit kamera hurtigt ved at trykke to gange på afbryderknappen. Denne genvej fungerer fra enhver skærm."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Åbn kameraet hurtigt"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Tryk to gange på afbryderknappen for at åbne kameraet"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Vip kameraet"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Tag selfies hurtigere"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Drej telefonen to gange for at aktivere selfietilstand"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Drej din tablet to gange for at aktivere selfietilstand"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Drej enheden to gange for at aktivere selfietilstand"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tryk to gange for at tjekke telefonen"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tryk to gange for at tjekke din tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tryk to gange for at tjekke enheden"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Du kan hurtigt se dine underretninger ved at trykke to gange på skærmen."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Tryk to gange på skærmen for at se klokkeslæt, underretningsikoner og andre oplysninger."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Tjek underretninger ved slukket skærm"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Løft for at tjekke telefon"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Løft for at tjekke din tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Løft for at tjekke enheden"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Du kan hurtigt se dine underretninger ved at tage din telefon op."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Du kan hurtigt se dine underretninger ved at samle din tablet op."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Du kan hurtigt se dine underretninger ved at samle din enhed op."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Se klokkeslæt, underretningsikoner og andre oplysninger, når du samler din telefon op."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Se klokkeslæt, underretningsikoner og andre oplysninger, når du samler din tablet op."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Se klokkeslæt, underretningsikoner og andre oplysninger, når du samler din enhed op."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Tjek underretninger ved slukket skærm"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Stryg over fingeraftryk for at se underretninger"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Du kan tjekke dine underretninger ved at stryge nedad på fingeraftrykslæseren på bagsiden af telefonen."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Du kan tjekke dine underretninger ved at stryge nedad på fingeraftrykslæseren på bagsiden af din tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Du kan tjekke dine underretninger ved at stryge nedad på fingeraftrykslæseren på bagsiden af enheden."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Se underretninger hurtigt"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Stryg nedad på fingeraftrykslæseren"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Hold telefonen op foran dig for at åbne kameraet"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Kameraet åbnes automatisk, når du holder din telefon op foran dig i billedtagningsposition (enten i liggende eller stående format). Funktionen virker også, selvom din telefon er inaktiv eller låst."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Tag billeder, mens telefonen er i dvale eller låst"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Forslagsbevægelse"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Følsomhed"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Vil du fjerne denne instant app?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Spil"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Lydfiler"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Anvendt lagerplads"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(afinstalleret for brugeren <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(deaktiveret for brugeren <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"AutoFyld-tjenesten"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Instant app"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Slå lagerstyring fra?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Film- og tv-apps"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Anvendt lagerplads"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Oplysninger om mobilselskab"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Udløs mobilselskab"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Hvad er nyt og spændende?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Se de fem mest populære funktioner"</string>
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index aa90ce5..40c8029 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Gut"</item>
     <item msgid="8986346415847956850">"Sehr gut"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Immer"</item>
-    <item msgid="844721238536786870">"Nur wenn angeschlossen"</item>
-    <item msgid="1986753720941888596">"Nie"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Immer"</item>
-    <item msgid="7433294150916905997">"Nur wenn angeschlossen"</item>
-    <item msgid="1390404486722375028">"Nie"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Letzte 30 Tage"</item>
     <item msgid="6600989128423965319">"Nutzungszyklus wählen…"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4ff15d1..b65994e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Du bist jetzt Entwickler!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Okay, du bist bereits Entwickler."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Bitte aktiviere die Entwickleroptionen zuerst."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Drahtlos &amp; Netzwerke"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Verbindungen"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Gerät"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE-Kennzeichnung"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videoanrufe eingerichtet"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"WLAN-Anrufe eingerichtet"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Präsenz bereitgestellt"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Mobilfunkstärke"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM-Adressbuch anzeigen"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Zugelassene Rufnummern anzeigen"</string>
@@ -105,10 +107,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Scannen nach Geräten"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Gerät umbenennen"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Umbenennen"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Verbindung trennen?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Hierdurch wird die Verbindung mit&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; getrennt."</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Geräteverbindung trennen?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Die Verbindung deines Smartphones mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird getrennt."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Die Verbindung deines Tablets mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird getrennt."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Die Verbindung deines Geräts mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird getrennt."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Trennen"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Du bist nicht zur Änderung der Bluetooth-Einstellungen berechtigt."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Neues Gerät koppeln"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist bei aktiviertem Bluetooth für Geräte in der Nähe sichtbar."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Bluetooth-Adresse des Smartphones: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Bluetooth-Adresse des Tablets: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth-Adresse des Geräts: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Verbindung mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> trennen?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Übertragung"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil deaktivieren?"</string>
@@ -120,7 +129,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Anfrage zur Bluetooth-Kopplung"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Kopplungsanfrage"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Für Kopplung mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tippen."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Empfangene Dateien anzeigen"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Erhaltene Dateien"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth-Gerät auswählen"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> fordert die Berechtigung, Bluetooth zu aktivieren"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> fordert die Berechtigung, Bluetooth zu deaktivieren"</string>
@@ -156,6 +165,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s möchte auf deine Nachrichten zugreifen. Möchtest du %2$s den Zugriff erlauben?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Anfrage wegen Zugriff auf SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> möchte auf deine SIM-Karte zugreifen. Wenn du den Zugriff auf die SIM-Karte gewährst, wird die Datenverbindung auf deinem Gerät für die Dauer der Verbindung deaktiviert. Möchtest du <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> den Zugriff erlauben?"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Für andere Geräte sichtbar als \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\""</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Meine Geräte"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Neues Gerät koppeln"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum &amp; Uhrzeit"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Zeitzone wählen"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -328,7 +340,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Konten"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Standort"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konten"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Sicherheit &amp; Standort"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Sicherheit &amp; Standort"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Verschlüsselung &amp; Anmeldedaten"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Smartphone verschlüsselt"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Gerät verschlüsselt"</string>
@@ -353,40 +365,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Mit Fingerabdruck entsperren"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Fingerabdruck verwenden"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Tippe einfach auf den Fingerabdrucksensor, um dein Smartphone zu entsperren, Käufe zu autorisieren oder dich in Apps anzumelden. Überlege genau, welche Fingerabdrücke du hinzufügen möchtest, da diese Aktionen mit allen Fingerabdrücken ausgeführt werden können, die du zu deinem Smartphone hinzufügst.\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_message_unlock_disabled" msgid="4193477159493347679">"Tippe einfach auf den Fingerabdrucksensor, um Käufe zu autorisieren oder dich in Apps anzumelden. Überlege dir gut, wessen Fingerabdrücke du hinzufügst. Mit jedem hinzugefügten Fingerabdruck können alle diese Aktionen durchgeführt werden.\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="3635924459027832861">"Tippe einfach auf den Fingerabdrucksensor, um dein Smartphone zu entsperren, Käufe zu autorisieren oder dich in Apps anzumelden. Überlege genau, welche Fingerabdrücke du hinzufügen möchtest, da diese Aktionen mit allen Fingerabdrücken ausgeführt werden können, die du zu deinem Smartphone hinzufügst.\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_message_unlock_disabled" msgid="1550756694054944874">"Mit deinem Fingerabdruck kannst du dein Smartphone entsperren oder Käufe 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="6817326798834882531">"Mit deinem Fingerabdruck kannst du dein Smartphone entsperren oder Käufe 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="3199351118385606526">"Abbrechen"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Weiter"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Überspringen"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Fingerabdruck hinzufügen"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Tablet verwenden, falls du es verlierst, es gestohlen wird oder die darauf befindlichen Daten gelöscht werden."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Gerät verwenden, falls du es verlierst, es gestohlen wird oder die darauf befindlichen Daten gelöscht werden."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Smartphone verwenden, falls du es verlierst, es gestohlen wird oder die darauf befindlichen Daten gelöscht werden."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Tablet verwenden, falls du es verlierst oder es gestohlen wird."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Gerät verwenden, falls du es verlierst oder es gestohlen wird."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Smartphone verwenden, falls du es verlierst oder es gestohlen wird."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Weiter"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Tablet verwenden, falls es verloren geht, gestohlen oder zurückgesetzt wird."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Gerät verwenden, falls es verloren geht, gestohlen oder zurückgesetzt wird."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Smartphone verwenden, falls es verloren geht, gestohlen oder zurückgesetzt wird."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Tablet verwenden, falls es verloren geht oder gestohlen wird."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Gerät verwenden, falls es verloren geht oder gestohlen wird."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Die Geräteschutzfunktionen werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Smartphone verwenden, falls es verloren geht oder gestohlen wird."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Trotzdem überspringen"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Zurück"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Sensor suchen"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Finde den Fingerabdrucksensor auf der Rückseite deines Smartphones."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Sensor berühren"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Er befindet sich auf der Rückseite deines Smartphones. Verwende am besten den Zeigefinger."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Abbildung mit Gerät und Position des Fingerabdrucksensors"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Name"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Löschen"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Los geht\'s"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Sensor berühren"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Lege deinen Finger auf den Sensor und hebe ihn an, wenn du eine Vibration spürst."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Berühre den Sensor noch einmal"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Bewege deinen Finger etwas, um alle unterschiedlichen Teile deines Fingerabdrucks hinzuzufügen."</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Abdruck hinzugefügt"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Wenn du dieses Symbol siehst, kannst du deinen Fingerabdruck zur Identifizierung oder zur Autorisierung eines Kaufs verwenden."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Tippe einfach auf den Fingerabdrucksensor, um dein Gerät zu aktivieren und zu entsperren."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Wenn dieses Symbol angezeigt wird, kannst du auch Käufe autorisieren oder dich in Apps anmelden."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Anheben und erneut berühren"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Hebe den Finger immer wieder an, um alle unterschiedlichen Teile deines Fingerabdrucks hinzuzufügen"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Fingerabdruck hinzugefügt"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Wenn du dieses Symbol siehst, kannst du deinen Fingerabdruck zur Identifizierung oder zur Autorisierung eines Kaufs verwenden."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Fingerabdruck-Einrichtung überspringen?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Du hast festgelegt, dass du unter anderem deinen Fingerabdruck zum Entsperren deines Smartphones verwenden möchtest. Wenn du diesen Schritt jetzt überspringst, musst du die Einrichtung zu einem späteren Zeitpunkt vornehmen. Die Einrichtung dauert nur ca. eine Minute."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Displaysperre einrichten"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Fertig"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Das ist nicht der Sensor"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Fingerabdrucksensor auf Gerät verwenden"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Berühre mit dem Zeigefinger den Sensor auf der Rückseite."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registrierung wurde nicht abgeschlossen."</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Zeitüberschreitung bei Fingerabdruckregistrierung. Versuche es erneut."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Fehler bei Fingerabdruckregistrierung. Versuche es erneut oder verwende einen anderen Finger."</string>
@@ -448,6 +458,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Du kannst verhindern, dass andere Personen dieses Gerät ohne deine Erlaubnis verwenden, indem du die Geräteschutzfunktionen aktivierst. Wähle eine Displaysperre aus."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Du kannst verhindern, dass andere Personen dieses Smartphone ohne deine Erlaubnis verwenden, indem du die Geräteschutzfunktionen aktivierst. Wähle eine Displaysperre aus."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Alternative Methode für die Displaysperre auswählen"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Optionen für die Displaysperre"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Optionen für die Displaysperre"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Displaysperre"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/direkt nach Ruhemodus"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> nach Ruhemodus"</string>
@@ -518,13 +530,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Entsperrungsmuster ändern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Entsperrungs-PIN ändern"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Entsperrungspasswort ändern"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Bitte versuche es noch einmal. Versuch <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> von <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Letzter Versuch"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Wenn du bei diesem Anmeldeversuch ein falsches Muster eingibst, werden dein Arbeitsprofil und damit verknüpfte Daten von diesem Gerät entfernt."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Wenn du bei diesem Anmeldeversuch eine falsche PIN eingibst, werden dein Arbeitsprofil und damit verknüpfte Daten von diesem Gerät entfernt."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Wenn du bei diesem Anmeldeversuch ein falsches Passwort eingibst, werden dein Arbeitsprofil und damit verknüpfte Daten von diesem Gerät entfernt."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Zu viele Fehlversuche. Dein Arbeitsprofil und damit verknüpfte Daten werden von diesem Gerät entfernt."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Schließen"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Bitte versuche es noch einmal. Versuch <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> von <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Deine Daten werden gelöscht"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Wenn du beim nächsten Versuch ein falsches Muster eingibst, werden die Daten auf diesem Gerät gelöscht"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Wenn du beim nächsten Versuch eine falsche PIN eingibst, werden die Daten auf diesem Gerät gelöscht"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Wenn du beim nächsten Versuch ein falsches Passwort eingibst, werden die Daten auf diesem Gerät gelöscht"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Wenn du beim nächsten Versuch ein falsches Muster eingibst, wird dieser Nutzer von dem Gerät entfernt"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Wenn du beim nächsten Versuch eine falsche PIN eingibst, wird dieser Nutzer von dem Gerät entfernt"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Wenn du beim nächsten Versuch ein falsches Passwort eingibst, wird dieser Nutzer von dem Gerät entfernt"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Wenn du beim nächsten Versuch ein falsches Muster eingibst, werden dein Arbeitsprofil und die zugehörigen Daten gelöscht"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Wenn du beim nächsten Versuch eine falsche PIN eingibst, werden dein Arbeitsprofil und die zugehörigen Daten gelöscht"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Wenn du beim nächsten Versuch ein falsches Passwort eingibst, werden dein Arbeitsprofil und die zugehörigen Daten gelöscht"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Zu viele Fehlversuche. Die Daten auf diesem Gerät werden gelöscht."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Zu viele Fehlversuche. Dieser Nutzer wird von dem Gerät entfernt."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Zu viele Fehlversuche. Dieses Arbeitsprofil und die zugehörigen Daten werden gelöscht."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Schließen"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Das Passwort muss mindestens <xliff:g id="COUNT">%d</xliff:g> Zeichen umfassen"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Die PIN muss mindestens <xliff:g id="COUNT">%d</xliff:g> Ziffern umfassen"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Weiter"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth - Erweitert"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bei aktiviertem Bluetooth kann dein Gerät mit Bluetooth-Geräten in der Nähe kommunizieren."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Zur Erhöhung der Standortgenauigkeit können System-Apps und -dienste Bluetooth-Geräte weiterhin erkennen. Du kannst dies in den <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>Sucheinstellungen<xliff:g id="LINK_END_1">LINK_END</xliff:g> ändern."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Verbindung konnte nicht hergestellt werden. Versuch es noch einmal."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Gerätedetails"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Bluetooth-Adresse des Geräts: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Gerät entkoppeln?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Dein Smartphone ist dann nicht mehr mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gekoppelt"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Dein Tablet ist dann nicht mehr mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gekoppelt"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Dein Gerät ist dann nicht mehr mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gekoppelt"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Gerät entkoppeln"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Verbinden mit..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird vom Medien-Audiosystem getrennt."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird von der Freisprechfunktion getrennt."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Nicht bereitstellen"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Nicht validieren"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Kein Zertifikat angegeben. Es wird keine private Verbindung hergestellt."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Der Netzwerkname ist zu lang."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Angabe einer Domain erforderlich."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS verfügbar"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS verfügbar)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 Netzwerk</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Erweiterte WLAN-Einstellungen"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"WLAN konfigurieren"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-Adresse"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-Adresse"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnetzmaske"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Diese Gruppe entfernen?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Mobiler WLAN-Hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"WLAN-Hotspot"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Mobilfunkverbindung für WLAN verwenden"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Internetverbindung dieses Tablets nicht über Hotspot freigegeben"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Internetverbindung dieses Smartphones nicht über Hotspot freigegeben"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Keine Freigabe der Internetverbindung oder von Inhalten für andere Geräte"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internetverbindung dieses Tablets wird über Hotspot freigegeben"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internetverbindung dieses Smartphones wird über Hotspot freigegeben"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Es werden Inhalte per App geteilt. Wenn du eine Internetverbindung freigeben möchtest, deaktiviere den Hotspot und aktiviere ihn dann neu"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"WLAN-Name"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> wird aktiviert..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Andere Geräte können sich mit <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> verbinden"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"WLAN-Passwort"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Band für Zugangspunkt"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Mit einem Hotspot kannst du ein WLAN für andere Geräte einrichten. Die Internetverbindung wird über deine mobilen Daten hergestellt, darum können zusätzliche Kosten anfallen."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"In Apps können über einen Hotspot Inhalte mit Geräten in der Nähe geteilt werden."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Hotspot wird aktiviert…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot wird deaktiviert…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ist aktiviert"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wenn die Option \"Anrufe über WLAN\" aktiviert ist, kann dein Smartphone abhängig von deiner Einstellung und von der Signalstärke Anrufe über WLAN-Netzwerke oder über das Netz deines Mobilfunkanbieters übertragen. Erkundige dich bei deinem Mobilfunkanbieter über die hierfür erhobenen Gebühren und andere Informationen, bevor du diese Funktion aktivierst."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Notfalladresse aktualisieren"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Adresse, die bei einem Notruf über WLAN von Notdiensten als dein Standort verwendet wird"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Keine Ergebnisse"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Display automatisch drehen"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Kräftige Farben"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Ausrichtung beim Drehen des Tablets automatisch ändern"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Ausrichtung beim Drehen des Telefons automatisch ändern"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Ausrichtung beim Drehen des Tablets automatisch ändern"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"\"Helligkeit an Lichtverhältnisse anpassen\": Ist diese Funktion aktiviert, kannst du die Helligkeit dennoch vorübergehend ändern."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Nachtlicht"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Beim Nachtlicht wird das Display gelb gefärbt. Dadurch kannst du den Bildschirm bei schwachem Licht leichter lesen und er wirkt beim Einschlafen nicht störend."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Planen"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Automatisch aktivieren"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nie"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Benutzerdefinierter Zeitplan"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Sonnenuntergang bis -aufgang"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Zeitplan"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Nie"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Zu benutzerdefinierter Zeit aktiv"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Von Sonnenuntergang bis -aufgang aktiv"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Beginn"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Ende"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensität"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Aus. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Wird niemals automatisch aktiviert."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Wird automatisch um <xliff:g id="ID_1">%1$s</xliff:g> aktiviert."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Wird bei Sonnenuntergang automatisch aktiviert."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"An. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Wird niemals automatisch deaktiviert."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Wird automatisch um <xliff:g id="ID_1">%1$s</xliff:g> deaktiviert."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Wird bei Sonnenaufgang automatisch deaktiviert."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Aus / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Wird nie automatisch aktiviert"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Wird automatisch um <xliff:g id="ID_1">%1$s</xliff:g> aktiviert"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Wird bei Sonnenuntergang automatisch aktiviert"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"An / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Wird nie automatisch deaktiviert"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Wird automatisch um <xliff:g id="ID_1">%1$s</xliff:g> deaktiviert"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Wird bei Sonnenaufgang automatisch deaktiviert"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Ruhezustand"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Display wird ausgeschaltet."</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Einstellungen"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische Helligkeit"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Zum Aktivieren anheben"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Inaktivitätsdisplay"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Inaktivitätsdisplay"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Immer aktiviert"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Neue Benachrichtigungen"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Anzeige"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Neue Benachrichtigungen"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bei Benachrichtigungen Bildschirm aktivieren"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Immer aktiviert"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Uhrzeit, Benachrichtigungssymbole und andere Informationen anzeigen"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Schriftgröße"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Text vergrößern oder verkleinern"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Einstellungen für SIM-Sperre"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN darf nicht leer sein."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Das MCC-Feld muss 3 Zeichen enthalten."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Das MNC-Feld muss 2 oder 3 Zeichen enthalten."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Der Anbieter erlaubt das Hinzufügen von APNs des Typs %s nicht."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Standard-APN-Einstellungen werden wiederhergestellt"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Auf Standard zurücksetzen"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Zurücksetzen auf Standard-APN-Einstellungen abgeschlossen"</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD-Karte löschen"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Alle Daten, z. B. Musik und Fotos, aus dem internen USB-Speicher löschen"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Alle Daten, z. B. Musik und Fotos, von der SD-Karte löschen"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIMs löschen"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Alle eSIMs auf dem Smartphone werden gelöscht. Dein Mobilfunktarif wird dadurch nicht gekündigt."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Alle eSIMs auf dem Tablet werden gelöscht. Dein Mobilfunktarif wird dadurch nicht gekündigt."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tablet zurücksetzen"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefon zurücksetzen"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Alle personenbezogenen Daten und heruntergeladenen Apps löschen? Diese Aktion kann nicht rückgängig gemacht werden!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Tethering oder Verwendung von mobilen Hotspots nicht möglich, während der Datensparmodus aktiviert ist"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-Tethering"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB verbunden; Tethering aktivieren"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Tethering aktiv"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Tethering bei Verwendung des USB-Speichers nicht möglich"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Keine USB-Verbindung"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Zum Einschalten verbinden"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB-Tethering-Fehler"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Internetverbindung des Smartphones über USB freigegeben"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Internetverbindung des Tablets über USB freigegeben"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-Tethering"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Internetverbindung dieses Tablets über Bluetooth freigegeben"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Internetverbindung dieses Smartphones über Bluetooth freigegeben"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Internetverbindung dieses Tablets für ein Gerät über Bluetooth freigegeben"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Internetverbindung dieses Smartphones für ein Gerät über Bluetooth freigegeben"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Internetverbindung dieses Tablets für <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> Geräte über Bluetooth freigegeben"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Internetverbindung dieses Smartphones für <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> Geräte über Bluetooth freigegeben"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Internetverbindung des Tablets über Bluetooth freigegeben"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Internetverbindung des Smartphones über Bluetooth freigegeben"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Internetverbindung von <xliff:g id="DEVICE_NAME">%1$d</xliff:g> über Bluetooth freigegeben"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Internetverbindung dieses Tablets nicht über Bluetooth freigegeben"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Internetverbindung dieses Smartphones nicht über Bluetooth freigegeben"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Kein Tethering"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Tethering nur für maximal <xliff:g id="MAXCONNECTION">%1$d</xliff:g> Geräte möglich"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Tethering für <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird deaktiviert."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Über \"Hotspot und Tethering\" kannst du für andere Geräte über das Mobilfunknetz eine Internetverbindung freigeben."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Über Hotspot und Tethering kannst du für andere Geräte über deine mobilen Daten eine Internetverbindung freigeben. In Apps können über einen Hotspot Inhalte mit Geräten in der Nähe geteilt werden."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hilfe"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobilfunknetz"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilfunktarif"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Standortmodus"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Standort über GPS, WLAN, Bluetooth oder Mobilfunknetz bestimmen"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Standort über WLAN, Bluetooth oder Mobilfunknetz bestimmen"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS zur Standortbestimmung nutzen"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"GPS und Gerätesensoren zur Standortbestimmung nutzen"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Suche"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"WLAN-Suche"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"System-Apps und -diensten zur Erhöhung der Standortgenauigkeit jederzeit das Erkennen von WLAN-Netzwerken gestatten"</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Es ist keine Datenverbindung vorhanden. Rufe %s von einem beliebigen, mit dem Internet verbundenen Computer auf, um diese Informationen jetzt anzuzeigen."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Wird geladen..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Passwort festlegen"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Passwort festlegen, um Fingerabdruck zu verwenden"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Muster wählen"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Muster festlegen, um Fingerabdruck zu verwenden"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN festlegen"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN festlegen, um Fingerabdruck zu verwenden"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Passwort bestätigen"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Muster bestätigen"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN bestätigen"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"App-Einstellungen"</string>
     <string name="install_applications" msgid="4872012136210802181">"Unbekannte Herkunft"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Alle App-Quellen zulassen"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Kürzlich geöffnete Apps"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Alle <xliff:g id="COUNT">%1$d</xliff:g> Apps anzeigen"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"vor <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Apps mit unbekannter Herkunft können gefährlich für dein Tablet und deine personenbezogenen Daten sein. Wenn du Apps aus dieser Quelle installierst, erklärst du dich damit einverstanden, dass du die Verantwortung für alle Schäden an deinem Tablet und jegliche Datenverluste trägst, die aus der Verwendung dieser Apps entstehen können."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Apps mit unbekannter Herkunft können gefährlich für dein Smartphone und deine personenbezogenen Daten sein. Wenn du Apps aus dieser Quelle installierst, erklärst du dich damit einverstanden, dass du die Verantwortung für alle Schäden an deinem Smartphone und jegliche Datenverluste trägst, die aus der Verwendung dieser Apps entstehen können."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Erweiterte Einstellungen"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Systemdienst beenden?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Wenn du diesen Dienst beendest, funktionieren möglicherweise einige Funktionen deines Tablets nicht mehr richtig, bis du es aus- und wieder einschaltest."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Wenn du diesen Dienst beendest, funktionieren möglicherweise einige Funktionen deines Telefons nicht mehr richtig, bis du es aus- und wieder einschaltest."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Sprachen, Eingabe &amp; Gesten"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Sprachen &amp; Eingabe"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Sprachen &amp; Eingabe"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Eingabehilfen"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> Druckdienste aktiviert</item>
       <item quantity="one">1 Druckdienst aktiviert</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> Druckaufträge</item>
+      <item quantity="one">1 Druckauftrag</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Druckdienste"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Keine Dienste installiert"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Keine Drucker gefunden"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Details"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Energieverbrauch anpassen"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Enthaltene Pakete"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps mit hohem Akkuverbrauch"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Gerät bleibt aktiv"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Gerät wird im Hintergrund aktiviert"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Häufige Standortabfrage"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> fehlerhafte Apps"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"App beenden?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Der Akkuverbrauch auf deinem Smartphone kann nicht normal verwaltet werden, weil es durch <xliff:g id="APP">%1$s</xliff:g> aktiv bleibt.\n\nUm das Problem zu beheben, kannst du das Beenden der App erzwingen.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Akkuleistung zu verbessern."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Der Akkuverbrauch auf deinem Tablet kann nicht normal verwaltet werden, weil es durch <xliff:g id="APP">%1$s</xliff:g> aktiv bleibt.\n\nUm das Problem zu beheben, kannst du das Beenden der App erzwingen.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Akkuleistung zu verbessern."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Der Akkuverbrauch auf deinem Gerät kann nicht normal verwaltet werden, weil es durch <xliff:g id="APP">%1$s</xliff:g> aktiv bleibt.\n\nUm das Problem zu beheben, kannst du das Beenden der App erzwingen.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Akkuleistung zu verbessern."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"App beenden"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Hintergrundnutzung deaktivieren?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Der Akkuverbrauch auf deinem Smartphone kann nicht normal verwaltet werden, weil es durch <xliff:g id="APP">%1$s</xliff:g> aktiv bleibt.\n\nUm das Problem zu beheben, kannst du festlegen, dass diese App nicht im Hintergrund ausgeführt wird."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Der Akkuverbrauch auf deinem Tablet kann nicht normal verwaltet werden, weil es durch <xliff:g id="APP">%1$s</xliff:g> aktiv bleibt.\n\nUm das Problem zu beheben, kannst du festlegen, dass diese App nicht im Hintergrund ausgeführt wird."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Der Akkuverbrauch auf deinem Gerät kann nicht normal verwaltet werden, weil es durch <xliff:g id="APP">%1$s</xliff:g> aktiv bleibt.\n\nUm das Problem zu beheben, kannst du festlegen, dass diese App nicht im Hintergrund ausgeführt wird."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Deaktivieren"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Standortzugriff deaktivieren?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Der Akkuverbrauch auf deinem Smartphone kann nicht normal verwaltet werden, weil <xliff:g id="APP">%1$s</xliff:g> immer wieder den Standort abfragt, auch wenn du die App nicht verwendest.\n\nUm das Problem zu beheben, kannst du den Standortzugriff für diese App deaktivieren."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Der Akkuverbrauch auf deinem Tablet kann nicht normal verwaltet werden, weil <xliff:g id="APP">%1$s</xliff:g> immer wieder den Standort abfragt, auch wenn du die App nicht verwendest.\n\nUm das Problem zu beheben, kannst du den Standortzugriff für diese App deaktivieren."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Der Akkuverbrauch auf deinem Gerät kann nicht normal verwaltet werden, weil <xliff:g id="APP">%1$s</xliff:g> immer wieder den Standort abfragt, auch wenn du die App nicht verwendest.\n\nUm das Problem zu beheben, kannst du den Standortzugriff für diese App deaktivieren."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Deaktivieren"</string>
     <string name="power_screen" msgid="3023346080675904613">"Display"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Taschenlampe"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
     <string name="power_service" msgid="1599661212370831780">"Dienste"</string>
     <string name="power_system" msgid="8290455327965307383">"System"</string>
-    <string name="power_user" msgid="1889728099253018005">"Nutzer"</string>
+    <string name="power_user" msgid="3706143225319881667">"Andere Nutzer"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU insgesamt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU Vordergrund"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Aktiv lassen"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Zu hoch berechneter Stromverbrauch"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Seit <xliff:g id="TIME">^1</xliff:g> verwendet"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktiv seit <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Displaynutzung: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> durch <xliff:g id="APP">%2$s</xliff:g> verbraucht"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> des gesamten Akkuverbrauchs"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN ändern"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Benachrichtigungen zeigen"</string>
     <string name="help_label" msgid="6886837949306318591">"Hilfe &amp; Feedback"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Hilfeartikel, Telefon- &amp; Chatsupport"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Hilfeartikel, Telefon- &amp; Chatsupport und die ersten Schritte"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Konto für Inhalte"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Extreme Gefahren"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">%d ausgeblendetes Element anzeigen</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Netzwerk &amp; Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"WLAN, mobile Daten, Datenverbrauch, Hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"Mobilfunknetz"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"Datennutzung"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"Hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Verbundene Geräte"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Streaming, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth und Streaming"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; Benachrichtigungen"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Berechtigungen, Standard-Apps"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Nutzer und Konten"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"Bewegung"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"Bezahlen, tippen, Zahlungen"</string>
     <string name="keywords_backup" msgid="470070289135403022">"Sicherung, sicherung"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"geste, gesten, rand, seite, aktiver rand, drücken, griff, greifen, helfen, assistent, assistant, squeezy, knautschen, quetschen, ok google, google assistant"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"geste, gesten, aufwecken, ruhemodus beenden, aktivieren, benachrichtigungen, bildschirm, display, bildschirm aus, display aus, bildschirm ausschalten, display ausschalten, bildschirm deaktivieren, display deaktivieren, bildschirm an, display an, bildschirm anschalten, display anschalten, bildschirm einschalten, display einschalten, bildschirm aktivieren, display aktivieren, drücken, rand, ruhemodus, inaktiv, griff, greifen"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"geste, gesten, stummschalten, stumm schalten, stummschaltung, schlummern, snooze, alarm, wecker, eingehender anruf, anruf, leise, display, bildschirm, sperrbildschirm, drücken, griff, greifen, rand, stop, stopp, beenden"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"WLAN-NFC-Tag einrichten"</string>
     <string name="write_tag" msgid="8571858602896222537">"Schreiben"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Zum Schreiben auf ein Tag tippen…"</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Keine geschäftlichen Benachrichtigungen anzeigen"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Wie sollen Profilbenachrichtigungen angezeigt werden, wenn dein Gerät gesperrt ist?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profilbenachrichtigungen"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Benachrichtigungen"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Benachrichtigungen"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"App-Benachrichtigungen"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Benachrichtigungskategorie"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Wichtigkeit"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Entscheidung der App überlassen"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Dringend"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Ton erlauben"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Diese Benachrichtigungen nicht auf dem aktuellen Bildschirm einblenden und keinen Ton sowie keine Vibration dafür erzeugen."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Geringe Wichtigkeit"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Mittlere Wichtigkeit"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Hohe Wichtigkeit"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Sehr hohe Wichtigkeit"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Benachrichtigungsassistent"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Benachrichtigungszugriff"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Zugriff auf Arbeitsprofil-Benachrichtigungen ist blockiert"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Bild-in-Bild"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Bild-in-Bild zulassen"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Während die App geöffnet ist oder nachdem du sie verlässt (z. B. um ein Video weiter anzusehen) öffnet die App ein Bild-im-Bild-Fenster. Das Fenster wird über anderen Apps eingeblendet, die du gerade verwendest."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Ja"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Nein"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Zugriff während \"Nicht stören\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Keine installierte App hat während \"Nicht stören\" Zugriff angefordert."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Apps werden geladen..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Dieses Arbeitsprofil wird verwaltet von:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Verwaltet von <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimentell)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Bildschirm drehen"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Bildschirminhalte drehen"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Hochformat beibehalten"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Querformat beibehalten"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Aktuelle Ausrichtung beibehalten"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Sicherer Start"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Weiter"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Du kannst dieses Gerät zusätzlich schützen, indem du festlegst, dass deine PIN vor dem Start eingegeben werden muss. Bis das Gerät startet, können keine Anrufe, Nachrichten oder Benachrichtigungen, einschließlich Weckrufen, empfangen werden. \n\nSo können Daten auf verloren gegangenen oder gestohlenen Geräten geschützt werden. Möchtest du festlegen, dass deine PIN zum Starten des Geräts eingegeben werden muss?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Du kannst dieses Gerät zusätzlich schützen, indem du festlegst, dass dein Passwort vor dem Start eingegeben werden muss. Bis das Gerät startet, können keine Anrufe, Nachrichten oder Benachrichtigungen, einschließlich Weckrufen, empfangen werden. \n\nSo können Daten auf verloren gegangenen oder gestohlenen Geräten geschützt werden. Möchtest du festlegen, dass dein Passwort zum Starten des Geräts eingegeben werden muss?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Neben dem Fingerabdruck zum Entsperren deines Geräts kannst du dein Gerät noch zusätzlich schützen, indem du festlegst, dass deine PIN vor dem Start eingegeben werden muss. Bis das Gerät startet, können keine Anrufe, Nachrichten oder Benachrichtigungen, einschließlich Weckrufen, empfangen werden.\n\nSo können Daten auf verloren gegangenen oder gestohlenen Geräten geschützt werden. Möchtest du festlegen, dass deine PIN zum Starten des Geräts eingegeben werden muss?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Neben dem Fingerabdruck zum Entsperren deines Geräts kannst du dein Gerät noch zusätzlich schützen, indem du festlegst, dass dein Muster vor dem Start eingegeben werden muss. Bis das Gerät startet, können keine Anrufe, Nachrichten oder Benachrichtigungen, einschließlich Weckrufen, empfangen werden.\n\nSo können Daten auf verloren gegangenen oder gestohlenen Geräten geschützt werden. Möchtest du festlegen, dass dein Muster zum Starten des Geräts eingegeben werden muss?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Neben dem Fingerabdruck zum Entsperren deines Geräts kannst du dein Gerät noch zusätzlich schützen, indem du festlegst, dass dein Passwort vor dem Start eingegeben werden muss. Bis das Gerät startet, können keine Anrufe, Nachrichten oder Benachrichtigungen, einschließlich Weckrufen, empfangen werden.\n\nSo können Daten auf verloren gegangenen oder gestohlenen Geräten geschützt werden. Festlegen, dass dein Passwort zum Starten des Geräts eingegeben werden muss&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Neben der Verwendung deines Fingerabdrucks zum Entsperren des Geräts kannst du es zusätzlich schützen, indem du festlegst, dass vor dem Gerätestart die Eingabe deines Passworts erforderlich ist. Bis das Gerät startet, können weder Anrufe noch Nachrichten, Benachrichtigungen oder Alarme empfangen werden.\n\nSo schützt du Daten auf verloren gegangenen oder gestohlenen Geräten. Möchtest du festlegen, dass dein Passwort zum Starten des Geräts eingegeben werden muss?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ja"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nein"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN erforderlich?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Akkuwarnung"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Vollständige Gerätenutzung zeigen"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"App-Nutzung zeigen"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Häufig verwendet"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> Apps funktionieren nicht wie gewohnt</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> funktioniert nicht wie gewohnt</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Apps belasten den Akku</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> belastet den Akku</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Nicht optimiert"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nicht optimiert"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Akkuverbrauch optimiert"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Über anderen Apps einblenden"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> von <xliff:g id="COUNT_1">%2$d</xliff:g> Apps dürfen über anderen eingeblendet werden"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Apps mit Berechtigung"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Ja"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Nein"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Zulässig"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Nicht zulässig"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"apps installieren aus unbekannten quellen"</string>
     <string name="write_settings" msgid="4797457275727195681">"Systemeinstellungen ändern"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"systemeinstellungen schreiben ändern"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Der Bildschirm ist gelb gefärbt. Das kann dir beim Einschlafen helfen."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Vorschläge"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> weitere"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> Vorschläge</item>
+      <item quantity="one">1 Vorschlag</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> Vorschläge</item>
+      <item quantity="one">+1  Vorschlag</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Entfernen"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Kalte Farbtemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Kältere Displayfarben verwenden"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Warnlimit für mobile Datennutzung: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Warnlimit für mobile Datennutzung: <xliff:g id="ID_1">%1$s</xliff:g>/Datenlimit: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Abrechnungszeitraum"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Der monatliche Abrechnungszeitraum beginnt jeweils am <xliff:g id="ID_1">%1$s</xliff:g>. jedes Monats"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Monatlich ab dem <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Monatlich am <xliff:g id="ID_1">%1$s</xliff:g>."</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Netzwerkbeschränkungen"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> Beschränkungen</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 App darf uneingeschränkt Daten verbrauchen, auch wenn der Datensparmodus aktiviert ist</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Datensparmodus"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Uneingeschränkte Daten"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Uneingeschränkter Datenzugriff"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Hintergrunddaten sind deaktiviert"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"An"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Aus"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Sperrbildschirm-Benachr. verwalten"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Benachrichtigungsinhalt ein- oder ausblenden"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Alle"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Hilfe"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Support &amp; Tipps"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Geringste Breite"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Keine installierte App hat Zugriff auf Premium-SMS angefordert."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Bei Premium-SMS können Kosten entstehen, die über den Mobilfunkanbieter abgerechnet werden. Wenn du für eine App Premium-SMS zulässt, kannst du aus ihr Premium-SMS versenden."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatisch"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuell"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Jetzt Speicherplatz freigeben"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Bewegungen"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Bewegungskombinationen"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Schnelle Gesten zum Steuern deines Smartphones"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Schnelle Gesten zum Steuern deines Tablets"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Schnelle Gesten zum Steuern deines Geräts"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Zur Kamera wechseln"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Starte die Kamera direkt, indem du die Ein-/Aus-Taste zweimal drückst. Dies funktioniert auf jedem Display."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Kamera schnell öffnen"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Ein-/Aus-Taste zweimal drücken, um die Kamera zu öffnen"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kamera wechseln"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Schnell Selfies aufnehmen"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Smartphone für den Selfie-Modus zweimal drehen"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Tablet für den Selfie-Modus zweimal drehen"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Gerät für den Selfie-Modus zweimal drehen"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Doppeltippen für schnellen Blick auf das Smartphone-Display"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Doppeltippen für schnellen Blick auf das Display des Tablets"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Doppeltippen für schnellen Blick auf das Display des Geräts"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Durch Doppeltippen auf das Display kannst du einen schnellen Blick auf deine Benachrichtigungen werfen."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Durch Doppeltippen auf den Bildschirm kannst du einen Blick auf die Uhrzeit, Benachrichtigungen und andere Informationen werfen."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Benachrichtigungen bei inaktivem Display sehen"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Für Benachr. anheben"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tablet hochnehmen, um das Display anzusehen"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Gerät hochnehmen, um das Display anzusehen"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Wirf einen schnellen Blick auf deine Benachrichtigungen, indem du dein Smartphone einfach in die Hand nimmst."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Wirf einen schnellen Blick auf deine Benachrichtigungen, indem du dein Tablet einfach in die Hand nimmst."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Wirf einen schnellen Blick auf deine Benachrichtigungen, indem du dein Gerät einfach in die Hand nimmst."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Wirf einen Blick auf die Uhrzeit, Benachrichtigungen und andere Informationen, indem du dein Smartphone einfach in die Hand nimmst."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Wirf einen Blick auf die Uhrzeit, Benachrichtigungen und andere Informationen, indem du dein Tablet einfach in die Hand nimmst."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Wirf einen Blick auf die Uhrzeit, Benachrichtigungen und andere Informationen, indem du dein Gerät einfach in die Hand nimmst."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Benachrichtigungen bei inaktivem Display sehen"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Benachr. mit Fingerabdruck"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Du kannst deine Benachrichtigungen lesen, indem du auf der Rückseite deines Smartphones über den Fingerabdrucksensor nach unten wischst."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Du kannst deine Benachrichtigungen lesen, indem du auf der Rückseite deines Tablets über den Fingerabdrucksensor nach unten wischst."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Du kannst deine Benachrichtigungen lesen, indem du auf der Rückseite deines Geräts über den Fingerabdrucksensor nach unten wischst."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Benachrichtigungen schnell sehen"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Auf dem Fingerabdrucksensor nach unten wischen"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Smartphone hochnehmen, um die Kamera zu öffnen"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Wenn du dein Smartphone hochhebst und es zum Fotografieren im Hoch- oder Querformat hältst, öffnet sich die Kamera automatisch. Dies funktioniert, wenn das Gerät im Ruhemodus oder gesperrt ist."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Fotos machen, wenn das Gerät im Ruhemodus oder gesperrt ist"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Assistent-Bewegung"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Empfindlichkeit"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Möchtest du diese Instant-App entfernen?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Spiele"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audiodateien"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Belegter Speicherplatz"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(für Nutzer <xliff:g id="USER">%s</xliff:g> deinstalliert)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(für Nutzer <xliff:g id="USER">%s</xliff:g> deaktiviert)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"AutoFill-Dienst"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Instant-App"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Speichermanager deaktivieren?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Film- &amp; TV-Apps"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Belegter Speicherplatz"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Informationen zur Nutzerverwaltung durch den Anbieter"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Nutzerverwaltung durch den Anbieter auslösen"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Was gibt\'s Neues?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Die fünf besten Funktionen"</string>
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index ab8d05b..6e1ba8b 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Καλό"</item>
     <item msgid="8986346415847956850">"Εξαιρετικό"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Πάντα"</item>
-    <item msgid="844721238536786870">"Μόνο όταν είναι συνδεδεμένο"</item>
-    <item msgid="1986753720941888596">"Ποτέ"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Πάντα"</item>
-    <item msgid="7433294150916905997">"Μόνο όταν είναι συνδεδεμένο"</item>
-    <item msgid="1390404486722375028">"Ποτέ"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 τελευταίες ημέρες"</item>
     <item msgid="6600989128423965319">"Ορισμός κύκλου χρήσης…"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 82e98ca..d8e4bda 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Είστε πλέον προγραμματιστής!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Δεν χρειάζεται, είστε ήδη προγραμματιστής."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Ενεργοποιήστε πρώτα τις επιλογές για προγραμματιστές."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Ασύρματο και δίκτυα"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Συνδέσεις"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Συσκευή"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Παρέχεται από την VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Παρέχεται δυνατότητα βιντεοκλήσης"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Παρέχεται δυνατότητα κλήσης μέσω Wi-Fi"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Παρέχεται EAB/παρουσία"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Ισχύς πομπού κινητής τηλεφωνίας"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Προβολή βιβλίου διευθύνσεων κάρτας SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Προβολή προκαθορισμένων αριθμών κλήσης"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Σάρωση για συσκευές"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Μετονομασία αυτής της συσκευής"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Μετονομασία"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Αποσύνδεση;"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Θα τερματιστεί η σύνδεσή σας με τη συσκευή:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Αποσύνδεση συσκευής;"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Το τηλέφωνό σας θα αποσυνδεθεί από τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Το tablet σας θα αποσυνδεθεί από τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Η συσκευή σας θα αποσυνδεθεί από τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Αποσύνδεση"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Δεν έχετε άδεια να αλλάξετε τις ρυθμίσεις Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Σύζευξη νέας συσκευής"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> είναι ορατή σε κοντινές συσκευές όταν είναι ανοικτές οι Ρυθμίσεις Bluetooth."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Διεύθυνση Bluetooth τηλεφώνου: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Διεύθυνση Bluetooh tablet <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Διεύθυνση Bluetooth συσκευής: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Να αποσυνδεθεί η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>;"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Μετάδοση"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Απενεργοπ. προφίλ;"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Αίτημα σύζευξης Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Αίτημα σύζευξης"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Πατήστε για σύζευξη με τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Εμφάνιση ληφθέντων αρχείων"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Αρχεία που έχουν ληφθεί"</string>
     <string name="device_picker" msgid="4978696506172252813">"Συσκευή Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> θέλει να ενεργοποιήσει το Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> θέλει να απενεργοποιήσει το Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s επιθυμεί να αποκτήσει πρόσβαση στα μηνύματά σας. Παραχώρηση πρόσβασης σε %2$s;"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Αίτημα πρόσβασης SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Η συσκευή <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> επιθυμεί πρόσβαση στην κάρτα SIM. Η χορήγηση πρόσβασης στην κάρτα SIM θα απενεργοποιήσει τη σύνδεση δεδομένων στη συσκευή σας κατά τη διάρκεια της σύνδεσης. Παραχώρηση πρόσβασης στη συσκευή <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Ορατή ως \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" σε άλλες συσκευές"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Οι συσκευές σας"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Σύζευξη νέας συσκευής"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Ημερομηνία &amp; ώρα"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Επιλέξτε ζώνη ώρας"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Λογαριασμοί"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Τοποθεσία"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Λογαριασμοί"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Ασφάλεια και τοποθεσία"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Ασφάλεια και τοποθεσία"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Κρυπτογράφηση και διαπιστευτήρια"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Το τηλέφωνο είναι κρυπτογραφημένο"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Η συσκευή είναι κρυπτογραφημένη"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Ξεκλείδ. με δακτ. αποτύπωμα"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Χρήση δακτυλικού αποτυπώματος"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Αγγίξτε απλώς τον αισθητήρα δακτυλικών αποτυπωμάτων για να ξεκλειδώσετε το τηλέφωνό σας, να επιτρέψετε αγορές ή να συνδεθείτε σε εφαρμογές. Να είστε προσεκτικοί με τα δακτυλικά αποτυπώματα που προσθέτετε. Αυτές οι ενέργειες θα μπορούν να γίνουν ακόμη και με ένα μόνο δακτυλικό αποτύπωμα που προσθέτετε.\n\nΣημείωση: Το ξεκλείδωμα με δακτυλικά αποτυπώματα ενδέχεται να είναι λιγότερο ασφαλές από ό, τι ένα ισχυρό μοτίβο ή κωδικός PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Απλώς αγγίξτε τον αισθητήρα δακτυλικών αποτυπωμάτων για να εξουσιοδοτήσετε αγορές ή για να συνδεθείτε σε εφαρμογές. Να είστε προσεχτικοί με τα δακτυλικά αποτυπώματα που προσθέτετε. Αυτές οι ενέργειες θα μπορούν να γίνουν με κάθε δακτυλικό αποτύπωμα που έχετε προσθέσει.\n\nΣημείωση: Δεν μπορείτε να χρησιμοποιήσετε το δακτυλικό σας αποτύπωμα για να ξεκλειδώσετε αυτήν τη συσκευή. Για περισσότερες πληροφορίες, επικοινωνήστε με τον διαχειριστή του οργανισμού σας."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Αγγίξτε απλώς τον αισθητήρα δακτυλικών αποτυπωμάτων για να ξεκλειδώσετε το τηλέφωνό σας, να εξουσιοδοτήσετε αγορές ή να συνδεθείτε σε εφαρμογές. Να είστε προσεκτικοί με τα δακτυλικά αποτυπώματα που προσθέτετε. Αυτές οι ενέργειες θα μπορούν να γίνουν ακόμη και με ένα μόνο δακτυλικό αποτύπωμα που έχετε προσθέσει.\n\nΣημείωση: Το ξεκλείδωμα με δακτυλικά αποτυπώματα ενδέχεται να είναι λιγότερο ασφαλές από ένα ισχυρό μοτίβο ή αριθμό PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Χρησιμοποιήστε το δακτυλικό σας αποτύπωμα, για να ξεκλειδώνετε το τηλέφωνό σας ή να εγκρίνετε αγορές.\n\nΣημείωση: Δεν μπορείτε να χρησιμοποιήσετε το δακτυλικό σας αποτύπωμα, για να ξεκλειδώσετε αυτήν τη συσκευή. Για περισσότερες πληροφορίες, επικοινωνήστε με τον διαχειριστή του οργανισμού σας."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Χρησιμοποιήστε το δακτυλικό σας αποτύπωμα για ξεκλείδωμα του τηλεφώνου ή για έγκριση αγορών.\n\nΣημείωση: Το δακτυλικό σας αποτύπωμα μπορεί να είναι λιγότερο ασφαλές από ένα ισχυρό μοτίβο ή PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Ακύρωση"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Συνέχεια"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Παράλειψη"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Προσθήκη δακτ. αποτυπ."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους από τη χρήση αυτού του tablet εάν χαθεί, κλαπεί ή υποστεί ολική επαναφορά."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους από τη χρήση αυτής της συσκευής εάν χαθεί, κλαπεί ή υποστεί ολική επαναφορά."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους από τη χρήση αυτού του τηλεφώνου εάν χαθεί, κλαπεί ή υποστεί ολική επαναφορά."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους από τη χρήση αυτού του tablet, αν χαθεί ή κλαπεί."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους από τη χρήση αυτής της συσκευής, αν χαθεί ή κλαπεί."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους από τη χρήση αυτού του τηλεφώνου, αν χαθεί ή κλαπεί."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Επόμενο"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους χρήστες από τη χρήση αυτού του tablet εάν χαθεί, κλαπεί ή επαναφερθεί."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους χρήστες από τη χρήση αυτής της συσκευής εάν χαθεί, κλαπεί ή επαναφερθεί."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους χρήστες από τη χρήση αυτού του τηλεφώνου εάν χαθεί, κλαπεί ή επαναφερθεί."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους χρήστες από τη χρήση αυτού του tablet εάν χαθεί ή κλαπεί."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους χρήστες από τη χρήση αυτής της συσκευής εάν χαθεί ή κλαπεί."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους χρήστες από τη χρήση αυτού του τηλεφώνου εάν χαθεί ή κλαπεί."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Παράλειψη"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Επιστροφή"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Βρείτε τον αισθητήρα"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Εντοπίστε τον αισθητήρα μοναδικού χαρακτηριστικού στο πίσω μέρος του τηλεφώνου σας."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Αγγίξτε τον αισθητήρα"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Βρίσκεται στο πίσω μέρος του τηλεφώνου σας. Χρησιμοποιήστε τον δείκτη σας."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Εικόνα συσκευής και της τοποθεσίας του αισθητήρα μοναδικού χαρακτηριστικού"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Όνομα"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ΟΚ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Διαγραφή"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Ας ξεκινήσουμε"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Αγγίξτε τον αισθητήρα"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Τοποθετήστε το δάχτυλό σας στον αισθητήρα και ανασηκώστε το μόλις αισθανθείτε μια δόνηση"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Συνέχεια"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Κουνήστε ελαφρώς το δάχτυλό σας για να προσθέσετε όλα τα διαφορετικά τμήματα του δαχτυλικού σας αποτυπώματος"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Προστέθηκε μον.χαρακ.!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Όποτε βλέπετε αυτό το εικονίδιο, μπορείτε να χρησιμοποιείτε το μοναδικό χαρακτηριστικό σας για την ταυτοποίηση ή την εξουσιοδότηση μιας αγοράς."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Απλά αγγίξτε τον αισθητήρα δακτυλικών αποτυπωμάτων για να αφυπνίσετε και να ξεκλειδώσετε τη συσκευή σας."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Όταν βλέπετε αυτό το εικονίδιο, μπορείτε επίσης να εξουσιοδοτείτε αγορές ή αν συνδέεστε σε εφαρμογές."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Ανασηκώστε και αγγίξτε ξανά"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Συνεχίστε να ανασηκώνετε το δάχτυλό σας, για να προσθέσετε τα διάφορα τμήματα του δακτυλικού σας αποτυπώματος"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Προστέθηκε δακτυλ. αποτύπωμα"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Όταν βλέπετε αυτό το εικονίδιο, χρησιμοποιήστε το δακτυλικό σας αποτύπωμα για ταυτοποίηση ή για την έγκριση αγορών."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Παράβλεψη ρύθμ. μοναδ. χαρακτηριστικού;"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Επιλέξατε να χρησιμοποιήσετε το μοναδικό χαρακτηριστικό σας ως έναν τρόπο για να ξεκλειδώσετε το τηλέφωνό σας. Εάν κάνετε παράβλεψη τώρα, θα πρέπει να το ρυθμίσετε αυτό αργότερα. Η εγκατάσταση διαρκεί μόνο ένα λεπτό περίπου."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ρύθμιση κλειδώματος οθόνης"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Τέλος"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ωχ, αυτό δεν είναι ο αισθητήρας"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Χρήση αισθητήρα μοναδικού χαρακτ. συσκευής."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Αγγίξτε τον πίσω αισθητήρα με τον δείκτη σας."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Η εγγραφή δεν ολοκληρώθηκε"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Λήξη χρονικού ορίου εγγραφής δακτυλικών αποτυπωμάτων. Δοκιμάστε ξανά."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Αποτυχία εγγραφής δακτυλικών αποτυπωμάτων. Δοκιμάστε ξανά ή χρησιμοποιήστε ένα άλλο δάκτυλο."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Αποτρέψτε άλλους από τη χρήση αυτής της συσκευής χωρίς την άδειά σας ενεργοποιώντας τις λειτουργίες προστασίας συσκευής. Επιλέξτε το κλείδωμα οθόνης που θέλετε να χρησιμοποιήσετε."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Αποτρέψτε άλλους από τη χρήση αυτού του τηλεφώνου χωρίς την άδειά σας ενεργοποιώντας τις λειτουργίες προστασίας συσκευής. Επιλέξτε το κλείδωμα οθόνης που θέλετε να χρησιμοποιήσετε."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Επιλέξτε εφεδρική μέθοδο κλειδώματος οθόνης"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Επιλογές κλειδώματος οθόνης"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Επιλογές κλειδώματος οθόνης"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Κλείδωμα οθόνης"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / αμέσως μετά την αδράνεια"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> μετά την αδράνεια"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Αλλαγή μοτίβου ξεκλειδώματος"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Αλλαγή αριθμού PIN ξεκλειδώματος"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Αλλαγή κωδικού πρόσβασης ξεκλειδώματος"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Προσπαθήστε ξανά. Προσπάθεια <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> από <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Τελευταία δοκιμή"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Εάν εισαγάγετε εσφαλμένο πρότυπο εργασίας σε αυτήν την προσπάθεια, το προφίλ εργασίας σας και τα συσχετισμένα δεδομένα θα καταργηθούν από αυτήν τη συσκευή."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Εάν εισαγάγετε εσφαλμένο PIN εργασίας σε αυτήν την προσπάθεια, το προφίλ εργασίας σας και τα συσχετισμένα δεδομένα θα καταργηθούν από αυτήν τη συσκευή."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Εάν εισαγάγετε εσφαλμένο κωδικό πρόσβασης εργασίας σε αυτήν την προσπάθεια, το προφίλ εργασίας σας και τα συσχετισμένα δεδομένα θα καταργηθούν από αυτήν τη συσκευή."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Πάρα πολλές ανεπιτυχείς προσπάθειες. Τα προφίλ εργασίας σας και τα συσχετισμένα δεδομένα θα καταργηθούν από αυτήν τη συσκευή."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Παράβλεψη"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Προσπαθήστε ξανά. Προσπάθεια <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> από <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Τα δεδομένα σας θα διαγραφούν"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Εάν εισαγάγετε εσφαλμένο μοτίβο στην επόμενη προσπάθεια, τα δεδομένα αυτής της συσκευής θα διαγραφούν"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Εάν εισαγάγετε εσφαλμένο PIN στην επόμενη προσπάθεια, τα δεδομένα αυτής της συσκευής θα διαγραφούν"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Εάν εισαγάγετε εσφαλμένο κωδικό πρόσβασης στην επόμενη προσπάθεια, τα δεδομένα αυτής της συσκευής θα διαγραφούν"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Εάν εισαγάγετε εσφαλμένο μοτίβο στην επόμενη προσπάθεια, αυτός ο χρήστης θα διαγραφεί"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Εάν εισαγάγετε εσφαλμένο PIN στην επόμενη προσπάθεια, αυτός ο χρήστης θα διαγραφεί"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Εάν εισαγάγετε εσφαλμένο κωδικό πρόσβασης στην επόμενη προσπάθεια, αυτός ο χρήστης θα διαγραφεί"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Εάν εισαγάγετε εσφαλμένο μοτίβο στην επόμενη προσπάθεια, το προφίλ εργασίας σας και τα δεδομένα του θα διαγραφούν"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Εάν εισαγάγετε εσφαλμένο PIN στην επόμενη προσπάθεια, το προφίλ εργασίας σας και τα δεδομένα του θα διαγραφούν"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Εάν εισαγάγετε εσφαλμένο κωδικό πρόσβασης στην επόμενη προσπάθεια, το προφίλ εργασίας σας και τα δεδομένα του θα διαγραφούν"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Πάρα πολλές ανεπιτυχείς προσπάθειες. Τα δεδομένα συσκευών θα διαγραφούν."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Πάρα πολλές ανεπιτυχείς προσπάθειες. Αυτός ο χρήστης θα διαγραφεί."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Πάρα πολλές ανεπιτυχείς προσπάθειες. Αυτό το προφίλ εργασίας και τα δεδομένα του θα διαγραφούν."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Παράβλεψη"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Πρέπει να αποτελείται από τουλάχιστον <xliff:g id="COUNT">%d</xliff:g> χαρακτήρες"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Το PIN πρέπει να αποτελείται από τουλάχιστον <xliff:g id="COUNT">%d</xliff:g> ψηφία"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Συνέχεια"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Προηγμένες ρυθμίσεις Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Eνεργοποιήστε το Bluetooth."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Για τη βελτίωση του εντοπισμού τοποθεσίας, οι εφαρμογές και οι υπηρεσίες θα μπορούν ακόμη να ανιχνεύουν συσκευές Bluetooth. Μπορείτε να αλλάξετε αυτήν την επιλογή στις <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ρυθμίσεις σάρωσης<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Δεν ήταν δυνατή η σύνδεση. Δοκιμάστε ξανά."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Λεπτομέρειες συσκευής"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Διεύθυνση Bluetooth συσκευής: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Κατάργηση απομνημόνευσης συσκευής;"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Δεν θα γίνεται πλέον σύζευξη του τηλεφώνου σας με τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Δεν θα γίνεται πλέον σύζευξη του tablet σας με τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Δεν θα γίνεται πλέον σύζευξη της συσκευής σας με τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Κατάργηση απομνημόνευσης συσκευής"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Σύνδεση σε..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί από τον ήχο μέσων."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί από τον ήχο handsfree."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Να μην παρέχεται"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Να μην επικυρώνεται"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Δεν έχει καθοριστεί πιστοποιητικό. Η σύνδεσή σας δεν θα είναι ιδιωτική."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Το όνομα δικτύου είναι υπερβολικά μεγάλο."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Πρέπει να καθορίσετε έναν τομέα."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Διαθέσιμο WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Διαθέσιμο WPS)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 δίκτυο</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Σύνθετο Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Διαμόρφωση Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Διεύθυνση MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Διεύθυνση IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Μάσκα υποδικτύου"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Διαγραφή αυτής της ομάδας;"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Φορητό σημείο πρόσβασης Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Σημείο πρόσβασης Wi-Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Χρήση σύνδεσης κινητής τηλεφωνίας για παροχή δικτύου Wi‑Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Δεν γίνεται κοινή χρήση της σύνδεσης αυτού του tablet στο διαδίκτυο μέσω σημείου πρόσβασης Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Δεν γίνεται κοινή χρήση της σύνδεσης αυτού του τηλεφώνου στο διαδίκτυο μέσω σημείου πρόσβασης Wi-Fi"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Δεν γίνεται κοινή χρήση διαδικτύου ή περιεχομένου με άλλες συσκευές"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Γίνεται κοινή χρήση της σύνδεσης αυτού του tablet στο διαδίκτυο μέσω σημείου πρόσβασης Wi-Fi"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Γίνεται κοινή χρήση της σύνδεσης αυτού του τηλεφώνου στο διαδίκτυο μέσω σημείου πρόσβασης Wi-Fi"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Η εφαρμογή μοιράζεται περιεχόμενο. Για να μοιραστείτε τη σύνδεση στο διαδίκτυο, απενεργοποιήστε το σημείο πρόσβασης Wi-Fi και, στη συνέχεια, ενεργοποιήστε το"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Όνομα Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Ενεργοποίηση σημείου πρόσβασης Wi-Fi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Είναι δυνατή η σύνδεση άλλων συσκευών στο σημείο πρόσβασης Wi-Fi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Κωδικός πρόσβασης Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Ζώνη σημείου πρόσβασης"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Χρησιμοποιήστε σημείο πρόσβασης Wi-Fi, για να δημιουργήσετε ένα δίκτυο Wi-Fi για τις άλλες συσκευές σας. Το σημείο πρόσβασης Wi-Fi παρέχει πρόσβαση στο διαδίκτυο χρησιμοποιώντας τη σύνδεση δεδομένων κινητής τηλεφωνίας. Ενδέχεται να ισχύουν επιπρόσθετες χρεώσεις δεδομένων κινητής τηλεφωνίας."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Οι εφαρμογές μπορούν να δημιουργούν ένα σημείο πρόσβασης Wi-Fi, για να μοιράζονται περιεχόμενο με κοντινές συσκευές."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Ενεργοποίηση σημείου πρόσβασης…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Απενεργοποίηση σημείου πρόσβασης…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"Το <xliff:g id="NETWORK_SSID">%1$s</xliff:g> είναι ενεργό"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Όταν είναι ενεργοποιημένη η λειτουργία κλήσης μέσω Wi-Fi, το τηλέφωνό σας μπορεί να δρομολογεί κλήσεις μέσω δικτύων Wi-Fi ή του δικτύου της εταιρείας κινητής τηλεφωνίας, ανάλογα με την προτίμησή σας και την ισχύ του κάθε σήματος. Πριν ενεργοποιήσετε τη λειτουργία, ρωτήστε την εταιρεία κινητής τηλεφωνίας για να μάθετε σχετικά με τις χρεώσεις και άλλες λεπτομέρειες."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Ενημέρωση διεύθυνσης έκτακτης ανάγκης"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Η διεύθυνση που χρησιμοποιείται από τις υπηρεσίες έκτακτης ανάγκης, ως η τοποθεσία σας εάν πραγματοποιήσετε μια κλήση στο 911 χρησιμοποιώντας Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Προβολή"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Δεν υπάρχουν αποτελέσματα"</string>
     <string name="display_settings" msgid="7965901687241669598">"Προβολή"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Αυτόματη περιστροφή οθόνης"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Έντονα χρώματα"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Αυτόματη εναλλαγή προσανατολισμού κατά την περιστροφή του tablet"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Αυτόματη εναλλαγή προσανατολισμού κατά την περιστροφή του τηλεφώνου"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Αυτόματη εναλλαγή προσανατολισμού κατά την περιστροφή του tablet"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Βελτιστοποιήστε το επίπεδο φωτεινότητας για το διαθέσιμο φως. Όταν είναι ενεργή η εφαρμογή, μπορείτε να προσαρμόσετε τη φωτεινότητα προσωρινά."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Νυχτερινός φωτισμός"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Η λειτουργία \"Νυχτερινός φωτισμός\" αλλάζει το χρώμα της οθόνης σας σε ζεστό κίτρινο. Έτσι είναι πιο εύκολο να κοιτάτε την οθόνη σας ή να διαβάζετε με χαμηλό φωτισμό και αυτό μπορεί να σας βοηθήσει να αποκοιμηθείτε πιο εύκολα."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Πρόγραμμα"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Κατάσταση"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Αυτόματη ενεργοποίηση"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Ποτέ"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Προσαρμοσμένος προγραμματισμός"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Από ηλιοβασίλεμα σε ανατολή"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Πρόγραμμα"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Χωρίς επιλογή"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Ενεργοποιείται σε προσαρμοσμένη ώρα"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Ενεργοπ. από δύση σε ανατολή"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Ώρα έναρξης"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Ώρα λήξης"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Κατάσταση"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Ένταση"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Απενεργοποιημένη. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Δεν θα ενεργοποιηθεί ποτέ αυτόματα."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Αυτόματη ενεργοποίηση στις <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Θα ενεργοποιηθεί αυτόματα με τη δύση του ηλίου."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Ενεργοποιημένη. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Δεν θα απενεργοποιηθεί ποτέ αυτόματα."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Αυτόματη απενεργοποίηση στις <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Θα απενεργοποιηθεί αυτόματα κατά την ανατολή του ηλίου."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Απενεργοποιημένη / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Δεν θα ενεργοποιείται ποτέ αυτόματα"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Θα ενεργοποιείται αυτόματα στις <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Θα ενεργοποιείται αυτόματα με τη δύση του ηλίου"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Ενεργοποιημένη / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Δεν θα απενεργοποιείται ποτέ αυτόματα"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Θα απενεργοποιείται αυτόματα στις <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Θα απενεργοποιείται αυτόματα κατά την ανατολή του ηλίου"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Χρόνος αδράνειας"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Η οθόνη απενεργοποιείται"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Μετά από <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> αδράνειας"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Ρυθμίσεις"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Αυτόματη φωτεινότητα"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Σηκώστε για ενεργοποίηση"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Οθόνη ambient"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Οθόνη περιβάλλοντος"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Πάντα ενεργή"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Νέες ειδοποιήσεις"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Χρόνος εμφάνισης"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Νέες ειδοποιήσεις"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Αφύπνιση οθόνης κατά τη λήψη ειδοποιήσεων"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Πάντα ενεργό"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Εμφάνιση ώρας, εικονιδίων ειδοποίησης και άλλων πληροφοριών"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Μέγεθος γραμματοσειράς"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Κάντε το κείμενο μεγαλύτερο ή μικρότερο"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ρυθμίσεις κλειδ/τος SIM"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Το APN δεν μπορεί να είναι κενό."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Το πεδίο MCC πρέπει να αποτελείται από 3 ψηφία."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Το πεδίο MNC πρέπει να αποτελείται από 2 ή 3 ψηφία."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Η εταιρεία κινητής τηλεφωνίας δεν επιτρέπει την προσθήκη APN του τύπου %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Επαναφορά προεπιλεγμένων ρυθμίσεων APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Επαναφορά στις προεπιλογές"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Η επαναφορά των προεπιλογών APN ολοκληρώθηκε."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Διαγραφή κάρτας SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Διαγράψτε όλα τα δεδομένα που υπάρχουν στον εσωτερικό αποθηκευτικό χώρο USB του τηλεφώνου σας, όπως αρχεία μουσικής και φωτογραφίες"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Διαγράψτε όλα τα δεδομένα που υπάρχουν στην κάρτα SD, όπως αρχεία μουσικής και φωτογραφίες"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Διαγραφή των eSIMs"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Διαγραφή όλων των eSIMs στο τηλέφωνο. Αυτή η ενέργεια δεν θα ακυρώσει το πρόγραμμα υπηρεσίας κινητής τηλεφωνίας."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Διαγραφή όλων των eSIMs στο tablet. Αυτή η ενέργεια δεν θα ακυρώσει το πρόγραμμα υπηρεσίας κινητής τηλεφωνίας."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Επαναφορά tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Επαναφορά τηλεφώνου"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Να διαγραφούν όλα τα προσωπικά σας στοιχεία και οι ληφθείσες εφαρμογές; Δεν είναι δυνατή η αναίρεση αυτής της ενέργειας!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Δεν είναι δυνατή η σύνδεση σε φορητό σημείο πρόσβασης Wi-Fi, ενώ είναι ενεργοποιημένη η Εξοικονόμηση δεδομένων"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Πρόσδεση USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"To USB είναι συνδεδεμένο, επιλέξτε για σύνδεση μέσω κινητής συσκευής"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Συνδέθηκε"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Δεν είναι δυνατή η σύνδεση μέσω κινητής συσκευής όταν ο αποθηκευτικός χώρος USB χρησιμοποιείται"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Το USB δεν συνδέθηκε"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Συνδέστε για ενεργοποίηση"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Σφάλμα πρόσδεσης USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Μοιραστείτε τη σύνδεση του τηλεφώνου στο διαδίκτυο μέσω USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Μοιραστείτε τη σύνδεση του tablet στο διαδίκτυο μέσω USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Πρόσδεση Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Η σύνδεση του tablet μοιράζεται μέσω Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Η σύνδεση του τηλεφώνου μοιράζεται μέσω Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Η σύνδεση του tablet μοιράζεται με 1 συσκευή μέσω Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Η σύνδεση του τηλεφώνου μοιράζεται με 1 συσκευή με Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Η σύνδεση του tablet μοιράζεται με <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> συσκευές μέσω Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Η σύνδεση του τηλ. μοιράζεται με <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> συσκευές μέσω Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Κοινή χρήση της σύνδεσης του tablet στο διαδίκτυο μέσω Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Κοινή χρήση της σύνδεσης του τηλεφώνου στο διαδίκτυο μέσω Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Κοινή χρήση σύνδεσης της συσκευής <xliff:g id="DEVICE_NAME">%1$d</xliff:g> μέσω Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Η σύνδεση του tablet δεν μοιράζεται μέσω Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Η σύνδεση τηλεφώνου δεν μοιράζεται μέσω Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Δεν έχει συνδεθεί"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Αδυναμία σύνδεσης σε περισσότερες από <xliff:g id="MAXCONNECTION">%1$d</xliff:g> συσκευές"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Χρήση σημείου πρόσβασης Wi-Fi και σύνδεσης για την παροχή σύνδεσης στο διαδίκτυο σε άλλες συσκευές μέσω σύνδεσης δεδομένων κινητών."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Χρήση σημείου πρόσβασης Wi-Fi και σύνδεσης για την παροχή σύνδεσης στο διαδίκτυο σε άλλες συσκευές μέσω σύνδεσης δεδομένων κινητής τηλεφωνίας. Οι εφαρμογές μπορούν επίσης να δημιουργούν ένα σημείο πρόσβασης Wi-Fi, για να μοιράζονται περιεχόμενο με κοντινές συσκευές."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Βοήθεια"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Δίκτυο κινητής τηλεφωνίας"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Πρόγραμμα κινητής τηλεφωνίας"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Λειτουργία τοποθεσίας"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Χρήση GPS, Wi‑Fi, Bluetooth και δικτύων κινητής τηλεφωνίας για καθορισμό τοποθεσίας"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Χρήση Wi‑Fi, Bluetooth και δικτύων κινητής τηλεφωνίας για καθορισμό τοποθεσίας"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Χρήση GPS για τον προσδιορισμό της τοποθεσίας"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Χρήση GPS και αισθητήρων συσκευής για τον καθορισμό της τοποθεσίας"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Σάρωση"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Σάρωση Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Βελτιώστε την τοποθεσία επιτρέποντας σε εφαρμογές και υπηρεσίες συστήματος να ανιχνεύουν δίκτυα Wi-Fi, ανά πάσα στιγμή."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Δεν είστε συνδεδεμένοι σε υπηρεσία δεδομένων. Για να προβάλετε αυτές τις πληροφορίες τώρα, μεταβείτε στο %s από οποιονδήποτε υπολογιστή με σύνδεση στο Διαδίκτυο."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Φόρτωση..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Επιλέξτε τον κωδικό πρ/σης"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Για χρήση δακτ. αποτ. ορίστε κωδ. πρόσβ."</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Επιλέξτε το μοτίβο σας"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Για χρήση δακτ. αποτ. ορίστε μοτίβο"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Επιλέξτε τον αριθμό PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Για χρήση δακτ. αποτ. ορίστε αρ. PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Επιβεβαιώστε τον κωδικό πρόσβασης"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Επιβεβαίωση μοτίβου"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Επιβεβαιώστε το PIN"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Ρυθμίσεις εφαρμογής"</string>
     <string name="install_applications" msgid="4872012136210802181">"Άγνωστες πηγές"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Αποδ. όλων των πηγών εφαρμογής"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Εφαρμογές που ανοίχτηκαν πρόσφατα"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Δείτε και τις <xliff:g id="COUNT">%1$d</xliff:g> εφαρμογές"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> πριν"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Το tablet σας και τα προσωπικά δεδομένα σας είναι πιο ευάλωτα σε επιθέσεις από άγνωστες εφαρμογές. Με την εγκατάσταση εφαρμογών από αυτήν την πηγή, συμφωνείτε ότι είστε υπεύθυνοι για οποιαδήποτε ζημιά στο tablet ή απώλεια δεδομένων που μπορεί να προκύψει από τη χρήση τους."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Το τηλέφωνό σας και τα προσωπικά δεδομένα σας είναι πιο ευάλωτα σε επιθέσεις από άγνωστες εφαρμογές. Με την εγκατάσταση εφαρμογών από αυτήν την πηγή, συμφωνείτε ότι είστε υπεύθυνοι για οποιαδήποτε ζημιά στο τηλέφωνο ή απώλεια δεδομένων που μπορεί να προκύψει από τη χρήση τους."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Σύνθετες ρυθμίσεις"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Διακοπή υπηρεσίας συστήματος;"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Αν διακόψετε τη λειτουργία αυτής της συσκευής, ενδέχεται να σταματήσει η σωστή εκτέλεση ορισμένων λειτουργιών του tablet σας, μέχρι να το απενεργοποιήσετε και να το ενεργοποιήσετε ξανά."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Αν διακόψετε τη λειτουργία αυτής της συσκευής, ενδέχεται να σταματήσει η σωστή εκτέλεση ορισμένων λειτουργιών του τηλεφώνου σας, μέχρι να το απενεργοποιήσετε και να το ενεργοποιήσετε ξανά."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Γλώσσες, εισαγωγή και κινήσεις"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Γλώσσες &amp; εισαγωγή"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Γλώσσες &amp; εισαγωγή"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Βοήθεια εισόδου"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ενεργές υπηρεσίες εκτύπωσης</item>
       <item quantity="one">1 ενεργή υπηρεσία εκτύπωσης</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> εργασίες εκτύπωσης</item>
+      <item quantity="one">1 εργασία εκτύπωσης</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Υπηρεσίες εκτύπωσης"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Δεν έχουν εγκατασταθεί υπηρεσίες"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Δεν βρέθηκαν εκτυπωτές"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Λεπτομέρειες χρήσης"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Προσαρμογή χρήσης ισχύος"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Συμπεριλαμβανόμενα πακέτα"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Εφαρμογές που εξαντλούν την μπαταρία"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Διατήρηση της συσκευής ενεργής"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ενεργοποίηση συσκευής στο παρασκήνιο"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Συχνό αίτημα τοποθεσίας"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> εφαρμογές που δεν λειτουργούν σωστά"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Διακοπή εφαρμογής;"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Το τηλέφωνό σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία, επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> διατηρεί το τηλέφωνό σας ενεργό.\n\nΓια να προσπαθήσετε να επιλύσετε αυτό το πρόβλημα, μπορείτε να κάνετε αναγκαστική διακοπή της εφαρμογής.\n\nΑν αυτό συνεχίσει να συμβαίνει, ίσως χρειαστεί να καταργήσετε την εγκατάσταση της εφαρμογής, για να βελτιώσετε την απόδοση της μπαταρίας."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Το tablet δεν μπορεί να διαχειριστεί κανονικά την μπαταρία, επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> διατηρεί το tablet ενεργό.\n\nΓια να προσπαθήσετε να επιλύσετε αυτό το πρόβλημα, μπορείτε να κάνετε αναγκαστική διακοπή της εφαρμογής.\n\nΑν αυτό συνεχίσει να συμβαίνει, ίσως χρειαστεί να καταργήσετε την εγκατάσταση της εφαρμογής, για να βελτιώσετε την απόδοση της μπαταρίας."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Η συσκευή σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία, επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> διατηρεί τη συσκευή σας ενεργή.\n\nΓια να προσπαθήσετε να επιλύσετε αυτό το πρόβλημα, μπορείτε να κάνετε αναγκαστική διακοπή της εφαρμογής.\n\nΑν αυτό συνεχίσει να συμβαίνει, ίσως χρειαστεί να καταργήσετε την εγκατάσταση της εφαρμογής, για να βελτιώσετε την απόδοση της μπαταρίας."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Διακοπή εφαρμογής"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Να απενεργοποιηθεί η χρήση παρασκηνίου;"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Το τηλέφωνό σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία, επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> συνεχίζει να το ενεργοποιεί.\n\nΓια να αντιμετωπίσει αυτό το πρόβλημα, το τηλέφωνό σας μπορεί να αποτρέψει την εκτέλεση αυτής της εφαρμογής στο παρασκήνιο."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Το tablet δεν μπορεί να διαχειριστεί κανονικά την μπαταρία, επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> συνεχίζει να το ενεργοποιεί.\n\nΓια να αντιμετωπίσει αυτό το πρόβλημα, το tablet μπορεί να αποτρέψει την εκτέλεση αυτής της εφαρμογής στο παρασκήνιο."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Η συσκευή σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία, επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> συνεχίζει να ενεργοποιεί τη συσκευή.\n\nΓια να αντιμετωπίσει αυτό το πρόβλημα, η συσκευή σας μπορεί να αποτρέψει την εκτέλεση αυτής της εφαρμογής στο παρασκήνιο."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Απενεργοποίηση"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Απενεργοποίηση τοποθεσίας;"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Το τηλέφωνό σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία, επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> συνεχίζει να ζητά την τοποθεσία σας όταν δεν χρησιμοποιείτε την εφαρμογή.\n\nΓια να επιλύσετε αυτό το πρόβλημα, μπορείτε να απενεργοποιήσετε την τοποθεσία για αυτήν την εφαρμογή."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Η tablet δεν μπορεί να διαχειριστεί κανονικά την μπαταρία, επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> συνεχίζει να ζητά την τοποθεσία σας όταν δεν χρησιμοποιείτε την εφαρμογή.\n\nΓια να επιλύσετε αυτό το πρόβλημα, μπορείτε να απενεργοποιήσετε την τοποθεσία για αυτήν την εφαρμογή."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Η συσκευή σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία, επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> συνεχίζει να ζητά την τοποθεσία σας όταν δεν χρησιμοποιείτε την εφαρμογή.\n\nΓια να επιλύσετε αυτό το πρόβλημα, μπορείτε να απενεργοποιήσετε την τοποθεσία για αυτήν την εφαρμογή."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Απενεργοποίηση"</string>
     <string name="power_screen" msgid="3023346080675904613">"Οθόνη"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Φακός"</string>
     <string name="power_camera" msgid="4976286950934622605">"Κάμερα"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Εφαρμογές"</string>
     <string name="power_service" msgid="1599661212370831780">"Υπηρεσίες"</string>
     <string name="power_system" msgid="8290455327965307383">"Σύστημα"</string>
-    <string name="power_user" msgid="1889728099253018005">"Χρήστης"</string>
+    <string name="power_user" msgid="3706143225319881667">"Άλλοι χρήστες"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Συνολικός χρόνος CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Προσκήνιο CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Διατήρηση λειτουρ."</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Υπερεκτίμηση χρήσης ισχύος"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Χρησιμοποιείται για <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Ενεργή για <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Χρήση οθόνης: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> χρησιμοποιείται από: <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> της συνολικής μπαταρίας"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Αλλαγή κωδικού PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Εμφάν. ειδοποιήσεων"</string>
     <string name="help_label" msgid="6886837949306318591">"Βοήθεια και σχόλια"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Άρθρα βοήθειας, υποστήριξη μέσω τηλεφώνου και συζήτησης"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Άρθρα βοήθειας, τηλέφωνο και συζήτηση, έναρξη"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Λογαριασμός για περιεχόμενο"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Αναγνωριστικό φωτογραφίας"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ακραίες απειλές"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Εμφάνιση %d κρυφού στοιχείου</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Δίκτυο και διαδίκτυο"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, δίκτυο κινητής τηλεφωνίας, χρήση δεδομένων, σημείο πρόσβασης Wi-Fi"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"δίκτυο κινητής τηλεφωνίας"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"χρήση δεδομένων"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"σημείο πρόσβασης Wi-Fi"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Συνδεδεμένες συσκευές"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Εφαρμογές και ειδοποιήσεις"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Άδειες, προεπιλεγμένες εφαρμογές"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Χρήστες και λογαριασμοί"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"κίνηση"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"πληρωμή, πάτημα, πληρωμές"</string>
     <string name="keywords_backup" msgid="470070289135403022">"αντίγραφο ασφαλείας, δημιουργία αντιγράφου ασφαλείας"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"κίνηση, άκρο, πλάι, ενεργό άκρο, πιέστε, λαβή, βοήθεια, βοηθός, squeezy, squeezie, squeezey, squeezee, ok google, βοηθός google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"κίνηση, αφύπνιση, ειδοποιήσεις, οθόνη, απενεργοποίηση οθόνης, ενεργοποίηση οθόνης, πιέστε, άκρο, αδρανής, αδράνεια, λαβή"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"κίνηση, σίγαση, αφύπνιση, ξυπνητήρι, εισερχόμενη κλήση, χωρίς ήχο, οθόνη, οθόνη κλειδώματος, πιέστε, λαβή, άκρο, διακοπή"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Ρύθμιση ετικέτας ΕΚΠ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Εγγραφή"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Αγγίξτε μια ετικέτα για εγγραφή…"</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Να μην εμφανίζονται ειδοποιήσεις εργασίας"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Πώς θέλετε να εμφανίζονται οι ειδοποιήσεις προφίλ στη συσκευή σας, όταν η συσκευή σας είναι κλειδωμένη;"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Ειδοποιήσεις προφίλ"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Ειδοποιήσεις"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Ειδοποιήσεις"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Ειδοπ/σεις εφ/γών"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Κατηγορία ειδοποιήσεων"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Βαρύτητα"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Να αποφασίσει η εφαρμογή"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Επείγον"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Να επιτρέπεται ο ήχος"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Να μην συνοδεύονται αυτές οι ειδοποιήσεις από ήχο, δόνηση ή προβολή σε αναδυόμενο παράθυρο κατά την προβολή τους στην τρέχουσα οθόνη."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Μικρής βαρύτητας"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Μεσαίας βαρύτητας"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Μεγάλης βαρύτητας"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Επείγουσες"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Βοηθός ειδοποιήσεων"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Πρόσβαση ειδοπ/σεων"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Η πρόσβαση στις ειδοποιήσεις προφίλ εργασίας έχει αποκλειστεί"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Λειτουργία Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Να επιτρέπεται η λειτουργία picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Να επιτρέπεται σε αυτήν την εφαρμογή να δημιουργεί ένα παράθυρο picture-in-picture ενώ η εφαρμογή είναι ανοικτή ή αφού αποχωρήσετε από αυτή (για παράδειγμα, για να συνεχίσετε να παρακολουθείτε ένα βίντεο). Αυτό το παράθυρο εμφανίζεται στο επάνω μέρος άλλων εφαρμογών που χρησιμοποιείτε."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Ναι"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Όχι"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Πρόσβαση \"Μην ενοχλείτε\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Δεν ζητήθηκε πρόσβαση στη λειτουργία \"Μην ενοχλείτε\" από εγκατεστημένες εφαρμογές"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Φόρτωση εφαρμογών…"</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Η διαχείριση αυτού του προφίλ γίνεται από:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Διαχείριση από <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Πειραματικό)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Περιστροφή συσκευής"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Περιστρέψτε το περιεχόμενο της οθόνης"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Διατήρηση κατακόρυφης προβολής"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Διατήρηση οριζόντιας προβολής"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Διατήρηση τρέχοντος προσανατολισμού"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Ασφαλής εκκίνηση"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Συνέχεια"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Μπορείτε να προστατεύσετε περαιτέρω αυτήν τη συσκευή ζητώντας την εισαγωγή του PIN πριν από την εκκίνησή της. Μέχρι να ξεκινήσει η λειτουργία της συσκευής, δεν είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών. \n\nΑυτό βοηθά στην προστασία των δεδομένων σε συσκευές που έχουν χαθεί ή κλαπεί. Να απαιτείται PIN για την έναρξη λειτουργίας της συσκευής;"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Μπορείτε να προστατεύσετε περαιτέρω αυτήν τη συσκευή ζητώντας την εισαγωγή του κωδικού πρόσβασής σας πριν από την εκκίνησή της. Μέχρι να ξεκινήσει η λειτουργία της συσκευής, δεν είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών. \n\nΑυτό βοηθά στην προστασία των δεδομένων σε συσκευές που έχουν χαθεί ή κλαπεί. Να απαιτείται κωδικός πρόσβασης για την έναρξη λειτουργίας της συσκευής;"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Εκτός από τη χρήση του δακτυλικού σας αποτυπώματος για το ξεκλείδωμα της συσκευής σας, μπορείτε να προστατεύσετε περαιτέρω αυτήν τη συσκευή ζητώντας το PIN πριν από την εκκίνηση της συσκευής. Μέχρι να ξεκινήσει η λειτουργία της συσκευής, δεν είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών.\n\nΑυτό βοηθά στην προστασία των δεδομένων σε συσκευές που έχουν χαθεί ή κλαπεί. Να απαιτείται PIN για την έναρξη λειτουργίας της συσκευής;"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Εκτός από τη χρήση του δακτυλικού αποτυπώματος για το ξεκλείδωμα της συσκευής σας, μπορείτε να προστατεύσετε περαιτέρω αυτήν τη συσκευή ζητώντας την εισαγωγή του μοτίβου σας πριν από την εκκίνησή της. Μέχρι να ξεκινήσει η λειτουργία της συσκευής, δεν είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών. \n\nΑυτό βοηθά στην προστασία των δεδομένων σε συσκευές που έχουν χαθεί ή κλαπεί. Να απαιτείται μοτίβο για την έναρξη λειτουργίας της συσκευής;"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Εκτός από τη χρήση του δακτυλικού αποτυπώματος για το ξεκλείδωμα της συσκευής σας, μπορείτε να προστατεύσετε περαιτέρω αυτήν τη συσκευή ζητώντας την εισαγωγή του κωδικού πρόσβασής σας πριν από την εκκίνησή της. Μέχρι να ξεκινήσει η λειτουργία της συσκευής, δεν είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών. \n\nΑυτό βοηθά στην προστασία των δεδομένων σε συσκευές που έχουν χαθεί ή κλαπεί. Να απαιτείται κωδικός πρόσβασης για την έναρξη λειτουργίας της συσκευής&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Εκτός από τη χρήση του δαχτυλικού αποτυπώματός σας για το ξεκλείδωμα της συσκευής, μπορείτε να προστατεύσετε ακόμα περισσότερο αυτήν τη συσκευή με έναν κωδικό πρόσβασης ο οποίος θα ζητείται πριν από την εκκίνησή της. Μέχρι να ολοκληρωθεί η εκκίνηση της συσκευής, δεν θα είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή η προβολή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών.\n\nΑυτή η ενέργεια συμβάλλει στην προστασία των δεδομένων των συσκευών σε περίπτωση απώλειας ή κλοπής. Θέλετε να ζητείται ο κωδικός πρόσβασης κατά την εκκίνηση της συσκευής;"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ναι"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Όχι"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Αίτημα κωδικού PIN;"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Ειδοποιήσεις χρήσης"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Εμφάνιση πλήρους χρήσης συσκευής"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Εμφάνιση χρήσης εφαρμογής"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Υψηλά επίπεδα χρήσης"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other">Η συμπεριφορά <xliff:g id="NUMBER">%2$d</xliff:g> εφαρμογών δεν είναι φυσιολογική</item>
+      <item quantity="one">Η συμπεριφορά της εφαρμογής <xliff:g id="APP">%1$s</xliff:g> δεν είναι φυσιολογική</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Εφαρμογές που εξαντλούν την μπαταρία</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> που εξαντλεί την μπαταρία</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Χωρίς βελτιστοποίηση"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Χωρίς βελτιστοποίηση"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Βελτιστοποίηση χρήσης μπαταρίας"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Εμφάνιση πάνω σε άλλες εφαρμογές"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> από τις <xliff:g id="COUNT_1">%2$d</xliff:g> εφαρμογές μπορούν να εμφανίζονται πάνω σε άλλες"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Εφαρμογές με άδεια"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Ναι"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Όχι"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Επιτρέπεται"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Δεν επιτρέπεται"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"εγκατάσταση εφαρμογών από άγνωστες πηγές"</string>
     <string name="write_settings" msgid="4797457275727195681">"Τροποποίηση ρυθμ. συστήματος"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"εγγραφή ρυθμίσεων τροποποίησης συστήματος"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Το χρώμα της οθόνης γίνεται ζεστό κίτρινο. Αυτό μπορεί να σας βοηθήσει να αποκοιμηθείτε."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Προτάσεις"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> ακόμη"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> προτάσεις</item>
+      <item quantity="one">1 πρόταση</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> προτάσεις</item>
+      <item quantity="one">+1 πρόταση</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Κατάργηση"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Ψυχρή θερμοκρασία χρώματος"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Χρήση πιο ψυχρών χρωμάτων οθόνης"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Προειδοποίηση <xliff:g id="ID_1">%1$s</xliff:g> δεδομένων"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Προειδοποίηση <xliff:g id="ID_1">%1$s</xliff:g> δεδομένων / Όριο <xliff:g id="ID_2">%2$s</xliff:g> δεδομένων"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Κύκλος χρέωσης"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Ο μηνιαίος κύκλος χρέωσης ξεκινά τη(ν) <xliff:g id="ID_1">%1$s</xliff:g> κάθε μήνα"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Η μηνιαία χρέωση ξεκινά τη(ν) <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Την <xliff:g id="ID_1">%1$s</xliff:g>η κάθε μήνα"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Περιορισμοί δικτύου"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> περιορισμοί</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 εφαρμογή επιτρέπεται να χρησιμοποιεί απεριόριστα δεδομένα όταν είναι ενεργή η Εξοικονόμηση δεδομένων</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Εξοικονόμηση δεδομένων"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Απερ/στη πρόσβ. δεδ."</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Απεριόριστα δεδομένα"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Τα δεδομένα παρασκηνίου είναι απενεργοποιημένα"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Ενεργή"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Απενεργοποιημένη"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Έλεγχος ειδοποιήσεων κλειδώματος οθόνης"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Εμφάνιση ή απόκρυψη περιεχομένου ειδοποιήσεων"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Όλες"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Υποστήριξη"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Υποστήριξη και συμβουλές"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Μικρότερο πλάτος"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Δεν ζητήθηκε πρόσβαση σε SMS ειδικής χρέωσης από εγκατεστημένες εφαρμογές"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Τα SMS ειδικής χρέωσης ενδέχεται να κοστίσουν και θα αυξήσουν το συνολικό ποσό των λογαριασμών σας κινητού τηλεφώνου. Εάν ενεργοποιήσετε την πρόσβαση για μια εφαρμογή, θα μπορείτε να στέλνετε SMS ειδικής χρέωσης χρησιμοποιώντας τη συγκεκριμένη εφαρμογή."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Αυτόματο"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Εγχειρίδιο χρήσης"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Ελευθερώστε χώρο τώρα"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Κινήσεις"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Συντομεύσεις κίνησης"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Γρήγορες κινήσεις για τον έλεγχο του τηλεφώνου σας"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Γρήγορες κινήσεις για τον έλεγχο του tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Γρήγορες κινήσεις για τον έλεγχο της συσκευής σας"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Μετάβαση στην κάμερα"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Για να ανοίξετε γρήγορα την κάμερα, πατήστε δύο φορές το κουμπί λειτουργίας. Αυτή η ενέργεια μπορεί να πραγματοποιηθεί από οποιαδήποτε οθόνη."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Γρήγορο άνοιγμα κάμερας"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Διπλό πάτημα του κουμπιού λειτουργίας για άνοιγμα κάμερας"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Αναστροφή κάμερας"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Ταχύτερη λήψη φωτογραφιών selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Περιστρέψτε δύο φορές το τηλέφωνο για λειτουργία selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Περιστρέψτε δύο φορές το tablet για λειτουργία selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Περιστρέψτε δύο φορές τη συσκευή για λειτουργία selfie"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Πατήστε δύο φορές για να ελέγξετε το τηλέφωνο"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Πατήστε δύο φορές για να ελέγξετε το tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Πατήστε δύο φορές για να ελέγξετε τη συσκευή"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Για να ελέγξετε γρήγορα τις ειδοποιήσεις σας, κάντε διπλό πάτημα στην οθόνη."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Για να ελέγξετε την ώρα, τα εικονίδια ειδοποίησης και άλλες πληροφορίες, κάντε διπλό πάτημα στην οθόνη."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Ελέγξτε τις ειδοποιήσεις όταν η οθόνη είναι απενεργοποιημένη"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Σηκώστε το για να δείτε"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Σηκώστε το tablet για να το ελέγξετε"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Σηκώστε τη συσκευή για να την ελέγξετε"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Για να ελέγξετε γρήγορα τις ειδοποιήσεις σας, σηκώστε το τηλέφωνο."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Για να ελέγξετε γρήγορα τις ειδοποιήσεις σας, σηκώστε το tablet."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Για να ελέγξετε γρήγορα τις ειδοποιήσεις σας, σηκώστε τη συσκευή."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Για να ελέγξετε την ώρα, τα εικονίδια ειδοποίησης και άλλες πληροφορίες, σηκώστε το τηλέφωνό σας."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Για να ελέγξετε την ώρα, τα εικονίδια ειδοποίησης και άλλες πληροφορίες, σηκώστε το tablet σας."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Για να ελέγξετε την ώρα, τα εικονίδια ειδοποίησης και άλλες πληροφορίες, σηκώστε τη συσκευή σας."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Ελέγξτε τις ειδοποιήσεις όταν η οθόνη είναι απενεργοποιημένη"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Σύρετε στον αισθητήρα δακτυλικών αποτυπωμάτων για ειδοποιήσεις"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Για να ελέγξετε τις ειδοποιήσεις σας, σύρετε προς τα κάτω στον αισθητήρα δακτυλικών αποτυπωμάτων στο πίσω μέρος του τηλεφώνου."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Για να ελέγξετε τις ειδοποιήσεις σας, σύρετε προς τα κάτω στον αισθητήρα δακτυλικών αποτυπωμάτων στο πίσω μέρος του tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Για να ελέγξετε τις ειδοποιήσεις σας, σύρετε προς τα κάτω στον αισθητήρα δακτυλικών αποτυπωμάτων στο πίσω μέρος της συσκευής."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Γρήγορη εμφάνιση ειδοποιήσεων"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Σύρετε προς τα κάτω στον αισθητήρα δακτυλικών αποτυπωμάτων"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Σηκώστε προς τα επάνω για να ανοίξετε την κάμερα"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Για να ανοίξετε αυτόματα την κάμερα, σηκώστε το τηλέφωνό σας στη θέση λήψης φωτογραφίας (οριζόντια ή κατακόρυφη). Λειτουργεί όταν το τηλέφωνό σας βρίσκεται σε κατάσταση αδράνειας ή είναι κλειδωμένο."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Τραβήξτε  φωτογραφίες όταν το τηλέφωνο είναι σε αδράνεια ή είναι κλειδωμένο"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Κίνηση βοήθειας"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Ευαισθησία"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Θέλετε να καταργήσετε αυτήν την Instant Εφαρμογή;"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Παιχνίδια"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Αρχεία ήχου"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Χώρος που χρησιμοποιείται"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(απεγκαταστάθηκε για <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(απενεργοποιήθηκε για <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Υπηρεσία αυτόματης συμπλήρωσης"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Instant Εφαρμογή"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Απενεργοποίηση διαχείρισης αποθηκευτικού χώρου;"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Εφαρμογές ταινιών και TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Χώρος που χρησιμοποιείται"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Πληροφορίες παροχής εταιρείας κινητής τηλεφωνίας"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Ενεργοποίηση παροχής εταιρείας κινητής τηλεφωνίας"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Τι νέο και συναρπαστικό υπάρχει;"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Δείτε τις κορυφαίες 5 λειτουργίες"</string>
 </resources>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index 395746a..f3beb46 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Good"</item>
     <item msgid="8986346415847956850">"Excellent"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Always"</item>
-    <item msgid="844721238536786870">"Only when plugged in"</item>
-    <item msgid="1986753720941888596">"Never"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Always"</item>
-    <item msgid="7433294150916905997">"Only when plugged in"</item>
-    <item msgid="1390404486722375028">"Never"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Last 30 days"</item>
     <item msgid="6600989128423965319">"Set usage cycle..."</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 720ced3..540eeee 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"You are now a developer!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"No need, you are already a developer."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Please enable developer options first."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Wireless &amp; networks"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Connections"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Device"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE provisioned"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Video Calling provisioned"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi Calling provisioned"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presence Provisioned"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Mobile Radio Power"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"View SIM address book"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"View fixed dialling numbers"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Scan for devices"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Rename this device"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Rename"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Disconnect?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"This will end your connection with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Disconnect device?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Your phone will disconnect from <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Your tablet will disconnect from <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Your device will disconnect from <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Disconnect"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"You don\'t have permission to change Bluetooth settings."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Pair new device"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while the Bluetooth settings are open."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Phone\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Tablet\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Device\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Broadcasting"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disable profile?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth pairing request"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Pairing request"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Tap to pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Show files received"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Received files"</string>
     <string name="device_picker" msgid="4978696506172252813">"Choose Bluetooth device"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn off Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wants to access your messages. Give access to %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM access request"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible as \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' to other devices"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Pair new device"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Date &amp; time"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Choose time zone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Accounts"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Location"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Security &amp; location"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Security &amp; location"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encryption &amp; credentials"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Phone encrypted"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Device encrypted"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Unlock with fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Use your fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"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.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Just touch the fingerprint sensor to authorise purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\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="3635924459027832861">"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.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continue"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Skip"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Add fingerprint"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Device protection features will not be activated. You won’t be able to prevent others from using this tablet if it’s lost, stolen or wiped."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Device protection features will not be activated. You won\'t be able to prevent others from using this device if it\'s lost, stolen or wiped."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Device protection features will not be activated. You won\'t be able to prevent others from using this phone if it\'s lost, stolen or wiped."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Device protection features will not be activated. You won’t be able to prevent others from using this tablet if it’s lost or stolen."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Device protection features will not be activated. You won’t be able to prevent others from using this device if it’s lost or stolen."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Device protection features will not be activated. You won’t be able to prevent others from using this phone if it’s lost or stolen."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Next"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Device protection features won’t be turned on. You won’t be able to prevent others from using this tablet if it’s lost, stolen or reset."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Device protection features won’t be turned on. You won’t be able to prevent others from using this device if it’s lost, stolen or reset."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Device protection features won’t be turned on. You won’t be able to prevent others from using this phone if it’s lost, stolen or reset."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Device protection features won’t be turned on. You won’t be able to prevent others from using this tablet if it’s lost or stolen."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Device protection features won’t be turned on. You won’t be able to prevent others from using this device if it’s lost or stolen."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Device protection features won’t be turned on. You won’t be able to prevent others from using this phone if it’s lost or stolen."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Skip anyway"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Go back"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Find the sensor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Locate the fingerprint sensor on the back of your phone."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Touch the sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"It’s on the back of your phone. Use your index finger."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustration with device and fingerprint sensor location"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Name"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Delete"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Let’s start"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Touch the sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Put your finger on the sensor and lift after you feel a vibration"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Keep going"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Move your finger slightly to add all the different parts of your fingerprint"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingerprint added!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Whenever you see this icon, you can use your fingerprint for identification or to authorise a purchase."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Just touch the fingerprint sensor to wake and unlock your device."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"When you see this icon, you can also authorise purchases or sign in to apps."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Lift, then touch again"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Keep lifting your finger to add the different parts of your fingerprint"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Fingerprint added"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"When you see this icon, use your fingerprint for identification or to approve purchases."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Skip fingerprint setup?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"You’ve chosen to use your fingerprint as one way to unlock your phone. If you skip now, you’ll need to set this up later. Setup takes only a minute or so."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Set up screen lock"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Done"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Whoops, that\'s not the sensor"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Use the fingerprint sensor on your device."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Touch the sensor on the back of your phone. Use your index finger."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Enrolment was not completed"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Fingerprint enrolment time limit reached. Try again."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Fingerprint enrolment didn\'t work. Try again or use a different finger."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Choose your backup screen lock method"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Screen lock options"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Screen lock options"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Screen lock"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> /Immediately after sleep"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> after sleep"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Change unlock pattern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Change unlock PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Change unlock password"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Try again. Attempt <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> of <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Last try"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"If you enter an incorrect work pattern on this attempt, your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"If you enter an incorrect work PIN on this attempt, your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"If you enter an incorrect work password on this attempt, your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Too many incorrect attempts. Your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Dismiss"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Try again. Attempt <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> of <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Your data will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"If you enter an incorrect pattern on the next attempt, data on this device will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"If you enter an incorrect PIN on the next attempt, data on this device will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"If you enter an incorrect password on the next attempt, data on this device will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"If you enter an incorrect pattern on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"If you enter an incorrect PIN on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"If you enter an incorrect password on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"If you enter an incorrect pattern on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"If you enter an incorrect PIN on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"If you enter an incorrect password on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Too many incorrect attempts. The data on this device will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Too many incorrect attempts. This user will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Too many incorrect attempts. This work profile and its data will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Dismiss"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Must be at least <xliff:g id="COUNT">%d</xliff:g> characters"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN must be at least <xliff:g id="COUNT">%d</xliff:g> digits"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continue"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Advanced Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"When Bluetooth is turned on, your device can communicate with other nearby Bluetooth devices."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"To improve location accuracy, system apps and services can still detect Bluetooth devices. You can change this in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scanning settings<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Couldn\'t connect. Try again."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Device details"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Device\'s Bluetooth address: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Forget device?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Your phone will no longer be paired with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Your tablet will no longer be paired with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Your device will no longer be paired with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Forget device"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Connect to…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from media audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from hands-free audio."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Do not provide"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Do not validate"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"No certificate specified. Your connection will not be private."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Network name is too long."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Must specify a domain."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS available"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 network</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Advanced Wi‑Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configure Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC address"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP address"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Forget this group?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Portable Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi hotspot"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Use mobile connection to provide Wi‑Fi network"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Not sharing this tablet’s Internet connection via hotspot"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Not sharing this phone’s Internet connection via hotspot"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Not sharing Internet or content with other devices"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Sharing this tablet’s Internet connection via hotspot"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Sharing this phone’s Internet connection via hotspot"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"App is sharing content. To share Internet connection, turn hotspot off, then on"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi name"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Other devices can connect to <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi‑Fi password"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP band"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Use hotspot to create a Wi‑Fi network for your other devices. Hotspot provides Internet using your mobile data connection. Additional mobile data charges may apply."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Apps can create a hotspot to share content with nearby devices."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Turning hotspot on…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Turning off hotspot…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> is active"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"When Wi-Fi calling is on, your phone can route calls via Wi-Fi networks or your operator\'s network, depending on your preference and which signal is stronger. Before turning on this feature, check with your operator regarding fees and other details."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Update Emergency Address"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Address used by emergency services as your location if you make a 999 call using Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"No results"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Auto-rotate screen"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Vivid colours"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Switch orientation automatically when rotating tablet"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Switch orientation automatically when rotating phone"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Switch orientation automatically when rotating tablet"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimise brightness level for available light. When this feature is on, you can still adjust brightness temporarily."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Night Light"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Night Light tints your screen amber. This makes it easier to look at your screen or read in dim light, and may help you fall asleep more easily."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Schedule"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Turn on automatically"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Never"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Customised schedule"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Sunset to sunrise"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Schedule"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"None"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Turns on at custom time"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Turns on from sunset to sunrise"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Start time"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"End time"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensity"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Off. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Will never turn on automatically."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Will turn on automatically at <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Will turn on automatically at sunset."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"On. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Will never turn off automatically."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Will turn off automatically at <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Will turn off automatically at sunrise."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Off / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Will never turn on automatically"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Will turn on automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Will turn on automatically at sunset"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"On / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Will never turn off automatically"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Will turn off automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Will turn off automatically at sunrise"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Screen turns off"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Settings"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lift to wake"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Ambient display"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambient display"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Always on"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"New notifications"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"When to show"</string>
+    <string name="doze_title" msgid="2375510714460456687">"New notifications"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Wake screen when you receive notifications"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Always on"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Show time, notification icons and other info"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"The APN cannot be empty."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC field must be 3 digits."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC field must be 2 or 3 digits."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operator does not allow adding APNs of type %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Restoring default APN settings."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Reset to default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Reset default APN settings completed"</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Erase SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Erase all the data on the internal USB storage, such as music or photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Erase all the data on the SD card, such as music or photos"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Erase eSIMs"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Erase all eSIMs on the phone. This will not cancel your mobile service plan."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Erase all eSIMs on the tablet. This will not cancel your mobile service plan."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Reset tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Reset phone"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Erase all your personal information and downloaded apps? You can\'t undo this action!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Can’t tether or use portable hotspots while Data Saver is on"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB tethering"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB connected, slide to tether"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Tethered"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Can\'t tether when USB storage is in use"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB not connected"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Connect to turn on"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB tethering error"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Share phone’s Internet connection via USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Share tablet’s Internet connection via USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth tethering"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Sharing this tablet’s Internet connection via Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Sharing this phone’s Internet connection via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Sharing this tablet’s Internet connection to 1 device via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Sharing this phone’s Internet connection to 1 device via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Sharing this tablet’s Internet connection to <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> devices via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Sharing this phone’s Internet connection to <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> devices via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Share tablet’s Internet connection via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Share phone’s Internet connection via Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Sharing this <xliff:g id="DEVICE_NAME">%1$d</xliff:g>’s Internet connection via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Not sharing this tablet’s Internet connection via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Not sharing this phone’s Internet connection via Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Not tethered"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Can\'t tether to more than <xliff:g id="MAXCONNECTION">%1$d</xliff:g> devices."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be untethered."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Use hotspot and tethering to provide Internet to other devices through your mobile data connection."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Use hotspot and tethering to provide Internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobile network"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobile plan"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Location mode"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Use GPS, Wi‑Fi, Bluetooth or mobile networks to determine location"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Use Wi‑Fi, Bluetooth or mobile networks to determine location"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Use GPS to determine location"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Use GPS and device sensors to determine location"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanning"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi scanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Improve location by allowing system apps and services to detect Wi‑Fi networks at any time."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"You don\'t have a data connection. To view this information now, go to %s from any computer connected to the Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Loading…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Choose your password"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"To use fingerprint, set password"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Choose your pattern"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"To use fingerprint, set pattern"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choose your PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"To use fingerprint, set PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirm your password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirm your PIN"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"App settings"</string>
     <string name="install_applications" msgid="4872012136210802181">"Unknown sources"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Allow all app sources"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Recently opened apps"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"See all <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> ago"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Your tablet and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your tablet or loss of data that may result from their use."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Your phone and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your phone or loss of data that may result from their use."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Advanced settings"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Stop system service?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"If you stop this service, some features of your tablet may stop working correctly until you turn it off and then on again."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"If you stop this service, some features of your phone may stop working correctly until you turn it off and then on again."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Languages, input &amp; gestures"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Languages &amp; input"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Languages &amp; input"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Input assistance"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
       <item quantity="one">1 print service on</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> print jobs</item>
+      <item quantity="one">1 print job</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Printing services"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No services installed"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"No printers found"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Use details"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Adjust power use"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Included packages"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps draining battery"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Keeping device awake"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Waking up device in background"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Requesting location frequently"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps misbehaving"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Stop app?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Your phone can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your phone awake.\n\nTo try to fix this issue, you can force stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Your tablet can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your tablet awake.\n\nTo try to fix this issue, you can force stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Your device can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your device awake.\n\nTo try to fix this issue, you can force stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Stop app"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Turn off background usage?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Your phone can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps waking up your phone.\n\nTo address this issue, your phone can prevent this app from running in the background."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Your tablet can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps waking up your tablet.\n\nTo address this issue, your tablet can prevent this app from running in the background."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Your device can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps waking up your device.\n\nTo address this issue, your device can prevent this app from running in the background."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Turn off"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Turn off location?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Your phone can’t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps requesting your location when you\'re not using the app.\n\nTo fix this issue, you can turn off location for this app."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Your tablet can’t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps requesting your location when you\'re not using the app.\n\nTo fix this issue, you can turn off location for this app."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Your device can’t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps requesting your location when you\'re not using the app.\n\nTo fix this issue, you can turn off location for this app."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Turn off"</string>
     <string name="power_screen" msgid="3023346080675904613">"Screen"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Flashlight"</string>
     <string name="power_camera" msgid="4976286950934622605">"Camera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
     <string name="power_service" msgid="1599661212370831780">"Services"</string>
     <string name="power_system" msgid="8290455327965307383">"System"</string>
-    <string name="power_user" msgid="1889728099253018005">"User"</string>
+    <string name="power_user" msgid="3706143225319881667">"Other users"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Keep awake"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Used for <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Active for <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Screen usage <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> used by <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> of overall battery"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Change PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Show notifications"</string>
     <string name="help_label" msgid="6886837949306318591">"Help &amp; feedback"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Help articles, phone &amp; chat support"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Help articles, phone &amp; chat, getting started"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Account for content"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Photo ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Extreme threats"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Show %d hidden item</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Network &amp; Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobile, data usage, hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"Mobile"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"Data Usage"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"Hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Connected devices"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissions, default apps"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Users &amp; accounts"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesture"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pay, tap, payments"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gesture, edge, side, active edge, squeeze, grip, assist, assistant, squeezy, squeezie, squeezey, squeezee, ok google, google assistant"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gesture, wake, notifications, screen, display, screen off, screen on, squeeze, edge, asleep, sleep, grip"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gesture, silence, snooze, alarm, incoming call, quiet, display, lockscreen, squeeze, grip, edge, stop"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tap a tag to write..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Don’t show work notifications at all"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"When your device is locked, how do you want profile notifications to be displayed?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profile notifications"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Notifications"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Notifications"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Notification category"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Let the app decide"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgent"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Allow sound"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Don\'t make sound, vibrate or peek these notifications into view on the current screen."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Low importance"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Medium importance"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"High importance"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgent importance"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Notification assistant"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Notification access"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Access to work profile notifications is blocked"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Allow picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Allow this app to create a picture-in-picture window while the app is open or after you leave it (for example, to continue watching a video). This window displays on top of other apps that you\'re using."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Yes"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"No"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Do Not Disturb access"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"No installed apps have requested Do Not Disturb access"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"This work profile is managed by:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Managed by <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Device rotation"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Rotate the contents of the screen"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Stay in portrait view"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Stay in landscape view"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Stay in current orientation"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Secure start-up"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continue"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"You can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Yes"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Require PIN?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Show full device usage"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Show app usage"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"High usage"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> behaving abnormally</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Apps draining battery</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> draining battery</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Not optimised"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Not optimised"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimising battery use"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Display over other apps"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> apps allowed to display over other apps"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Apps with permission"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Yes"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"No"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Allowed"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Not allowed"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"install apps unknown sources"</string>
     <string name="write_settings" msgid="4797457275727195681">"Modify system settings"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"write modify system settings"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Screen is tinted amber. This may help you fall asleep."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> more"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
+      <item quantity="one">1 suggestion</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
+      <item quantity="one">+1 suggestion</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Remove"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> data warning"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> data warning / <xliff:g id="ID_2">%2$s</xliff:g> data limit"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Billing cycle"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Monthly cycle starts on the <xliff:g id="ID_1">%1$s</xliff:g> of every month"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Monthly starting <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Monthly on day <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Network restrictions"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 app allowed to use unrestricted data when Data Saver is on</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Data Saver"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Unrestricted data access"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Unrestricted data"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Background data is turned off"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"On"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Off"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Control lock screen notifications"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Show or hide notification content"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"All"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Support"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Support &amp; tips"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Smallest width"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"No installed apps have requested Premium SMS access"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS may cost you money and will add up to your mobile bills. If you enable permission for an app, you will be able to send premium SMS using that app."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatic"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Free up space now"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestures"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Gesture shortcuts"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Quick gestures to control your phone"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Quick gestures to control your tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Quick gestures to control your device"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Jump to camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"To quickly open camera, press the power button twice. Works from any screen."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Open camera quickly"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Press power button twice to open camera"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Flip camera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Take selfies faster"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Double-twist phone for selfie mode"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Double-twist tablet for selfie mode"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Double-twist device for selfie mode"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Double-tap to check phone"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Double-tap to check tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Double-tap to check device"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"To quickly check your notifications, double-tap your screen."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"To check time, notification icons and other info, double-tap your screen."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Check notifications when screen is off"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Lift to check phone"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Lift to check tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Lift to check device"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"To quickly check your notifications, pick up your phone."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"To quickly check your notifications, pick up your tablet."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"To quickly check your notifications, pick up your device."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"To check time, notification icons and other info, pick up your phone."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"To check time, notification icons and other info, pick up your tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"To check time, notification icons and other info, pick up your device."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Check notifications when screen is off"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Swipe fingerprint for notifications"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"To check your notifications, swipe down on the fingerprint sensor on the back of your tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"To check your notifications, swipe down on the fingerprint sensor on the back of your device."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"See notifications quickly"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Swipe down on the fingerprint sensor"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Raise to open camera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"To open the camera automatically, lift up your phone into a photo-taking position (landscape or portrait). Works when your phone is asleep or locked."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Take photos when phone is asleep or locked"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Assist gesture"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensitivity"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Do you want to remove this instant app?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Games"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio files"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Space used"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(uninstalled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(disabled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Auto-fill service"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Instant app"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Turn off the storage manager?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Movie &amp; TV apps"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Space used"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Provisioning Info"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Whats new and exciting?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Check out the top 5 features"</string>
 </resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 395746a..f3beb46 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Good"</item>
     <item msgid="8986346415847956850">"Excellent"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Always"</item>
-    <item msgid="844721238536786870">"Only when plugged in"</item>
-    <item msgid="1986753720941888596">"Never"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Always"</item>
-    <item msgid="7433294150916905997">"Only when plugged in"</item>
-    <item msgid="1390404486722375028">"Never"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Last 30 days"</item>
     <item msgid="6600989128423965319">"Set usage cycle..."</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 720ced3..540eeee 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"You are now a developer!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"No need, you are already a developer."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Please enable developer options first."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Wireless &amp; networks"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Connections"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Device"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE provisioned"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Video Calling provisioned"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi Calling provisioned"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presence Provisioned"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Mobile Radio Power"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"View SIM address book"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"View fixed dialling numbers"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Scan for devices"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Rename this device"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Rename"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Disconnect?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"This will end your connection with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Disconnect device?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Your phone will disconnect from <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Your tablet will disconnect from <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Your device will disconnect from <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Disconnect"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"You don\'t have permission to change Bluetooth settings."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Pair new device"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while the Bluetooth settings are open."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Phone\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Tablet\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Device\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Broadcasting"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disable profile?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth pairing request"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Pairing request"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Tap to pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Show files received"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Received files"</string>
     <string name="device_picker" msgid="4978696506172252813">"Choose Bluetooth device"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn off Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wants to access your messages. Give access to %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM access request"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible as \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' to other devices"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Pair new device"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Date &amp; time"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Choose time zone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Accounts"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Location"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Security &amp; location"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Security &amp; location"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encryption &amp; credentials"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Phone encrypted"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Device encrypted"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Unlock with fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Use your fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"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.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Just touch the fingerprint sensor to authorise purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\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="3635924459027832861">"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.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continue"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Skip"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Add fingerprint"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Device protection features will not be activated. You won’t be able to prevent others from using this tablet if it’s lost, stolen or wiped."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Device protection features will not be activated. You won\'t be able to prevent others from using this device if it\'s lost, stolen or wiped."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Device protection features will not be activated. You won\'t be able to prevent others from using this phone if it\'s lost, stolen or wiped."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Device protection features will not be activated. You won’t be able to prevent others from using this tablet if it’s lost or stolen."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Device protection features will not be activated. You won’t be able to prevent others from using this device if it’s lost or stolen."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Device protection features will not be activated. You won’t be able to prevent others from using this phone if it’s lost or stolen."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Next"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Device protection features won’t be turned on. You won’t be able to prevent others from using this tablet if it’s lost, stolen or reset."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Device protection features won’t be turned on. You won’t be able to prevent others from using this device if it’s lost, stolen or reset."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Device protection features won’t be turned on. You won’t be able to prevent others from using this phone if it’s lost, stolen or reset."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Device protection features won’t be turned on. You won’t be able to prevent others from using this tablet if it’s lost or stolen."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Device protection features won’t be turned on. You won’t be able to prevent others from using this device if it’s lost or stolen."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Device protection features won’t be turned on. You won’t be able to prevent others from using this phone if it’s lost or stolen."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Skip anyway"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Go back"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Find the sensor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Locate the fingerprint sensor on the back of your phone."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Touch the sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"It’s on the back of your phone. Use your index finger."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustration with device and fingerprint sensor location"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Name"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Delete"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Let’s start"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Touch the sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Put your finger on the sensor and lift after you feel a vibration"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Keep going"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Move your finger slightly to add all the different parts of your fingerprint"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingerprint added!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Whenever you see this icon, you can use your fingerprint for identification or to authorise a purchase."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Just touch the fingerprint sensor to wake and unlock your device."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"When you see this icon, you can also authorise purchases or sign in to apps."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Lift, then touch again"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Keep lifting your finger to add the different parts of your fingerprint"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Fingerprint added"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"When you see this icon, use your fingerprint for identification or to approve purchases."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Skip fingerprint setup?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"You’ve chosen to use your fingerprint as one way to unlock your phone. If you skip now, you’ll need to set this up later. Setup takes only a minute or so."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Set up screen lock"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Done"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Whoops, that\'s not the sensor"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Use the fingerprint sensor on your device."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Touch the sensor on the back of your phone. Use your index finger."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Enrolment was not completed"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Fingerprint enrolment time limit reached. Try again."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Fingerprint enrolment didn\'t work. Try again or use a different finger."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Choose your backup screen lock method"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Screen lock options"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Screen lock options"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Screen lock"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> /Immediately after sleep"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> after sleep"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Change unlock pattern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Change unlock PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Change unlock password"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Try again. Attempt <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> of <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Last try"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"If you enter an incorrect work pattern on this attempt, your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"If you enter an incorrect work PIN on this attempt, your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"If you enter an incorrect work password on this attempt, your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Too many incorrect attempts. Your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Dismiss"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Try again. Attempt <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> of <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Your data will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"If you enter an incorrect pattern on the next attempt, data on this device will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"If you enter an incorrect PIN on the next attempt, data on this device will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"If you enter an incorrect password on the next attempt, data on this device will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"If you enter an incorrect pattern on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"If you enter an incorrect PIN on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"If you enter an incorrect password on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"If you enter an incorrect pattern on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"If you enter an incorrect PIN on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"If you enter an incorrect password on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Too many incorrect attempts. The data on this device will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Too many incorrect attempts. This user will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Too many incorrect attempts. This work profile and its data will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Dismiss"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Must be at least <xliff:g id="COUNT">%d</xliff:g> characters"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN must be at least <xliff:g id="COUNT">%d</xliff:g> digits"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continue"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Advanced Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"When Bluetooth is turned on, your device can communicate with other nearby Bluetooth devices."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"To improve location accuracy, system apps and services can still detect Bluetooth devices. You can change this in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scanning settings<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Couldn\'t connect. Try again."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Device details"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Device\'s Bluetooth address: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Forget device?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Your phone will no longer be paired with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Your tablet will no longer be paired with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Your device will no longer be paired with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Forget device"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Connect to…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from media audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from hands-free audio."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Do not provide"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Do not validate"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"No certificate specified. Your connection will not be private."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Network name is too long."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Must specify a domain."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS available"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 network</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Advanced Wi‑Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configure Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC address"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP address"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Forget this group?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Portable Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi hotspot"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Use mobile connection to provide Wi‑Fi network"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Not sharing this tablet’s Internet connection via hotspot"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Not sharing this phone’s Internet connection via hotspot"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Not sharing Internet or content with other devices"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Sharing this tablet’s Internet connection via hotspot"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Sharing this phone’s Internet connection via hotspot"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"App is sharing content. To share Internet connection, turn hotspot off, then on"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi name"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Other devices can connect to <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi‑Fi password"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP band"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Use hotspot to create a Wi‑Fi network for your other devices. Hotspot provides Internet using your mobile data connection. Additional mobile data charges may apply."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Apps can create a hotspot to share content with nearby devices."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Turning hotspot on…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Turning off hotspot…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> is active"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"When Wi-Fi calling is on, your phone can route calls via Wi-Fi networks or your operator\'s network, depending on your preference and which signal is stronger. Before turning on this feature, check with your operator regarding fees and other details."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Update Emergency Address"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Address used by emergency services as your location if you make a 999 call using Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"No results"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Auto-rotate screen"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Vivid colours"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Switch orientation automatically when rotating tablet"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Switch orientation automatically when rotating phone"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Switch orientation automatically when rotating tablet"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimise brightness level for available light. When this feature is on, you can still adjust brightness temporarily."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Night Light"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Night Light tints your screen amber. This makes it easier to look at your screen or read in dim light, and may help you fall asleep more easily."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Schedule"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Turn on automatically"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Never"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Customised schedule"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Sunset to sunrise"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Schedule"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"None"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Turns on at custom time"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Turns on from sunset to sunrise"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Start time"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"End time"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensity"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Off. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Will never turn on automatically."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Will turn on automatically at <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Will turn on automatically at sunset."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"On. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Will never turn off automatically."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Will turn off automatically at <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Will turn off automatically at sunrise."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Off / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Will never turn on automatically"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Will turn on automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Will turn on automatically at sunset"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"On / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Will never turn off automatically"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Will turn off automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Will turn off automatically at sunrise"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Screen turns off"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Settings"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lift to wake"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Ambient display"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambient display"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Always on"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"New notifications"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"When to show"</string>
+    <string name="doze_title" msgid="2375510714460456687">"New notifications"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Wake screen when you receive notifications"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Always on"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Show time, notification icons and other info"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"The APN cannot be empty."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC field must be 3 digits."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC field must be 2 or 3 digits."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operator does not allow adding APNs of type %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Restoring default APN settings."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Reset to default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Reset default APN settings completed"</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Erase SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Erase all the data on the internal USB storage, such as music or photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Erase all the data on the SD card, such as music or photos"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Erase eSIMs"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Erase all eSIMs on the phone. This will not cancel your mobile service plan."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Erase all eSIMs on the tablet. This will not cancel your mobile service plan."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Reset tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Reset phone"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Erase all your personal information and downloaded apps? You can\'t undo this action!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Can’t tether or use portable hotspots while Data Saver is on"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB tethering"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB connected, slide to tether"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Tethered"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Can\'t tether when USB storage is in use"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB not connected"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Connect to turn on"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB tethering error"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Share phone’s Internet connection via USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Share tablet’s Internet connection via USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth tethering"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Sharing this tablet’s Internet connection via Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Sharing this phone’s Internet connection via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Sharing this tablet’s Internet connection to 1 device via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Sharing this phone’s Internet connection to 1 device via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Sharing this tablet’s Internet connection to <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> devices via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Sharing this phone’s Internet connection to <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> devices via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Share tablet’s Internet connection via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Share phone’s Internet connection via Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Sharing this <xliff:g id="DEVICE_NAME">%1$d</xliff:g>’s Internet connection via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Not sharing this tablet’s Internet connection via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Not sharing this phone’s Internet connection via Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Not tethered"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Can\'t tether to more than <xliff:g id="MAXCONNECTION">%1$d</xliff:g> devices."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be untethered."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Use hotspot and tethering to provide Internet to other devices through your mobile data connection."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Use hotspot and tethering to provide Internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobile network"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobile plan"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Location mode"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Use GPS, Wi‑Fi, Bluetooth or mobile networks to determine location"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Use Wi‑Fi, Bluetooth or mobile networks to determine location"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Use GPS to determine location"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Use GPS and device sensors to determine location"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanning"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi scanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Improve location by allowing system apps and services to detect Wi‑Fi networks at any time."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"You don\'t have a data connection. To view this information now, go to %s from any computer connected to the Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Loading…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Choose your password"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"To use fingerprint, set password"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Choose your pattern"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"To use fingerprint, set pattern"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choose your PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"To use fingerprint, set PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirm your password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirm your PIN"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"App settings"</string>
     <string name="install_applications" msgid="4872012136210802181">"Unknown sources"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Allow all app sources"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Recently opened apps"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"See all <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> ago"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Your tablet and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your tablet or loss of data that may result from their use."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Your phone and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your phone or loss of data that may result from their use."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Advanced settings"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Stop system service?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"If you stop this service, some features of your tablet may stop working correctly until you turn it off and then on again."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"If you stop this service, some features of your phone may stop working correctly until you turn it off and then on again."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Languages, input &amp; gestures"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Languages &amp; input"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Languages &amp; input"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Input assistance"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
       <item quantity="one">1 print service on</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> print jobs</item>
+      <item quantity="one">1 print job</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Printing services"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No services installed"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"No printers found"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Use details"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Adjust power use"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Included packages"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps draining battery"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Keeping device awake"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Waking up device in background"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Requesting location frequently"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps misbehaving"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Stop app?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Your phone can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your phone awake.\n\nTo try to fix this issue, you can force stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Your tablet can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your tablet awake.\n\nTo try to fix this issue, you can force stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Your device can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your device awake.\n\nTo try to fix this issue, you can force stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Stop app"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Turn off background usage?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Your phone can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps waking up your phone.\n\nTo address this issue, your phone can prevent this app from running in the background."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Your tablet can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps waking up your tablet.\n\nTo address this issue, your tablet can prevent this app from running in the background."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Your device can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps waking up your device.\n\nTo address this issue, your device can prevent this app from running in the background."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Turn off"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Turn off location?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Your phone can’t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps requesting your location when you\'re not using the app.\n\nTo fix this issue, you can turn off location for this app."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Your tablet can’t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps requesting your location when you\'re not using the app.\n\nTo fix this issue, you can turn off location for this app."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Your device can’t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps requesting your location when you\'re not using the app.\n\nTo fix this issue, you can turn off location for this app."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Turn off"</string>
     <string name="power_screen" msgid="3023346080675904613">"Screen"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Flashlight"</string>
     <string name="power_camera" msgid="4976286950934622605">"Camera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
     <string name="power_service" msgid="1599661212370831780">"Services"</string>
     <string name="power_system" msgid="8290455327965307383">"System"</string>
-    <string name="power_user" msgid="1889728099253018005">"User"</string>
+    <string name="power_user" msgid="3706143225319881667">"Other users"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Keep awake"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Used for <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Active for <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Screen usage <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> used by <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> of overall battery"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Change PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Show notifications"</string>
     <string name="help_label" msgid="6886837949306318591">"Help &amp; feedback"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Help articles, phone &amp; chat support"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Help articles, phone &amp; chat, getting started"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Account for content"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Photo ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Extreme threats"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Show %d hidden item</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Network &amp; Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobile, data usage, hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"Mobile"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"Data Usage"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"Hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Connected devices"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissions, default apps"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Users &amp; accounts"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesture"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pay, tap, payments"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gesture, edge, side, active edge, squeeze, grip, assist, assistant, squeezy, squeezie, squeezey, squeezee, ok google, google assistant"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gesture, wake, notifications, screen, display, screen off, screen on, squeeze, edge, asleep, sleep, grip"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gesture, silence, snooze, alarm, incoming call, quiet, display, lockscreen, squeeze, grip, edge, stop"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tap a tag to write..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Don’t show work notifications at all"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"When your device is locked, how do you want profile notifications to be displayed?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profile notifications"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Notifications"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Notifications"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Notification category"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Let the app decide"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgent"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Allow sound"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Don\'t make sound, vibrate or peek these notifications into view on the current screen."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Low importance"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Medium importance"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"High importance"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgent importance"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Notification assistant"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Notification access"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Access to work profile notifications is blocked"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Allow picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Allow this app to create a picture-in-picture window while the app is open or after you leave it (for example, to continue watching a video). This window displays on top of other apps that you\'re using."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Yes"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"No"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Do Not Disturb access"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"No installed apps have requested Do Not Disturb access"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"This work profile is managed by:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Managed by <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Device rotation"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Rotate the contents of the screen"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Stay in portrait view"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Stay in landscape view"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Stay in current orientation"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Secure start-up"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continue"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"You can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Yes"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Require PIN?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Show full device usage"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Show app usage"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"High usage"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> behaving abnormally</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Apps draining battery</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> draining battery</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Not optimised"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Not optimised"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimising battery use"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Display over other apps"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> apps allowed to display over other apps"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Apps with permission"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Yes"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"No"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Allowed"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Not allowed"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"install apps unknown sources"</string>
     <string name="write_settings" msgid="4797457275727195681">"Modify system settings"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"write modify system settings"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Screen is tinted amber. This may help you fall asleep."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> more"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
+      <item quantity="one">1 suggestion</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
+      <item quantity="one">+1 suggestion</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Remove"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> data warning"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> data warning / <xliff:g id="ID_2">%2$s</xliff:g> data limit"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Billing cycle"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Monthly cycle starts on the <xliff:g id="ID_1">%1$s</xliff:g> of every month"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Monthly starting <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Monthly on day <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Network restrictions"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 app allowed to use unrestricted data when Data Saver is on</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Data Saver"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Unrestricted data access"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Unrestricted data"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Background data is turned off"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"On"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Off"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Control lock screen notifications"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Show or hide notification content"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"All"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Support"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Support &amp; tips"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Smallest width"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"No installed apps have requested Premium SMS access"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS may cost you money and will add up to your mobile bills. If you enable permission for an app, you will be able to send premium SMS using that app."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatic"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Free up space now"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestures"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Gesture shortcuts"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Quick gestures to control your phone"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Quick gestures to control your tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Quick gestures to control your device"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Jump to camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"To quickly open camera, press the power button twice. Works from any screen."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Open camera quickly"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Press power button twice to open camera"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Flip camera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Take selfies faster"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Double-twist phone for selfie mode"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Double-twist tablet for selfie mode"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Double-twist device for selfie mode"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Double-tap to check phone"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Double-tap to check tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Double-tap to check device"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"To quickly check your notifications, double-tap your screen."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"To check time, notification icons and other info, double-tap your screen."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Check notifications when screen is off"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Lift to check phone"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Lift to check tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Lift to check device"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"To quickly check your notifications, pick up your phone."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"To quickly check your notifications, pick up your tablet."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"To quickly check your notifications, pick up your device."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"To check time, notification icons and other info, pick up your phone."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"To check time, notification icons and other info, pick up your tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"To check time, notification icons and other info, pick up your device."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Check notifications when screen is off"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Swipe fingerprint for notifications"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"To check your notifications, swipe down on the fingerprint sensor on the back of your tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"To check your notifications, swipe down on the fingerprint sensor on the back of your device."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"See notifications quickly"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Swipe down on the fingerprint sensor"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Raise to open camera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"To open the camera automatically, lift up your phone into a photo-taking position (landscape or portrait). Works when your phone is asleep or locked."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Take photos when phone is asleep or locked"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Assist gesture"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensitivity"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Do you want to remove this instant app?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Games"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio files"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Space used"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(uninstalled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(disabled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Auto-fill service"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Instant app"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Turn off the storage manager?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Movie &amp; TV apps"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Space used"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Provisioning Info"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Whats new and exciting?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Check out the top 5 features"</string>
 </resources>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index 395746a..f3beb46 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Good"</item>
     <item msgid="8986346415847956850">"Excellent"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Always"</item>
-    <item msgid="844721238536786870">"Only when plugged in"</item>
-    <item msgid="1986753720941888596">"Never"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Always"</item>
-    <item msgid="7433294150916905997">"Only when plugged in"</item>
-    <item msgid="1390404486722375028">"Never"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Last 30 days"</item>
     <item msgid="6600989128423965319">"Set usage cycle..."</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 720ced3..540eeee 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"You are now a developer!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"No need, you are already a developer."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Please enable developer options first."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Wireless &amp; networks"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Connections"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Device"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE provisioned"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Video Calling provisioned"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi Calling provisioned"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presence Provisioned"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Mobile Radio Power"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"View SIM address book"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"View fixed dialling numbers"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Scan for devices"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Rename this device"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Rename"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Disconnect?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"This will end your connection with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Disconnect device?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Your phone will disconnect from <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Your tablet will disconnect from <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Your device will disconnect from <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Disconnect"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"You don\'t have permission to change Bluetooth settings."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Pair new device"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while the Bluetooth settings are open."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Phone\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Tablet\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Device\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Broadcasting"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disable profile?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth pairing request"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Pairing request"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Tap to pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Show files received"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Received files"</string>
     <string name="device_picker" msgid="4978696506172252813">"Choose Bluetooth device"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn off Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wants to access your messages. Give access to %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM access request"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible as \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' to other devices"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Pair new device"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Date &amp; time"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Choose time zone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Accounts"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Location"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Security &amp; location"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Security &amp; location"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encryption &amp; credentials"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Phone encrypted"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Device encrypted"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Unlock with fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Use your fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"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.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Just touch the fingerprint sensor to authorise purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\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="3635924459027832861">"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.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continue"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Skip"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Add fingerprint"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Device protection features will not be activated. You won’t be able to prevent others from using this tablet if it’s lost, stolen or wiped."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Device protection features will not be activated. You won\'t be able to prevent others from using this device if it\'s lost, stolen or wiped."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Device protection features will not be activated. You won\'t be able to prevent others from using this phone if it\'s lost, stolen or wiped."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Device protection features will not be activated. You won’t be able to prevent others from using this tablet if it’s lost or stolen."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Device protection features will not be activated. You won’t be able to prevent others from using this device if it’s lost or stolen."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Device protection features will not be activated. You won’t be able to prevent others from using this phone if it’s lost or stolen."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Next"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Device protection features won’t be turned on. You won’t be able to prevent others from using this tablet if it’s lost, stolen or reset."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Device protection features won’t be turned on. You won’t be able to prevent others from using this device if it’s lost, stolen or reset."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Device protection features won’t be turned on. You won’t be able to prevent others from using this phone if it’s lost, stolen or reset."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Device protection features won’t be turned on. You won’t be able to prevent others from using this tablet if it’s lost or stolen."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Device protection features won’t be turned on. You won’t be able to prevent others from using this device if it’s lost or stolen."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Device protection features won’t be turned on. You won’t be able to prevent others from using this phone if it’s lost or stolen."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Skip anyway"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Go back"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Find the sensor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Locate the fingerprint sensor on the back of your phone."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Touch the sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"It’s on the back of your phone. Use your index finger."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustration with device and fingerprint sensor location"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Name"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Delete"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Let’s start"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Touch the sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Put your finger on the sensor and lift after you feel a vibration"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Keep going"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Move your finger slightly to add all the different parts of your fingerprint"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingerprint added!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Whenever you see this icon, you can use your fingerprint for identification or to authorise a purchase."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Just touch the fingerprint sensor to wake and unlock your device."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"When you see this icon, you can also authorise purchases or sign in to apps."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Lift, then touch again"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Keep lifting your finger to add the different parts of your fingerprint"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Fingerprint added"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"When you see this icon, use your fingerprint for identification or to approve purchases."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Skip fingerprint setup?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"You’ve chosen to use your fingerprint as one way to unlock your phone. If you skip now, you’ll need to set this up later. Setup takes only a minute or so."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Set up screen lock"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Done"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Whoops, that\'s not the sensor"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Use the fingerprint sensor on your device."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Touch the sensor on the back of your phone. Use your index finger."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Enrolment was not completed"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Fingerprint enrolment time limit reached. Try again."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Fingerprint enrolment didn\'t work. Try again or use a different finger."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Choose your backup screen lock method"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Screen lock options"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Screen lock options"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Screen lock"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> /Immediately after sleep"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> after sleep"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Change unlock pattern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Change unlock PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Change unlock password"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Try again. Attempt <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> of <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Last try"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"If you enter an incorrect work pattern on this attempt, your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"If you enter an incorrect work PIN on this attempt, your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"If you enter an incorrect work password on this attempt, your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Too many incorrect attempts. Your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Dismiss"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Try again. Attempt <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> of <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Your data will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"If you enter an incorrect pattern on the next attempt, data on this device will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"If you enter an incorrect PIN on the next attempt, data on this device will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"If you enter an incorrect password on the next attempt, data on this device will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"If you enter an incorrect pattern on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"If you enter an incorrect PIN on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"If you enter an incorrect password on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"If you enter an incorrect pattern on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"If you enter an incorrect PIN on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"If you enter an incorrect password on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Too many incorrect attempts. The data on this device will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Too many incorrect attempts. This user will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Too many incorrect attempts. This work profile and its data will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Dismiss"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Must be at least <xliff:g id="COUNT">%d</xliff:g> characters"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN must be at least <xliff:g id="COUNT">%d</xliff:g> digits"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continue"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Advanced Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"When Bluetooth is turned on, your device can communicate with other nearby Bluetooth devices."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"To improve location accuracy, system apps and services can still detect Bluetooth devices. You can change this in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scanning settings<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Couldn\'t connect. Try again."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Device details"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Device\'s Bluetooth address: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Forget device?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Your phone will no longer be paired with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Your tablet will no longer be paired with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Your device will no longer be paired with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Forget device"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Connect to…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from media audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from hands-free audio."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Do not provide"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Do not validate"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"No certificate specified. Your connection will not be private."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Network name is too long."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Must specify a domain."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS available"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 network</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Advanced Wi‑Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configure Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC address"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP address"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Forget this group?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Portable Wi‑Fi hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi hotspot"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Use mobile connection to provide Wi‑Fi network"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Not sharing this tablet’s Internet connection via hotspot"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Not sharing this phone’s Internet connection via hotspot"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Not sharing Internet or content with other devices"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Sharing this tablet’s Internet connection via hotspot"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Sharing this phone’s Internet connection via hotspot"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"App is sharing content. To share Internet connection, turn hotspot off, then on"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi name"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Other devices can connect to <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi‑Fi password"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP band"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Use hotspot to create a Wi‑Fi network for your other devices. Hotspot provides Internet using your mobile data connection. Additional mobile data charges may apply."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Apps can create a hotspot to share content with nearby devices."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Turning hotspot on…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Turning off hotspot…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> is active"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"When Wi-Fi calling is on, your phone can route calls via Wi-Fi networks or your operator\'s network, depending on your preference and which signal is stronger. Before turning on this feature, check with your operator regarding fees and other details."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Update Emergency Address"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Address used by emergency services as your location if you make a 999 call using Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"No results"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Auto-rotate screen"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Vivid colours"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Switch orientation automatically when rotating tablet"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Switch orientation automatically when rotating phone"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Switch orientation automatically when rotating tablet"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimise brightness level for available light. When this feature is on, you can still adjust brightness temporarily."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Night Light"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Night Light tints your screen amber. This makes it easier to look at your screen or read in dim light, and may help you fall asleep more easily."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Schedule"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Turn on automatically"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Never"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Customised schedule"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Sunset to sunrise"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Schedule"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"None"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Turns on at custom time"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Turns on from sunset to sunrise"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Start time"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"End time"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensity"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Off. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Will never turn on automatically."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Will turn on automatically at <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Will turn on automatically at sunset."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"On. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Will never turn off automatically."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Will turn off automatically at <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Will turn off automatically at sunrise."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Off / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Will never turn on automatically"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Will turn on automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Will turn on automatically at sunset"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"On / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Will never turn off automatically"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Will turn off automatically at <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Will turn off automatically at sunrise"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Screen turns off"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Settings"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lift to wake"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Ambient display"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambient display"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Always on"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"New notifications"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"When to show"</string>
+    <string name="doze_title" msgid="2375510714460456687">"New notifications"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Wake screen when you receive notifications"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Always on"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Show time, notification icons and other info"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"The APN cannot be empty."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC field must be 3 digits."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC field must be 2 or 3 digits."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operator does not allow adding APNs of type %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Restoring default APN settings."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Reset to default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Reset default APN settings completed"</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Erase SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Erase all the data on the internal USB storage, such as music or photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Erase all the data on the SD card, such as music or photos"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Erase eSIMs"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Erase all eSIMs on the phone. This will not cancel your mobile service plan."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Erase all eSIMs on the tablet. This will not cancel your mobile service plan."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Reset tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Reset phone"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Erase all your personal information and downloaded apps? You can\'t undo this action!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Can’t tether or use portable hotspots while Data Saver is on"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB tethering"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB connected, slide to tether"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Tethered"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Can\'t tether when USB storage is in use"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB not connected"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Connect to turn on"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB tethering error"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Share phone’s Internet connection via USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Share tablet’s Internet connection via USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth tethering"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Sharing this tablet’s Internet connection via Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Sharing this phone’s Internet connection via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Sharing this tablet’s Internet connection to 1 device via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Sharing this phone’s Internet connection to 1 device via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Sharing this tablet’s Internet connection to <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> devices via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Sharing this phone’s Internet connection to <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> devices via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Share tablet’s Internet connection via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Share phone’s Internet connection via Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Sharing this <xliff:g id="DEVICE_NAME">%1$d</xliff:g>’s Internet connection via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Not sharing this tablet’s Internet connection via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Not sharing this phone’s Internet connection via Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Not tethered"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Can\'t tether to more than <xliff:g id="MAXCONNECTION">%1$d</xliff:g> devices."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be untethered."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Use hotspot and tethering to provide Internet to other devices through your mobile data connection."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Use hotspot and tethering to provide Internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobile network"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobile plan"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Location mode"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Use GPS, Wi‑Fi, Bluetooth or mobile networks to determine location"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Use Wi‑Fi, Bluetooth or mobile networks to determine location"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Use GPS to determine location"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Use GPS and device sensors to determine location"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanning"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi scanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Improve location by allowing system apps and services to detect Wi‑Fi networks at any time."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"You don\'t have a data connection. To view this information now, go to %s from any computer connected to the Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Loading…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Choose your password"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"To use fingerprint, set password"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Choose your pattern"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"To use fingerprint, set pattern"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choose your PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"To use fingerprint, set PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirm your password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirm your PIN"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"App settings"</string>
     <string name="install_applications" msgid="4872012136210802181">"Unknown sources"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Allow all app sources"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Recently opened apps"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"See all <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> ago"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Your tablet and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your tablet or loss of data that may result from their use."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Your phone and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your phone or loss of data that may result from their use."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Advanced settings"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Stop system service?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"If you stop this service, some features of your tablet may stop working correctly until you turn it off and then on again."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"If you stop this service, some features of your phone may stop working correctly until you turn it off and then on again."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Languages, input &amp; gestures"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Languages &amp; input"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Languages &amp; input"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Input assistance"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
       <item quantity="one">1 print service on</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> print jobs</item>
+      <item quantity="one">1 print job</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Printing services"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No services installed"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"No printers found"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Use details"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Adjust power use"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Included packages"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps draining battery"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Keeping device awake"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Waking up device in background"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Requesting location frequently"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps misbehaving"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Stop app?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Your phone can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your phone awake.\n\nTo try to fix this issue, you can force stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Your tablet can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your tablet awake.\n\nTo try to fix this issue, you can force stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Your device can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your device awake.\n\nTo try to fix this issue, you can force stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Stop app"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Turn off background usage?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Your phone can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps waking up your phone.\n\nTo address this issue, your phone can prevent this app from running in the background."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Your tablet can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps waking up your tablet.\n\nTo address this issue, your tablet can prevent this app from running in the background."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Your device can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps waking up your device.\n\nTo address this issue, your device can prevent this app from running in the background."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Turn off"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Turn off location?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Your phone can’t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps requesting your location when you\'re not using the app.\n\nTo fix this issue, you can turn off location for this app."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Your tablet can’t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps requesting your location when you\'re not using the app.\n\nTo fix this issue, you can turn off location for this app."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Your device can’t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> keeps requesting your location when you\'re not using the app.\n\nTo fix this issue, you can turn off location for this app."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Turn off"</string>
     <string name="power_screen" msgid="3023346080675904613">"Screen"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Flashlight"</string>
     <string name="power_camera" msgid="4976286950934622605">"Camera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
     <string name="power_service" msgid="1599661212370831780">"Services"</string>
     <string name="power_system" msgid="8290455327965307383">"System"</string>
-    <string name="power_user" msgid="1889728099253018005">"User"</string>
+    <string name="power_user" msgid="3706143225319881667">"Other users"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Keep awake"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Used for <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Active for <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Screen usage <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> used by <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> of overall battery"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Change PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Show notifications"</string>
     <string name="help_label" msgid="6886837949306318591">"Help &amp; feedback"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Help articles, phone &amp; chat support"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Help articles, phone &amp; chat, getting started"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Account for content"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Photo ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Extreme threats"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Show %d hidden item</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Network &amp; Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobile, data usage, hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"Mobile"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"Data Usage"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"Hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Connected devices"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissions, default apps"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Users &amp; accounts"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesture"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pay, tap, payments"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gesture, edge, side, active edge, squeeze, grip, assist, assistant, squeezy, squeezie, squeezey, squeezee, ok google, google assistant"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gesture, wake, notifications, screen, display, screen off, screen on, squeeze, edge, asleep, sleep, grip"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gesture, silence, snooze, alarm, incoming call, quiet, display, lockscreen, squeeze, grip, edge, stop"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tap a tag to write..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Don’t show work notifications at all"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"When your device is locked, how do you want profile notifications to be displayed?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profile notifications"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Notifications"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Notifications"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Notification category"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Let the app decide"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgent"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Allow sound"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Don\'t make sound, vibrate or peek these notifications into view on the current screen."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Low importance"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Medium importance"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"High importance"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgent importance"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Notification assistant"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Notification access"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Access to work profile notifications is blocked"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Allow picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Allow this app to create a picture-in-picture window while the app is open or after you leave it (for example, to continue watching a video). This window displays on top of other apps that you\'re using."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Yes"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"No"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Do Not Disturb access"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"No installed apps have requested Do Not Disturb access"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"This work profile is managed by:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Managed by <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Device rotation"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Rotate the contents of the screen"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Stay in portrait view"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Stay in landscape view"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Stay in current orientation"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Secure start-up"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continue"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"You can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Yes"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Require PIN?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Show full device usage"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Show app usage"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"High usage"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> behaving abnormally</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Apps draining battery</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> draining battery</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Not optimised"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Not optimised"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimising battery use"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Display over other apps"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> apps allowed to display over other apps"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Apps with permission"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Yes"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"No"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Allowed"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Not allowed"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"install apps unknown sources"</string>
     <string name="write_settings" msgid="4797457275727195681">"Modify system settings"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"write modify system settings"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Screen is tinted amber. This may help you fall asleep."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> more"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
+      <item quantity="one">1 suggestion</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
+      <item quantity="one">+1 suggestion</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Remove"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Cool colour temperature"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Use cooler display colours"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> data warning"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> data warning / <xliff:g id="ID_2">%2$s</xliff:g> data limit"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Billing cycle"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Monthly cycle starts on the <xliff:g id="ID_1">%1$s</xliff:g> of every month"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Monthly starting <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Monthly on day <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Network restrictions"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 app allowed to use unrestricted data when Data Saver is on</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Data Saver"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Unrestricted data access"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Unrestricted data"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Background data is turned off"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"On"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Off"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Control lock screen notifications"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Show or hide notification content"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"All"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Support"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Support &amp; tips"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Smallest width"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"No installed apps have requested Premium SMS access"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS may cost you money and will add up to your mobile bills. If you enable permission for an app, you will be able to send premium SMS using that app."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatic"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Free up space now"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestures"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Gesture shortcuts"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Quick gestures to control your phone"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Quick gestures to control your tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Quick gestures to control your device"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Jump to camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"To quickly open camera, press the power button twice. Works from any screen."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Open camera quickly"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Press power button twice to open camera"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Flip camera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Take selfies faster"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Double-twist phone for selfie mode"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Double-twist tablet for selfie mode"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Double-twist device for selfie mode"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Double-tap to check phone"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Double-tap to check tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Double-tap to check device"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"To quickly check your notifications, double-tap your screen."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"To check time, notification icons and other info, double-tap your screen."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Check notifications when screen is off"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Lift to check phone"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Lift to check tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Lift to check device"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"To quickly check your notifications, pick up your phone."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"To quickly check your notifications, pick up your tablet."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"To quickly check your notifications, pick up your device."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"To check time, notification icons and other info, pick up your phone."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"To check time, notification icons and other info, pick up your tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"To check time, notification icons and other info, pick up your device."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Check notifications when screen is off"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Swipe fingerprint for notifications"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"To check your notifications, swipe down on the fingerprint sensor on the back of your tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"To check your notifications, swipe down on the fingerprint sensor on the back of your device."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"See notifications quickly"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Swipe down on the fingerprint sensor"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Raise to open camera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"To open the camera automatically, lift up your phone into a photo-taking position (landscape or portrait). Works when your phone is asleep or locked."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Take photos when phone is asleep or locked"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Assist gesture"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensitivity"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Do you want to remove this instant app?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Games"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio files"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Space used"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(uninstalled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(disabled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Auto-fill service"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Instant app"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Turn off the storage manager?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Movie &amp; TV apps"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Space used"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Operator Provisioning Info"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Whats new and exciting?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Check out the top 5 features"</string>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index d40bb83..a476f83 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Buena"</item>
     <item msgid="8986346415847956850">"Excelente"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Siempre"</item>
-    <item msgid="844721238536786870">"Sólo cuando está conectado"</item>
-    <item msgid="1986753720941888596">"Nunca"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Siempre"</item>
-    <item msgid="7433294150916905997">"Sólo cuando está conectado"</item>
-    <item msgid="1390404486722375028">"Nunca"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Últimos 30 días"</item>
     <item msgid="6600989128423965319">"Configurar ciclo de uso…"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index c2ff3f7..f7f4a63 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"¡Ya eres programador!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"No es necesario, ya eres programador."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Primero habilita las opciones para programador."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Conexiones inalámbricas y redes"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Conexiones"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Dispositivo"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE suministrada"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videollamadas suministradas"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Llamadas por Wi-Fi suministradas"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presence suministrados"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Potencia de la señal móvil"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Ver libreta de direcciones de SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ver números fijos"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Buscar dispositivos"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Cambiar nombre de dispositivo"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Cambiar nombre"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"¿Desconectar?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Esto pondrá fin a tu conexión con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"¿Desconectar dispositivo?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Tu teléfono se desconectará de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Tu tablet se desconectará de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Tu dispositivo se desconectará de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Desconecta"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"No tienes permiso para cambiar la configuración de Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Sincronizar dispositivo nuevo"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Los dispositivos cercanos podrán ver tu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> si está abierta la configuración de Bluetooth."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Dirección Bluetooth del teléfono: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Dirección Bluetooth de la tablet: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Dirección Bluetooth del dispositivo: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"¿Desconectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmisión"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"¿Inhabilitar perfil?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitud de vinculación de Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Vinculando solicitud"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Presiona para realizar una sincronización con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar los archivos recibidos"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Archivos recibidos"</string>
     <string name="device_picker" msgid="4978696506172252813">"Elegir dispositivo"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la conexión Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> quiere desactivar la conexión Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s quiere acceder a tus mensajes. ¿Quieres permitir el acceso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitud de acceso a SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"El dispositivo <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> quiere acceder a tu tarjeta SIM. Al otorgar el acceso a la tarjeta SIM, inhabilitarás la conectividad de datos en el dispositivo por el tiempo que dure la conexión. Otorga el acceso al dispositivo <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>."</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para otros dispositivos"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Tus dispositivos"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sincronizar dispositivo nuevo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Fecha y hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Elige la zona horaria"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Cuentas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Ubicación"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Cuentas"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Seguridad y ubicación"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Seguridad y ubicación"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encriptación y credenciales"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Teléfono encriptado"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Dispositivo encriptado"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloquea con tu huella digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Usa tus huellas digitales"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Solo toca el sensor de huellas digitales para desbloquear tu teléfono, autorizar compras o acceder a las apps. Ten cuidado con las personas que agregas, ya que todas las huellas digitales que agregues podrán realizar estas acciones.\n\nNota: Tu huella digital puede ser menos segura que un PIN o un patrón eficaz."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Toca el sensor de huellas digitales para autorizar compras o acceder a las apps. Ten cuidado con las personas que agregas, ya que todas las huellas digitales que agregues podrán realizar estas acciones.\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="3635924459027832861">"Solo tienes que tocar el sensor de huellas digitales para desbloquear tu teléfono, autorizar compras o acceder a las apps. Ten cuidado, ya que todas las huellas digitales que agregues podrán realizar estas acciones.\n\nNota: Es posible que las huellas digitales sean menos seguras que un patrón o PIN eficaz."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"Usa tu huella digital para desbloquear el teléfono o aprobar compras.\n\nNota: La huella digital es menos segura que un PIN o un patrón eficaz."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Omitir"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Agregar huella digital"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"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 borran todos los datos."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas usen este dispositivo si se pierde, te lo roban o se borran todos los datos."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas usen este teléfono si se pierde, te lo roban o se borran todos los datos."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"No se activarán las funciones de protección del dispositivo. Si la pierdes o te la roban, no podrás evitar que otras personas usen esta tablet."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"No se activarán las funciones de protección del dispositivo. Si lo pierdes o te lo roban, no podrás evitar que otras personas lo usen."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"No se activarán las funciones de protección del dispositivo. Si lo pierdes o te lo roban, no podrás evitar que otras personas usen este teléfono."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Siguiente"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"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="4629503416877189572">"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>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas usen este teléfono si lo pierdes, te lo roban o se restablece."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas usen esta tablet si la pierdes o te la roban."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas usen este dispositivo si lo pierdes o te lo roban."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas usen este teléfono si lo pierdes o te lo roban."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Omitir"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Atrás"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Busca el sensor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Busca el sensor de huellas digitales en la parte posterior del teléfono."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Toca el sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Se encuentra en la parte posterior del teléfono. Usa el dedo índice."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustración del dispositivo y la ubicación del sensor de huellas digitales"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nombre"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Aceptar"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Borrar"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Comencemos"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Toca el sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Coloca el dedo en el sensor y levántalo cuando sientas una vibración."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuar"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mueve el dedo ligeramente para agregar todas las partes de tu huella digital."</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Huella digital agregada"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Cuando veas este ícono, podrás utilizar tu huella digital para identificarte o para autorizar una compra."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Solo toca el sensor de huellas digitales para activar y desbloquear el dispositivo."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Cuando veas este ícono, podrás autorizar compras o acceder a las apps."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Levanta dedo y vuelve a tocar"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Sigue levantando el dedo para agregar diferentes partes de tu huella digital"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Se agregó la huella digital"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Cuando veas este ícono, usa tu huella digital para identificarte o para aprobar compras."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"¿Omitir configuración de huella digital?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"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="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueo de pantalla"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Listo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ese no es el sensor"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utilizar sensor de huellas digitales de disp."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Toca el sensor posterior con el dedo índice."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"No se completó el registro"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Se alcanzó el límite de tiempo para el registro de huellas digitales. Vuelve a intentarlo."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"El registro de huellas digitales no funcionó. Vuelve a intentarlo o usa otro dedo."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa las funciones de protección del dispositivo para impedir que terceros lo usen sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa las funciones de protección del dispositivo para impedir que terceros usen este teléfono sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Elegir el método secundario de bloqueo de pantalla"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opciones de bloqueo de pantalla"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opciones de bloqueo de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / inmediatamente después de la suspensión"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> después de la suspensión"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Cambiar patrón de desbloqueo"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN de desbloqueo"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambiar la contraseña de desbloqueo"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Vuelve a intentarlo. Intento <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Último intento"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Si ingresas un patrón de trabajo incorrecto en este intento, el perfil de trabajo y los datos asociados se quitarán de este dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Si ingresas un PIN de trabajo incorrecto en este intento, el perfil de trabajo y los datos asociados se quitarán de este dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Si ingresas una contraseña de trabajo incorrecta en este intento, el perfil de trabajo y los datos asociados se quitarán de este dispositivo."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Hubo demasiados intentos incorrectos. El perfil de trabajo y los datos asociados se quitarán de este dispositivo."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Descartar"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Vuelve a intentarlo. Intento <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Se borrarán tus datos"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Si ingresas un patrón incorrecto en el próximo intento, se borrarán los datos de este dispositivo"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Si ingresas un PIN incorrecto en el próximo intento, se borrarán los datos de este dispositivo"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Si ingresas una contraseña incorrecta en el próximo intento, se borrarán los datos de este dispositivo"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Si ingresas un patrón incorrecto en el próximo intento, se borrará este usuario"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Si ingresas un PIN incorrecto en el próximo intento, se borrará este usuario"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Si ingresas una contraseña incorrecta en el próximo intento, se borrará este usuario"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Si ingresas un patrón incorrecto en el próximo intento, se borrarán tu perfil de trabajo y sus datos"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Si ingresas un PIN incorrecto en el próximo intento, se borrarán tu perfil de trabajo y sus datos"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Si ingresas una contraseña incorrecta en el próximo intento, se borrarán tu perfil de trabajo y sus datos"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Hubo demasiados intentos incorrectos. Se borrarán los datos de este dispositivo."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Hubo demasiados intentos incorrectos. Se borrará este usuario."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Hubo demasiados intentos incorrectos. Se borrarán este perfil de trabajo y sus datos."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Descartar"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Debe tener al menos <xliff:g id="COUNT">%d</xliff:g> caracteres"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"El PIN debe tener al menos <xliff:g id="COUNT">%d</xliff:g> dígitos"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avanzado"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Permite conexión con dispositivos cercanos"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Para mejorar la precisión de la ubicación, los servicios y las aplicaciones del sistema pueden detectar dispositivos Bluetooth. Puedes cambiar esta opción en la <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuración de búsqueda<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"No se pudo establecer la conexión. Vuelve a intentarlo."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Detalles del dispositivo"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Dirección Bluetooth del dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"¿Olvidar este dispositivo?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"El teléfono ya no estará sincronizado con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"La tablet ya no estará sincronizada con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"El dispositivo ya no estará sincronizado con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Olvidar este dispositivo"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectar a..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio multimedia."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio de manos libres."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"No proporcionar"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"No validar"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"No especificaste ningún certificado. Tu conexión no será privada."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"El nombre de la red es demasiado largo."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Se debe especificar un dominio."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WSP disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WSP disponible)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 red</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Config. avanzada de Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurar Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Dirección MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Dirección IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de subred"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"¿Deseas borrar este grupo?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Zona Wi-Fi portátil"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Zona Wi-Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Usar conexión móvil para brindar Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"No se comparte la conexión a Internet de esta tablet mediante hotspot"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"No se comparte la conexión a Internet de este teléfono mediante hotspot"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"No compartir Internet ni contenido con otros dispositivos"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Compartir la conexión a Internet de esta tablet por hotspot"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Compartir la conexión a Internet de este teléfono por hotspot"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"La app está compartiendo contenido. Para compartir la conexión a Internet, desactiva el hotspot y vuelve a activarlo"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nombre de Wi-Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Activando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Otros dispositivos pueden conectarse a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Contraseña de Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda AP"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Usa el hotspot para crear una red Wi‑Fi para otros dispositivos. El hotspot brinda acceso a Internet mediante tu conexión de datos móviles. Es posible que se apliquen cargos adicionales de datos móviles."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Las apps pueden crear un hotspot para compartir contenido con dispositivos cercanos."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Activando zona…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desactivando zona…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> está activa"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Cuando están activadas las llamadas por Wi-Fi, el teléfono puede enviar las llamadas por redes Wi-Fi o por la red del proveedor, según tu preferencia y la señal que sea más intensa. Antes de activar esta función, verifica el costo y otros detalles con el proveedor de red."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Actualizar dirección de emergencia"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Dirección que los servicios de ayuda usarán como tu ubicación si realizas alguna llamada de emergencia mediante Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Sin resultados"</string>
     <string name="display_settings" msgid="7965901687241669598">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotar automáticamente la pantalla"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Colores intensos"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Cambiar la orientación automáticamente al girar el tablet"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Cambiar la orientación automáticamente al girar el dispositivo"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Cambiar la orientación automáticamente al girar el tablet"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimiza el nivel de brillo según la luz disponible. También puedes ajustarlo temporalmente."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Luz nocturna"</string>
     <string name="night_display_text" msgid="1837277457033025056">"La Luz nocturna le da un tono ámbar a tu pantalla. No solo te permitirá ver  o leer mejor en lugares con luz tenue, sino que también podría ayudarte a conciliar el sueño más rápido."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Programar"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Estado"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Activar automáticamente"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nunca"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Programación personalizada"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Del atardecer al amanecer"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Programar"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ninguno"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Encender una hora personalizada"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Activar de atardecer a amanecer"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Hora de inicio"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de finalización"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Estado"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensidad"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Desactivado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"No se activará automáticamente."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Se activará automáticamente a las <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Se activará automáticamente al atardecer."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Activado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"No se desactivará automáticamente."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Se desactivará automáticamente a las <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Se desactivará automáticamente al amanecer."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Desactivado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Nunca se activará automáticamente"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Se activará automáticamente a las <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Se activará automáticamente al atardecer"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Activado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Nunca se desactivará automáticamente"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Se desactivará automáticamente a las <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Se desactivará automáticamente al amanecer"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspender"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Cuando se apaga la pantalla"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Configuración"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar el dispositivo para activarlo"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Pantalla ambiente"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Pantalla ambiente"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Siempre activada"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nuevas notificaciones"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Cuándo mostrar"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nuevas notificaciones"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activar la pantalla al recibir notificaciones"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Siempre activada"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostrar hora, íconos de notificaciones y otra información"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Aumenta o reduce el tamaño del texto en pantalla"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueo de la tarjeta SIM"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"El APN no puede estar vacío."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"El campo de MCC debe contener 3 dígitos."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"El campo MNC debe contener 2 ó 3 dígitos."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"El proveedor no permite que se agreguen APN del tipo %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Restaurando la configuración APN predeterminada"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Restablecer valores predeterminados"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Se restableció la configuración predeterminada de APN."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Borrar tarjeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Borra todos los datos del almacenamiento USB, como la música o las fotos."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Borra todos los datos de la tarjeta SD, como música o fotos."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Borrar eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Borra todas las eSIM del teléfono. No se cancelará tu plan de servicio de datos móviles."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Borra todas las eSIM de la tablet. No se cancelará tu plan de servicio de datos móviles."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer la tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restablecer dispositivo"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"¿Deseas eliminar toda tu información personal y las aplicaciones descargadas? Esta acción no se puede deshacer."</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"No podrán establecerse conexiones a través del dispositivo portátil ni hotspots portátiles cuando se active el modo de ahorro de datos."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Anclaje a red USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Conectado al USB, verificar el anclaje a redes"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Anclado a red"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"No se puede anclar a red si el almacenamiento USB está en uso."</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB no conectado"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Conéctate para activar."</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Error de anclaje a red USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Compartir la conexión a Internet del teléfono por USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Compartir la conexión a Internet de la tablet por USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Anclaje a red Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Compartir conexión de la tablet por Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Compartir conexión del teléfono por Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Compartiendo la conexión a Internet de la tablet con 1 dispositivo por Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Compartiendo la conexión a Internet del teléfono con 1 dispositivo por Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Compartiendo la conexión a Internet de la tablet con <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivos por Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Compartiendo la conexión a Internet del teléfono con <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivos por Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Comparte la conexión a Internet de la tablet mediante Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Comparte la conexión a Internet del teléfono mediante Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Compartiendo la conexión a Internet de este <xliff:g id="DEVICE_NAME">%1$d</xliff:g> por Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"No se comparte la conexión a Internet de esta tablet por Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"No se comparte la conexión a Internet de este teléfono por Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"No anclado a red"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"No se puede anclar a red a más de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ya no se anclará a red."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Usa la función de hotspot y conexión mediante dispositivo portátil para brindar acceso a Internet a otros dispositivos con tu conexión de datos móviles."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Usa la función de hotspot y conexión mediante dispositivo portátil para brindar acceso a Internet a otros dispositivos con tu conexión de datos móviles. Las apps también pueden crear un hotspot para compartir contenido con dispositivos cercanos."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Red móvil"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plan móvil"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de ubicación"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Usar GPS, Wi-Fi, Bluetooth o redes móviles para determinar la ubicación"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Usar Wi-Fi, Bluetooth o redes móviles para determinar la ubicación"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Determinar ubicación con GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Usar GPS y los sensores del dispositivo para determinar la ubicación"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Buscando"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Búsqueda de redes Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Para mejorar la precisión de la ubicación, permite que los servicios y las aplicaciones del sistema detecten redes Wi-Fi en cualquier momento."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"No tienes una conexión de datos. Para ver esta información ahora, visita %s desde cualquier computadora conectada a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Elige la contraseña"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Configura tu contraseña"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Elige un patrón"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Configura el patrón"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Elige el PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Configura el PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirma la contraseña."</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma el patrón"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirma tu PIN."</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Configuración de aplicación"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fuentes desconocidas"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Permitir todas las fuentes"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Apps abiertas recientemente"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Ver las <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"hace <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tu tablet y tus datos personales son más vulnerables a los ataques de apps desconocidas. Si instalas apps de esta fuente, serás responsable de los daños que sufra tu tablet y la pérdida de datos debido al uso de estas apps."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Tu teléfono y tus datos personales son más vulnerables a los ataques de apps desconocidas. Si instalas apps de esta fuente, serás responsable de los daños que sufra tu teléfono y la pérdida de datos debido al uso de estas apps."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configuración avanzada"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"¿Deseas detener el servicio?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Si detienes este servicio, algunas funciones de la tablet podrían dejar de ejecutarse correctamente hasta que lo apagues y enciendas nuevamente."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Si detienes este servicio, algunas funciones del dispositivo podrían dejar de ejecutarse correctamente hasta que lo apagues y enciendas nuevamente."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Idiomas, entrada y gestos"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Idiomas y entradas"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Idiomas y entradas"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Ayuda con métodos de entrada"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> servicios de impresión activados</item>
       <item quantity="one">1 servicio de impresión activado</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> trabajos de impresión</item>
+      <item quantity="one">1 trabajo de impresión</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Servicios de impresión"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No se instaló ningún servicio."</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"No se encontraron impresoras"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Detalles de uso"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Ajustar el uso de energía"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Paquetes incluidos"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps que agotan la batería"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Mantiene el dispositivo activo"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Activa el dispositivo en segundo plano"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Solicita la ubicación frecuentemente"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps no funcionan correctamente"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"¿Quieres detener la app?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"El teléfono no puede administrar la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionar este problema, puedes forzar la detención de la app.\n\nSi el problema persiste, es posible que debas desinstalar la app para mejorar el rendimiento de la batería."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"La tablet no puede administrar la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> la mantiene activa.\n\nPara solucionar este problema, puedes forzar la detención de la app.\n\nSi el problema persiste, es posible que debas desinstalar la app para mejorar el rendimiento de la batería."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"El dispositivo no puede administrar la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionar este problema, puedes forzar la detención de la app.\n\nSi el problema persiste, es posible que debas desinstalar la app para mejorar el rendimiento de la batería."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Detener la app"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"¿Quieres desactivar el uso en segundo plano?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"El teléfono no puede administrar la batería normalmente porque <xliff:g id="APP">%1$s</xliff:g> lo activa constantemente.\n\nPara solucionar este problema, el teléfono puede evitar que esta app se ejecute en segundo plano."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"La tablet no puede administrar la batería normalmente porque <xliff:g id="APP">%1$s</xliff:g> la activa constantemente.\n\nPara solucionar este problema, la tablet puede evitar que esta app se ejecute en segundo plano."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"El dispositivo no puede administrar la batería normalmente porque <xliff:g id="APP">%1$s</xliff:g> lo activa constantemente.\n\nPara solucionar este problema, el dispositivo puede evitar que esta app se ejecute en segundo plano."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Desactivar"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"¿Quieres desactivar la ubicación?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"El teléfono no puede administrar la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> solicita tu ubicación incluso cuando no usas la app.\n\nPara solucionar este problema, puedes desactivar la ubicación para esta app."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"La tablet no puede administrar la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> solicita tu ubicación incluso cuando no estás usando la app.\n\nPara solucionar este problema, puedes desactivar la ubicación para esta app."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"El dispositivo no puede administrar la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> solicita tu ubicación incluso cuando no usas la app.\n\nPara solucionar este problema, puedes desactivar la ubicación para esta app."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Desactivar"</string>
     <string name="power_screen" msgid="3023346080675904613">"Pantalla"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Linterna"</string>
     <string name="power_camera" msgid="4976286950934622605">"Cámara"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
     <string name="power_service" msgid="1599661212370831780">"Servicios"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
-    <string name="power_user" msgid="1889728099253018005">"Usuario"</string>
+    <string name="power_user" msgid="3706143225319881667">"Otros usuarios"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer plano de la CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantener en funcionamiento"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uso de potencia sobrecalculada"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Se usó durante <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Activa durante <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Uso de la pantalla: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> usado por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> de la batería total"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Cambiar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificaciones"</string>
     <string name="help_label" msgid="6886837949306318591">"Ayuda y comentarios"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Artículos de ayuda, asistencia por chat y teléfono"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Artículos de ayuda, teléfono y chat, comenzar"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Cuenta para contenido"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Amenazas serias"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Mostrar %d elemento oculto</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Internet y redes"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, móvil, uso de datos, hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"red móvil"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"uso de datos"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, transmisión, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, transmisión"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps y notificaciones"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permisos, apps predeterminadas"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Usuarios y cuentas"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, presionar, pagos"</string>
     <string name="keywords_backup" msgid="470070289135403022">"copia de seguridad, copia"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gesto, borde, lado, borde activo, presionar, sujetar, asistencia, asistente, squeezy, squeezie, squeezey, ok google, asistente de google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gesto, activar, notificaciones, pantalla, pantalla apagada, pantalla encendida, presionar, borde, inactivo, suspender, sujetar"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gesto, silencio, posponer, alarma, llamada entrante, volumen bajo, pantalla, pantalla bloqueada, presionar, sujetar, borde, detener"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escribir"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Presiona una etiqueta para editarla…"</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"No mostrar notificaciones del perfil de trabajo"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"¿Cómo deseas ver las notificaciones de perfil cuando el dispositivo esté bloqueado?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notificaciones de perfil"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Notificaciones"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Notificaciones"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notificaciones de aplicaciones"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoría de notificaciones"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importancia"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Permitir que la app decida"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgente"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Permitir sonido"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"No emitir sonido, vibrar ni mostrar estas notificaciones en la pantalla actual."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Poca importancia"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Mediana importancia"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importancia alta"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgente"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Asistente de notificaciones"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Acceso a notificaciones"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"El acceso a las notificaciones del perfil de trabajo está bloqueado"</string>
@@ -2830,8 +2912,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Imagen en imagen"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir imagen en imagen"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permite que esta app cree una ventana de imagen en imagen mientras esté abierta o cuando salgas (por ejemplo, para seguir viendo un video). Esta ventana se mostrará sobre otras apps que estés usando."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Sí"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"No"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso en No molestar"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ninguna aplicación instalada solicitó acceso en No molestar."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones…"</string>
@@ -2962,11 +3042,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"La siguiente aplicación administra este perfil de trabajo:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Administrado por <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Rotación del dispositivo"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Girar el contenido de la pantalla"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Mantener vista vertical"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Mantener vista horizontal"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Mantener orientación actual"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Inicio seguro"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"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>
@@ -2974,7 +3049,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"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="4550632760119547492">"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="932184823193006087">"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="1088818752838720964">"Además de usar tu huella digital para desbloquear el dispositivo, puedes solicitar la 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 contraseña para iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"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_yes" msgid="4439509435889513411">"Sí"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"¿Solicitar PIN?"</string>
@@ -3092,6 +3167,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso completo del dispositivo"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de apps"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Uso elevado"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apps no funcionan correctamente</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> no funciona correctamente</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other"> apps agotan la batería</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> agota la batería</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Sin optimizar"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Sin optimizar"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizando el uso de la batería"</string>
@@ -3184,8 +3268,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Mostrar sobre otras apps"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> apps que pueden mostrarse sobre otras apps"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplicaciones con permiso"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Sí"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"No"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Permitida"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"No permitida"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instalar, apps, fuentes desconocidas"</string>
     <string name="write_settings" msgid="4797457275727195681">"Modificar config. del sistema"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"editar, modificar, sistema, configuración"</string>
@@ -3275,6 +3359,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"La pantalla tiene un tono ámbar que te ayudará a conciliar el sueño."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Sugerencias"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"y <xliff:g id="ID_1">%1$d</xliff:g> más"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> sugerencias</item>
+      <item quantity="one">1 sugerencia</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> sugerencias más</item>
+      <item quantity="one">1 sugerencia más</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Quitar"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de colores fríos"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar colores de pantalla más fríos"</string>
@@ -3293,8 +3386,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Advertencia de datos: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Advertencia de datos: <xliff:g id="ID_1">%1$s</xliff:g>/Límite de datos: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciclo de facturación"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Ciclo mensual a partir del <xliff:g id="ID_1">%1$s</xliff:g> de cada mes"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"De forma mensual a partir del <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"El <xliff:g id="ID_1">%1$s</xliff:g> de cada mes"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Restricciones de red"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restricciones</item>
@@ -3314,7 +3406,7 @@
       <item quantity="one">1 app tiene permiso para usar datos sin restricción cuando se activa Reducir datos</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Reducir datos"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Datos sin restricciones"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Datos sin restricciones"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Se desactivaron los datos en segundo plano"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Activado"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Desactivado"</string>
@@ -3378,8 +3470,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notific. en pantalla bloqueada"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Ocultar o mostrar el contenido de las notificaciones"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Todas"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Asistencia"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Asistencia"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ancho más pequeño"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ninguna app que instalaste solicitó acceso a SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS Premium podría implicar cargos en la factura de tu proveedor. Si otorgaste permiso a alguna app, podrás enviar SMS premium con esa app."</string>
@@ -3444,28 +3535,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automático"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liberar espacio ahora"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestos"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Gestos de acceso directo"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gestos rápidos para controlar tu teléfono"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gestos rápidos para controlar tu tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gestos rápidos para controlar tu dispositivo"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Ir a la cámara"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Para abrir la cámara rápidamente, presiona dos veces el botón de encendido (funciona desde cualquier pantalla)."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Abre la cámara rápidamente"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Presiona el botón de encendido dos veces para abrir cámara"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Alternar cámara"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Toma selfies más rápido"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Gira el teléfono dos veces para acceder al modo selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Gira la tablet dos veces para acceder al modo selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Gira el dispositivo dos veces para acceder al modo selfie"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Presiona dos veces el teléfono para revisarlo"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Presiona dos veces la tablet para revisarla"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Presiona dos veces el dispositivo para revisarlo"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Para revisar tus notificaciones rápidamente, presiona dos veces tu pantalla."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Para consultar la hora, los íconos de notificaciones y otros datos, presiona dos veces la pantalla."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Revisa las notificaciones cuando la pantalla está apagada"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levantar el teléfono para revisarlo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levanta la tablet para revisarla"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levanta el dispositivo para revisarlo"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Para revisar las notificaciones rápidamente, levanta el teléfono."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Para revisar tus notificaciones rápidamente, agarra tu tablet."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Para revisar tus notificaciones rápidamente, agarra tu dispositivo."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Para consultar la hora, los íconos de notificaciones y otros datos, levanta el teléfono."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Para consultar la hora, los íconos de notificaciones y otros datos, levanta la tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Para consultar la hora, los íconos de notificaciones y otros datos, levanta el dispositivo."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Revisa las notificaciones cuando la pantalla está apagada"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Desliza tu huella para ver notificaciones"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales que está en la parte posterior del teléfono."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales que está en la parte posterior de la tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales que está en la parte posterior del dispositivo."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Consulta tus notificaciones rápidamente"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Desliza el dedo hacia abajo en sensor de huellas digitales"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Levanta el teléfono para abrir la cámara"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Para abrir la cámara automáticamente, levanta el teléfono como si fueras a tomar una foto (en modo vertical u horizontal). Esta acción funciona con el teléfono bloqueado o en modo de suspensión."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Toma fotos cuando el teléfono está inactivo o bloqueado"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto de asistencia"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilidad"</string>
@@ -3569,6 +3673,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"¿Quieres quitar esta app instantánea?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Juegos"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Archivos de audio"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Espacio en uso"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(se desinstaló para <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(se inhabilitó para <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Servicio autocompletar"</string>
@@ -3582,5 +3687,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"App instantánea"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"¿Deseas desactivar el administrador de almacenamiento?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Apps de películas y TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Espacio en uso"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Información del aprovisionamiento del proveedor"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Activar aprovisionamiento del proveedor"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"¿Cuáles son las novedades y qué es lo más emocionante?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Descubre las 5 características principales"</string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index ea13054..bd5e0d9 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Buena"</item>
     <item msgid="8986346415847956850">"Excelente"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Siempre"</item>
-    <item msgid="844721238536786870">"Solo si se está cargando"</item>
-    <item msgid="1986753720941888596">"Nunca"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Siempre"</item>
-    <item msgid="7433294150916905997">"Solo si se está cargando"</item>
-    <item msgid="1390404486722375028">"Nunca"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Últimos 30 días"</item>
     <item msgid="6600989128423965319">"Establecer ciclo uso..."</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3d11883..f1bc3ff 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"¡Ahora están activadas las opciones para desarrolladores!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Las opciones para desarrolladores ya están activadas."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Habilita primero las opciones para desarrolladores."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Conexiones inalámbricas y redes"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Conexiones"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Dispositivo"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE administrada"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videollamada preparada"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Llamada Wi-Fi preparada"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presence asignados"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Potencia de la señal móvil"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Ver libreta de direcciones de tarjeta SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ver números de marcación fija"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Buscar dispositivos"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Cambiar nombre del dispositivo"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Cambiar nombre"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"¿Desconectar?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Finalizará la conexión con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;."</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"¿Desconectar dispositivo?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Tu teléfono se desconectará de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Tu tablet se desconectará de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Tu dispositivo se desconectará de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Desconectar"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"No tienes permiso para cambiar los ajustes de Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Vincular dispositivo nuevo"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será visible para dispositivos cercanos mientras los ajustes de Bluetooth estén abiertos."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Dirección de Bluetooth del teléfono: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Dirección de Bluetooth del tablet: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Dirección de Bluetooth del dispositivo: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"¿Desconectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emisiones"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"¿Inhabilitar perfil?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitud de vinculación de Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitud de vinculación"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Toca para vincular con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar archivos recibidos"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Archivos recibidos"</string>
     <string name="device_picker" msgid="4978696506172252813">"Seleccionar dispositivo Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar el Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> quiere desactivar el Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s quiere acceder a tus mensajes. ¿Quieres permitir el acceso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitud de acceso de SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> quiere acceder a tu tarjeta SIM. Si lo permites, se inhabilitará la conexión de datos del dispositivo durante la conexión. Conceder acceso a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para otros dispositivos"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Tus dispositivos"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Vincular dispositivo nuevo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Fecha y hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Elige una zona horaria"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Cuentas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Ubicación"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Cuentas"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Seguridad y ubicación"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Seguridad y ubicación"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Cifrado y credenciales"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Teléfono cifrado"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Dispositivo cifrado"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloqueo con huella digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Usar tu huella digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Solo tienes que tocar el sensor de huellas digitales para desbloquear el teléfono, autorizar compras o iniciar sesión en aplicaciones. Cualquier huella digital que añadas podrá realizar estas acciones, por lo que debes tener cuidado con las huellas que incluyas.\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_message_unlock_disabled" msgid="4193477159493347679">"Solo tienes que tocar el sensor de huellas digitales para autorizar compras o iniciar sesión en aplicaciones. Cualquier huella digital que añadas podrá realizar estas acciones, por lo que debes tener cuidado con las huellas que incluyas.\n\nNota: No puedes usar tu huella digital para desbloquear este dispositivo. Para obtener 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="3635924459027832861">"Solo tienes que tocar el sensor de huellas digitales para desbloquear el teléfono, autorizar compras o iniciar sesión en aplicaciones. Cualquier huella digital que añadas podrá realizar estas acciones, por lo que debes tener cuidado con las huellas que incluyas.\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_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Saltar"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Añadir huella digital"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Las funciones de protección del dispositivo no se activarán. No podrás evitar que otros utilicen este tablet en caso de pérdida, robo o borrado de datos."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Las funciones de protección del dispositivo no se activarán. No podrás evitar que otros utilicen este dispositivo en caso de pérdida, robo o borrado de datos."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Las funciones de protección del dispositivo no se activarán. No podrás evitar que otros utilicen este teléfono en caso de pérdida, robo o borrado de datos."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Las funciones de protección del dispositivo no se activarán. No podrás evitar que otros utilicen este tablet en caso de pérdida o robo."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Las funciones de protección del dispositivo no se activarán. No podrás evitar que otros utilicen este dispositivo en caso de pérdida o robo."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Las funciones de protección del dispositivo no se activarán. No podrás evitar que otros utilicen este teléfono en caso de pérdida o robo."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Siguiente"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios utilicen este tablet si lo pierdes, te lo roban o se restablecen sus datos de fábrica."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios lo utilicen si lo pierdes, te lo roban o se restablecen sus datos de fábrica."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios utilicen este teléfono si lo pierdes, te lo roban o se restablecen sus datos de fábrica."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios utilicen este tablet si lo pierdes o te lo roban."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios lo utilicen si lo pierdes o te lo roban."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios utilicen este teléfono si lo pierdes o te lo roban."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Sí, saltar"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Volver"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Localiza el sensor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localiza el sensor de huellas digitales situado en la parte trasera del teléfono."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Tocar el sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Está en la parte trasera del teléfono. Utiliza el dedo índice."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustración con la ubicación del sensor de huellas digitales y dispositivo"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nombre"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Aceptar"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Eliminar"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"¡Empecemos!"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Tocar el sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Pon el dedo en el sensor y levántalo cuando notes una vibración."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Sigue un poco más"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mueve el dedo ligeramente para añadir todas las partes de tu huella digital."</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Huella digital añadida"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Cuando aparezca este icono, puedes usar tu huella digital para identificarte o autorizar una compra."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Solo tienes que tocar el sensor de huellas digitales para activar y desbloquear el dispositivo."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Si aparece este icono, significa que también puedes autorizar las compras o iniciar sesión en las aplicaciones."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Levantar el dedo y tocar"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Levanta el dedo para añadir las distintas partes de tu huella digital"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Huella digital añadida"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Cuando veas este icono, utiliza tu huella digital para identificarte o aprobar compras."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"¿Saltar la configuración de huella digital?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Has decidido utilizar tu huella digital para desbloquear el teléfono. Si te saltas este paso ahora, tendrás que configurarlo más tarde (este proceso tarda aproximadamente un minuto)."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueo de pantalla"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Listo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"¡Vaya! Ese no es el sensor"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Usa el sensor de huellas digitales del dispositivo."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Toca el sensor situado detrás del teléfono con el dedo índice."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registro no completado"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Se ha alcanzado el tiempo de registro de la huella digital. Vuelve a intentarlo."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"El registro de la huella digital no se ha realizado correctamente. Vuelve a intentarlo o utiliza otro dedo."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa las funciones de protección del dispositivo para evitar que otros lo utilicen sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa las funciones de protección del dispositivo para evitar que otros utilicen el teléfono sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Selecciona el método de bloqueo de pantalla alternativo"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opciones de bloqueo de pantalla"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opciones de bloqueo de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/Inmediatamente después de activar el modo de suspensión"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> después de activar el modo de suspensión"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Cambiar patrón desbloqueo"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN de desbloqueo"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambiar contraseña de desbloqueo"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Vuelve a intentarlo. Intento <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Último intento"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Si vuelves a introducir un patrón de trabajo incorrecto, el perfil de trabajo y los datos asociados se quitarán de este dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Si vuelves a introducir un PIN de trabajo incorrecto, el perfil de trabajo y los datos asociados se quitarán de este dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Si vuelves a introducir una contraseña de trabajo incorrecta, el perfil de trabajo y los datos asociados se quitarán de este dispositivo."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Has fallado demasiadas veces. El perfil de trabajo y los datos asociados se quitarán de este dispositivo."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Descartar"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Vuelve a intentarlo. Intento <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Tus datos se eliminarán"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Si vuelves a introducir un patrón incorrecto, los datos de este dispositivo se eliminarán"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Si vuelves a introducir un PIN incorrecto, los datos de este dispositivo se eliminarán"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Si vuelves a introducir una contraseña incorrecta, los datos de este dispositivo se eliminarán"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Si vuelves a introducir un patrón incorrecto, este usuario se eliminará"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Si vuelves a introducir un PIN incorrecto, este usuario se eliminará"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Si vuelves a introducir una contraseña incorrecta, este usuario se eliminará"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Si vuelves a introducir un patrón incorrecto, tu perfil de trabajo y sus datos se eliminarán"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Si vuelves a introducir un PIN incorrecto, tu perfil de trabajo y sus datos se eliminarán"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Si vuelves a introducir una contraseña incorrecta, tu perfil de trabajo y sus datos se eliminarán"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Se han producido demasiados intentos fallidos. Los datos de este dispositivo se eliminarán."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Se han producido demasiados intentos fallidos. Este usuario se eliminará."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Se han producido demasiados intentos fallidos. Este perfil de trabajo y sus datos se eliminarán."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ignorar"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Debe tener al menos <xliff:g id="COUNT">%d</xliff:g> caracteres"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"El PIN debe tener al menos <xliff:g id="COUNT">%d</xliff:g> dígitos"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Ajustes avanzados de Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Permite la comunicación con dispositivos Bluetooth cercanos"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Para mejorar la precisión de la ubicación, los servicios y las aplicaciones del sistema pueden detectar dispositivos Bluetooth aunque esta conexión esté desactivada. Puedes cambiar esta opción en los <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ajustes de búsqueda<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"No se ha podido establecer conexión. Vuelve a intentarlo."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Detalles del dispositivo"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Dirección de Bluetooth del dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"¿Olvidar dispositivo?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Tu teléfono se desvinculará de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Tu tablet se desvinculará de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Tu dispositivo se desvinculará de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Olvidar dispositivo"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectar con…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del perfil de audio A2DP."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio manos libres."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"No proporcionar"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"No validar"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"No se ha especificado ningún certificado. La conexión no será privada."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"El nombre de la red es demasiado largo."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Se debe especificar un dominio."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 red</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Ajustes avanzados de Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurar Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Dirección MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Dirección IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de subred"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"¿Olvidar este grupo?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Crear punto de acceso Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Punto de acceso Wi-Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Usar la conexión móvil para proporcionar una red Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"No se comparte la conexión a Internet del tablet mediante un punto de acceso"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"No se comparte la conexión a Internet del teléfono mediante un punto de acceso"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"No se está compartiendo la conexión a Internet ni el contenido con otros dispositivos"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Se está compartiendo la conexión a Internet de este tablet mediante un punto de acceso"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Se está compartiendo la conexión a Internet de este teléfono mediante un punto de acceso"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"La aplicación está compartiendo contenido. Para compartir la conexión a Internet, desactiva el punto de acceso y vuelve a activarlo."</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nombre de Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Activando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Otros dispositivos pueden conectarse a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Contraseña de Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda de punto de acceso"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Utiliza un punto de acceso con el fin de crear una red Wi-Fi para otros dispositivos. Los puntos de acceso ofrecen acceso a Internet mediante tu conexión de datos móviles. Es posible que se apliquen cargos adicionales por el uso de datos."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Las aplicaciones pueden crear un punto de acceso para compartir contenido con dispositivos cercanos."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Activando zona Wi-Fi…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desactivando zona Wi-Fi…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> está activa"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Si has activado las llamadas Wi-Fi, tu teléfono puede establecer las llamadas por redes Wi-Fi o por la red de tu operador, en función de la preferencia que hayas establecido y de qué señal tenga más potencia. Antes de activar esta función, consulta con tu proveedor las tarifas aplicables y otros detalles."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Actualizar dirección de emergencia"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Dirección que utilizan los servicios de emergencia como tu ubicación si llamas al 911 por Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Sin resultados"</string>
     <string name="display_settings" msgid="7965901687241669598">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Girar pantalla automáticamente"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Colores intensos"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Cambiar orientación al girar el tablet"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Cambiar orientación automáticamente al girar el teléfono"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Cambiar orientación al girar el tablet"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimiza el brillo en función de la luz ambiental. Puedes ajustarlo temporalmente aunque actives esta función."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Luz nocturna"</string>
     <string name="night_display_text" msgid="1837277457033025056">"La luz nocturna da un tono ámbar a la pantalla. De esta forma, es más fácil ver la pantalla con poca luz y conciliar el sueño."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Programar"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Estado"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Activar automáticamente"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nunca"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Programación personalizada"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Amanecer / Anochecer"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Programar"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Nunca"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Activar a una hora personalizada"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Activar de anochecer a amanecer"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Hora de inicio"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de finalización"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Estado"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensidad"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Desactivado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"No se activará nunca automáticamente."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Se activará automáticamente a esta hora: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Se activará automáticamente al anochecer."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Activado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"No se desactivará nunca automáticamente."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Se desactivará automáticamente a esta hora: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Se desactivará automáticamente al amanecer."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"No/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"No se activará nunca automáticamente"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Se activará automáticamente a esta hora: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Se activará automáticamente al anochecer"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Activado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"No se desactivará nunca automáticamente"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Se desactivará automáticamente a esta hora: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Se desactivará automáticamente al amanecer"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspender después de"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"La pantalla se apaga"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Ajustes"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar el dispositivo para activarlo"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Pantalla ambiente"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Pantalla ambiente"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Siempre activada"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nuevas notificaciones"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Cuándo debe mostrarse"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nuevas notificaciones"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activar pantalla al recibir notificaciones"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Siempre activada"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostrar la hora, iconos de notificación y otra información"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de la fuente"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Aumenta o disminuye el tamaño del texto"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ajustes de bloqueo de tarjeta SIM"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"El campo APN no puede estar vacío."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"El campo MCC debe contener 3 dígitos."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"El campo MNC debe contener 2 o 3 dígitos."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"El operador no permite que se añadan APNs de tipo %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Restaurando la configuración de APN predeterminada"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Restablecer ajustes"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Se ha restablecido la configuración predeterminada de APN."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Borrar tarjeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Borra todos los datos del almacenamiento USB interno, como la música o las fotos."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Borrar todos los datos de la tarjeta SD"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Borrar contenido de eSIMs"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Borra todas las tarjetas eSIM del teléfono. Esta acción no cancelará tu plan de servicios móviles."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Borra todas las tarjetas eSIM del tablet. Esta acción no cancelará tu plan de servicios móviles."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restablecer teléfono"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"¿Quieres borrar toda tu información personal y todas las aplicaciones descargadas? Esta acción no se puede deshacer."</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"No se puede hacer el anclaje de red ni utilizar zonas Wi-Fi portátiles mientras el ahorro de datos esté activado"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Compartir por USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB conectado, sin anclaje a red"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Anclado a red"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"No se puede hacer el anclaje a red si el almacenamiento USB está en uso"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB no conectado"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Conectar para activar"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Error al compartir por USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Compartir la conexión a Internet del teléfono por USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Compartir la conexión a Internet del tablet por USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Compartir por Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Compartiendo conexión a Internet del tablet por Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Compartiendo conexión a Internet del móvil por Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Compartiendo la conexión a Internet con 1 dispositivo por Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Compartiendo la conexión a Internet con 1 dispositivo por Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Compartiendo la conexión a Internet con <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivos por Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Compartiendo la conexión a Internet con <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivos por Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Comparte la conexión a Internet del tablet por Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Comparte la conexión a Internet del teléfono por Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Compartiendo la conexión a Internet de este <xliff:g id="DEVICE_NAME">%1$d</xliff:g> por Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"No se comparte la conexión a Internet de este tablet por Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"No se comparte la conexión a Internet de este móvil por Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"No anclado"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"No se puede anclar a más de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Se desactivará el anclaje a red de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Utiliza el punto de acceso y la conexión mediante dispositivo portátil para compartir tu conexión a Internet con otros dispositivos a través de datos móviles."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Utiliza el punto de acceso y la conexión mediante dispositivo portátil para compartir tu conexión a Internet con otros dispositivos a través de datos móviles. Las aplicaciones también pueden crear un punto de acceso para compartir contenido con dispositivos cercanos."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Red móvil"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plan móvil"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de ubicación"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Usa las redes móviles, la conexión Wi-Fi, el Bluetooth o el GPS para determinar la ubicación"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Usa las redes móviles, la conexión Wi‑Fi o el Bluetooth para determinar la ubicación"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Determinar ubicación con el GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Utiliza el GPS y los sensores del dispositivo para determinar la ubicación"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Búsqueda"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Búsqueda de redes Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Los servicios y las aplicaciones del sistema pueden detectar redes Wi‑Fi en cualquier momento para mejorar la precisión de la ubicación."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"No tienes conexión de datos. Para ver esta información, accede a %s desde cualquier ordenador conectado a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Elige tu contraseña"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para usar huella, añade contraseña"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Elige un patrón"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para usar huella, añade patrón"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Elige tu PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Para usar huella, añade PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirma tu contraseña"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma el patrón"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirma el número PIN"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Ajustes de aplicación"</string>
     <string name="install_applications" msgid="4872012136210802181">"Orígenes desconocidos"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Permitir todas las fuentes"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Aplicaciones abiertas recientemente"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Ver todas las aplicaciones (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"Hace <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tu tablet y tus datos personales son más vulnerables a los ataques de aplicaciones desconocidas. Al instalar aplicaciones de esta fuente, aceptas ser responsable de cualquier daño que sufra tu tablet o la pérdida de datos que se pueda derivar de su uso."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Tu teléfono y tus datos personales son más vulnerables a los ataques de aplicaciones desconocidas. Al instalar aplicaciones de esta fuente, aceptas ser responsable de cualquier daño que sufra tu teléfono o la pérdida de datos que se pueda derivar de su uso."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Ajustes avanzados"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"¿Quieres detener el servicio del sistema?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Si detienes este servicio, es posible que algunas funciones del tablet dejen de funcionar correctamente hasta que reinicies el dispositivo."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Si detienes este servicio, es posible que algunas funciones del teléfono dejen de funcionar correctamente hasta que reinicies el dispositivo."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Idiomas, entrada de texto y gestos"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Idiomas e introducción de texto"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Idiomas e introducción de texto"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Asistencia de entrada"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> servicios de impresión activos</item>
       <item quantity="one">1 servicio de impresión activo</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> trabajos de impresión</item>
+      <item quantity="one">1 trabajo de impresión</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Servicios de impresión"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No se ha instalado ningún servicio."</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"No se encontraron impresoras"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Detalles de uso"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Cómo reducir el uso de la batería"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Paquetes incluidos"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplicaciones que están agotando la batería"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"El dispositivo se está manteniendo activo"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"El dispositivo se está activando en segundo plano"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"La ubicación se solicita con frecuencia"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Hay <xliff:g id="NUMBER">%1$d</xliff:g> aplicaciones que no funcionan correctamente"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"¿Detener aplicación?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Tu teléfono no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionarlo, intenta forzar la detención de la aplicación.\n\nSi el problema persiste, desinstala la aplicación para mejorar el rendimiento de la batería."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Tu tablet no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionarlo, intenta forzar la detención de la aplicación.\n\nSi el problema persiste, desinstala la aplicación para mejorar el rendimiento de la batería."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Tu dispositivo no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionarlo, intenta forzar la detención de la aplicación.\n\nSi el problema persiste, desinstala la aplicación para mejorar el rendimiento de la batería."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Detener aplicación"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"¿Desactivar el uso en segundo plano?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Tu teléfono no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionar este problema, tu teléfono puede evitar que esa aplicación se ejecute en segundo plano."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Tu tablet no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionar este problema, tu tablet puede evitar que esa aplicación se ejecute en segundo plano."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Tu dispositivo no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionar este problema, tu dispositivo puede evitar que esa aplicación se ejecute en segundo plano."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Desactivar"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"¿Desactivar ubicación?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Tu teléfono no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> solicita tu ubicación cuando no estás utilizando la aplicación.\n\nPara solucionar este problema, puedes desactivar la ubicación de esta aplicación."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Tu tablet no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> solicita tu ubicación cuando no estás utilizando la aplicación.\n\nPara solucionar este problema, puedes desactivar la ubicación de esta aplicación."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Tu dispositivo no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> solicita tu ubicación cuando no estás utilizando la aplicación.\n\nPara solucionar este problema, puedes desactivar la ubicación de esta aplicación."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Desactivar"</string>
     <string name="power_screen" msgid="3023346080675904613">"Pantalla"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Linterna"</string>
     <string name="power_camera" msgid="4976286950934622605">"Cámara"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Aplicaciones"</string>
     <string name="power_service" msgid="1599661212370831780">"Servicios"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
-    <string name="power_user" msgid="1889728099253018005">"Usuario"</string>
+    <string name="power_user" msgid="3706143225319881667">"Otros usuarios"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total de CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer plano de la CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Activo"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uso de potencia sobrecalculado"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"En uso durante <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Activa durante <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Uso de la pantalla: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> usado por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> del total de batería"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Cambiar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificaciones"</string>
     <string name="help_label" msgid="6886837949306318591">"Ayuda y sugerencias"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Artículos de ayuda, asistencia por teléfono y chat"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Artículos de ayuda, teléfono y chat, cómo empezar"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Cuenta para contenido"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Amenazas graves"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Mostrar %d elemento oculto</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Red e Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, datos móviles, uso de datos, punto de acceso"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"móvil"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"uso de datos"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"punto de acceso"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Enviar pantalla, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, enviar contenido"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicaciones y notificaciones"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permisos, aplicaciones predeterminadas"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Usuarios y cuentas"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, tocar, pagos"</string>
     <string name="keywords_backup" msgid="470070289135403022">"copia de seguridad, copia seguridad"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gesto, borde, lado, borde activo, apretar, agarrar, asistencia, asistente, función de apretar, apretado, apretando, que se puede apretar, ok google, asistente de google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gesto, activar, notificaciones, pantalla, pantalla desactivada, pantalla activada, apretar, borde, suspensión, suspender, agarrar"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gesto, silenciar, posponer, alarma, llamada entrante, silencio, pantalla, pantalla de bloqueo, apretar, agarrar, borde, detener"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Editar"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toca una etiqueta para editarla..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"No mostrar ninguna notificación de trabajo"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"¿Cómo quieres que se muestren las notificaciones del perfil cuando el dispositivo esté bloqueado?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notificaciones del perfil"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Notificaciones"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Notificaciones"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notificaciones de aplicaciones"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoría de notificaciones"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importancia"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Permite que la aplicación decida"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgente"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Permitir sonido"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"No emitir sonido, vibrar ni mostrar notificaciones en la pantalla actual."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Poco importante"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Algo importante"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Muy importante"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgente"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Asistente de notificaciones"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Acceso a notificaciones"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Se ha bloqueado el acceso a las notificaciones del perfil de trabajo"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Imagen en imagen"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir imagen en imagen"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permite que la aplicación cree una ventana imagen en imagen mientras esté abierta o después de que hayas salido de ella (por ejemplo, para seguir viendo un vídeo). La ventana se muestra sobre otras aplicaciones que estés utilizando."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Sí"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"No"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso a No molestar"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ninguna aplicación instalada ha solicitado acceso de No molestar"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Este perfil de trabajo está administrado por:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Administrado por <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Rotación del dispositivo"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Girar el contenido de la pantalla"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Mantener vista vertical"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Mantener vista horizontal"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Mantener orientación actual"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Inicio seguro"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Para proteger aún más tu dispositivo, haz que solicite tu PIN antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia. \n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir PIN al iniciar el dispositivo?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Para proteger aún más tu dispositivo, haz que solicite la contraseña antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia. \n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir contraseña al iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Además de utilizar la huella digital para desbloquear el dispositivo, puedes protegerlo aún más si haces que solicite tu PIN antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir PIN al iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Además de utilizar la huella digital para desbloquear el dispositivo, puedes protegerlo aún más si haces que solicite el patrón antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir patrón al iniciar el dispositivo?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Además de utilizar la huella digital para desbloquear el dispositivo, puedes protegerlo aún más si haces que solicite la contraseña antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir contraseña al iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Además de utilizar tu huella digital para desbloquear el dispositivo, puedes protegerlo aún más configurándolo para que solicite una contraseña antes de que se inicie. Hasta entonces, no podrás recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsto permite proteger los datos en dispositivos perdidos o robados. ¿Quieres que el dispositivo pida la contraseña para iniciarse?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sí"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"¿Solicitar PIN?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso completo del dispositivo"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de la aplicación"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Uso elevado"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplicaciones no funcionan con normalidad</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> no funciona con normalidad</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other"> aplicaciones están agotando la batería</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> está agotando la batería</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Sin optimizar"</string>
     <string name="high_power_on" msgid="6216293998227583810">"No optimizada"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizando el uso de la batería"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Mostrar sobre otras apps"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> aplicaciones que se pueden mostrar sobre otras"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplicaciones con permiso"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Sí"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"No"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Permitida"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"No permitida"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instalar aplicaciones fuentes desconocidas"</string>
     <string name="write_settings" msgid="4797457275727195681">"Modificar ajustes del sistema"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"escribir, modificar, ajustes del sistema"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"La pantalla adopta un tono ámbar que puede ayudarte a conciliar el sueño."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Sugerencias"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"Más de <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"<xliff:g id="ID_1">%1$d</xliff:g> más"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> sugerencias</item>
+      <item quantity="one">1 sugerencia</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">Más de <xliff:g id="COUNT">%1$d</xliff:g> sugerencias</item>
+      <item quantity="one">Más de 1 sugerencia</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Quitar"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de colores fríos"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizar colores de pantalla más fríos"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Advertencia de datos: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Advertencia de datos: <xliff:g id="ID_1">%1$s</xliff:g>/Límite de datos: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciclo de facturación"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Ciclo mensual a partir del <xliff:g id="ID_1">%1$s</xliff:g> de cada mes"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mensualmente a partir del <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Cada mes (el día <xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Restricciones de red"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restricciones</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 aplicación puede usar datos sin restricción cuando el ahorro de datos está activado</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Ahorro de datos"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Acceso a datos sin restricción"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Datos no restringidos"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Las conexiones automáticas están desactivadas"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Activado"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Desactivado"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notificac. en pantalla bloqueo"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar u ocultar contenido de las notificaciones"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Todo"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Ayuda"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Ayuda y consejos"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ancho más pequeño"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ninguna aplicación instalada ha solicitado acceso SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Es posible que el envío de SMS premium te cueste dinero y el importe correspondiente se sume a las facturas de tu operador. Si habilitas el permiso para una aplicación, puedes enviar SMS premium con ella."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automático"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liberar espacio"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestos"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Accesos directos de gestos"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gestos rápidos para controlar el teléfono"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gestos rápidos para controlar el tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gestos rápidos para controlar el dispositivo"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Abrir cámara"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Pulsa dos veces el botón de encendido para abrir la cámara rápidamente. Funciona desde cualquier pantalla."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Abrir la cámara rápidamente"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Pulsa el botón de encendido dos veces para abrir la cámara"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Cambiar de cámara"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Hacer selfies más rápido"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Gira el teléfono dos veces para activar el modo selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Gira el tablet dos veces para activar el modo selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Gira el dispositivo dos veces para activar el modo selfie"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tocar el teléfono dos veces para comprobar notificaciones"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tocar el tablet dos veces para comprobar notificaciones"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tocar el dispositivo dos veces para comprobar notificaciones"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Toca dos veces la pantalla para consultar las notificaciones rápidamente."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Toca la pantalla dos veces para ver la hora, los iconos de notificación y otra información."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Consulta notificaciones cuando la pantalla esté apagada"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levantar el teléfono para comprobar las notificaciones"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levantar el tablet para comprobar las notificaciones"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levantar el dispositivo para comprobar las notificaciones"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Coge el teléfono para consultar las notificaciones rápidamente."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Coge el tablet para consultar las notificaciones rápidamente."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Coge el dispositivo para consultar las notificaciones rápidamente."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Coge el teléfono para ver la hora, los iconos de notificación y otra información."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Coge el tablet para ver la hora, los iconos de notificación y otra información."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Coge el dispositivo para consultar la hora, iconos de notificación y otra información."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Consulta notificaciones cuando la pantalla esté apagada"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Deslizar por el sensor de huellas para abrir notificaciones"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para ver tus notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales situado en la parte trasera del teléfono."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para ver tus notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales situado en la parte trasera del tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para ver tus notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales situado en la parte trasera del dispositivo."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Ver las notificaciones más rápido"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Desliza el dedo hacia abajo en sensor de huellas digitales"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Levanta el teléfono para abrir la cámara"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Para abrir la cámara de forma automática, levanta el teléfono como si quisieras hacer una foto (en posición horizontal o vertical). Funciona cuando el teléfono está bloqueado o en suspensión."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Haz fotos cuando el teléfono esté bloqueado o en suspensión"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto de asistencia"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilidad"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"¿Quieres quitar esta aplicación instantánea?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Juegos"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Archivos de audio"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Espacio usado"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(opción desinstalada para <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(opción inhabilitada para <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Servicio Autocompletar"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Aplicación instantánea"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"¿Desactivar el administrador de almacenamiento?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplicaciones de películas y TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Espacio usado"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Información de servicios del operador"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Activar servicios del operador"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"¿Cuáles son las fascinantes novedades?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Consulta las 5 funciones principales"</string>
 </resources>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index d8534ad..fdba453 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Hea"</item>
     <item msgid="8986346415847956850">"Suurepärane"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Alati"</item>
-    <item msgid="844721238536786870">"Ainult siis, kui on ühendatud"</item>
-    <item msgid="1986753720941888596">"Mitte kunagi"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Alati"</item>
-    <item msgid="7433294150916905997">"Ainult siis, kui on ühendatud"</item>
-    <item msgid="1390404486722375028">"Mitte kunagi"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Viimased 30 päeva"</item>
     <item msgid="6600989128423965319">"Kas. tsükli määramine ..."</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index eb1961c..f6431a7 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Olete nüüd arendaja!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Ei ole vaja, olete juba arendaja."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Lubage esmalt arendaja valikud."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Traadita ühendus ja võrgud"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Ühendused"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Seade"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE on ette valmistatud"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videokõne ettevalmistamine"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"WiFi-kõne ettevalmistamine"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presence\'i ettevalmistatud"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Mobiiliraadio toide"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM-kaardi aadressiraamatu kuvamine"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Kuva määratud valimisnumbrid"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Otsi seadmeid"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Seadme ümbernimetamine"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Nimeta ümber"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Kas katkestada ühendus?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"See lõpetab teie ühenduse seadmega:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Kas katkestada seadme ühendus?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Teie telefon katkestab ühenduse seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Teie tahvelarvuti katkestab ühenduse seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Teie seade katkestab ühenduse seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Katk. üh."</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Teil ei ole luba Bluetoothi seadete muutmiseks."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Uue seadme sidumine"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> on läheduses olevatele seadmetele nähtav, kui Bluetoothi seaded on avatud."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Telefoni Bluetoothi aadress: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Tahvelarvuti Bluetoothi aadress: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Seadme Bluetoothi aadress: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Kas katkestada ühendus seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Edastamine"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Kas profiil keelata?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetoothi sidumisettepanek"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Sidumistaotlus"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Puudutage seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sidumiseks."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Näita vastuvõetud faile"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Vastuvõetud failid"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth-seadme valimine"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"Rakendus <xliff:g id="APP_NAME">%1$s</xliff:g> soovib Bluetoothi sisse lülitada"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"Rakendus <xliff:g id="APP_NAME">%1$s</xliff:g> soovib Bluetoothi välja lülitada"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s soovib saada juurdepääsu sõnumitele. Kas anda seadmele %2$s juurdepääs?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Juurdepääsutaotlus SIM-kaardile"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Seade <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> soovib juurdepääsu teie SIM-kaardile. Kui annate juurdepääsu SIM-kaardile, keelatakse seadmes ühenduse ajaks andmesideühendus. Juurdepääsu andmine seadmele <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Teistele seadmetele nähtav seadmena „<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Teie seadmed"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Uue seadme sidumine"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Kuupäev ja kellaaeg"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Ajavööndi valimine"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Kontod"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Asukoht"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Kontod"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Turvalisus ja asukoht"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Turvalisus ja asukoht"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Krüpteerimine ja mandaat"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon on krüpteeritud"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Seade on krüpteeritud"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Sõrmejäljega avamine"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Sõrmejälje kasutamine"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"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.\n\nMärkus. Sõrmejälg võib olla vähem turvaline kui keerukas muster või PIN-kood."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Ostude volitamiseks või rakendustesse sisselogimiseks peate puudutama vaid sõrmejäljeandurit. Olge sõrmejälgede lisamisel ettevaatlik. Neid toiminguid saab teha isegi ühe lisatud sõrmejäljega.\n\nMärkus. Te ei saa sõrmejälge kasutada selle seadme avamiseks. Lisateabe saamiseks võtke ühendust organisatsiooni administraatoriga."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"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.\n\nMärkus. Sõrmejälg võib olla vähem turvaline kui keerukas muster või PIN-kood."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Tühista"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Jätka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Jäta vahele"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Lisa sõrmejälg"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Seadme kaitsefunktsioone ei aktiveerita. Te ei saa takistada teisi tahvelarvutit kasutamast, kui selle kaotate, see varastatakse või selle andmed kustutatakse."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Seadme kaitsefunktsioone ei aktiveerita. Te ei saa takistada teisi seadet kasutamast, kui selle kaotate, see varastatakse või selle andmed kustutatakse."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Seadme kaitsefunktsioone ei aktiveerita. Te ei saa takistada teisi telefoni kasutamast, kui selle kaotate, see varastatakse või selle andmed kustutatakse."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Seadme kaitsefunktsioone ei aktiveerita. Te ei saa takistada teisi tahvelarvutit kasutamast, kui selle kaotate või see varastatakse."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Seadme kaitsefunktsioone ei aktiveerita. Te ei saa takistada teisi seadet kasutamast, kui selle kaotate või see varastatakse."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Seadme kaitsefunktsioone ei aktiveerita. Te ei saa takistada teisi telefoni kasutamast, kui selle kaotate või see varastatakse."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Järgmine"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Seadme kaitsefunktsioone ei lülitata sisse. Te ei saa tahvelarvuti kaotsimineku, varguse või lähtestamise puhul teistel selle kasutamist takistada."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Seadme kaitsefunktsioone ei lülitata sisse. Te ei saa seadme kaotsimineku, varguse või lähtestamise puhul teistel selle kasutamist takistada."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Seadme kaitsefunktsioone ei lülitata sisse. Te ei saa telefoni kaotsimineku, varguse või lähtestamise puhul teistel selle kasutamist takistada."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Seadme kaitsefunktsioone ei lülitata sisse. Te ei saa tahvelarvuti kaotsimineku või varguse puhul teistel selle kasutamist takistada."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Seadme kaitsefunktsioone ei lülitata sisse. Te ei saa seadme kaotsimineku või varguse puhul teistel selle kasutamist takistada."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Seadme kaitsefunktsioone ei lülitata sisse. Te ei saa telefoni kaotsimineku või varguse puhul teistel selle kasutamist takistada."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Jäta ikka vahele"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Mine tagasi"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Leidke andur"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Leidke telefoni tagaküljel olev sõrmejäljeandur."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Puudutage andurit"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"See asub telefoni tagaküljel. Kasutage oma nimetissõrme."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Seadme joonis ja sõrmejäljeanduri asukoht"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nimi"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Kustuta"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Alustame"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Puudutage andurit"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Asetage oma sõrm andurile ja tõstke see üles, kui tunnete vibratsiooni"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Jätkake"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Liigutage veidi oma sõrme, et lisada oma sõrmejälje kõik erinevad osad"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Sõrmejälg lisati."</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Alati kui seda ikooni näete, saate tuvastamiseks või ostu volitamiseks kasutada oma sõrmejälge."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Seadme äratamiseks ja avamiseks puudutage lihtsalt sõrmejäljelugejat."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Kui näete seda ikooni, saate ka oste volitada ja rakendustesse sisse logida."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Tõstke, siis puudutage uuesti"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Tõstke sõrme, et lisada sõrmejälje eri osad"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Sõrmejälg on lisatud"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Kui näete seda ikooni, kasutage tuvastamiseks või ostude kinnitamiseks oma sõrmejälge."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Kas jätta sõrmejälje seadistus vahele?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Valisite telefoni avamise üheks viisiks sõrmejälje kasutamise. Kui seadistamise praegu vahele jätate, peate seda tegema hiljem. See võtab ainult umbes minuti."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Seadista ekraanilukk"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Valmis"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Vabandust, see pole andur"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Kasutage seadme sõrmejäljeandurit."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Puud. telefoni tagaküljel asuvat andurit. Kasut. oma nimetissõrme."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registreerumist ei lõpetatud"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Sõrmejälje registreerimisaeg lõppes. Proovige uuesti."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Sõrmejälje registreerimine ei toiminud. Proovige uuesti või kasutage teist sõrme."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata seadet kasutada. Valige kasutatav ekraanilukk."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata telefoni kasutada. Valige kasutatav ekraanilukk."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Valige oma ekraaniluku varumeetod"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Ekraaniluku valikud"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Ekraaniluku valikud"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekraanilukk"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / kohe pärast unerežiimi"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> pärast unerežiimi"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Avamismustri muutmine"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Muuda avamise PIN-koodi"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Avamisparooli muutmine"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Proovige uuesti. Katse <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>/<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Viimane katse"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Kui sisestate sellel katsel vale töömustri, eemaldatakse teie tööprofiil ja seotud andmed sellest seadmest."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Kui sisestate sellel katsel vale töö-PIN-koodi, eemaldatakse teie tööprofiil ja seotud andmed sellest seadmest."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Kui sisestate sellel katsel vale tööparooli, eemaldatakse teie tööprofiil ja seotud andmed sellest seadmest."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Liiga palju valesid katseid. Teie tööprofiil ja seotud andmed eemaldatakse sellest seadmest."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Loobu"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Proovige uuesti. Katse <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>/<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Teie andmed kustutatakse"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Kui sisestate järgmisel katsel vale mustri, kustutatakse selle seadme andmed"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Kui sisestate järgmisel katsel vale PIN-koodi, kustutatakse selle seadme andmed"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Kui sisestate järgmisel katsel vale parooli, kustutatakse selle seadme andmed"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Kui sisestate järgmisel katsel vale mustri, kustutatakse see kasutaja"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Kui sisestate järgmisel katsel vale PIN-koodi, kustutatakse see kasutaja"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Kui sisestate järgmisel katsel vale parooli, kustutatakse see kasutaja"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Kui sisestate järgmisel katsel vale mustri, kustutatakse teie tööprofiil ja selle andmed"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Kui sisestate järgmisel katsel vale PIN-koodi, kustutatakse teie tööprofiil ja selle andmed"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Kui sisestate järgmisel katsel vale parooli, kustutatakse teie tööprofiil ja selle andmed"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Liiga palju valesid katseid. Selle seadme andmed kustutatakse."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Liiga palju valesid katseid. See kasutaja kustutatakse."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Liiga palju valesid katseid. See tööprofiil ja selle andmed kustutatakse."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Loobu"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Peab sisaldama vähemalt <xliff:g id="COUNT">%d</xliff:g> tähemärki"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN-kood peab sisaldama vähemalt <xliff:g id="COUNT">%d</xliff:g> numbrit"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Jätka"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Täpsemad Bluetoothi seaded"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kui Bluetooth on sisse lülitatud, saab seade suhelda teiste lähikonna Bluetooth-seadmetega."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Asukoha täpsuse parandamiseks saavad süsteemirakendused ja -teenused endiselt tuvastada Bluetoothi seadmeid. Seda saate muuta <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>skannimisseadetes<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Ühendust ei õnnestunud luua. Proovige uuesti."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Seadme üksikasjad"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Seadme Bluetoothi aadress: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Kas unustada seade?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Teie telefon ei ole enam seotud seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Teie tahvelarvuti ei ole enam seotud seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Teie seade ei ole enam seotud seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Unusta seade"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Ühendamine ..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ühendus meediumiheliga katkestatakse."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ühendus vabakäeseadme heliga katkestatakse."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ära esita"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ära kinnita"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Sertifikaati pole määratud. Teie ühendus pole privaatne."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Võrgu nimi on liiga pikk."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Tuleb määrata domeen."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS on saadaval"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS on saadaval"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 võrk</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Täpsemad WiFi-seaded"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"WiFi seadistamine"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-aadress"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-aadress"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Alamvõrgu mask"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Kas unustada see rühm?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Mobiilne WiFi-kuumkoht"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"WiFi-leviala"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Kasuta WiFi-võrgu loomiseks mobiilse andmeside ühendust"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Tahvelarvuti Interneti-ühendust ei jagata leviala kaudu"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Telefoni Interneti-ühendust ei jagata mobiilse kuumkoha kaudu"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Interneti-ühendust ega sisu teiste seadmetega ei jagata"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Tahvelarvuti Interneti-ühendust jagatakse leviala kaudu"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Telefoni Interneti-ühendust jagatakse leviala kaudu"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Rakendus jagab sisu. Interneti-ühenduse jagamiseks lülitage leviala välja ja seejärel uuesti sisse"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"WiFi-võrgu nimi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Võrgu <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> sisselülitamine …"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Teised seadmed saavad luua ühenduse võrguga <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"WiFi-võrgu parool"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-riba"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"WiFi-võrgu loomiseks teiste seadmete jaoks kasutage leviala. Leviala kasutab Interneti pakkumiseks mobiilset andmesideühendust. Rakenduda võivad mobiilse andmeside tasud."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Rakendused saavad leviala luua, et läheduses olevate seadmetega sisu jagada."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Leviala sisselülitamine ..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Leviala väljalülitamine ..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> on aktiivne"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Kui WiFi-kõned on sisse lülitatud, saab telefon olenevalt eelistustest ja signaalitugevusest kõnesid marsruutida WiFi-võrkude või teie operaatori võrgu kaudu. Enne selle funktsiooni sisselülitamist uurige operaatorilt tasude ja muude üksikasjade kohta."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Hädaabi aadressi värskendamine"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Aadress, mida hädaabiteenused kasutavad teie asukohana, kui teete WiFi kaudu hädaabikõne"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekraan"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Tulemusi ei ole"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ekraan"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Pööra ekraani automaatselt"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Erksad värvid"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Tahvelarvuti pööramisel automaatselt paigutuse ümberlülitamine"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Muuda telefoni pööramisel automaatselt orientatsiooni"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Tahvelarvuti pööramisel automaatselt paigutuse ümberlülitamine"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Heledust optimeeritakse valgustingimuste järgi. Kui funktsioon on sisse lülitatud, saate heledust siiski ajutiselt reguleerida."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Öövalgus"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Funktsioon Öövalgus toonib ekraani kollaseks. Nii on hämaras ekraani mugavam vaadata ja sellelt teksti lugeda. See võib aidata teil ka hõlpsamini magama jääda."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Ajastamine"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Olek"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Lülita automaatselt sisse"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Mitte kunagi"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Kohandatud ajakava"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Loojangust päikesetõusuni"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Ajastamine"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Mitte kunagi"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Lülitub sisse kohandatud ajal"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Lül. sisse loojangust päikeset."</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Algusaeg"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Lõppaeg"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Olek"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensiivsus"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Väljas. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Ei lülitu kunagi automaatselt sisse."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Lülitub automaatselt sisse kell <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Lülitub automaatselt sisse päikeseloojangul."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Sees. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Ei lülitu kunagi automaatselt välja."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Lülitub automaatselt välja kell <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Lülitub automaatselt välja päikesetõusu ajal."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Väljas / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Ei lülitu kunagi automaatselt sisse"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Lülitub automaatselt sisse kell <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Lülitub automaatselt sisse päikeseloojangul"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Sees / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Ei lülitu kunagi automaatselt välja"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Lülitub automaatselt välja kell <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Lülitub automaatselt välja päikesetõusul"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Unerežiim"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekraan lülitub välja"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pärast <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tegevusetust"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Seaded"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaatne eredus"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Tõstke äratamiseks"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Ambientne ekraan"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Säästlik ekraan"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Alati sees"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Uued märguanded"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Millal kuvada?"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Uued märguanded"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ekraan aktiveerub, kui saate märguandeid"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Alati sees"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Näitamise aeg, märguande ikoonid ja muu teave"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fondi suurus"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Teksti suuremaks või väiksemaks muutmine"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kaardi luku seaded"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN ei saa olla tühi."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC-väli peab olema kolmekohaline."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC-väli peab olema kahe- või kolmekohaline."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operaator ei luba tüübiga %s APN-ide lisamist."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"APN-i vaikeseadete taastamine."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Lähtesta vaikeseadetele"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN-i vaikeseadete lähtestamine on lõpule viidud."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Kustuta SD-kaart"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Sisemiselt USB-mäluseadmelt kõikide andmete (nt muusika või fotode) kustutamine"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD-kaardilt kõigi andmete (nt muusika või fotode) kustutamine"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Kustuta eSIM-kaardid"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Kustutab kõik telefonis olevad eSIM-kaardid. See ei tühista teie mobiilsideteenuse paketti."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Kustutab kõik tahvelarvutis olevad eSIM-kaardid. See ei tühista teie mobiilsideteenuse paketti."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Lähtesta tahvelarvuti"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Lähtesta telefon"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Kas kustutada kõik teie isiklikud andmed ja allalaaditud rakendused? Seda toimingut ei saa tagasi võtta."</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Kui andmeside mahu säästja on sisse lülitatud, siis ei saa jagada ega kasutada teisaldatavat leviala"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB jagamine"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB ühendatud, märkige jagamiseks"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Jagatud"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Ei saa jagada, kui USB-mäluseade on kasutusel"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB ei ole ühendatud"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Ühendage sisselülitamiseks"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB jagamise viga"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Jagage telefoni Interneti-ühendust USB kaudu"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Jagage tahvelarvuti Interneti-ühendust USB kaudu"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Jagamine Bluetoothiga"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Tahvelarvuti Interneti-üh. jagam. Bluetoothi kaudu"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Telefoni Interneti-ühenduse jag. Bluetoothi kaudu"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Tahvelarv. Interneti-üh. jag. Bluetoothi kaudu ühe seadmega"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Telef. Interneti-ühenduse jag. Bluetoothi kaudu ühe seadmega"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Tahvelarvuti Interneti-üh. jagam. Bluetoothi kaudu <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> seadmega"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Telefoni Interneti-ühenduse jag. Bluetoothi kaudu <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> seadmega"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Jagage tahvelarvuti Interneti-ühendust Bluetoothi kaudu"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Jagage telefoni Interneti-ühendust Bluetoothi kaudu"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Seadme <xliff:g id="DEVICE_NAME">%1$d</xliff:g> Interneti-ühenduse jag. Bluetoothi kaudu"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Tahvelarv. Interneti-üh. ei jag. Bluetoothi kaudu"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Telefoni Interneti-ühendust ei jagata Bluetoothi kaudu"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Jagamata"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Ei saa jagada rohkem kui <xliff:g id="MAXCONNECTION">%1$d</xliff:g> seadmele."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ühenduse jagamine lõpetatakse."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Muudele seadmetele Interneti-ühenduse pakkumiseks mobiilse andmesideühenduse kaudu kasutage ühenduse jagamise funktsiooni mobiilse kuumkohaga."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Mobiilse andmesideühenduse kaudu teistele seadmetele Interneti-ühenduse pakkumiseks kasutage leviala ja jagamist. Rakendused saavad samuti leviala luua, et läheduses olevate seadmetega sisu jagada."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Abi"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobiilsidevõrk"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiilipakett"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Asukoharežiim"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Asukoha määramine GPS-i, WiFi-, Bluetoothi või mobiilsidevõrgu abil"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Asukoha määramine WiFi-, Bluetoothi või mobiilsidevõrgu abil"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Asukoha määramiseks GPS-i kasutamine"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Kasuta asukoha tuvastamiseks GPS-i ja seadme andureid"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skannimine"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"WiFi skannimine"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Parandab asukoha täpsust, lubades süsteemirakendustel ja -teenustel mis tahes ajal tuvastada WiFi-võrke."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Teil ei ole andmesideühendust. Selle teabe vaatamiseks praegu minge Interneti-ühendusega arvutis aadressile %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laadimine ..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Valige parool"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Sõrmejälje kasutamiseks määrake parool"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Mustri valimine"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Sõrmejälje kasutamiseks määrake muster"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Valige PIN-kood"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Sõrmejälje kasutamiseks määrake PIN-kood"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Kinnitage parool"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Mustri kinnitamine"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Kinnitage PIN-kood"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Rakenduse seaded"</string>
     <string name="install_applications" msgid="4872012136210802181">"Tundmatud allikad"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Luba kõik rakenduse allikad"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Hiljuti avatud rakendused"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Kuva kõik <xliff:g id="COUNT">%1$d</xliff:g> rakendust"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> tagasi"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Teie tahvelarvuti ja isiklikud andmed on tundmatute rakenduste rünnakute suhtes haavatavamad. Sellest allikast rakendusi installides nõustute, et vastutate tahvelarvuti kahjude ja andmekao eest, mis võib selliste rakenduste kasutamisest tuleneda."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Teie telefon ja isiklikud andmed on tundmatute rakenduste rünnakute suhtes haavatavamad. Sellest allikast rakendusi installides nõustute, et vastutate telefoni kahjude ja andmekao eest, mis võib selliste rakenduste kasutamisest tuleneda."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Täpsemad seaded"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Kas peatada süsteemi teenus?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Kui teenuse peatate, ei pruugi mõned tahvelarvuti funktsioonid õigesti töötada, kuni selle välja ja seejärel uuesti sisse lülitate."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Kui teenuse peatate, ei pruugi mõned telefoni funktsioonid õigesti töötada, kuni selle välja ja seejärel uuesti sisse lülitate."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Keeled, sisestus ja liigutused"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Keeled ja sisend"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Keeled ja sisend"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Sisestusabi"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> printimisteenust on sisse lülitatud</item>
       <item quantity="one">1 printimisteenus on sisse lülitatud</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> prinditööd</item>
+      <item quantity="one">1 prinditöö</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Printimisteenused"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Ühtki teenust pole installitud"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Printereid ei leitud"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Kasuta detaile"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Reguleerige energiakasutust"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Kaasnevad paketid"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Akut kulutavad rakendused"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Seadme ärkvel hoidmine"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Seadme äratamine taustal"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Asukohateabe sage taotlemine"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> valesti käituvat rakendust"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Kas peatada rakendus?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Teie telefon ei saa akut tavapärasel moel hallata, kuna rakendus <xliff:g id="APP">%1$s</xliff:g> hoiab teie seadet ärkvel.\n\nProbleemi lahendamiseks võite rakenduse sundpeatada.\n\nKui probleem ei lahene, tuleb teil aku säästmiseks võib-olla rakendus desinstallida."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Teie tahvelarvuti ei saa akut tavapärasel moel hallata, kuna rakendus <xliff:g id="APP">%1$s</xliff:g> hoiab teie seadet ärkvel.\n\nProbleemi lahendamiseks võite rakenduse sundpeatada.\n\nKui probleem ei lahene, tuleb teil aku säästmiseks võib-olla rakendus desinstallida."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Teie seade ei saa akut tavapärasel moel hallata, kuna rakendus <xliff:g id="APP">%1$s</xliff:g> hoiab teie seadet ärkvel.\n\nProbleemi lahendamiseks võite rakenduse sundpeatada.\n\nKui probleem ei lahene, tuleb teil aku säästmiseks võib-olla rakendus desinstallida."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Peata rakendus"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Kas lülitada taustal kasutamine välja?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Teie telefon ei saa akut tavapärasel moel hallata, kuna rakendus <xliff:g id="APP">%1$s</xliff:g> äratab teie seadet sageli.\n\nProbleemi lahendamiseks võib seade takistada rakenduse taustal töötamist."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Teie tahvelarvuti ei saa akut tavapärasel moel hallata, kuna rakendus <xliff:g id="APP">%1$s</xliff:g> äratab teie seadet sageli.\n\nProbleemi lahendamiseks võib seade takistada rakenduse taustal töötamist."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Teie seade ei saa akut tavapärasel moel hallata, kuna rakendus <xliff:g id="APP">%1$s</xliff:g> äratab teie seadet sageli.\n\nProbleemi lahendamiseks võib seade takistada rakenduse taustal töötamist."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Lülita välja"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Kas soovite asukoha välja lülitada?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Teie telefon ei saa akut tavapärasel moel hallata, kuna rakendus <xliff:g id="APP">%1$s</xliff:g> taotleb teie asukohateavet ka ajal, mil te rakendust ei kasuta.\n\nProbleemi lahendamiseks võite oma asukoha selle rakenduse jaoks välja lülitada."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Teie tahvelarvuti ei saa akut tavapärasel moel hallata, kuna rakendus <xliff:g id="APP">%1$s</xliff:g> taotleb teie asukohateavet ka ajal, mil te rakendust ei kasuta.\n\nProbleemi lahendamiseks võite oma asukoha selle rakenduse jaoks välja lülitada."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Teie seade ei saa akut tavapärasel moel hallata, kuna rakendus <xliff:g id="APP">%1$s</xliff:g> taotleb teie asukohateavet ka ajal, mil te rakendust ei kasuta.\n\nProbleemi lahendamiseks võite oma asukoha selle rakenduse jaoks välja lülitada."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Lülita välja"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ekraan"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Taskulamp"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kaamera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Rakendused"</string>
     <string name="power_service" msgid="1599661212370831780">"Teenused"</string>
     <string name="power_system" msgid="8290455327965307383">"Süsteem"</string>
-    <string name="power_user" msgid="1889728099253018005">"Kasutaja"</string>
+    <string name="power_user" msgid="3706143225319881667">"Teised kasutajad"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU kokku"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU esiplaanil"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Hoia ärkvel"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Liigselt arvestatud energiatarbimine"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Kasutatud <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktiivne <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Ekraanikasutus: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> kasutab <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> kogu akumahust"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Muuda PIN-koodi"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Kuva teatised"</string>
     <string name="help_label" msgid="6886837949306318591">"Abi ja tagasiside"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Abiartiklid, telefoni- ja vestlustugi"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Abiartiklid, telefon ja vestlus, alustamine"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Sisu konto"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Foto ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Väga ohtlikud olukorrad"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Kuva %d peidetud üksus</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Võrk ja Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"WiFi, mobiil, andmekasutus, leviala"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobiil"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"andmekasutus"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"leviala"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Ühendatud seadmed"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Rakendused ja märguanded"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Load, vaikerakendused"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Kasutajad ja kontod"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"liigutus"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"maksa, puuduta, maksed"</string>
     <string name="keywords_backup" msgid="470070289135403022">"varukoopia, varundamine"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"liigutus, serv, külg, aktiivne serv, vajutamine, haare, abi, assistent, squeezy, squeezie, squeezey, squeezee, ok google, google\'i assistent"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"liigutus, äratamine, märguanded, ekraan, ekraanikuva, ekraani väljalülitamine, ekraani sisselülitamine, vajutamine, serv, uni, unerežiim, haare"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"liigutus, vaikus, edasilükkamine, alarm, sissetulev kõne, vaikne, ekraan, lukustuskuva, vajutamine, haare, serv, peatamine"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"WiFi NFC-kiibi seadistamine"</string>
     <string name="write_tag" msgid="8571858602896222537">"Kirjuta"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Kirjutamiseks puudutage kiipi ..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Ära kuva töökoha märguandeid üldse"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kuidas tuleks profiili märguanded kuvada siis, kui seade on lukus?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profiili märguanded"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Märguanded"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Märguanded"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Rakenduse märguanded"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Märguande kategooria"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Tähtsus"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Lubage rakendusel otsustada"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Kiireloomuline"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Heli lubamine"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Ära tee heli, vibreeri ega kuva neid märguandeid praeguse ekraani servas."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Madal tähtsuse tase"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Keskmine tähtsuse tase"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Kõrge tähtsuse tase"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Kiireloomuline tähtsuse tase"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Märguannete abi"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Juurdepääs märguannetele"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Juurdepääs tööprofiili märguannetele on blokeeritud"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Pilt pildis"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Luba režiim Pilt pildis"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Lubage rakendusel luua pilt pildis aken ajal, mil rakendus on avatud, või pärast sellest väljumist (näiteks video vaatamise jätkamiseks). Aken kuvatakse muude kasutatavate rakenduste peal."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Jah"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Ei"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Mitte segada juurdepääs"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ükski installitud rakendus pole palunud juurdepääsu funktsioonile Mitte segada"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Rakenduste laadimine ..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Seda tööprofiili hallatakse rakendusega"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Haldab <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Katseline)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Seadme pööramine"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Ekraanikuva sisu pööramine"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Vertikaalkuva säilitamine"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Horisontaalkuva säilitamine"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Praeguse suuna säilitamine"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Turvaline käivitamine"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Jätka"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Seadme tõhusamaks kaitsmiseks saate nõuda PIN-koodi sisestamist, enne kui seade käivitub. Enne käivitumist ei saa seadmega kõnesid, sõnumeid ega märguandeid, sealhulgas alarme, vastu võtta. \n\nSee aitab kaitsta kaotsiläinud või varastatud seadmetes olevaid andmeid. Kas soovite nõuda seadme käivitamiseks PIN-koodi sisestamist?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Seadme tõhusamaks kaitsmiseks saate nõuda parooli sisestamist, enne kui seade käivitub. Enne käivitumist ei saa seadmega kõnesid, sõnumeid ega märguandeid, sealhulgas alarme, vastu võtta. \n\nSee aitab kaitsta kaotsiläinud või varastatud seadmetes olevaid andmeid. Kas soovite nõuda seadme käivitamiseks parooli sisestamist?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Peale sõrmejäljega avamise funktsiooni saate seadme tõhusamaks kaitsmiseks nõuda PIN-koodi sisestamist, enne kui seade käivitub. Enne käivitumist ei saa seadmega kõnesid, sõnumeid ega märguandeid, sealhulgas alarme, vastu võtta. \n\nSee aitab kaitsta kaotsiläinud või varastatud seadmetes olevaid andmeid. Kas soovite nõuda seadme käivitamiseks PIN-koodi sisestamist?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Peale sõrmejäljega avamise funktsiooni saate seadme tõhusamaks kaitsmiseks nõuda mustri sisestamist, enne kui seade käivitub. Enne käivitumist ei saa seadmega kõnesid, sõnumeid ega märguandeid, sealhulgas alarme, vastu võtta. \n\nSee aitab kaitsta kaotsiläinud või varastatud seadmetes olevaid andmeid. Kas soovite nõuda seadme käivitamiseks mustri sisestamist?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Peale sõrmejäljega avamise funktsiooni saate seadme tõhusamaks kaitsmiseks nõuda parooli sisestamist, enne kui seade käivitub. Enne käivitumist ei saa seadmega kõnesid, sõnumeid ega märguandeid, sealhulgas alarme, vastu võtta. \n\nSee aitab kaitsta kaotsiläinud või varastatud seadmetes olevaid andmeid. Kas soovite nõuda seadme käivitamiseks parooli sisestamist?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Lisaks sellele, et saate seadme avamiseks kasutada sõrmejälge, saate oma seadet veelgi paremini kaitsta, nõudes käivitamisel parooli. Enne seadme käivitumist ei saa te vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme.\n\nSee aitab kaitsta kaotatud või varastatud seadmetes olevaid andmeid. Kas küsida seadme käivitamisel parooli?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Jah"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ei"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Kas nõuda PIN-koodi?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Teated kasutuse kohta"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Kuva seadme kogu kasutusteave"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Kuva rakenduse kasutusteave"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Suur kasutus"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> rakendust käitub ebatavaliselt</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> käitub ebatavaliselt</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Rakendused kulutavad akut</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> kulutab akut</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Pole optimeeritud"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Pole optimeeritud"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Akukasutuse optimeerimine"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Muude rakenduste peal kuvamine"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> rakendusel <xliff:g id="COUNT_1">%2$d</xliff:g>-st on lubatud muude rakenduste peal kuvada"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Loaga rakendused"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Jah"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Ei"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Lubatud"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Pole lubatud"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"rakenduste installimine tundmatutest allikatest"</string>
     <string name="write_settings" msgid="4797457275727195681">"Süsteemiseadete muutmine"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"kirjuta muuda süsteemiseaded"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekraan on toonitud kollaseks. See võib aidata teil magama jääda."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Soovitused"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"Ja veel <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> soovitust</item>
+      <item quantity="one">1 soovitus</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">Ja veel <xliff:g id="COUNT">%1$d</xliff:g> soovitust</item>
+      <item quantity="one">Ja veel 1 soovitus</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Eemalda"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Külm värvitemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Kasutatakse külmemaid ekraanivärve"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> – andmemahu hoiatus"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> – andmemahu hoiatus / <xliff:g id="ID_2">%2$s</xliff:g> – andmemahu piirang"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Arveldustsükkel"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Kuupõhine tsükkel algab iga kuu <xliff:g id="ID_1">%1$s</xliff:g>. päeval"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Kuupõhine alates <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Iga kuu <xliff:g id="ID_1">%1$s</xliff:g>. päeval"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Võrgupiirangud"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> piirangut</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 rakendusel on lubatud kasutada piiranguteta andmemahtu, kui andmeside mahu säästja on sisse lülitatud</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Andmeside mahu säästja"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Piiranguteta juurdepääs andmesidele"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Piiramata andmed"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Taustaandmed on välja lülitatud"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Sees"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Väljas"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Lukustuskuva märguannete juhtimine"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Märguande sisu kuvamine või peitmine"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Kõik"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Tugi"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Tugi ja nõuanded"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Kõige väiksem laius"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ükski installitud rakendus pole taotlenud juurdepääsu tasuliste SMS-ide saatmiseks"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Tasuliste SMS-ide saatmisel võidakse teilt nõuda tasu, mis lisatakse operaatori esitatud arvele. Kui annate rakendusele loa, saate selle rakendusega tasulisi SMS-e saata."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automaatne"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Käsitsi"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Vabastage ruumi"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Liigutused"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Liigutuspõhised otseteed"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Kiirliigutused telefoni juhtimiseks"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Kiirliigutused tahvelarvuti juhtimiseks"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Kiirliigutused seadme juhtimiseks"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kaamera avamine"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Kaamera kiireks avamiseks vajutage toitenuppu kaks korda. See töötab igal ekraanil."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Kaamera kiiresti avamine"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Vajutage kaamera avamiseks kaks korda toitenuppu"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kaamera vahetamine"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Selfide kiiremini jäädvustamine"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Pöörake selfirežiimi avamiseks telefoni kaks korda"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Pöörake selfirežiimi avamiseks tahvelarvutit kaks korda"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Pöörake selfirežiimi avamiseks seadet kaks korda"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Topeltpuudutage telefoni kontrollimiseks"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Topeltpuudutage tahvelarvuti kontrollimiseks"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Topeltpuudutage seadme kontrollimiseks"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Märguannete kiireks kontrollimiseks topeltpuudutage ekraani."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Kellaaja, märguandeikoonide ja muu teabe vaatamiseks topeltpuudutage ekraani."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Vaadake märguandeid, kui ekraan on välja lülitatud"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Telefoni kontrollimiseks tõstmine"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tahvelarvuti kontrollimiseks tõstke seda"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Seadme kontrollimiseks tõstke seda"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Märguannete kiireks kontrollimiseks võtke telefon kätte."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Märguannete kiireks kontrollimiseks võtke tahvelarvuti kätte."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Märguannete kiireks kontrollimiseks võtke seade kätte."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Kellaaja, märguandeikoonide ja muu teabe vaatamiseks võtke telefon kätte."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Kellaaja, märguandeikoonide ja muu teabe vaatamiseks võtke tahvelarvuti kätte."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Kellaaja, märguandeikoonide ja muu teabe vaatamiseks võtke seade kätte."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Vaadake märguandeid, kui ekraan on välja lülitatud"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Sõrmejälje pühkimine märguannete vaatamiseks"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Märguannete kontrollimiseks pühkige telefoni tagaküljel oleval sõrmejäljeanduril alla."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Märguannete kontrollimiseks pühkige tahvelarvuti tagaküljel oleval sõrmejäljeanduril alla."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Märguannete kontrollimiseks pühkige seadme tagaküljel oleval sõrmejäljeanduril alla."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Kiiresti märguannete vaatamine"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Pühkige sõrmejäljeanduril alla"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Tõstke kaamera avamiseks"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Kaamera automaatseks avamiseks tõstke oma telefon foto jäädvustamise asendisse (maastiku- või portreevõte). Töötab ka siis, kui telefon on unerežiimis või lukustatud."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Fotode jäädvustamine unerežiimis või lukustatud telefoniga"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Abiliigutus"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Tundlikkus"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Kas soovite selle installimata avatava rakenduse eemaldada?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Mängud"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Helifailid"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Kasutatav ruum"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstall. kasutaja <xliff:g id="USER">%s</xliff:g> jaoks)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(keelatud kasutaja <xliff:g id="USER">%s</xliff:g> jaoks)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Automaattäite teenus"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Installimata avatav rakendus"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Kas soovite salvestusruumi halduri välja lülitada?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Filmi- ja TV-rakendused"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Kasutatav ruum"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Operaatori ettevalmistamise teave"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Operaatori ettevalmistamise päästik"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Mis on uut ja põnevat?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Vaadake viit populaarseimat funktsiooni"</string>
 </resources>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index 25c162d..8cf4ae8 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Ona"</item>
     <item msgid="8986346415847956850">"Bikaina"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Beti"</item>
-    <item msgid="844721238536786870">"Entxufatuta dagoenean soilik"</item>
-    <item msgid="1986753720941888596">"Inoiz ez"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Beti"</item>
-    <item msgid="7433294150916905997">"Entxufatuta dagoenean soilik"</item>
-    <item msgid="1390404486722375028">"Inoiz ez"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Azken 30 egunak"</item>
     <item msgid="6600989128423965319">"Erabilera-zikloa…"</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index ee808e6..6603485 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Garatzailea zara!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Ez dago zertan, dagoeneko garatzailea zara."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Lehendabizi, gaitu garatzaileen aukerak."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Hari gabekoak eta sareak"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Konexioak"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Gailua"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE hornituta"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Bideo-deiak aktibatuta"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi bidezko deiak aktibatuta"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presence hornitu da"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Sare mugikor bidezko irratiaren indarra"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Ikusi SIMeko kontaktuak"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ikusi markatze finkoko zenbakiak"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Bilatu gailuak"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Aldatu gailuaren izena"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Aldatu izena"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Deskonektatu?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Gailu honekin duzun konexioa amaituko da:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Gailua deskonektatu nahi duzu?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailutik deskonektatuko da telefonoa."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailutik deskonektatuko da tableta."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailutik deskonektatuko da zure gailua."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Deskonektatu"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Ez daukazu Bluetooth-ezarpenak aldatzeko baimenik."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Parekatu beste gailu batekin"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Bluetooth ezarpenak irekita badaude, inguruko gailuek <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ikusi ahal izango dute."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Telefonoaren Bluetooth helbidea: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Tabletaren Bluetooth helbidea: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Gailuaren Bluetooth helbidea: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> deskonektatu nahi duzu?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Igorpena"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profila desgaitu?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth bidez bikotetzeko eskaera"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Bikotetzeko eskaera"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin parekatzeko, sakatu hau."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Erakutsi jasotako fitxategiak"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Jasotako fitxategiak"</string>
     <string name="device_picker" msgid="4978696506172252813">"Aukeratu Bluetooth gailua"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak Bluetooth konexioa aktibatu nahi du"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak Bluetooth konexioa desaktibatu nahi du"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s gailuak zure mezuak atzitu nahi ditu. %2$s gailuari sarbidea eman?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM txartelerako sarbide-eskaera"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> gailuak SIM txartela atzitu nahi du. SIM txartelerako sarbidea ematen badiozu, gailuaren datu-konexioa desgaituko da, txartelerako konexioak dirauen bitartean. Eman sarbidea <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> gailuari"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"\"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" gisa dago ikusgai beste gailuentzat"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Zure gailuak"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parekatu beste gailu batekin"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data eta ordua"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Aukeratu ordu-zona"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Kontuak"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Kokapena"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Kontuak"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Segurtasuna eta kokapena"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkriptatzea eta kredentzialak"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Enkriptatuta dago telefonoa"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Enkriptatuta dago gailua"</string>
@@ -354,40 +367,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desblokeatu hatz-marka bidez"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Erabili hatz-marka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Ukitu hatz-marken sentsorea telefonoa desblokeatzeko, erosketak baimentzeko edo aplikazioetan saioa hasteko. Kontuz aukeratu noren hatz-markak gehitzen dituzun. Hatz-marka bakar bat gehituta ere gauza daitezke aipatutako ekintzak.\n\nOharra: baliteke hatz-markak ez izatea eredu edo PIN kode konplexuak bezain seguruak."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Ukitu hatz-marken sentsorea erosketak baimentzeko edo aplikazioetan saioa hasteko. Erne noren hatz-markak gehitzen dituzun; gehitzen duzun edozein hatz-markarekin egin ahal izango baitituzu ekintza horiek.\n\nOharra: ezin duzu erabili hatz-marka gailua desblokeatzeko. Informazio gehiago lortzeko, jarri erakundearen administratzailearekin harremanetan."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Ukitu hatz-marken sentsorea telefonoa desblokeatzeko, erosketak baimentzeko edo aplikazioetan saioa hasteko. Kontuz aukeratu noren hatz-markak gehitzen dituzun, hatz-marka bakar bat gehituta ere gauza baitaitezke aipatutako ekintzak.\n\nOharra: baliteke hatz-markak ez izatea eredu edo PIN kode konplexuak bezain seguruak."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"Erabili hatz-marka telefonoa desblokeatzeko eta erosketak onartzeko.\n\nOharra: agian hatz-marka ez da izango eredu edo PIN kode sendo bat bezain segurua."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Utzi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Jarraitu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Saltatu"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Gehitu hatz-marka"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Ez dira aktibatuko gailuaren babes-eginbideak. Ezin izango diozu galarazi inori tableta erabiltzea hura galtzen bazaizu, lapurtzen badizute edo bertako datu guztiak ezabatzen badituzte."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Ez dira aktibatuko gailuaren babes-eginbideak. Ezin izango diozu inori galarazi gailua erabiltzea hura galtzen baduzu, lapurtzen badizute edo datuak guztiz ezabatzen badira."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Ez dira aktibatuko gailuaren babes-eginbideak. Ezin izango diozu inori galarazi telefonoa erabiltzea hura galtzen baduzu, lapurtzen badizute edo datuak guztiz ezabatzen badira."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Ez dira aktibatuko gailuaren babes-eginbideak. Ezin izango diozu inori galarazi tableta erabiltzea hura galtzen baduzu edo lapurtzen badizute."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Ez dira aktibatuko gailuaren babes-eginbideak. Ezin izango diozu inori galarazi gailua erabiltzea hura galtzen baduzu edo lapurtzen badizute."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Ez dira aktibatuko gailuaren babes-eginbideak. Ezin izango diozu inori galarazi telefonoa erabiltzea hura galtzen baduzu edo lapurtzen badizute."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Hurrengoa"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Ez dira aktibatuko gailuaren babes-eginbideak. Tableta galtzen baduzu, lapurtzen badizute edo berrezarri egiten bada, ezin izango duzu ekidin beste pertsona batzuek erabiltzea."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Ez dira aktibatuko gailuaren babes-eginbideak. Gailua galtzen baduzu, lapurtzen badizute edo berrezarri egiten bada, ezin izango duzu ekidin beste pertsona batzuek erabiltzea."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Ez dira aktibatuko gailuaren babes-eginbideak. Telefonoa galtzen baduzu, lapurtzen badizute edo berrezarri egiten bada, ezin izango duzu ekidin beste pertsona batzuek erabiltzea."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Ez dira aktibatuko gailuaren babes-eginbideak. Tableta galtzen baduzu edo lapurtzen badizute, ezin izango duzu ekidin beste pertsona batzuek erabiltzea."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Ez dira aktibatuko gailuaren babes-eginbideak. Gailua galtzen baduzu edo lapurtzen badizute, ezin izango duzu ekidin beste pertsona batzuek erabiltzea."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Ez dira aktibatuko gailuaren babes-eginbideak. Telefonoa galtzen baduzu edo lapurtzen badizute, ezin izango duzu ekidin beste pertsona batzuek erabiltzea."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Saltatu halere"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Atzera"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Bilatu sentsorea"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Bilatu hatz-marken sentsorea; telefonoaren atzealdean dago."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Ukitu sentsorea"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Telefonoaren atzealdean dago. Erabili hatz erakuslea."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Hatz-marken sentsorea gailuan non dagoen erakusten duen ilustrazioa"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Izena"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Ados"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Ezabatu"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Has gaitezen!"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Ukitu sentsorea"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Ezarri hatza sentsorean eta, dardara sentitzen duzunean, jaso ezazu"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Ez gelditu"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mugitu hatza pixka bat, hatz-markaren zati guztiak gehitzeko"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Gehitu da hatz-marka!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ikono hau ikusten duzunean, hatz-marka digitala erabil dezakezu zeure burua identifikatzeko edo erosketak baimentzeko."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Ukitu hatz-marka digitalaren sentsorea gailua aktibatzeko eta desblokeatzeko."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Ikono hau ikusten duzunean, erosketak baimendu ahal izango dituzu edo aplikazioetan saioa hasi."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Jaso hatza eta ukitu berriro"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Jarraitu hatza jasotzen, hatz-markaren zati guztiak gehitzeko"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Gehitu da hatz-marka"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Ikono hau ikusten duzunean, erabili hatz-marka zeure burua identifikatzeko edo erosketak onartzeko."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Hatz-markaren konfigurazioa saltatu?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Hatz-marka erabiltzea aukeratu duzu telefonoa desblokeatzeko modu bat gisa. Urratsa saltatzen baduzu, geroago konfiguratu beharko duzu. Minutu bat inguru baino ez duzu beharko konfiguratzeko."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Konfiguratu pantailaren blokeoa"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Eginda"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hori ez da sentsorea"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Erabili gailuko hatz-marken sentsorea."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Ukitu telefonoaren atzealdeko sentsorea. Erabili hatz erakuslea."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Ez da erregistratu"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Hatz-marka digitalak erregistratzeko denbora-muga gainditu da. Saiatu berriro."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Ezin izan da erregistratu hatz-marka. Saiatu berriro edo erabili beste hatz bat."</string>
@@ -449,6 +460,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Galarazi inork gailua baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Galarazi inork telefonoa baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Aukeratu pantaila blokeatzeko ordezko metodoa"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Pantaila blokeatzeko aukerak"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Pantaila blokeatzeko aukerak"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Pantailaren blokeoa"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>: inaktibo ezarri bezain laster"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> inaktibo ezarri ondoren"</string>
@@ -519,13 +532,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Aldatu desblokeatzeko eredua"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Aldatu desblokeo PINa"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Aldatu desblokeatzeko pasahitza"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Saiatu berriro. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>/<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> saiakera."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Azken saiakera"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Saiakera honetan laneko eredu okerra idazten baduzu, laneko profila eta harekin erlazionatutako datuak gailutik kenduko dira."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Saiakera honetan laneko PIN kode okerra idazten baduzu, laneko profila eta harekin erlazionatutako datuak gailutik kenduko dira."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Saiakera honetan laneko pasahitz okerra idazten baduzu, laneko profila eta harekin erlazionatutako datuak gailutik kenduko dira."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Saiakera oker gehiegi egin dituzu. Laneko profila eta harekin erlazionatutako datuak gailutik kenduko dira."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Baztertu"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Saiatu berriro. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>/<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> saiakera."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Datuak ezabatu egingo dira"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Hurrengo saiakeran eredua oker marrazten baduzu, gailuko datuak ezabatu egingo dira"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Hurrengo saiakeran PIN kodea oker idazten baduzu, gailuko datuak ezabatu egingo dira"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Hurrengo saiakeran pasahitza oker idazten baduzu, gailuko tresnak ezabatu egingo dira"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Hurrengo saiakeran eredua oker marrazten baduzu, erabiltzailea ezabatu egingo da"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Hurrengo saiakeran PIN kodea oker idazten baduzu, erabiltzailea ezabatu egingo da"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Hurrengo saiakeran pasahitza oker idazten baduzu, erabiltzailea ezabatu egingo da"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Hurrengo saiakeran eredua oker marrazten baduzu, laneko profila eta bertako datuak ezabatu egingo dira"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Hurrengo saiakeran PIN kodea oker idazten baduzu, laneko profila eta bertako datuak ezabatu egingo dira"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Hurrengo saiakeran pasahitza oker idazten baduzu, laneko profila eta bertako datuak ezabatu egingo dira"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Saiakera oker gehiegi egin dituzu. Gailu honetako datuak ezabatu egingo dira."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Saiakera oker gehiegi egin dituzu. Erabiltzailea ezabatu egingo da."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Saiakera oker gehiegi egin dituzu. Laneko profila eta bertako datuak ezabatu egingo dira."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Baztertu"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Gutxienez <xliff:g id="COUNT">%d</xliff:g> karaktere izan behar ditu"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Gutxienez <xliff:g id="COUNT">%d</xliff:g> digitu izan behar ditu PIN kodeak"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Jarraitu"</string>
@@ -626,6 +647,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth ezarpen aurreratuak"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth eginbidea gaituta badago, inguruko Bluetooth gailuekin komunika daiteke gailua."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Kokapenaren zehaztasuna hobetzeko, sistemaren aplikazioek eta zerbitzuek Bluetooth gailuak hautematen jarraituko dute. Hori aldatzeko, zoaz <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>gailuak bilatzeko ezarpenetara<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Ezin izan da konektatu berriro. Saiatu berriro."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Gailuaren xehetasunak"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Gailuaren Bluetooth helbidea: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Gailua ahaztu nahi duzu?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Aurrerantzean, telefonoa ez da parekatuko <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Aurrerantzean, tableta ez da parekatuko <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Aurrerantzean, gailua ez da parekatuko <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Ahaztu gailua"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Konektatu hona…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> deskonektatuko da euskarriaren audiotik."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> deskonektatuko da esku libreko audiotik."</string>
@@ -778,6 +807,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ez zehaztu"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ez balidatu"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Ez da zehaztu ziurtagiririk. Konexioa ez da izango pribatua."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Sarearen izena luzeegia da."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Domeinua zehaztu behar da."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPSa erabilgarri"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPSa erabilgarri)"</string>
@@ -809,7 +839,6 @@
       <item quantity="one">1 sare</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi ezarpen aurreratuak"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfiguratu Wi‑Fi sarea"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC helbidea"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP helbidea"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Azpisarearen maskara"</string>
@@ -846,9 +875,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Taldea ahaztu?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Wi-Fi sare publiko eramangarria"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi sare publikoa"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Erabili datu-konexioa Wi‑Fi sarea eskaintzeko"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Tableta ez da ari Interneteko konexioa partekatzen sare publiko bidez"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Telefonoa ez da ari Interneteko konexioa partekatzen sare publiko bidez"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Ez zara ari partekatzen Interneteko konexiorik ez edukirik beste gailuekin"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Tabletaren Interneteko konexioa partekatzen ari zara sare publiko bidez"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Telefonoaren Interneteko konexioa partekatzen ari zara sare publiko bidez"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Edukia partekatzen ari da aplikazioa. Interneteko konexioa partekatzeko, desaktibatu eta aktibatu berriro sare publikoa."</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi sarearen izena"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> aktibatzen…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> sarera konekta daitezke beste gailuak"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi pasahitza"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Sarbide-puntuaren banda"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Erabili sare publikoa beste gailuentzako Wi-Fi sare bat sortzeko. Sare publikoen bidez, Interneteko konexioa ematen da datu mugikorrak erabilita. Agian datu mugikorrak erabiltzearen ondoriozko kostu gehigarriak izango dituzu."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikazioek sare publikoak sor ditzakete edukia inguruko gailuekin partekatzeko."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Sare publikoa aktibatzen…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Sare publikoa desaktibatzen…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"Aktibatu da <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
@@ -895,6 +932,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi bidezko deiak aktibatuta daudenean, telefonoak Wi-Fi sareen bidez edo operadorearen sarearen bidez bidera ditzake deiak, zure hobespenen eta seinalearen sendotasunaren arabera. Eginbide hau aktibatu aurretik, eskatu tarifak eta bestelako informazioa operadoreari."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Eguneratu larrialdietarako helbidea"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Wi-Fi bidez larrialdi-zerbitzuetara deituz gero kokapen gisa erabiliko den helbidea"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Bistaratzea"</string>
@@ -952,6 +990,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Ez dago emaitzarik"</string>
     <string name="display_settings" msgid="7965901687241669598">"Bistaratzea"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Biratu pantaila automatikoki"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Kolore biziak"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Aldatu orientazioa automatikoki tableta biratzean"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Aldatu orientazioa automatikoki telefonoa biratzean"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Aldatu orientazioa automatikoki tableta biratzean"</string>
@@ -979,23 +1018,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimizatu distira inguruko argitasunaren arabera. Eginbide honekin, aldi baterako doi dezakezu pantailaren distira."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Gaueko argia"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Gaueko argiak tindu horikaraz janzten du pantaila. Horrela, ez zaizu horren nekagarria egingo argi gutxirekin pantailari begira egotea eta errazago hartuko duzu lo, gainera."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Antolaketa"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Egoera"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Aktibatu automatikoki"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Inoiz ez"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Ordutegi pertsonalizatua"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Iluntzetik egunsentira"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Programazioa"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Inoiz ez"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Ordu jakinetan aktibatzen da"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Aktibatu iluntzetik egunsentira"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Hasiera-ordua"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Amaiera-ordua"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Egoera"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intentsitatea"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Desaktibatuta. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Ez da inoiz aktibatuko automatikoki."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Ordu honetan aktibatuko da automatikoki: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Iluntzean aktibatuko da automatikoki."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Aktibatuta. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Ez da inoiz desaktibatuko automatikoki."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Ordu honetan desaktibatuko da automatikoki: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Egunsentian desaktibatuko da automatikoki."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Desaktibatuta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Ez da aktibatuko inoiz automatikoki"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Ordu honetan aktibatuko da automatikoki: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Iluntzean aktibatuko da automatikoki"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Aktibatuta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Ez da desaktibatuko inoiz automatikoki"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Ordu honetan desaktibatuko da automatikoki: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Egunsentian desaktibatuko da automatikoki"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Ezarri egonean moduan"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Pantaila itzaltzen da"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktibo egon ondoren"</string>
@@ -1019,8 +1057,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Ezarpenak"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Distira automatikoa"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aktibatu eskuetan hartzen denean"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Giroaren araberako bistaratzea"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Pantaila iluna"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Beti aktibatuta"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Jakinarazpen berriak"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Noiz erabili"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Jakinarazpen berriak"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Argitu pantaila jakinarazpenak jasotzen dituzunean"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Beti aktibatuta"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Erakutsi ordua, jakinarazpenen ikonoak eta bestelako informazioa"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Letra-tipoaren tamaina"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Handitu edo txikitu testua"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM txartelaren blokeo-ezarpenak"</string>
@@ -1272,6 +1316,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APNak ezin du hutsik egon."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC eremuak 3 digitu izan behar ditu."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC eremuak 2 edo 3 digitu izan behar ditu."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operadoreak ez du onartzen %s motako APN identifikatzailerik."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"APN ezarpen lehenetsiak leheneratzen."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Berrezarri balio lehenetsiak"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN ezarpen lehenetsiak berrezarri dira."</string>
@@ -1301,6 +1346,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Ezabatu SD txartela"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ezabatu barneko USB memoriako datu guztiak, adibidez, musika edo argazkiak"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ezabatu SD txarteleko datu guztiak, besteak beste, musika edo argazkiak."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Ezabatu eSIM txartelak"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Ezabatu telefonoko eSIM txartel guztiak. Ez da bertan behera utziko zerbitzu mugikorraren plana."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Ezabatu tabletako eSIM txartel guztiak. Ez da bertan behera utziko zerbitzu mugikorraren plana."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Berrezarri tableta"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Berrezarri telefonoa"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Informazio pertsonal guztia eta deskargatutako aplikazioak ezabatu nahi dituzu? Ekintza hori ezin da desegin."</string>
@@ -1323,26 +1371,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Datu-aurrezlea aktibatuta badago, ezin da partekatu konexioa, ezta sare publiko eramangarriak erabili ere"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Konexioa partekatzea (USB)"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB bidez konektatuta, egiaztatu beste gailu batekin konexioa parteka daitekeen"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"USB bidez konektatuta"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Ezin da beste gailu batekin konexioa partekatu USB memoria erabili bitartean"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB bidez konektatu gabe"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Konektatu aktibatzeko"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Errorea USB bidez konexioa partekatzean"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Partekatu telefonoaren Interneteko konexioa USB bidez"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Partekatu tabletaren Interneteko konexioa USB bidez"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Konexioa partekatzea (Bluetooth)"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Tableta Interneteko konexioa partekatzen ari da Bluetooth bidez"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Telefonoa Interneteko konexioa partekatzen ari da Bluetooth bidez"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Tableta Interneteko konexioa partekatzen ari da Bluetooth bidez gailu batekin"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Telefonoa Interneteko konexioa partekatzen ari da Bluetooth bidez gailu batekin"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Tableta Interneteko konexioa partekatzen ari da Bluetooth bidez <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> gailurekin"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Telefonoa Interneteko konexioa partekatzen ari da Bluetooth bidez <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> gailurekin"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Partekatu tabletaren Interneteko konexioa Bluetooth bidez"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Partekatu telefonoaren Interneteko konexioa Bluetooth bidez"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g> gailua Interneteko konexioa partekatzen ari da Bluetooth bidez"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Tableta ez da ari Interneteko konexioa partekatzen Bluetooth bidez"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Telefonoa ez da ari Interneteko konexioa partekatzen Bluetooth bidez"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Telefono bidezko konexiorik gabe"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Ezin da <xliff:g id="MAXCONNECTION">%1$d</xliff:g> gailurekin baino gehiagorekin konexioa partekatu."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuko konexioa amaituko da."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Erabili sare publikoa eta konexioa partekatzea beste gailuei Interneteko konexioa emateko zure datu mugikorren konexioaren bidez."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Erabili sare publikoa eta konexioa partekatzea beste gailuei Interneteko konexioa emateko zure datu mugikorren konexioaren bidez. Aplikazioek ere sare publikoak sor ditzakete, edukia inguruko gailuekin partekatzeko."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Laguntza"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Sare mugikorra"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mugikorraren plana"</string>
@@ -1375,7 +1412,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Kokapen modua"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Erabili GPS sistema edota Wi‑Fi, Bluetooth edo telefonia mugikorreko sareak kokapena zehazteko"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Erabili Wi‑Fi, Bluetooth edo telefonia mugikorreko sareak kokapena zehazteko"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Erabili GPS sistema kokapena zehazteko"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Erabili GPS sistema eta gailuaren sentsoreak kokapena zehazteko"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Bilaketa"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi sareak bilatzea"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Hobetu kokapenaren zehaztasuna sistemaren aplikazioei eta zerbitzuei Wi-Fi sareak edonoiz hautemateko aukera emanda."</string>
@@ -1420,8 +1457,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Ez duzu datu-konexiorik. Informazioa orain ikusteko, joan %s gunera Internetera konektatutako ordenagailu batetik."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Kargatzen…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Aukeratu pasahitza"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Hatz-marka erabiltzeko, ezarri pasahitza"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Aukeratu eredua"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Hatz-marka erabiltzeko, ezarri eredua"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Aukeratu PIN kodea"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Hatz-marka erabiltzeko, ezarri PIN kodea"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Berretsi pasahitza"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Berretsi eredua"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Berretsi PIN kodea"</string>
@@ -1490,6 +1530,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Aplikazioaren ezarpenak"</string>
     <string name="install_applications" msgid="4872012136210802181">"Iturburu ezezagunak"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Onartu iturburu guztiak"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Azkenaldian irekitako aplikazioak"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Ikusi <xliff:g id="COUNT">%1$d</xliff:g> aplikazioak"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"Duela <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"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="1952257127370115988">"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="advanced_settings" msgid="1777249286757067969">"Ezarpen aurreratuak"</string>
@@ -1658,6 +1701,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Sistemaren zerbitzua gelditu?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Zerbitzua gelditzen baduzu, agian tabletako eginbide batzuk behar bezala funtzionatzeari utziko diote, tableta itzali eta berriro piztu arte."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Zerbitzua gelditzen baduzu, agian telefonoko eginbide batzuk behar bezala funtzionatzeari utziko diote, telefonoa itzali eta berriro piztu arte."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Hizkuntzak, idazketa eta keinuak"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Hizkuntza eta idazketa"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Hizkuntza eta idazketa"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Idazteko laguntza"</string>
@@ -1872,6 +1919,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> inprimatze-zerbitzu aktibatuta</item>
       <item quantity="one">1 inprimatze-zerbitzu aktibatuta</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> inprimatze-lan</item>
+      <item quantity="one">1 inprimatze-lan</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Inprimatze-zerbitzuak"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Ez dago zerbitzurik instalatuta"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Ez da inprimagailurik aurkitu"</string>
@@ -1938,6 +1989,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Erabilera-xehetasunak"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Doitu energia-erabilera"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Sartutako paketeak"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Bateria asko kontsumitzen ari diren aplikazioak"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Zerbaitek aktibo mantendu du gailua"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Zerbait gailua esnarazten aritu da atzeko planoan"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Gailua sarriegi ari da eskatzen kokapena"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplikazio ez dira ari behar bezala funtzionatzen"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Aplikazioa gelditu nahi duzu?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Telefonoak ezin du kudeatu bateria modu normalean, <xliff:g id="APP">%1$s</xliff:g> aplikazioak aktibo mantentzen duelako.\n\nArazo hori konpontzeko, gelditzera behar dezakezu aplikazioa.\n\nArazoak bere horretan jarraitzen badu, agian aplikazioa desinstalatu beharko duzu bateriaren errendimendua hobetzeko."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Tabletak ezin du kudeatu bateria modu normalean, <xliff:g id="APP">%1$s</xliff:g> aplikazioak aktibo mantentzen duelako.\n\nArazo hori konpontzeko, gelditzera behar dezakezu aplikazioa.\n\nArazoak bere horretan jarraitzen badu, agian aplikazioa desinstalatu beharko duzu bateriaren errendimendua hobetzeko."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Gailuak ezin du kudeatu bateria modu normalean, <xliff:g id="APP">%1$s</xliff:g> aplikazioak aktibo mantentzen duelako.\n\nArazo hori konpontzeko, gelditzera behar dezakezu aplikazioa.\n\nArazoak bere horretan jarraitzen badu, agian aplikazioa desinstalatu beharko duzu bateriaren errendimendua hobetzeko."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Gelditu aplikazioa"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Atzeko planoan erabiltzeari utzi nahi diozu?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Telefonoak ezin du kudeatu bateria modu normalean, <xliff:g id="APP">%1$s</xliff:g> aplikazioak esnarazi egiten duelako etengabe.\n\nArazo hori konpontzeko, aplikazioari atzeko planoan exekutatzeari utzarazi diezaioke telefonoak."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Tabletak ezin du kudeatu bateria modu normalean, <xliff:g id="APP">%1$s</xliff:g> aplikazioak esnarazi egiten duelako etengabe.\n\nArazo hori konpontzeko, aplikazioari atzeko planoan exekutatzeari utzarazi diezaioke tabletak."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Gailuak ezin du kudeatu bateria modu normalean, <xliff:g id="APP">%1$s</xliff:g> aplikazioak esnarazi egiten duelako etengabe.\n\nArazo hori konpontzeko, aplikazioari atzeko planoan exekutatzeari utzarazi diezaioke gailuak."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Desaktibatu"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Kokapena desaktibatu nahi duzu?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Telefonoak ezin du kudeatu bateria modu normalean, <xliff:g id="APP">%1$s</xliff:g> aplikazioa kokapena eskatzen ari delako etengabe, aplikazio hori erabiltzen ari ez zarenean ere.\n\nArazo hori konpontzeko, desaktibatu kokapena aplikazio horrentzat."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Tabletak ezin du kudeatu bateria modu normalean, <xliff:g id="APP">%1$s</xliff:g> aplikazioa kokapena eskatzen ari delako etengabe, aplikazio hori erabiltzen ari ez zarenean ere.\n\nArazo hori konpontzeko, desaktibatu kokapena aplikazio horrentzat."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Gailuak ezin du kudeatu bateria modu normalean, <xliff:g id="APP">%1$s</xliff:g> aplikazioa kokapena eskatzen ari delako etengabe, aplikazio hori erabiltzen ari ez zarenean ere.\n\nArazo hori konpontzeko, desaktibatu kokapena aplikazio horrentzat."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Desaktibatu"</string>
     <string name="power_screen" msgid="3023346080675904613">"Pantaila"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Linterna"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1952,7 +2023,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Aplikazioak"</string>
     <string name="power_service" msgid="1599661212370831780">"Zerbitzuak"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
-    <string name="power_user" msgid="1889728099253018005">"Erabiltzailea"</string>
+    <string name="power_user" msgid="3706143225319881667">"Beste erabiltzaileak"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"PUZaren erabilera, guztira"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPUaren aurreko planoa"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantendu aktibo"</string>
@@ -2004,6 +2075,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uste baino energia gutxiago erabili da."</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Erabilera-denbora: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"<xliff:g id="TIME">^1</xliff:g> egon da aktibo"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Pantailaren erabilera: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> erabili du <xliff:g id="APP">%2$s</xliff:g> aplikazioak"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Bateria osoaren <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2563,7 +2635,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Aldatu PIN kodea"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Erakutsi jakinarazpenak"</string>
     <string name="help_label" msgid="6886837949306318591">"Laguntza eta iritziak"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Laguntza-artikuluak, telefono eta txat bidezko laguntza"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Laguntza-artikuluak, telefono eta txat bidezko laguntza, lehen urratsen gidak"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Edukia gordetzeko kontua"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Argazkiaren IDa"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Mehatxu oso larriak"</string>
@@ -2653,9 +2725,12 @@
       <item quantity="one">Erakutsi %d elementu ezkutu</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Sareak eta Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, sare mugikorrak, datuen erabilera, sare publikoa"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mugikorra"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datuen erabilera"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"sare publikoa"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Konektatutako gailuak"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, igorpenak, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, igorpenak"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikazioak eta jakinarazpenak"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Baimenak, aplikazio lehenetsiak"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Erabiltzaileak eta kontuak"</string>
@@ -2708,6 +2783,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"keinua"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ordaindu, ukitu, ordainketak"</string>
     <string name="keywords_backup" msgid="470070289135403022">"babeskopia, segurtasun kopia"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"keinua, ertza, alboa, ertz aktiboa, estutu, estutzea, heldu, eutsi, oratu, laguntza, lagundu, laguntzailea, ok google, google laguntzailea"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"keinua, esnatu, iratzarri, esnarazi, jakinarazpenak, pantaila, bistaratu, bistaratzea, pantaila itzalita, pantaila piztuta, estutu, estutzea, ertza, alboa, lo, lotan, inaktibo, lo egin, heldu, eutsi, oratu"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"keinua, isiltasuna, isilarazi, atzeratu, alarma, jasotako deia, sarrerako deia, deia, isilik, bistaratu, bistaratzea, pantaila blokeatua, estutu, estutzea, heldu, eutsi, oratu, ertza, ertzak, gelditu, geldiarazi"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfiguratu Wi-Fi NFC etiketa"</string>
     <string name="write_tag" msgid="8571858602896222537">"Idatzi"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Ukitu etiketa bat bertan idazteko…"</string>
@@ -2790,7 +2868,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Ez erakutsi laneko jakinarazpenik"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Gailua blokeatuta dagoenean, nola ikusi nahi dituzu profileko jakinarazpenak?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profileko jakinarazpenak"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Jakinarazpenak"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Jakinarazpenak"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Aplikazioen jakinarazpenak"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Jakinarazpenaren kategoria"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Garrantzia"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Aplikazioak erabaki dezala"</string>
@@ -2805,6 +2884,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Premiazkoa"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Baimendu soinua egitea"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Ez egin soinurik edo dardararik eta ez agerrarazi jakinarazpenak uneko pantailan"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Garrantzi txikikoa"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Garrantzi ertainekoa"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Garrantzi handikoa"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Premiazkoa"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Jakinarazpenen laguntzailea"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Jakinarazpenetarako sarbidea"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Blokeatuta dago laneko profileko jakinarazpenetarako sarbidea"</string>
@@ -2832,8 +2915,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Pantaila txikia"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Baimendu pantaila txikia erabiltzea"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Baimendu aplikazio honek pantaila txiki bat sortzea aplikazioa irekita dagoenean edo handik irtetean (adibidez, bideoak ikusten jarraitzeko). Erabiltzen ari zaren beste aplikazioen gaienean bistaratzen da leiho hori."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Bai"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Ez"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"Ez molestatu\" aukerarako sarbidea"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ez dago \"Ez molestatu\" aukerarako sarbidea eskatu duen aplikaziorik"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Aplikazioak kargatzen…"</string>
@@ -2964,11 +3045,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Laneko profil hau honen bidez kudeatzen da:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Kudeatzailea: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Esperimentala)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Gailua biratzea"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Aldatu pantailaren orientazioa"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Jarraitu ikuspegi bertikalean"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Jarraitu modu horizontalean"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ez aldatu pantailaren orientazioa"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Abio segurua"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Jarraitu"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Gailua are gehiago babesteko, PIN kodea eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, ezta alarmarik jo ere. \n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. PIN kodea eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
@@ -2976,7 +3052,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Gailua are gehiago babesteko, pasahitza eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, ezta alarmarik jo ere. \n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. Pasahitza eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Hatz-marka erabiltzeaz gain, gailua are gehiago babesteko, PIN kodea eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, ezta alarmarik jo ere. \n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. PIN kodea eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Hatz-marka erabiltzeaz gain, gailua are gehiago babesteko, eredua eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, ezta alarmarik jo ere. \n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. Eredua eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Hatz-marka erabiltzeaz gain, gailua are gehiago babesteko, pasahitza eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, ezta alarmarik jo ere. \n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. Pasahitza eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Gailua babestuago izan dezazun, desblokeatzeko hatz-marka erabiltzeaz gain, pasahitza eska dezakezu gailua abiarazterakoan. Abiarazi ezean, gailuak ezingo du jaso deirik, mezurik edo jakinarazpenik, eta alarmek ez dute joko.\n\nGaldutako edo lapurtutako gailuetan dauden datuak babesteko balio du neurri horrek. Pasahitza eskatzea nahi duzu gailua abiarazterakoan?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Bai"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ez"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN kodea eskatzea nahi duzu?"</string>
@@ -3094,6 +3170,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Erabilera-abisuak"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Erakutsi gailuaren erabilera guztia"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Erakutsi aplikazioaren erabilera"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Bateria asko ari da erabiltzen"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikazio ez dira ari behar bezala funtzionatzen</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> ez da ari behar bezala funtzionatzen</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Bateria asko kontsumitzen ari diren aplikazioak</item>
+      <item quantity="one">Bateria asko kontsumitzen ari da <xliff:g id="APP">%1$s</xliff:g></item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Optimizaziorik gabe"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Optimizaziorik gabe"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Bateria-optimizazioa aplikatzen da"</string>
@@ -3186,8 +3271,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Bistaratu aplikazioen gainean"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g> aplikaziok dute besteen gainean bistaratzeko baimena"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Baimena duten aplikazioak"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Bai"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Ez"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Baimena dauka"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Ez dauka baimenik"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instalatu aplikazio iturburu ezezagun"</string>
     <string name="write_settings" msgid="4797457275727195681">"Aldatu sistemaren ezarpenak"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"idatzi aldatu sistema ezarpenak"</string>
@@ -3277,6 +3362,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Pantaila tindu horikaraz jantzi dugu. Errazago hartuko zaitu loak horrela."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Iradokizunak"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+ beste <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> iradokizun</item>
+      <item quantity="one">1 iradokizun</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> iradokizun</item>
+      <item quantity="one">+1 iradokizun</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Kendu"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Kolore hotzak"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Erabili kolore hotzagoak pantailan"</string>
@@ -3295,8 +3389,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Datuen erabileraren abisua: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Datuen erabileraren abisua: <xliff:g id="ID_1">%1$s</xliff:g>. Datuen muga: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Fakturazio-zikloa"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Hileroko zikloa hilabete bakoitzeko <xliff:g id="ID_1">%1$s</xliff:g>. egunean hasiko da"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Hilero, <xliff:g id="ID_1">%1$s</xliff:g>. egunetik hasita"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Hilean behin, <xliff:g id="ID_1">%1$s</xliff:g>. egunean"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Sarearen murriztapenak"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> murriztapen</item>
@@ -3316,7 +3409,7 @@
       <item quantity="one">Aplikazio batek dauka datuak mugarik gabe erabiltzeko baimena, baita datu-aurrezlea aktibatuta dagoenean ere</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Datu-aurrezlea"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Datuak mugarik gabe erabiltzea"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Datuen erabilera mugagabea"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Atzeko planoko datuak desaktibatuta daude"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Aktibatuta"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Desaktibatuta"</string>
@@ -3380,8 +3473,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Pantaila blokeatuko jakinarazpenak"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Erakutsi edo ezkutatu jakinarazpenaren edukia"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Guztiak"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Laguntza"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Laguntza eta aholkuak"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Zabalerarik txikiena"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ez dago premium SMSetarako sarbidea eskatu duen aplikaziorik."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMSak ordaindu egin behar izan ditzakezu eta, hala bada, operadorearen fakturan gehituko da haien kostua. Aplikazioei baimen hau ematen badiezu, premium SMSak bidaltzeko gai izango dira."</string>
@@ -3446,28 +3538,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatikoa"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Eskuzko ezarpenak"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Egin tokia"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Keinuak"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Keinu bidezko lasterbideak"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Telefonoa kontrolatzeko keinuak"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Tableta kontrolatzeko keinu bizkorrak"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gailua kontrolatzeko keinu bizkorrak"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Ireki kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Kamera bizkor irekitzeko, sakatu birritan etengailua. Edozein pantailatan zaudela egin dezakezu hori."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Ireki kamera bizkor"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Kamera irekitzeko, sakatu birritan etengailua"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Biratu kamera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Atera autoargazkiak bizkorrago"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Autoargazki modua erabiltzeko, biratu telefonoa birritan"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Autoargazki modua erabiltzeko, biratu tableta birritan"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Autoargazki modua erabiltzeko, biratu gailua birritan"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Sakatu birritan telefonoa bertan dagoena ikusteko"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Sakatu birritan tableta bertan dagoena ikusteko"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Sakatu birritan gailua bertan dagoena ikusteko"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Jakinarazpenak bizkor ikusteko, sakatu birritan pantaila."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Ordua, jakinarazpenen ikonoak eta bestelako informazioa begiratzeko, sakatu pantaila birritan."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Ikusi jakinarazpenak pantaila itzalita dagoenean"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Jaso telefonoa bertan dagoena ikusteko"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Jaso tableta bertan dagoena ikusteko"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Jaso gailua bertan dagoena ikusteko"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Jakinarazpenak bizkor ikusteko, hartu telefonoa eskuan."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Jakinarazpenak bizkor ikusteko, hartu tableta eskuan."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Jakinarazpenak bizkor ikusteko, hartu gailua eskuan."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Ordua, jakinarazpenen ikonoak eta bestelako informazioa begiratzeko, hartu telefonoa."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ordua, jakinarazpenen ikonoak eta bestelako informazioa begiratzeko, hartu tableta."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ordua, jakinarazpenen ikonoak eta bestelako informazioa begiratzeko, hartu gailua."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Ikusi jakinarazpenak pantaila itzalita dagoenean"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Pasatu hatza sentsoretik jakinarazpenak ikusteko"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Jakinarazpenei begiratu bat emateko, pasatu hatza beherantz telefonoaren atzealdeko hatz-marken sentsorean."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Jakinarazpenei begiratu bat emateko, pasatu hatza beherantz tabletaren atzealdeko hatz-marken sentsorean."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Jakinarazpenei begiratu bat emateko, pasatu hatza beherantz gailuaren atzealdeko hatz-marken sentsorean."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Ikusi jakinarazpenak bizkor"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Pasatu hatza beherantz hatz-marken sentsorean"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Jaso telefonoa kamera irekitzeko"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Kamera automatikoki irekitzeko, jaso telefonoa argazkiak ateratzeko posiziora (horizontalki nahiz bertikalki). Telefonoa inaktibo edo blokeatuta dagoenean ere funtzionatzen du."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Atera argazkiak telefonoa inaktibo edo blokeatuta dagoenean"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Laguntza aktibatzeko keinua"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sentikortasuna"</string>
@@ -3571,6 +3676,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Zuzeneko aplikazio hau kendu nahi duzu?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Jokoak"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio-fitxategiak"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Erabilitako tokia"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> - desinstalatuta)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> - desgaituta)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Betetze automatikoaren zerbitzua"</string>
@@ -3584,5 +3690,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Zuzeneko aplikazioa"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Memoria-kudeatzailea desaktibatu nahi duzu?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Zinema- eta telebista-aplikazioak"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Erabilitako tokia"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Operadorearen hornikuntza-informazioa"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Abiarazi operadorearen hornikuntza"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Zer berri dago?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Eman begiratu bat bost eginbide nagusiei"</string>
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 32ca0b7..cd8b986 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"خوب"</item>
     <item msgid="8986346415847956850">"عالی"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"همیشه"</item>
-    <item msgid="844721238536786870">"تنها زمانی که وصل است"</item>
-    <item msgid="1986753720941888596">"هیچ‌وقت"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"همیشه"</item>
-    <item msgid="7433294150916905997">"تنها زمانی که وصل است"</item>
-    <item msgid="1390404486722375028">"هیچ‌وقت"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"۳۰ روز گذشته"</item>
     <item msgid="6600989128423965319">"تنظیم چرخه مصرف..."</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0d51f1d..fd4b159 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"شما اکنون یک برنامه‌نویس هستید!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"نیازی نیست، شما در حال حاضر یک برنامه‌نویس هستید."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"لطفاً ابتدا گزینه‌های تولیدکننده را فعال کنید."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"بی‌سیم و شبکه‌ها"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"اتصال‌ها"</string>
     <string name="header_category_device" msgid="4544026001618307754">"دستگاه"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"‏مشروط به VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"مجوز تماس تصویری داده شد"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"‏مجوز تماس با Wifi داده شد"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"‏EAB/حضور مشروط است"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"توان رادیوی همراه"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"مشاهده دفترچه نشانی سیم‌کارت"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"مشاهده شماره‌های شماره‌گیری ثابت"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"اسکن برای دستگاه‌ها"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"تغییر نام این دستگاه"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"تغییر نام"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"اتصال قطع شود؟"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"‏این کار اتصال شما را با این دستگاه قطع می‌کند:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;."</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"ارتباط دستگاه قطع شود؟"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"ارتباط تلفنتان با <xliff:g id="DEVICE_NAME">%1$s</xliff:g> قطع می‌شود."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"ارتباط رایانه لوحی‌تان با <xliff:g id="DEVICE_NAME">%1$s</xliff:g> قطع می‌شود."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"ارتباط دستگاهتان با <xliff:g id="DEVICE_NAME">%1$s</xliff:g> قطع می‌شود."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"قطع ارتباط"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"اجازه ندارید تنظیمات بلوتوث را تغییر دهید."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"مرتبط‌سازی دستگاه جدید"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"هنگام باز بودن تنظیمات بلوتوث، <xliff:g id="DEVICE_NAME">%1$s</xliff:g> برای دستگاه‌های اطراف قابل مشاهده است."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"نشانی بلوتوث تلفن: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"نشانی بلوتوث رایانه لوحی: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"نشانی بلوتوث دستگاه: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"ارتباط <xliff:g id="DEVICE_NAME">%1$s</xliff:g> قطع شود؟"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"پخش"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"غیر فعال کردن نمایه؟"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"درخواست مرتبط‌سازی"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"درخواست مرتبط‌سازی"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"برای مرتبط‌سازی با <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ضربه بزنید."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"نمایش فایل‌های دریافتی"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"فایل‌های دریافت‌شده"</string>
     <string name="device_picker" msgid="4978696506172252813">"انتخاب دستگاه بلوتوث"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> می‌خواهد بلوتوث را روشن کند"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> می‌خواهد بلوتوث را خاموش کند"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏%1$s می‌خواهد به پیام‌های شما دسترسی یابد. اجازه دسترسی به %2$s داده شود؟"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"درخواست دسترسی به سیم‌‌کارت"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> می‌خواهد به سیم‌کارت شما دسترسی پیدا کند. درصورتی‌که به دسترسی به سیم‌کارت اجازه دهید، اتصال داده در مدت اتصال در دستگاه شما غیرفعال می‌شود. به <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> اجازه دسترسی دهید"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"به‌عنوان «<xliff:g id="DEVICE_NAME">^1</xliff:g>» برای سایر دستگاه‌ها قابل مشاهده است"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"دستگاه‌های شما"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"مرتبط‌سازی دستگاه جدید"</string>
     <string name="date_and_time" msgid="9062980487860757694">"تاریخ و زمان"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"انتخاب منطقهٔ زمانی"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"حساب‌ها"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"مکان"</string>
     <string name="account_settings_title" msgid="626177544686329806">"حساب‌ها"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"امنیت و مکان"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"امنیت و موقعیت مکانی"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"رمزگذاری و اعتبارنامه"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"تلفن رمزگذاری شده است"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"دستگاه رمزگذاری شد"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"بازکردن قفل با اثر انگشت"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"استفاده از اثرانگشت"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"برای باز کردن قفل تلفن، تأیید خریدها یا ورود به سیستم برنامه‌ها، کافی است حسگر اثر انگشت را لمس کنید. مراقب باشید اثر انگشت چه کسی را اضافه می‌کنید. حتی یک اثر انگشت اضافه‌شده می‌تواند همه این کارها را انجام دهد.\n\nتوجه: ممکن است اثر انگشت از الگو یا پین قدرتمند امنیت کمتری داشته باشد."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"برای تأیید خریدها یا ثبت ورود در برنامه‌ها، کافی است حسگر اثرانگشت را لمس کنید. مراقب باشید اثرانگشت چه کسی را اضافه می‌کنید. حتی یک اثرانگشت اضافه‌شده می‌تواند همه این کارها را انجام دهد.\n\nتوجه: نمی‌توانید از اثرانگشتتان برای باز کردن قفل این دستگاه استفاده کنید. برای اطلاعات بیشتر، با سرپرست سازمانتان تماس بگیرید."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"برای باز کردن قفل تلفن، تأیید خریدها یا ورود به سیستم برنامه‌ها، کافی است حسگر اثر انگشت را لمس کنید. مراقب باشید اثر انگشت چه کسی را اضافه می‌کنید. حتی یک اثر انگشت اضافه‌شده می‌تواند همه این کارها را انجام دهد.\n\nتوجه: ممکن است امنیت اثر انگشت از الگو یا کد پین قوی کمتر باشد."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"از اثر انگشتتان برای باز کردن قفل تلفن یا تأیید خریدها استفاده کنید.\n\nتوجه: نمی‌توانید از اثر انگشتتان برای باز کردن قفل این دستگاه استفاده کنید. برای اطلاعات بیشتر، با سرپرست سیستم سازمانتان تماس بگیرید."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"از اثر انگشتتان برای باز کردن قفل تلفن یا تأیید خریدها استفاده کنید.\n\nتوجه: ممکن است امنیت اثر انگشت از یک الگو یا پین قوی کمتر باشد."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"لغو"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ادامه"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"رد شدن"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"افزودن اثر انگشت"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"قابلیت‌های حفاظتی دستگاه فعال نخواهد شد. در صورت گم شدن، سرقت یا پاک شدن اطلاعات این رایانه لوحی، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"قابلیت‌های حفاظتی دستگاه فعال نخواهد شد. درصورت گم شدن، سرقت یا پاک شدن اطلاعات دستگاه، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"قابلیت‌های حفاظتی دستگاه فعال نخواهد شد. درصورت گم شدن، سرقت یا پاک شدن اطلاعات این تلفن، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"قابلیت‌های حفاظتی دستگاه فعال نخواهد شد. درصورت گم شدن یا به‌سرقت رفتن این رایانه لوحی، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"قابلیت‌های حفاظتی دستگاه فعال نخواهد شد. درصورت گم شدن یا به‌سرقت رفتن این دستگاه، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"قابلیت‌های حفاظتی دستگاه فعال نخواهد شد. درصورت گم شدن یا به‌سرقت رفتن این تلفن، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"بعدی"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"قابلیت‌های محافظت از دستگاه روشن نمی‌شوند. اگر رایانه لوحی گم، دزدیده یا بازنشانی شود، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"قابلیت‌های محافظت از دستگاه روشن نمی‌شوند. اگر دستگاه گم، دزدیده یا بازنشانی شود، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"قابلیت‌های محافظت از دستگاه روشن نمی‌شوند. اگر تلفن گم، دزدیده یا بازنشانی شود، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"قابلیت‌های محافظت از دستگاه روشن نمی‌شوند. اگر رایانه لوحی گم یا دزدیده شود، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"قابلیت‌های محافظت از دستگاه روشن نمی‌شوند. اگر دستگاه گم یا دزدیده شود، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"قابلیت‌های محافظت از دستگاه روشن نمی‌شوند. اگر تلفن گم یا دزدیده شود، نمی‌توانید مانع استفاده دیگران از آن شوید."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"در هر حال رد شود"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"برگشت"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"پیدا کردن حسگر"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"محل حسگر اثر انگشت را در پشت تلفنتان پیدا کنید."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"حسگر را لمس کنید"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"در پشت تلفنتان قرار دارد. از انگشت اشاره‌تان استفاده کنید."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"تصویر دستگاه و مکان حسگر اثر انگشت"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"نام"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"تأیید"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"حذف"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"بیایید شروع کنیم"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"حسگر را لمس کنید"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"انگشتتان را روی حسگر بگذارید و بعد از احساس لرزش، آن را بردارید"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ادامه دهید"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"اندکی انگشتتان را حرکت دهید تا همه قسمت‌های متفاوت اثر انگشتتان اضافه شود"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"اثر انگشت اضافه شد."</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"هر زمان این نماد را ببینید، می‌توانید از اثر انگشتتان برای شناسایی یا تأیید خرید استفاده کنید."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"برای روشن کردن و باز کردن قفل دستگاهتان کافیست حسگر اثر انگشت را لمس کنید."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"وقتی این نماد را می‌بینید، همچنین می‌توانید خریدها را مجاز کنید یا به سیستم برنامه‌ها وارد شوید."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"بردارید و سپس دوباره لمس کنید"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"مدام انگشتتان را جابه‌جا کنید تا بخش‌های مختلف اثر انگشتتان را اضافه کنید"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"اثر انگشت اضافه شد"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"وقتی این نماد را می‌بینید، از اثر انگشتتان برای شناسایی یا تأیید خریدها استفاده کنید."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"از تنظیم اثر انگشت رد می‌شوید؟"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"انتخاب کرده‌اید که از اثر انگشتتان به‌عنوان روشی برای باز کردن قفل تلفن استفاده کنید. اگر اکنون این مرحله را رد کنید، باید بعداً آن را تنظیم کنید. تنظیم فقط یک دقیقه یا همین حدود طول می‌کشد."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"تنظیم قفل صفحه"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"تمام"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"اووه، آن حسگر نیست"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"از حسگر اثر انگشت در دستگاهتان استفاده کنید."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"با استفاده از انگشت اشاره، حسگر را در  پشت تلفن لمس کنید."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ثبت انجام نشد"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"مهلت زمانی ثبت اثر انگشت به پایان رسید. دوباره امتحان کنید."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ثبت اثر انگشت کار نمی‌کند. دوباره امتحان کنید یا از انگشت دیگری استفاده کنید."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"با فعال کردن قابلیت‌های حفاظتی دستگاه، نگذارید دیگران بدون اجازه شما از این دستگاه استفاده کنند. قفل صفحه موردنظر برای استفاده را انتخاب کنید."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"با فعال کردن قابلیت‌های حفاظتی دستگاه، نگذارید دیگران بدون اجازه شما از این تلفن استفاده کنند. قفل صفحه موردنظر برای استفاده را انتخاب کنید."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"روش پشتیبان قفل صفحه را انتخاب کنید"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"گزینه‌های قفل صفحه"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"گزینه‌های قفل صفحه"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"قفل صفحه"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / بلافاصله پس از حالت خواب"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> پس از حالت خواب"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"تغییر الگوی بازگشایی قفل"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"تغییر پین بازگشایی قفل"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"تغییر گذرواژه قفل‌گشا"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"دوباره امتحان کنید. تلاش <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> از <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"آخرین تلاش"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"اگر در این تلاش الگوی کاری نادرستی وارد کنید، نمایه کاری‌تان و داده‌های مرتبط با آن از این دستگاه پاک خواهد شد."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"اگر در این تلاش پین کاری نادرستی وارد کنید، نمایه کاری‌تان و داده‌های مرتبط با آن از این دستگاه پاک خواهد شد."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"اگر در این تلاش گذرواژه کاری نادرستی وارد کنید، نمایه کاری‌تان و داده‌های مرتبط با آن از این دستگاه پاک خواهد شد."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"تلاش‌های نادرست بسیاری انجام شده است. نمایه کاری‌تان و داده‌های مرتبط با آن از این دستگاه حذف خواهد شد."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"رد کردن"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"دوباره امتحان کنید. تلاش <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> از <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"داده‌هایتان حذف خواهد شد"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"اگر در تلاش بعدی الگوی نادرستی وارد کنید، داده‌های این دستگاه حذف خواهد شد"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"اگر در تلاش بعدی‌ پین نادرستی وارد کنید، داده‌های این دستگاه حذف خواهد شد"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"اگر در تلاش بعدی‌ گذرواژه نادرستی وارد کنید، داده‌های این دستگاه حذف خواهد شد"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"اگر در تلاش بعدی‌ الگوی نادرستی وارد کنید، این کاربر حذف خواهد شد"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"اگر در تلاش بعدی‌ پین نادرستی وارد کنید، این کاربر حذف خواهد شد"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"اگر در تلاش بعدی گذرواژه نادرستی وارد کنید، این کاربر حذف خواهد شد"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"اگر در تلاش بعدی الگوی نادرستی وارد کنید، داده‌های نمایه کاری شما و داده‌های آن حذف خواهد شد"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"اگر در تلاش بعدی‌ پین نادرستی وارد کنید، نمایه کاری شما و داده‌های آن حذف خواهند شد"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"اگر در تلاش بعدی‌ گذرواژه نادرستی وارد کنید، نمایه کاری شما و داده‌های آن حذف خواهند شد"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"تلاش‌های اشتباه بسیار زیادی انجام شده است. داده‌های این دستگاه حذف خواهد شد."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"تلاش‌های اشتباه بسیار زیادی انجام شده است. این کاربر حذف خواهد شد."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"تلاش‌های اشتباه بسیار زیادی انجام شده است. این نمایه کاری و داده‌های آن‌ حذف خواهند شد."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"نپذیرفتن"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"باید حداقل <xliff:g id="COUNT">%d</xliff:g> نویسه داشته باشد"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"پین باید حداقل <xliff:g id="COUNT">%d</xliff:g> رقم داشته باشد"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ادامه"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"بلوتوث پیشرفته"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"با بلوتوث روشن، دستگاهتان می‌تواند با دستگاه‌های بلوتوث اطراف در ارتباط باشد."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"برای بهبود صحت مکان، برنامه‌ها و سرویس‌های سیستم همچنان می‌توانند دستگاه‌های بلوتوث را شناسایی کنند. می‌توانید این مورد را در <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>تنظیمات اسکن<xliff:g id="LINK_END_1">LINK_END</xliff:g> تغییر دهید."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"متصل نشد. دوباره امتحان کنید."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"جزئیات دستگاه"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"نشانی بلوتوث دستگاه: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"دستگاه فراموش شود؟"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"تلفنتان دیگر با <xliff:g id="DEVICE_NAME">%1$s</xliff:g> مرتبط نخواهد بود"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"رایانه لوحی‌تان دیگر با <xliff:g id="DEVICE_NAME">%1$s</xliff:g> مرتبط نخواهد بود"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"دستگاهتان دیگر با <xliff:g id="DEVICE_NAME">%1$s</xliff:g> مرتبط نخواهد بود"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"فراموش کردن دستگاه"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"اتصال به..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> از صدای رسانه قطع می‌شود."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> از صدای هندزفری قطع می‌شود."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"ارائه نشود"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"راستی‌آزمایی نشود"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"مجوزی مشخص نشده است. اتصال شما خصوصی نخواهد بود."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"نام شبکه خیلی طولانی است."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"باید دامنه‌ای مشخص کنید."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS در دسترس است"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS در دسترس است)"</string>
@@ -809,7 +838,6 @@
       <item quantity="other">‏%d شبکه</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"‏Wi-Fi پیشرفته"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"‏پیکربندی Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"‏آدرس MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"‏آدرس IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"پوشش زیرشبکه"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"این گروه فراموش شود؟"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"‏نقطه اتصال قابل حمل Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"‏نقطه اتصال Wi-Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"‏استفاده از اتصال شبکه تلفن همراه برای ارائه شبکه Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"اتصال اینترنتی این رایانه لوحی ازطریق نقطه اتصال اشتراک‌گذاری نمی‌شود"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"اتصال اینترنتی این تلفن ازطریق نقطه اتصال اشتراک‌گذاری نمی‌شود"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"اینترنت یا محتوا با سایر دستگاه‌ها به اشتراک گذاشته نمی‌شود"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"اتصال اینترنت این رایانه لوحی ازطریق نقطه اتصال اشتراک‌گذاری می‌شود"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"اتصال اینترنت این تلفن ازطریق نقطه اتصال اشتراک‌گذاری می‌شود"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"برنامه محتوا را به اشتراک می‌گذارد. برای اشتراک‌گذاری اتصال اینترنت، نقطه اتصال را خاموش و سپس روشن کنید"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"‏نام Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"درحال روشن کردن <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"سایر دستگاه‌ها می‌توانند به <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> متصل شوند."</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"‏گذرواژه Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"‏باند AP"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"‏برای ایجاد یک شبکه Wi‑Fi برای سایر دستگاه‌ها، از نقطه اتصال استفاده کنید. نقطه اتصال با استفاده از اتصال داده تلفن همراه، اینترنت ارائه می‌دهد. ممکن است هزینه‌های داده تلفن همراه اضافه اعمال شوند."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"برنامه‌ها می‌توانند نقطه اتصالی ایجاد کنند تا محتوا را با دستگاه‌های اطراف به اشتراک بگذارند."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"در حال روشن کردن نقطه اتصال…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"در حال خاموش کردن نقطه اتصال…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> فعال است"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"۱"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"‏وقتی تماس Wi-Fi روشن است، تلفن شما می‌تواند بنابر تنظیمات ترجیحی‌تان و اینکه چه سیگنالی قدرتمندتر است، تماس‌ها را از طریق شبکه‌های Wi-Fi یا شبکه شرکت مخابراتی‌تان هدایت کند. قبل از روشن کردن این قابلیت، هزینه‌ها و سایر جزئیات را با شرکت مخابراتی‌تان بررسی کنید."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"به‌روزرسانی نشانی اضطراری"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"‏نشانی‌ای که اگر از طریق Wi-Fi با ۹۱۱ تماس بگیرید، توسط خدمات اضطراری به‌عنوان مکان شما استفاده می‌شود"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"صفحه‌نمایش"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"نتیجه‌ای پیدا نشد"</string>
     <string name="display_settings" msgid="7965901687241669598">"صفحه‌نمایش"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"چرخش خودکار صفحه"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"رنگ‌های زنده"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"هنگام چرخاندن رایانهٔ لوحی، جهت به‌طور خودکار تغییر می‌کند"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"هنگام چرخاندن تلفن، جهت به‌طور خودکار تغییر می‌کند"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"هنگام چرخاندن رایانهٔ لوحی، جهت به‌طور خودکار تغییر می‌کند"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"میزان روشنایی چراغ‌ در دسترس را بهینه کنید. این قابلیت که روشن است، همچنان می‌توانید روشنایی را تنظیم موقت کنید."</string>
     <string name="night_display_title" msgid="2626451512200357686">"نور شب"</string>
     <string name="night_display_text" msgid="1837277457033025056">"«نور شب» ته‌رنگ کهربایی به صفحه‌نمایش شما می‌بخشد. این کار باعث می‌شود نگاه کردن به صفحه در نور کم آسان‌تر شود و ممکن است کمک کند آسان‌تر به خواب بروید."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"زمان‌بندی"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"وضعیت"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"روشن شدن خودکار"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"هیچ‌وقت"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"سفارشی کردن زمان‌بندی"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"غروب تا طلوع"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"زمان‌بندی"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"هیچ‌کدام"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"در زمان سفارشی روشن می‌شود"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"از غروب تا طلوع روشن می‌شود"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"زمان شروع"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"زمان پایان"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"وضعیت"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"شدت"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"خاموش. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"هرگز به‌طور خودکار روشن نمی‌شود."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g> به‌طور خودکار روشن می‌شود."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"در غروب به‌طور خودکار روشن می‌شود."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"روشن. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"هرگز به‌طور خودکار خاموش نمی‌شود."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g> به‌طور خودکار خاموش می‌شود."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"به‌طور خودکار در طلوع خاموش می‌شود."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"خاموش / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"هرگز به‌طور خودکار روشن نمی‌شود"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"در ساعت <xliff:g id="ID_1">%1$s</xliff:g> به‌طور خودکار روشن می‌شود"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"در غروب به‌طور خودکار روشن می‌شود"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"روشن / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"هرگز به‌طور خودکار خاموش نمی‌شود"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"در ساعت <xliff:g id="ID_1">%1$s</xliff:g> به‌طور خودکار خاموش می‌شود"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"به‌طور خودکار در طلوع خاموش می‌شود"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"حالت خواب"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"صفحه نمایش خاموش می‌شود"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> پس از غیرفعال بودن"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"تنظیمات"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"روشنایی خودکار"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"بیدار شدن با بالا بردن"</string>
-    <string name="doze_title" msgid="2259176504273878294">"نمایشگر محیط"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"نمایشگر محیط"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"همیشه روشن"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"اعلان‌های جدید"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"زمان نمایش دادن"</string>
+    <string name="doze_title" msgid="2375510714460456687">"اعلان‌های جدید"</string>
     <string name="doze_summary" msgid="3846219936142814032">"روشن شدن صفحه‌نمایش هنگامی که اعلانی دریافت می‌کنید"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"همیشه روشن"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"نمایش زمان، نمادهای اعلان و سایر اطلاعات"</string>
     <string name="title_font_size" msgid="4405544325522105222">"اندازه قلم"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"نوشتار را بزرگ‌تر یا کوچک‌تر کنید"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"تنظیمات قفل سیم کارت"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"نام نقطه دستیابی نمی‌تواند خالی باشد."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"‏قسمت MCC باید 3 رقمی باشد."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"‏قسمت MNC باید 2 یا 3 رقم باشد."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"‏شرکت مخابراتی اجازه نمی‌دهد APN از نوع %s اضافه کنید."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"بازیابی تنظیمات پیش‌فرض نام نقطه دستیابی"</string>
     <string name="menu_restore" msgid="8260067415075573273">"بازنشانی به موارد پیش‌فرض"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"بازنشانی تنظیمات پیش‌فرض نام نقطه دستیابی انجام شد."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"‏پاک کردن کارت SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"‏همه داده‌های موجود در حافظهٔ USB داخلی مانند موسیقی یا عکس‌ها را پاک کنید"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"‏همه داده‌های موجود در کارت SD از جمله موسیقی یا عکس‌ها حذف می‌شوند"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"‏پاک کردن eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"‏همه کارت‌های eSIM را در تلفن پاک کنید. با این کار طرح سرویس همراهتان لغو نخواهد شد."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"‏همه کارت‌های eSIM را در رایانه لوحی پاک کنید. با این کار طرح سرویس همراهتان لغو نخواهد شد."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"بازنشانی رایانهٔ لوحی"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"بازنشانی تلفن"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"همه اطلاعات شخصی و برنامه‌های دانلودشده پاک شود؟ امکان واگرد این کار وجود ندارد!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"هنگامی که محافظ صفحه روشن است نمی‌توانید از نقاط اتصال قابل حمل یا اتصال به اینترنت با تلفن همراه استفاده کنید"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"‏اتصال داده با سیم USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"‏USB متصل شد، برای اتصال داده با سیم بررسی کنید"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"دارای اتصال داده با سیم"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"‏هنگام استفاده از حافظهٔ USB، نمی‌توان از اتصال داده با تلفن همراه استفاده کرد"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"‏USB متصل نیست"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"برای روشن شدن، آن را متصل کنید"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"‏خطای اتصال داده با سیم USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"‏اشتراک‌گذاری اتصال اینترنت تلفن ازطریق USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"‏اشتراک‌گذاری اینترنت رایانه لوحی ازطریق USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"تترینگ با بلوتوث"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"اشتراک‌گذاری اتصال اینترنت این رایانه لوحی ازطریق بلوتوث"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"اشتراک‌گذاری اتصال اینترنت این تلفن ازطریق بلوتوث"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"اشتراک‌گذاری اتصال اینترنت این رایانه لوحی با ۱ دستگاه ازطریق بلوتوث"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"اشتراک‌گذاری اتصال اینترنت این تلفن با ۱ دستگاه ازطریق بلوتوث"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"اشتراک‌گذاری اتصال اینترنت این رایانه لوحی با <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> دستگاه ازطریق بلوتوث"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"اشتراک‌گذاری اتصال اینترنت این تلفن با <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> دستگاه‌ ازطریق بلوتوث"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"اشتراک‌گذاری اتصال اینترنت رایانه لوحی ازطریق بلوتوث"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"اشتراک‌گذاری اتصال اینترنت تلفن ازطریق بلوتوث"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"اشتراک‌گذاری اتصال اینترنت این <xliff:g id="DEVICE_NAME">%1$d</xliff:g> ازطریق بلوتوث"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"اتصال اینترنتی این رایانه لوحی ازطریق بلوتوث اشتراک‌گذاری نمی‌شود"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"اتصال اینترنتی این تلفن ازطریق بلوتوث اشتراک‌گذاری نمی‌شود"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"اتصال به اینترنت با تلفن همراه برقرار نشد"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"اتصال اینترنتی با تلفن همراه به بیش از <xliff:g id="MAXCONNECTION">%1$d</xliff:g> دستگاه امکان‌پذیر نیست."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> از اتصال اینترنتی با تلفن همراه قطع می‌شود."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"برای ارائه اینترنت به سایر دستگاه‌ها ازطریق اتصال داده تلفن همراهتان، از نقطه اتصال و «اتصال به اینترنت با تلفن همراه» استفاده کنید."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"برای ارائه اینترنت به سایر دستگاه‌ها ازطریق اتصال داده تلفن همراهتان، از نقطه اتصال و اتصال به اینترنت با تلفن همراه استفاده کنید. همچنین برنامه‌ها می‌توانند نقطه اتصالی ایجاد کنند تا محتوا را با دستگاه‌های اطراف به اشتراک بگذارند."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"راهنمایی"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"شبکه تلفن همراه"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"طرح تلفن همراه"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"حالت مکان"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"‏استفاده از GPS،‏ Wi-Fi، بلوتوث یا شبکه‌های تلفن همراه برای تعیین مکان"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"‏استفاده از Wi-Fi، بلوتوث یا شبکه‌های تلفن همراه برای تعیین مکان"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏استفاده از GPS برای تعیین موقعیت مکانی"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"‏استفاده از GPS و حسگرهای دستگاه برای تعیین مکان"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"اسکن کردن"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"‏اسکن کردن Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"‏بهبود موقعیت مکانی با اجازه دادن به برنامه‌ها و سرویس‌های سیستم برای شناسایی شبکه‌های Wi‑Fi در هرزمانی."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"‏شما اتصال داده ندارید. برای اینکه هم‌اکنون این اطلاعات را مشاهده کنید، از هر رایانه متصل به اینترنت به %s بروید."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"در حال بارگیری…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"انتخاب گذرواژه"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"تنظیم گذرواژه برای استفاده از اثر انگشت"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"انتخاب الگو"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"تنظیم الگو برای استفاده از اثر انگشت"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"انتخاب پین"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"تنظیم پین برای استفاده از اثر انگشت"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"تأیید گذرواژه"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"تأیید الگو"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"تأیید پین"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"تنظیمات برنامه"</string>
     <string name="install_applications" msgid="4872012136210802181">"منابع ناشناس"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"همه منابع برنامه مجاز است"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"برنامه‌های اخیراً بازشده"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"مشاهده همه <xliff:g id="COUNT">%1$d</xliff:g> برنامه"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> قبل"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"رایانه لوحی و داده‌های شخصی شما بیشتر درمعرض خطر حمله برنامه‌های ناشناس هستند. با نصب برنامه از این منبع، موافقت می‌کنید که درقبال هرگونه آسیب وارده به رایانه لوحی یا از دست دادن داده‌هایتان که در نتیجه استفاده از این برنامه‌ها روی دهد، خودتان مسئول هستید."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"تلفن و داده‌های شخصی شما بیشتر درمعرض خطر حمله برنامه‌های ناشناس هستند. با نصب برنامه از این منبع، موافقت می‌کنید که درقبال هرگونه آسیب وارده به تلفن یا از دست دادن داده‌هایتان که در نتیجه استفاده از این برنامه‌ها روی دهد، خودتان مسئول هستید."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"تنظیمات پیشرفته"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"توقف سرویس سیستم؟"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"اگر این سرویس را متوقف کنید، برخی از قابلیت‌های رایانهٔ لوحی شما ممکن است تا زمانی که گوشی را خاموش و سپس دوباره روشن کنید، به درستی کار نکنند."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"اگر این سرویس را متوقف کنید، برخی از قابلیت‌های گوشی شما ممکن است تا زمانی که گوشی را خاموش و سپس دوباره روشن کنید، به‌درستی کار نکنند."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"زبان، ورودی و اشاره"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"زبان‌ها و ورودی"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"زبان‌ها و ورودی"</string>
     <string name="input_assistance" msgid="7577795275222555487">"کمک برای ورودی"</string>
@@ -1872,6 +1918,10 @@
       <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="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <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="print_settings_title" msgid="3685449667822217816">"خدمات چاپ"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"سرویسی نصب نشده است"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"هیچ چاپگری یافت نشد"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"جزئیات استفاده"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"تنظیم استفاده از نیرو"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"شامل بسته ها"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"برنامه‌ها باتری را خالی می‌کنند"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"دستگاه را بیدار نگه می‌دارد"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"دستگاه را در پس‌زمینه بیدار می‌کند"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"به‌طور مکرر مکان را درخواست می‌کند"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> برنامه عملکرد نادرست دارند"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"برنامه متوقف شود؟"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"تلفنتان نمی‌تواند باتری را به‌طور معمول مدیریت کند، زیرا <xliff:g id="APP">%1$s</xliff:g> آن را بیدار نگه می‌دارد.\n\nبرای برطرف کردن این مشکل، می‌توانید برنامه را به اجبار متوقف کنید.\n\nاگر مشکل ادامه دارد، ممکن است لازم باشد برنامه را حذف نصب کنید تا عملکرد باتری بهبود یابد."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"رایانه لوحی‌تان نمی‌تواند باتری را به‌طور معمول مدیریت کند، زیرا <xliff:g id="APP">%1$s</xliff:g> آن را بیدار نگه می‌دارد.\n\nبرای برطرف کردن این مشکل، می‌توانید برنامه را به اجبار متوقف کنید.\n\nاگر مشکل ادامه دارد، ممکن است لازم باشد برنامه را حذف نصب کنید تا عملکرد باتری بهبود یابد."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"دستگاهتان نمی‌تواند باتری را به‌طور معمول مدیریت کند، زیرا <xliff:g id="APP">%1$s</xliff:g> آن را بیدار نگه می‌دارد.\n\nبرای برطرف کردن این مشکل، می‌توانید برنامه را به اجبار متوقف کنید.\n\nاگر مشکل ادامه دارد، ممکن است لازم باشد برنامه را حذف نصب کنید تا عملکرد باتری بهبود یابد."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"متوقف کردن برنامه"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"استفاده در پس‌زمینه خاموش شود؟"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"تلفنتان نمی‌تواند باتری را به‌طور معمول مدیریت کند زیرا <xliff:g id="APP">%1$s</xliff:g> دستگاه را بیدار نگه می‌دارد.\n\nبرای حل به این مشکل، تلفنتان می‌تواند مانع از اجرای این برنامه در پس‌زمینه شود."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"رایانه لوحی‌تان نمی‌تواند باتری را به‌طور معمول مدیریت کند زیرا <xliff:g id="APP">%1$s</xliff:g> دستگاه را بیدار نگه می‌دارد.\n\nبرای حل به این مشکل، رایانه لوحی‌تان می‌تواند مانع از اجرای این برنامه در پس‌زمینه شود."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"دستگاهتان نمی‌تواند باتری را به‌طور معمول مدیریت کند زیرا <xliff:g id="APP">%1$s</xliff:g> دستگاه را بیدار نگه می‌دارد.\n\nبرای حل این مشکل، دستگاهتان می‌تواند مانع از اجرای این برنامه در پس‌زمینه شود."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"خاموش کردن"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"مکان خاموش شود؟"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"تلفنتان نمی‌تواند باتری را به‌طور معمول مدیریت کند زیرا وقتی از برنامه استفاده نمی‌کنید، <xliff:g id="APP">%1$s</xliff:g> به درخواست برای مکان ادامه می‌دهد.\n\n برای برطرف کردن این مشکل، می‌توانید مکان را برای این برنامه خاموش کنید."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"رایانه لوحی‌تان نمی‌تواند باتری را به‌طور معمول مدیریت کند زیرا وقتی از برنامه استفاده نمی‌کنید، <xliff:g id="APP">%1$s</xliff:g> به درخواست برای مکان ادامه می‌دهد.\n\n برای برطرف کردن این مشکل، می‌توانید مکان را برای این برنامه خاموش کنید."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"دستگاهتان نمی‌تواند باتری را به‌طور معمول مدیریت کند زیرا وقتی از برنامه استفاده نمی‌کنید، <xliff:g id="APP">%1$s</xliff:g> به درخواست برای مکان ادامه می‌دهد.\n\n برای برطرف کردن این مشکل، می‌توانید مکان را برای این برنامه خاموش کنید."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"خاموش کردن"</string>
     <string name="power_screen" msgid="3023346080675904613">"صفحه‌نمایش"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"چراغ قوه"</string>
     <string name="power_camera" msgid="4976286950934622605">"دوربین"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"برنامه‌ها"</string>
     <string name="power_service" msgid="1599661212370831780">"سرویس‌ها"</string>
     <string name="power_system" msgid="8290455327965307383">"سیستم"</string>
-    <string name="power_user" msgid="1889728099253018005">"کاربر"</string>
+    <string name="power_user" msgid="3706143225319881667">"کاربران دیگر"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"‏مقدار کل CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏پیش زمینه CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"بیدار باش"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"نیروی مصرفی بیش از حد محاسبه شده"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> میلی‌آمپرساعت"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"مدت‌ زمان استفاده <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"فعال به مدت<xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"مصرف صفحه‌نمایش <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g> از شارژ باتری را مصرف کرده است"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> از کل شارژ باتری"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"تغییر پین"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"نمایش اعلان‌ها"</string>
     <string name="help_label" msgid="6886837949306318591">"راهنما و بازخورد"</string>
-    <string name="support_summary" msgid="8276116616493882830">"مقاله‌های راهنما، پشتیبانی تلفنی و گپی"</string>
+    <string name="support_summary" msgid="2705726826263742491">"مقاله‌های راهنما، تلفن و گپ، شروع‌به‌کار"</string>
     <string name="user_account_title" msgid="1127193807312271167">"حساب برای محتوا"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"کارت شناسایی عکس‌دار"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"تهدیدهای بسیار جدی"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="other">‏نمایش %d مورد پنهان</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"شبکه و اینترنت"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"‏Wi-Fi، دستگاه همراه، مصرف داده، نقطه اتصال"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"دستگاه همراه"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"مصرف داده"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"نقطه اتصال"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"دستگاه‌های متصل"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"‏بلوتوث، ارسال محتوا، NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"بلوتوث، ارسال محتوا"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"برنامه‌ها و اعلان‌ها"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"مجوزها، برنامه‌های پیش‌فرض"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"کاربران و حساب‌ها"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"اشاره"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"پرداخت کردن، ضربه زدن، پرداخت‌ها"</string>
     <string name="keywords_backup" msgid="470070289135403022">"پشتیبان‌گیری، پشتیبان"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"‏اشاره، لبه، کنار،لبه فعال، فشردن، در دست گرفتن، کمک کردن، دستیار، قابل فشردن، فشردگی، فشرده، ‏‎دستگاه آب خشک‌کن،‏ ok google، دستیار google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"اشاره، بیدار کردن، اعلان‌ها، صفحه‌نمایش، نمایشگر، صفحه خاموش، صفحه روشن، فشردن، لبه، خواب، حالت خواب، در دست گرفتن"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"اشاره، سکوت، تعویق، زنگ ساعت، تماس ورودی، بی‌صدا، نمایشگر، صفحه قفل، فشردن، در دست گرفتن، لبه، توقف"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏تنظیم برچسب NFC برای Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"نوشتن"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ضربه زدن روی یک برچسب برای نوشتن..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"اعلان‌های کاری اصلاً نشان داده نشوند"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"وقتی دستگاه قفل است، می‌خواهید اعلان‌های نمایه چگونه نشان داده شوند؟"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"اعلان‌های نمایه"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"اعلان‌ها"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"اعلان‌ها"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"اعلان‌های برنامه"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"دسته اعلان"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"اهمیت"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"برنامه خودش تصمیم بگیرد"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"فوری"</string>
     <string name="allow_sound" msgid="1820188704793497324">"صدا مجاز است"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"بدون صدا و لرزش یا نمایش این اعلان‌ها در صفحه‌نمایش کنونی."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"اهمیت کم"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"اهمیت متوسط"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"اهمیت زیاد"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"اهمیت فوری"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"دستیار اعلان"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"دسترسی به اعلان"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"دسترسی به اعلان‌های نمایه کاری مسدود شده است"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"تصویر در تصویر"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"مجاز کردن تصویر در تصویر"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"به این برنامه اجازه دهید زمانی‌که باز است یا پس از اینکه از آن خارج شدید (مثلاً برای ادامه تماشای ویدیو)، پنجره تصویر در تصویر ایجاد کند. این پنجره روی سایر برنامه‌هایی که درحال استفاده از آنها هستید نمایش داده می‌شود."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"بله"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"نه"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"دسترسی به «مزاحم نشوید»"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"هیچ برنامه نصب شده‌ای دسترسی به «مزاحم نشوید» را درخواست نکرده است"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"در حال بارگیری برنامه..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"سرپرست زیر این نمایه کاری را مدیریت می‌کند:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"مدیریت شده توسط <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(آزمایشی)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"چرخش دستگاه"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"چرخاندن محتوای صفحه"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"ماندن در نمای عمودی"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ماندن در نمای افقی"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ماندن در جهت کنونی"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"راه‌اندازی امن"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ادامه"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"برای محافظت بیشتر از دستگاه، می‌توانید راه‌اندازی آن را به وارد کردن پین موکول کنید. تا‌ زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس، پیام یا اعلان (ازجمله هشدار) دریافت کند. \n\nاین امر به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. برای راه‌اندازی دستگاهتان وارد کردن پین الزامی است؟"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"برای محافظت بیشتر از دستگاه، می‌توانید راه‌اندازی آن را به وارد کردن گذرواژه‌ موکول کنید. تا‌ زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس، پیام یا اعلان (ازجمله هشدار) دریافت کند. \n\nاین امر به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. برای راه‌اندازی دستگاهتان وارد کردن گذرواژه الزامی است؟"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"علاوه بر استفاده از اثر انگشت برای باز کردن قفل دستگاه، برای محافظت بیشتر می‌توانید راه‌اندازی آن را به وارد کردن پین موکول کنید. تا زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام یا اعلان (ازجمله هشدار) دریافت کند.\n\nاین کار به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. برای راه‌اندازی دستگاهتان وارد کردن پین الزامی است؟"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"علاوه بر استفاده از اثر انگشت برای باز کردن قفل دستگاه، برای محافظت بیشتر می‌توانید راه‌اندازی آن را به وارد کردن الگو موکول کنید. تا زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام یا اعلان (ازجمله هشدار) دریافت کند.\n\nاین کار به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. برای راه‌اندازی دستگاهتان وارد کردن الگو الزامی است؟"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"‏علاوه بر استفاده از اثر انگشت برای باز کردن قفل دستگاه، برای محافظت بیشتر می‌توانید راه‌اندازی آن را به وارد کردن گذرواژه‌ موکول کنید. تا زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام یا اعلان (ازجمله هشدار) دریافت کند.\n\nاین کار به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. برای راه‌اندازی دستگاهتان وارد کردن گذرواژه الزامی است&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"علاوه بر استفاده از اثرانگشت برای باز کردن قفل دستگاه، برای محافظت بیشتر می‌توانید وارد کردن گذرواژه را برای راه‌اندازی آن لازم کنید. تا زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام یا اعلان (ازجمله هشدار) دریافت کند.\n\nاین کار به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. وارد کردن گذرواژه برای راه‌اندازی دستگاهتان الزامی شود؟"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"بله"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"نه"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"پین درخواست شود؟"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"هشدارهای استفاده"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"نمایش اطلاعات کامل درباره مصرف دستگاه"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"نمایش مصرف برنامه"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"مصرف بالا"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> برنامه رفتار غیرعادی دارند</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> برنامه رفتار غیرعادی دارند</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">برنامه‌ها باتری را خالی می‌کنند</item>
+      <item quantity="other">برنامه‌ها باتری را خالی می‌کنند</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"بهینه‌نشده"</string>
     <string name="high_power_on" msgid="6216293998227583810">"بهینه نشده"</string>
     <string name="high_power_off" msgid="3393904131961263278">"بهینه‌سازی مصرف باتری"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"نمایش روی سایر برنامه‌ها"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"برای نمایش روی سایر برنامه‌ها، <xliff:g id="COUNT_0">%1$d</xliff:g> مورد از <xliff:g id="COUNT_1">%2$d</xliff:g> برنامه مجاز شده‌اند"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"برنامه‌های دارای مجوز"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"بله"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"نه"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"مجاز"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"مجاز نیست"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"نصب برنامه‌ از منابع ناشناس"</string>
     <string name="write_settings" msgid="4797457275727195681">"تغییر تنظیمات سیستم"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"نوشتن تغییر تنظیمات سیستم"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"صفحه‌نمایش ته‌رنگ کهربایی به خود می‌گیرد. شاید این رنگ بتواند به شما کمک کند به خواب بروید."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"پیشنهادات"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> مورد دیگر"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <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="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <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="suggestion_remove" msgid="904627293892092439">"حذف"</string>
     <string name="color_temperature" msgid="2070126836910615605">"دمای رنگ سرد"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"استفاده از رنگ‌های سردتر نمایشگر"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> هشدار داده"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> هشدار داده / <xliff:g id="ID_2">%2$s</xliff:g> محدودیت داده"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"چرخه صورت‌حساب"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"چرخه ماهیانه در روز <xliff:g id="ID_1">%1$s</xliff:g> هر ماه شروع می‌شود"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"پرداخت ماهیانه از <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"روز <xliff:g id="ID_1">%1$s</xliff:g> هر ماه"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"محدودیت‌های شبکه"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> محدودیت</item>
@@ -3316,7 +3408,7 @@
       <item quantity="other">هنگام روشن بودن «صرفه‌جویی داده»، <xliff:g id="COUNT">%1$d</xliff:g> برنامه می‌توانند بدون محدودیت از داده‌ها استفاده کند</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"صرفه‌جویی داده"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"دسترسی نامحدود به داده"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"داده بدون محدودیت"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"داده‌های پس‌زمینه خاموش است"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"روشن"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"خاموش"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"کنترل اعلان‌های قفل صفحه"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"نمایش یا پنهان کردن محتوای اعلان"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"همه"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"پشتیبانی"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"‏dp ‏<xliff:g id="ID_1">%d</xliff:g>"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"پشتیبانی و نکته‌ها"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"کوچک‌ترین عرض"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"هیچ برنامه نصب‌شده‌ای دسترسی به «پیامک ویژه» را درخواست نکرده است"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ممکن است استفاده از «پیامک ویژه» برای شما هزینه داشته باشد و مبلغ صورت‌حساب‌های شرکت مخابراتی‌تان را افزایش دهد. اگر مجوز را برای برنامه‌ای فعال کنید، می‌توانید با استفاده از آن برنامه پیامک ویژه ارسال کنید."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"خودکار"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"دستی"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"هم‌اکنون فضا را خالی کنید"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"اشاره‌ها"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"میان‌برهای اشاره"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"اشاره‌های سریع برای کنترل تلفن"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"اشاره‌های سریع برای کنترل رایانه لوحی"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"اشاره‌های سریع برای کنترل دستگاه"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"رفتن به دوربین"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"برای باز کردن سریع دوربین، دکمه روشن/خاموش را دو بار فشار دهید. در همه صفحه‌ها کار می‌کند."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"باز کردن سریع دوربین"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"برای باز کردن دوربین، دکمه روشن/خاموش را دو بار فشار دهید"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"چرخش دوربین"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"سریع‌تر گرفتن خودگرفت"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"برای حالت خودگرفت، تلفن را دو بار بچرخانید"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"برای حالت خودگرفت، رایانه لوحی را دو بار بچرخانید"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"برای حالت خودگرفت، دستگاه را دو بار بچرخانید"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"برای بررسی تلفن، دو ضربه سریع بزنید"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"برای بررسی رایانه لوحی، دو ضربه سریع بزنید"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"برای بررسی دستگاه، دو ضربه سریع بزنید"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"برای بررسی سریع اعلان‌ها، روی صفحه‌نمایش دو ضربه سریع بزنید."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"برای بررسی زمان، نمادهای اعلان و سایر اطلاعات، روی صفحه‌نمایش دو ضربه سریع بزنید."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"وقتی صفحه خاموش است، اعلان‌ها بررسی شوند"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"برای بررسی تلفن، آن را بردارید"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"برای بررسی رایانه لوحی، آن را بردارید"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"برای بررسی دستگاه، آن را بردارید"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"برای بررسی سریع اعلان‌ها، تلفنتان را بردارید."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"برای بررسی سریع اعلان‌ها، رایانه لوحی‌تان را بردارید."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"برای بررسی سریع اعلان‌ها، دستگاهتان را بردارید."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"برای بررسی زمان، نمادهای اعلان و سایر اطلاعات، تلفنتان را بردارید."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"برای بررسی زمان، نمادهای اعلان و سایر اطلاعات، رایانه لوحی‌تان را بردارید."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"برای بررسی زمان، نمادهای اعلان و سایر اطلاعات، دستگاهتان را بردارید."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"وقتی صفحه خاموش است، اعلان‌ها بررسی شوند"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"تند کشیدن اثرانگشت برای اعلان‌ها"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"برای بررسی اعلان‌ها، انگشتتان را روی حسگر اثرانگشت (در پشت تلفن) تند به پایین بکشید."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"برای بررسی اعلان‌ها، انگشتتان را روی حسگر اثرانگشت (در پشت رایانه لوحی) تند به پایین بکشید."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"برای بررسی اعلان‌ها، انگشتتان را روی حسگر اثرانگشت (در پشت دستگاه) تند به پایین بکشید."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"دیدن سریع اعلان‌ها"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"تند کشیدن انگشت به طرف پایین روی حسگر اثر انگشت"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"برای باز کردن دوربین، تلفن را بالا ببرید"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"برای باز شدن خودکار دوربین، تلفنتان را در موقعیت عکس گرفتن (منظره یا پرتره) بالا ببرید. وقتی تلفنتان خواب یا قفل باشد کار می‌کند."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"وقتی تلفن درحالت خواب یا قفل است، عکس بگیرید"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"اشاره دستیار"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"حساسیت"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"می‌خواهید این برنامه فوری را بردارید؟"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"بازی"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"فایل‌های صوتی"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"فضای مورداستفاده"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(برای کاربر <xliff:g id="USER">%s</xliff:g> حذف نصب شد)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(برای کاربر <xliff:g id="USER">%s</xliff:g> غیرفعال شد)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"سرویس تکمیل خودکار"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"برنامه فوری"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"مدیر فضای ذخیره‌سازی خاموش شود؟"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"فیلم و برنامه‌های تلویزیونی"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"فضای مورداستفاده"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"اطلاعات ارائه شرکت مخابراتی"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"شروع ارائه شرکت مخابراتی"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"چه مواردی جدید و هیجان انگیز هستند؟"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"بررسی ۵ قابلیت برتر"</string>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 88cea35..7ce271b 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Hyvä"</item>
     <item msgid="8986346415847956850">"Erinomainen"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Aina"</item>
-    <item msgid="844721238536786870">"Vain, kun laturi on kytketty"</item>
-    <item msgid="1986753720941888596">"Ei koskaan"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Aina"</item>
-    <item msgid="7433294150916905997">"Vain, kun laturi on kytketty"</item>
-    <item msgid="1390404486722375028">"Ei koskaan"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 viime päivää"</item>
     <item msgid="6600989128423965319">"Aseta käyttöjakso…"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 9e0f5f0..6402294 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Olet nyt kehittäjä!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Ei tarvitse klikata, olet jo kehittäjä."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Ota kehittäjäasetukset ensin käyttöön."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Langaton verkko ja verkot"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Yhteydet"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Laite"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTEn hallinnoima"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videopuhelukäyttäjiä hallitaan"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi-puhelukäyttäjiä hallitaan"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/läsnäolo hallinnoitu"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Mobiiliradion voimakkuus"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Näytä SIM-kortin osoitekirja"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Näytä sallitut numerot"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Etsi laitteita"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Nimeä tämä laite uudelleen"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Nimeä uudelleen"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Katkaistaanko yhteys?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Katkaisee yhteyden laitteeseen:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Katkaistaanko laitteen yhteys?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ei ole enää yhteydessä puhelimeen."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ei ole enää yhteydessä tablettiin."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ei ole enää yhteydessä laitteeseen."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Katkaise"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Sinulla ei ole lupaa muuttaa Bluetooth-asetuksia."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Muodosta laitepari uuden laitteen kanssa"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> näkyy lähellä olevissa laitteissa, kun Bluetooth-asetukset on auki."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Puhelimen Bluetooth-osoite: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Tabletin Bluetooth-osoite: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Laitteen Bluetooth-osoite: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Katkaistaanko yhteys laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Lähetys"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Poistetaanko profiili?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth-laiteparipyyntö"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Laiteparinmuodostuspyyntö"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Muodosta laitepari laitteen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kanssa koskettamalla."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Näytä vastaanotetut tiedostot"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Vastaanotetut tiedostot"</string>
     <string name="device_picker" msgid="4978696506172252813">"Valitse Bluetooth-laite"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> haluaa ottaa Bluetoothin käyttöön."</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> haluaa poistaa Bluetoothin käytöstä."</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s haluaa käyttää viestejäsi. Myönnetäänkö käyttöoikeus kohteeseen %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM-kortin käyttöoikeuspyyntö"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> haluaa käyttää SIM-korttiasi. SIM-kortin käyttöoikeuden myöntäminen poistaa laitteesi datayhteyden käytöstä yhteyden ajaksi. Myönnä käyttöoikeus laitteelle <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>?"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Muille laitteille näkyvä nimi: <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Omat laitteet"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Muodosta laitepari uuden laitteen kanssa"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Päivämäärä ja aika"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Valitse aikavyöhyke"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Tilit"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Sijainti"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Tilit"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Suojaus ja sijainti"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Suojaus ja sijainti"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Salaus ja kirjautumistiedot"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Puhelimen tiedot on salattu."</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Laite salattu"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Avaa sormenjäljellä"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Sormenjäljen käyttäminen"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Avaa puhelimen lukitus, hyväksy ostoksia tai kirjaudu sovelluksiin koskettamalla sormenjälkitunnistinta. Ole varovainen lisätessäsi sormenjälkiä – edellä mainitut toiminnot onnistuvat vain yhdellä laitteeseen lisätyllä 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_message_unlock_disabled" msgid="4193477159493347679">"Hyväksy ostoksia tai kirjaudu sovelluksiin koskettamalla sormenjälkianturia. Ole varovainen lisätessäsi sormenjälkiä – edellä mainitut toiminnot onnistuvat kaikilla laitteeseen lisätyillä sormenjäljillä.\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="3635924459027832861">"Avaa puhelimen lukitus, hyväksy ostoksia tai kirjaudu sovelluksiin koskettamalla sormenjälkitunnistinta. Ole varovainen lisätessäsi sormenjälkiä – nämä toiminnot onnistuvat vain yhdellä laitteeseen lisätyllä 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_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Peruuta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Jatka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Ohita"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Lisää sormenjälki"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää tablettisi käyttöä, jos se varastetaan, katoaa tai sen tiedot tyhjennetään."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää laitteesi käyttöä, jos se varastetaan, katoaa tai sen tiedot tyhjennetään."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää puhelimesi käyttöä, jos se varastetaan, katoaa tai sen tiedot tyhjennetään."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää tablettisi käyttöä, jos se varastetaan tai katoaa."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää laitteesi käyttöä, jos se varastetaan tai katoaa."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää puhelimesi käyttöä, jos se varastetaan tai katoaa."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Seuraava"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää tabletin käyttöä, jos se varastetaan, katoaa tai sen tiedot pyyhitään."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää laitteen käyttöä, jos se varastetaan, katoaa tai sen tiedot pyyhitään."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää puhelimen käyttöä, jos se varastetaan, katoaa tai sen tiedot pyyhitään."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää tabletin käyttöä, jos se varastetaan tai katoaa."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää laitteesi käyttöä, jos se varastetaan tai katoaa."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Laitteen suojausominaisuuksia ei oteta käyttöön. Et voi estää puhelimen käyttöä, jos se varastetaan tai katoaa."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ohita silti"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Takaisin"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Etsi anturi"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Etsi sormenjälkianturi puhelimen takapuolelta."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Kosketa tunnistinta"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Se on puhelimen takaosassa. Käytä etusormea."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Laitteen ja sormenjälkianturin sijainnin kuva."</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nimi"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Ok"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Poista"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Aloitetaan"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Kosketa tunnistinta"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Aseta sormesi tunnistimelle ja nosta se, kun tunnet värähdyksen."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Jatka koskettamista"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Lisää sormenjälkesi kokonaisuudessaan liikuttamalla sormeasi varovasti."</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Sormenjälki lisättiin!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kun tämä kuvake on näkyvissä, voit tunnistautua tai vahvistaa ostoksen sormenjälkesi avulla."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Voit avata laitteesi lukituksen koskettamalla sormenjälkianturia."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Kun näet tämän kuvakkeen, voit myös hyväksyä ostoksia ja kirjautua sovelluksiin."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Nosta sormi ja kosketa taas"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Kosketa tunnistinta toistuvasti, niin sormenjäljen eri osat lisätään."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Sormenjälki lisätty"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Kun tämä kuvake on näkyvissä, voit tunnistautua tai vahvistaa ostoksen sormenjäljellä."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ohitetaanko sormenjäljen määritys?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Olet valinnut sormenjäljen yhdeksi tavaksi avata puhelimesi lukitus. Jos ohitat tämän nyt, sinun on määritettävä se myöhemmin. Määritys kestää vain noin minuutin."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ota näytön lukitus käyttöön"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Valmis"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hups, anturi ei ole siinä."</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Käytä laitteen sormenjälkianturia."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Kosketa puhelimen takaosan tunnistinta etusormella."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Rekisteröitymistä ei suoritettu loppuun."</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Sormenjäljen rekisteröinnin aikaraja on saavutettu. Yritä uudelleen."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Sormenjäljen rekisteröinti ei onnistunut. Yritä uudelleen tai käytä eri sormea."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Estä laitteesi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Estä puhelimesi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Valitse toissijainen näytönlukitusmenetelmä"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Näytön lukitusvaihtoehdot"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Näytön lukitusvaihtoehdot"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Näytön lukitus"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / välittömästi virransäästötilaan siirtymisen jälkeen"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> virransäästötilaan siirtymisen jälkeen"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Vaihda lukituksenpoistokuvio"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Muuta lukituksen poistoon tarvittava PIN-koodi"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Vaihda lukituksen poiston salasana"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Yritä uudelleen. Yritys <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>/<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Viimeinen yritys"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Jos annat väärän työprofiilin kuvion tällä yrityskerralla, työprofiilisi ja siihen liittyvät tiedot poistetaan tältä laitteelta."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Jos annat väärän työprofiilin PIN-koodin tällä yrityskerralla, työprofiilisi ja siihen liittyvät tiedot poistetaan tältä laitteelta."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Jos annat väärän työprofiilin salasanan tällä yrityskerralla, työprofiilisi ja siihen liittyvät tiedot poistetaan tältä laitteelta."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Liian monta virheellistä yritystä. Työprofiilisi ja siihen liittyvät tiedot poistetaan tältä laitteelta."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Hylkää"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Yritä uudelleen. Yritys <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>/<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Tietosi poistetaan"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Jos annat väärän kuvion seuraavalla yrityskerralla, laitteen tiedot poistetaan."</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Jos annat väärän PIN-koodin seuraavalla yrityskerralla, laitteen tiedot poistetaan."</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Jos annat väärän salasanan seuraavalla yrityskerralla, laitteen tiedot poistetaan."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Jos annat väärän kuvion seuraavalla yrityskerralla, tämä käyttäjä poistetaan."</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Jos annat väärän PIN-koodin seuraavalla yrityskerralla, tämä käyttäjä poistetaan."</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Jos annat väärän salasanan seuraavalla yrityskerralla, tämä käyttäjä poistetaan."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Jos annat väärän kuvion seuraavalla yrityskerralla, työprofiilisi ja sen tiedot poistetaan."</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Jos annat väärän PIN-koodin seuraavalla yrityskerralla, työprofiilisi ja sen tiedot poistetaan."</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Jos annat väärän salasanan seuraavalla yrityskerralla, työprofiilisi ja sen tiedot poistetaan."</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Liian monta virheellistä yritystä. Laitteen tiedot poistetaan."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Liian monta virheellistä yritystä. Tämä käyttäjä poistetaan."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Liian monta virheellistä yritystä. Tämä työprofiili ja sen tiedot poistetaan."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Hylkää"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Salasanan vähimmäispituus on <xliff:g id="COUNT">%d</xliff:g> merkkiä."</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN-koodin vähimmäispituus on <xliff:g id="COUNT">%d</xliff:g> merkkiä."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Jatka"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth-lisäasetukset"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kun Bluetooth on käytössä, laite voi viestiä lähiympäristön Bluetooth-laitteiden kanssa."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Parantaakseen sijainnin tarkkuutta järjestelmäsovellukset ja -palvelut voivat edelleen havaita Bluetooth-laitteita. Voit muuttaa tätä <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>etsintäasetuksissa<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Yhteyttä ei voi muodostaa. Yritä uudelleen."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Laitteen tiedot"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Laitteen Bluetooth-osoite: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Unohdetaanko laite?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ei ole enää puhelimen pari."</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ei ole enää tabletin pari."</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ei ole enää laitteen pari."</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Unohda laite"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Yhdistä profiiliin..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> irrotetaan median äänentoistosta."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> irrotetaan handsfree-äänentoistosta."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Älä anna"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Älä vahvista"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Ei määritettyä varmennetta. Yhteytesi ei ole yksityinen."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Verkon nimi on liian pitkä."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Määritä verkkotunnus."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS käytettävissä"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS käytettävissä)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 verkko</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi-lisäasetukset"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Määritä Wi‑Fi-asetukset"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-osoite"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-osoite"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Aliverkon peite"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Unohdetaanko tämä ryhmä?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Kannettava Wi-Fi-hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi-hotspot"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Käytä Wi‑Fi-verkkoa mobiiliyhteyden kautta"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Tabletin internetyhteyttä ei jaeta hotspotin kautta"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Puhelimen internetyhteyttä ei jaeta hotspotin kautta"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Internetyhteyttä tai sisältöä ei jaeta muiden laitteiden kanssa."</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Tabletin internetyhteys jaetaan hotspotin kautta."</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Puhelimen internetyhteys jaetaan hotspotin kautta."</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Sovellus jakaa sisältöä. Jos haluat jakaa internetyhteyden, sammuta hotspot ja käynnistä se uudelleen."</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi-Fi-verkon nimi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Käynnistetään <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> on muiden laitteiden käytettävissä."</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-verkon salasana"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-taajuus"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Hotspot-ominaisuudella voit luoda muille laitteillesi Wi-Fi-verkon. Ominaisuus jakaa internetyhteyden muille laitteille mobiilidatayhteydellä. Lisämaksuja mobiilidatan käytöstä voidaan periä."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Sovellukset voivat luoda hotspotin ja jakaa sisältöä lähellä olevien laitteiden kanssa."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Otetaan yhteyspiste käyttöön..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Poistetaan yhteyspiste käytöstä..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> on aktiivinen"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Kun Wi-Fi-puhelut on käytössä, puhelimesi voi ohjata puhelut Wi-Fi-verkkojen tai operaattorisi verkon kautta, riippuen asetuksistasi ja siitä, kummassa on voimakkaampi signaali. Ennen kuin otat tämän ominaisuuden käyttöön, tarkista maksut ja muut tiedot operaattoriltasi."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Päivitä hätäosoite"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Osoite, jota hätäpalvelut käyttävät sijaintinasi, jos soitat hätäpuhelun Wi-Fillä"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Näyttö"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Ei tuloksia"</string>
     <string name="display_settings" msgid="7965901687241669598">"Näyttö"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Näytön automaattinen kierto"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Kirkkaat värit"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Vaihda suuntaa automaattisesti, kun tablet-laitetta kierretään"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Vaihda suuntaa automaattisesti, kun puhelinta käännetään"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Vaihda suuntaa automaattisesti, kun tablet-laitetta kierretään"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimoi kirkkaus ympäristön valoisuuden mukaan. Voit yhä säätää kirkkautta väliaikaisesti itse."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Yövalo"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Yövalo tekee näytöstä keltasävyisen. Sen avulla näytön katselu heikossa valossa on helpompaa ja saatat nukahtaa helpommin."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Aikataulu"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Tila"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Ota käyttöön automaattisesti"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Ei koskaan"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Muokattu aikataulu"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Auringonlaskusta sen nousuun"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Aikataulu"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ei mitään"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Käynnistyy valitsemaasi aikaan"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Auringonlaskusta sen nousuun"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Alkamisaika"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Päättymisaika"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Tila"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Voimakkuus"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Pois päältä: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Älä koskaan käynnistä automaattisesti"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Käynnistä automaattisesti kello <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Käynnistä automaattisesti, kun aurinko laskee"</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Päällä: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Älä koskaan sammuta automaattisesti"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Sammuta automaattisesti kello <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Sammuta automaattisesti, kun aurinko nousee"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Pois päältä / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Ei käynnisty automaattisesti"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Käynnistyy automaattisesti kello <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Käynnistyy automaattisesti, kun aurinko laskee"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Päällä / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Ei sammu automaattisesti"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Sammuu automaattisesti kello <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Sammuu automaattisesti, kun aurinko nousee"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Siirtyminen virransäästöön"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Näyttö sammuu"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Laitteen oltua käyttämättä: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Asetukset"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaattinen kirkkaus"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Herätä nostamalla"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Ambient-näyttö"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Himmennetty näyttö"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Aina käytössä"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Uudet ilmoitukset"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Näyttämisaika"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Uudet ilmoitukset"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktivoi näyttö, kun saat ilmoituksia."</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Aina käytössä"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Näytä aika, ilmoitukset, kuvakkeet ja muut tiedot."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Kirjasimen koko"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Suurenna tai pienennä tekstiä."</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kortin lukitusasetukset"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN ei voi olla tyhjä."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC-kentän arvon on oltava 3 numeroa."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC-kentän arvon on oltava 2 tai 3 numeroa."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operaattori ei salli %s-tyyppisten APN:ien lisäämistä."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Palautetaan APN-oletusasetuksia"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Palauta oletukset"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN-oletusasetukset on palautettu."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Tyhjennä SD-kortti"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Poista kaikki sisäisen USB-tallennustilan tiedot, kuten musiikki tai valokuvat."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Poista kaikki SD-kortin tiedot, kuten musiikki tai valokuvat."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Tyhjennä eSIMit"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Tyhjennä kaikki puhelimen eSIMit. Tämä ei peruuta mobiilipalvelupakettiasi."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Tyhjennä kaikki tabletin eSIMit. Tämä ei peruuta mobiilipalvelupakettiasi."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Palauta tablet-laitteen tehdasasetukset"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Nollaa puhelimen asetukset"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Haluatko poistaa kaikki henkilökohtaiset tietosi ja lataamasi sovellukset? Toimintoa ei voi peruuttaa."</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Kun Data Saver on käytössä, puhelinta ei voi käyttää modeemina eikä kannettavien hotspotien käyttäminen onnistu."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Internetin jakaminen USB:n kautta"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB yhdistetty, jaa internetyhteys valitsemalla tämä"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Internetyhteys jaettu"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Internetyhteyttä ei voi jakaa USB-tallennustilan ollessa käytössä."</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB ei yhdistetty"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Liitä USB"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Virhe internetyhteyden jakamisessa USB:n kautta"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Jaa puhelimen internetyhteys USB:llä"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Jaa tabletin internetyhteys USB:llä"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Jaettu Bluetooth-yhteys"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Tabletin internetyhteys jaetaan Bluetoothilla"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Puhelimen internetyhteys jaetaan Bluetoothilla"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Tabletin internetyhteys jaettu 1 laitteelle Bluetoothilla"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Puhelimen internetyhteys jaettu 1 laitteelle Bluetoothilla"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Tabletin internetyhteys jaettu <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> laitteelle Bluetoothilla"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Puhelimen internetyhteys jaettu <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> laitteelle Bluetoothilla"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Jaa tabletin internetyhteys Bluetoothilla"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Jaa puhelimen internetyhteys Bluetoothilla"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Laitteen <xliff:g id="DEVICE_NAME">%1$d</xliff:g> internetyhteys jaetaan Bluetoothilla"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Tabletin internetyhteyttä ei jaeta Bluetoothilla"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Puhelimen internetyhteyttä ei jaeta Bluetoothilla"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Ei kytketty"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Voidaan yhdistää korkeintaan <xliff:g id="MAXCONNECTION">%1$d</xliff:g> laitteeseen."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Jaettu internetyhteys katkaistaan laitteesta <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Hotspot- ja yhteyden jako ‑ominaisuuksien avulla voit jakaa internetyhteyden muille laitteille mobiilidatayhteydellä."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Hotspot- ja yhteyden jako ‑ominaisuuksien avulla voit jakaa internetyhteyden muille laitteille mobiilidatayhteydellä. Sovellukset voivat myös luoda hotspotin ja jakaa sisältöä lähellä olevien laitteiden kanssa."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ohjeet"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobiiliverkko"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiilisopimus"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Paikannustila"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Paikanna GPS:llä sekä Wi-Fi-, Bluetooth- ja mobiiliverkoilla."</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Paikanna Wi-Fi-, Bluetooth- ja mobiiliverkoilla."</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Paikanna sijaintisi GPS:n avulla"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Käytä GPS:ää ja laitteen antureita sijainnin määrittämiseen."</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Analysoidaan"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi-haku"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Paranna sijaintipalveluita antamalla järjestelmäsovellusten ja -palveluiden havaita Wi-Fi-verkkoja milloin tahansa."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Laite ei ole yhteydessä verkkoon. Voit tarkastella näitä tietoja osoitteessa %s tietokoneella, jolla on internetyhteys."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Ladataan…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Valitse salasana"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Sormenjälki: aseta salasana"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Valitse kuvio"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Sormenjälki: aseta kuvio"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Valitse PIN-koodi"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Sormenjälki: aseta PIN-koodi"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Vahvista salasana"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Vahvista kuvio"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Vahvista PIN-koodi"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Sovellusasetukset"</string>
     <string name="install_applications" msgid="4872012136210802181">"Tuntemattomat lähteet"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Salli kaikki lähteet"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Viimeksi avatut sovellukset"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Näytä kaikki <xliff:g id="COUNT">%1$d</xliff:g> sovellusta"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> sitten"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tuntemattomista lähteistä tulevat sovellukset voivat helpommin kaapata tablettisi ja henkilötietosi. Lataamalla sovelluksia tästä lähteestä hyväksyt, että olet itse vastuussa tabletillesi aiheutuvista vahingoista tai tietojen katoamisesta, joka saattaa johtua sovellusten käytöstä."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Tuntemattomista lähteistä tulevat sovellukset voivat helpommin kaapata puhelimesi ja henkilötietosi. Lataamalla sovelluksia tästä lähteestä hyväksyt, että olet itse vastuussa puhelimellesi aiheutuvista vahingoista tai tietojen katoamisesta, joka saattaa johtua sovellusten käytöstä."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Lisäasetukset"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Pysäytetäänkö järjestelmäpalvelu?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Jos pysäytät palvelun, jotkut tablet-laitteen toiminnot eivät välttämättä enää toimi oikein, ennen kuin sammutat laitteen ja käynnistät sen uudelleen."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Jos pysäytät palvelun, jotkut puhelimen toiminnot eivät välttämättä enää toimi oikein, kunnes sammutat laitteen ja käynnistät sen uudelleen."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Kielet, syöttötavat ja eleet"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Kielet ja syöttötapa"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Kielet ja syöttötapa"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Syöttöapu"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tulostuspalvelua käytössä</item>
       <item quantity="one">1 tulostuspalvelu käytössä</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tulostustyötä</item>
+      <item quantity="one">1 tulostustyö</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Tulostuspalvelut"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Ei asennettuja palveluita"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Tulostimia ei löydy"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Käyttötiedot"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Säädä virrankäyttöä"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Sisältyvät paketit"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Akkua kuluttavat sovellukset"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Pitää näytön päällä"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Käynnistää näytön taustalla"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Pyytää sijaintitietoja usein"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> sovellusta ei toimi oikein"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Lopetetaanko sovellus?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Puhelin ei voi hallita akunkäyttöä normaalisti, koska <xliff:g id="APP">%1$s</xliff:g> pitää näyttöä aktivoituna.\n\nOngelman korjaamiseksi voit pakottaa sovelluksen lopetuksen.\n\nJos tämä tapahtuu toistuvasti, akun optimointi voi edellyttää sovelluksen poistamista."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Tabletti ei voi hallita akunkäyttöä normaalisti, koska <xliff:g id="APP">%1$s</xliff:g> pitää näyttöä aktivoituna.\n\nOngelman korjaamiseksi voit pakottaa sovelluksen lopetuksen.\n\nJos tämä tapahtuu toistuvasti, akun optimointi voi edellyttää sovelluksen poistamista."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Laite ei voi hallita akunkäyttöä normaalisti, koska <xliff:g id="APP">%1$s</xliff:g> pitää näyttöä aktivoituna.\n\nOngelman korjaamiseksi voit pakottaa sovelluksen lopetuksen.\n\nJos tämä tapahtuu toistuvasti, akun optimointi voi edellyttää sovelluksen poistamista."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Lopeta sovellus"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Estetäänkö taustalla toimiminen?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Puhelin ei voi hallita akunkäyttöä normaalisti, koska <xliff:g id="APP">%1$s</xliff:g> aktivoi näyttöä toistuvasti.\n\nOngelman korjaamiseksi puhelin voi estää sovellusta toimimasta taustalla."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Tabletti ei voi hallita akunkäyttöä normaalisti, koska <xliff:g id="APP">%1$s</xliff:g> aktivoi näyttöä toistuvasti.\n\nOngelman korjaamiseksi tabletti voi estää sovellusta toimimasta taustalla."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Laite ei voi hallita akunkäyttöä normaalisti, koska <xliff:g id="APP">%1$s</xliff:g> aktivoi näyttöä toistuvasti.\n\nOngelman korjaamiseksi laite voi estää sovellusta toimimasta taustalla."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Poista käytöstä"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Poistetaanko sijainti käytöstä?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Puhelin ei voi hallita akunkäyttöä normaalisti, koska <xliff:g id="APP">%1$s</xliff:g> pyytää sijaintitietoja toistuvasti, vaikka et käytä sitä.\n\nOngelman korjaamiseksi voit poistaa sijainnin sovelluksen käytöstä."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Tabletti ei voi hallita akunkäyttöä normaalisti, koska <xliff:g id="APP">%1$s</xliff:g> pyytää sijaintitietoja toistuvasti, vaikka et käytä sitä.\n\nOngelman korjaamiseksi voit poistaa sijainnin sovelluksen käytöstä."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Laite ei voi hallita akunkäyttöä normaalisti, koska <xliff:g id="APP">%1$s</xliff:g> pyytää sijaintitietoja toistuvasti, vaikka et käytä sitä.\n\nOngelman korjaamiseksi voit poistaa sijainnin sovelluksen käytöstä."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Poista käytöstä"</string>
     <string name="power_screen" msgid="3023346080675904613">"Näyttö"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Taskulamppu"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Sovellukset"</string>
     <string name="power_service" msgid="1599661212370831780">"Palvelut"</string>
     <string name="power_system" msgid="8290455327965307383">"Järjestelmä"</string>
-    <string name="power_user" msgid="1889728099253018005">"Käyttäjä"</string>
+    <string name="power_user" msgid="3706143225319881667">"Muut käyttäjät"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Suorittimen käyttöaika yhteensä"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Suorittimen käyttö etualalla"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ei virransäästötilaa"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Yliarvioitu virrankulutus"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Käyttöaika: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktiivinen <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Näytön käyttö <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> on käyttänyt <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> kaikesta virrankulutuksesta"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Vaihda PIN-koodi"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Näytä ilmoitukset"</string>
     <string name="help_label" msgid="6886837949306318591">"Ohjeet ja palaute"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Ohjeartikkelit, puhelin- ja chat-tuki"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Ohjeartikkelit, puhelin ja chat, aloitus"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Käytettävä tili"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Kuvatunnus"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Erittäin vakavat uhat"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Näytä %d piilotettu kohde</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Verkko ja internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobiiliyhteys, datan käyttö, hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobiili"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datan käyttö"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Yhdistetyt laitteet"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, suoratoisto, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Sovellukset ja ilmoitukset"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Käyttöoikeudet, oletussovellukset"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Käyttäjät ja tilit"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"eleet"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"maksa, napauta, maksut"</string>
     <string name="keywords_backup" msgid="470070289135403022">"varmuuskopiointi, varmuuskopio"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"ele, edge, sivu, active edge, puristus, ote, apu, assistant, squeezy, squeezie, squeezey, squeezee, ok google, google assistant"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"ele, aktivoi, ilmoitukset, näyttö, ruutu, näyttö poissa, näyttö päällä, puristus, edge, lepotila, levossa, ote"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"ele, hiljennä, torkku, herätys, saapuva puhelu, äänetön, näyttö, lukitusnäyttö, puristus, ote, edge, lopeta"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Määritä Wi-Fi ja NFC-tagi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Kirjoita"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Kirjoita napauttamalla tagia…"</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Älä näytä mitään työilmoituksia"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Miten haluat profiilin ilmoitusten näkyvän, kun laite on lukittu?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profiilin ilmoitukset"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Ilmoitukset"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Ilmoitukset"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Sovellusilmoitukset"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Ilmoituksen luokka"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Tärkeys"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Anna sovelluksen päättää"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Kiireellinen"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Salli ääni"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Ilmoitus ei tule aktiiviselle näytölle eikä salli ääniä tai värinää."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Ei kovin tärkeä"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Melko tärkeä"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Hyvin tärkeä"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Kiireellinen"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Ilmoitusapuri"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Pääsy ilmoituksiin"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Työprofiilin ilmoitusten käyttö on estetty."</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Kuva kuvassa"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Salli kuva kuvassa"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Anna sovellukselle lupa luoda kuva kuvassa ‑ikkuna, kun se on auki tai siirryt siitä muualle (esimerkiksi palaat videoon). Tämä ikkuna näytetään muiden sovellusten ikkunoiden päällä."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Kyllä"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Ei"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Älä häiritse -käyttöoikeudet"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Yksikään asennettu sovellus ei ole pyytänyt Älä häiritse -tilan käyttöoikeutta."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ladataan sovelluksia…"</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Tätä työprofiilia hallinnoi"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Hallinnoija: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Kokeellinen)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Laitteen kierto"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Kierrä näytön sisältö"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Säilytä pystynäkymä"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Säilytä vaakanäkymä"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Säilytä nykyinen suunta"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Turvallinen käynnistys"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Jatka"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Voit parantaa laitteen suojausta vaatimalla PIN-koodin antamista laitteen käynnistyksen yhteydessä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluja, viestejä tai herätyksiä ja muita ilmoituksia. \n\nTämä auttaa suojaamaan laitteen tietoja, jos laite katoaa tai varastetaan. Vaaditaanko PIN-koodin antamista laitteen käynnistyksen yhteydessä?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Voit parantaa laitteen suojausta vaatimalla salasanan antamista laitteen käynnistyksen yhteydessä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluja, viestejä tai herätyksiä ja muita ilmoituksia.\n\nTämä auttaa suojaamaan laitteella olevia tietoja, jos laite katoaa tai varastetaan. Vaaditaanko salasanan antamista laitteen käynnistyksen yhteydessä?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Sen lisäksi, että käytät lukituksen avaamiseen sormenjälkeäsi, voit parantaa laitteen suojausta vaatimalla PIN-koodin antamista laitteen käynnistyksen yhteydessä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluja, viestejä tai herätyksiä ja muita ilmoituksia.\n\nTämä auttaa suojaamaan laitteella olevia tietoja, jos laite katoaa tai varastetaan. Vaaditaanko PIN-koodin antamista laitteen käynnistyksen yhteydessä?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Sen lisäksi, että käytät lukituksen avaamiseen sormenjälkeäsi, voit parantaa laitteen suojausta vaatimalla kuvion antamista laitteen käynnistyksen yhteydessä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluja, viestejä tai herätyksiä ja muita ilmoituksia.\n\nTämä auttaa suojaamaan laitteella olevia tietoja, jos laite katoaa tai varastetaan. Vaaditaanko kuvion antamista laitteen käynnistyksen yhteydessä?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Sen lisäksi, että käytät lukituksen avaamiseen sormenjälkeäsi, voit parantaa laitteen suojausta vaatimalla salasanan antamista laitteen käynnistyksen yhteydessä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluja, viestejä tai herätyksiä ja muita ilmoituksia.\n\nTämä auttaa suojaamaan laitteella olevia tietoja, jos laite katoaa tai varastetaan. Vaaditaanko salasanan antamista laitteen käynnistyksen yhteydessä?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Sormenjäljellä avaamisen lisäksi voit parantaa laitteen suojausta entisestään pyytämällä salasanaa ennen käynnistymistä. Laite ei vastaanota puheluita, viestejä tai ilmoituksia, esimerkiksi herätyksiä, ennen kuin se on käynnistynyt.\n\nTämä auttaa suojaamaan kadonneen tai varastetun laitteen tietoja. Otetaanko salasanan pyytäminen käynnistettäessä käyttöön?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Kyllä"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ei"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Vaaditaanko PIN-koodi?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Käyttöilmoitukset"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Näytä kaikki laitteen käyttö"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Näytä sovelluksen käyttö"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Suuri virrankulutus"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> sovellusta toimii epätavallisesti.</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> toimii epätavallisesti.</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Sovellukset kuluttavat akkua</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> kuluttaa akkua</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Ei optimointia"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Ei optimointia"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Akun käyttöä optimoidaan."</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Sovellusten päällä näkyminen"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g> sovellusta saa näkyä muiden sovellusten päällä."</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Sovellukset, joilla on käyttöoikeus"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Kyllä"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Ei"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Sallittu"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Ei sallittu"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"sovellusten asentaminen tuntemattomista lähteistä"</string>
     <string name="write_settings" msgid="4797457275727195681">"Muokkaa järjestelmäasetuksia"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"kirjoita muokkaa järjestelmäasetukset"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Näyttö on keltasävyinen. Tämä voi auttaa sinua nukahtamaan."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Ehdotukset"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> muuta"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ehdotusta</item>
+      <item quantity="one">1 ehdotus</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> ehdotusta</item>
+      <item quantity="one">+1 ehdotus</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Poista"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Viileä värilämpötila"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Käytä viileämpiä värilämpötiloja"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Datavaroitus <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Datavaroitus <xliff:g id="ID_1">%1$s</xliff:g> / Datankäyttöraja <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Laskutusjakso"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Kuukauden jakso alkaa joka kuukauden <xliff:g id="ID_1">%1$s</xliff:g>. päivänä."</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Kuukausi, alkaa päivänä <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Joka kuukauden <xliff:g id="ID_1">%1$s</xliff:g>. päivä"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Verkkorajoitukset"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> rajoitusta</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 sovellus saa käyttää rajattomasti dataa, kun Data Saver on käytössä.</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Data Saver"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Rajoittamaton data sallittu"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Rajoittamaton data"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Taustatiedonsiirto ei käytössä"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Käytössä"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Pois käytöstä"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Hallinnoi lukitusnäytön ilmoituksia"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Näytä tai piilota ilmoituksien sisältö."</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Kaikki"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Tuki"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Tuki ja vinkit"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Pienin leveys"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Yksikään asennettu sovellus ei ole pyytänyt premium-tekstiviestien käyttöoikeutta."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium-tekstiviestien käyttö saattaa olla maksullista, ja kulut lisätään operaattorisi laskuun. Jos annat sovellukselle käyttöoikeuden, voit lähettää premium-tekstiviestejä kyseisellä sovelluksella."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automaattinen"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuaalinen"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Vapauta tilaa"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Eleet"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Pikakäyttöliikkeet"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Puhelin ohjaamisen pikaeleet"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Tabletin ohjaamisen pikaeleet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Laitten ohjaamisen pikaeleet"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kameraan siirtyminen"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Avaa kamera nopeasti painamalla virtapainiketta kahdesti. Tämä toimii miltä tahansa näytöltä."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Avaa kamera nopeasti"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Paina virtapainiketta kahdesti, niin kamera avataan."</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kameran vaihtaminen"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Ota selfieitä nopeasti"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Käännä puhelinta kahdesti, niin selfie-tila käynnistyy."</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Käännä tablettia kahdesti, niin selfie-tila käynnistyy."</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Käännä laitetta kahdesti, niin selfie-tila käynnistyy."</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tarkista ilmoitukset kaksoisnapauttamalla puhelimen näyttöä"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tarkista ilmoitukset kaksoisnapauttamalla tabletin näyttöä"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tarkista ilmoitukset kaksoisnapauttamalla laitteen näyttöä"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Tarkista ilmoitukset nopeasti kaksoisnapauttamalla näyttöä."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Kaksoisnapauta näyttöä, niin näet ajan, ilmoituskuvakkeet ja muita tietoja."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Näytä ilmoitukset, vaikka näyttö on pois päältä."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Tarkista ilmoitukset nostamalla puhelimesi"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tarkista ilmoitukset nostamalla tablettisi"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Tarkista ilmoitukset nostamalla laitteesi"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Tarkista ilmoitukset nopeasti ottamalla puhelin käteesi."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Tarkista ilmoitukset nopeasti ottamalla tabletti käteesi."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Tarkista ilmoitukset nopeasti ottamalla laite käteesi."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Ota puhelin käteesi, niin näet ajan, ilmoituskuvakkeet ja muita tietoja."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ota tabletti käteesi, niin näet ajan, ilmoituskuvakkeet ja muita tietoja."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ota laite käteesi, niin näet ajan, ilmoituskuvakkeet ja muita tietoja."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Näytä ilmoitukset, vaikka näyttö on pois päältä."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Näytä ilmoitukset pyyhkäisemällä sormenjälkitunnistinta"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Voit katsoa ilmoitukset pyyhkäisemällä puhelimen takaosassa olevasta sormenjälkitunnistimesta alaspäin."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Voit katsoa ilmoitukset pyyhkäisemällä tabletin takaosassa olevasta sormenjälkitunnistimesta alaspäin."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Voit katsoa ilmoitukset pyyhkäisemällä laitteen takaosassa olevasta sormenjälkitunnistimesta alaspäin."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Katso ilmoitukset nopeasti"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Pyyhkäise alas sormenjälkitunnistimesta."</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Avaa kamera nostamalla"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Avaa kamera automaattisesti nostamalla puhelin kuvanottoasentoon (vaaka- tai pystysuunnassa). Tämä toimii, kun puhelin on lepotilassa tai lukittu."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Ota kuvia, kun puhelin on lepotilassa tai lukittu."</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Apuele"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Herkkyys"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Poistetaanko tämä pikasovellus?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Pelit"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Äänitiedostot"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Käytetty tila"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(poistettu käyttäjältä <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(poistettu käytöstä: <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Automaattinen täyttö ‑palvelu"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Pikasovellus"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Poistetaanko tallennustilan hallinta käytöstä?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Elokuva- ja TV-sovellukset"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Käytetty tila"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Operaattorin hallintatiedot"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Ota operaattorin hallinta käyttöön"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Uutuuksia"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Katso viisi kätevää ominaisuutta"</string>
 </resources>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index 6a85506..c58e1f7 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Bonne"</item>
     <item msgid="8986346415847956850">"Excellente"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Toujours"</item>
-    <item msgid="844721238536786870">"Uniquement si l\'appareil ebranché"</item>
-    <item msgid="1986753720941888596">"Jamais"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Toujours"</item>
-    <item msgid="7433294150916905997">"Uniquement si l\'appareil ebranché"</item>
-    <item msgid="1390404486722375028">"Jamais"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 derniers jours"</item>
     <item msgid="6600989128423965319">"Défin. du cycle d\'util..."</item>
@@ -426,12 +416,12 @@
     <item msgid="7169235156349580064">"Personnalisé"</item>
   </string-array>
   <string-array name="vpn_types_long">
-    <item msgid="2732002039459078847">"VPN PPTP"</item>
-    <item msgid="3799752201662127867">"VPN L2TP/IPSec avec clés pré-partagées"</item>
-    <item msgid="4725504331295252103">"VPN L2TP/IPSec avec certificats"</item>
-    <item msgid="7526551163264034377">"VPN IPSec avec clés pré-partagées et authentification Xauth"</item>
-    <item msgid="8064740940687465039">"VPN IPSec avec certificats et authentification Xauth"</item>
-    <item msgid="4946199982372391490">"VPN IPSec avec certificats et authentification hybride"</item>
+    <item msgid="2732002039459078847">"RPV PPTP"</item>
+    <item msgid="3799752201662127867">"RPV L2TP/IPSec avec clés pré-partagées"</item>
+    <item msgid="4725504331295252103">"RPV L2TP/IPSec avec certificats"</item>
+    <item msgid="7526551163264034377">"RPV IPSec avec clés pré-partagées et authentification Xauth"</item>
+    <item msgid="8064740940687465039">"RPV IPSec avec certificats et authentification Xauth"</item>
+    <item msgid="4946199982372391490">"RPV IPSec avec certificats et authentification hybride"</item>
   </string-array>
   <string-array name="vpn_states">
     <item msgid="8621078286418985762">"Déconnecté"</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 9d18051..f8c3fd6 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Vous êtes désormais un développeur!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Inuti, vous êtes déjà un développeur."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Veuillez d\'abord activer les options pour les concepteurs"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Sans fil et réseaux"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Connexions"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Appareil"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Indicateur de configuration VoLTE activé"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Appel vidéo géré"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Appel Wi-Fi géré"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Configuration EAB/Présence effectuée"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Alimentation de radio cellulaire"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Afficher le carnet d\'adresses de la carte SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Afficher les numéros autorisés"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Recherche d\'appareils"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Renommer cet appareil"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Renommer"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Voulez-vous vraiment vous déconnecter?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Cette opération va mettre fin à votre connexion avec :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Déconnecter l\'appareil?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Votre téléphone se déconnectera de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Votre tablette se déconnectera de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Votre appareil se déconnectera de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Déconnecter"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Vous n\'êtes pas autorisé à modifier les paramètres Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Associer un nouvel appareil"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Lorsque le Bluetooth est activé, votre <xliff:g id="DEVICE_NAME">%1$s</xliff:g> est visible par les appareils à proximité."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Adresse Bluetooth du téléphone : <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Adresse Bluetooth de la tablette : <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Adresse Bluetooth de l\'appareil : <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Déconnecter <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Diffusion"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Désactiver le profil?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Demande d\'association Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Demande d\'association"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Touchez pour associer à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Afficher les fichiers reçus"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Fichiers reçus"</string>
     <string name="device_picker" msgid="4978696506172252813">"Sélectionner un appareil Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer le Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> souhaite désactiver le Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s souhaite accéder à vos messages. Autoriser l\'accès à %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Demande d\'accès à la carte SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> souhaite accéder à votre carte SIM. Le fait d\'accorder l\'accès à la carte SIM désactive la connectivité de données sur votre appareil pendant la durée de la connexion. Accorder l\'accès à <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>."</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible comme « <xliff:g id="DEVICE_NAME">^1</xliff:g> » aux autres appareils"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vos appareils"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Associer un nouvel appareil"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Date et heure"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Sélectionner le fuseau horaire"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Comptes"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Position"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Comptes"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Sécurité et localisation"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Sécurité et localisation"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Cryptage et authentifiants"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Téléphone crypté"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Appareil crypté"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Déverrouillage avec empreinte"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Utilisez empreinte digitale"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"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.\n\nRemarque : Vos empreintes digitales peuvent être moins sécurisées qu\'un schéma ou un code fiables."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Il suffit de toucher le capteur d\'empreintes digitales pour autoriser les achats ou vous connecter à des applications. Soyez prudent d\'ajouter uniquement les empreintes digitales de personnes en qui vous avez confiance. Même une seule empreinte ajoutée peut effectuer toutes ces actions.\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="3635924459027832861">"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.\n\nRemarque : 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_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"Utilisez votre empreinte digitale pour déverrouiller votre téléphone ou autoriser des achats.\n\nRemarque : 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_cancel" msgid="3199351118385606526">"Annuler"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Passer"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Ajouter empr. digitale"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Les fonctions de protection de l\'appareil ne seront pas activées. Vous ne serez pas en mesure d\'empêcher les autres d\'utiliser cette tablette si celle-ci est perdue ou volée, ou si son contenu est effacé."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Les fonctions de protection de l\'appareil ne seront pas activées. Vous ne serez pas en mesure d\'empêcher les autres d\'utiliser cet appareil si celui-ci est perdu ou volé, ou si son contenu est effacé."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Les fonctions de protection de l\'appareil ne seront pas activées. Vous ne serez pas en mesure d\'empêcher les autres d\'utiliser ce téléphone si celui-ci est perdu ou volé, ou si son contenu est effacé."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Les fonctions de protection de l\'appareil ne seront pas activées. Vous ne serez pas en mesure d\'empêcher les autres d\'utiliser cette tablette si celle-ci est perdue ou volée."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Les fonctions de protection de l\'appareil ne seront pas activées. Vous ne serez pas en mesure d\'empêcher les autres d\'utiliser cet appareil si celui-ci est perdu ou volé."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Les fonctions de protection de l\'appareil ne seront pas activées. Vous ne serez pas en mesure d\'empêcher les autres d\'utiliser ce téléphone si celui-ci est perdu ou volé."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Suivant"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cette tablette en cas de perte, de vol ou de réinitialisation."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cet appareil en cas de perte, de vol ou de réinitialisation."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser ce téléphone en cas de perte, de vol ou de réinitialisation."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cette tablette en cas de perte ou de vol."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cet appareil en cas de perte ou de vol."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser ce téléphone en cas de perte ou de vol."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ignorer quand même"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Retour"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Trouver le capteur"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localisez le capteur d\'empreintes digitales sur le dos de votre téléphone."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Toucher le capteur"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Il se trouve à l\'arrière de votre téléphone. Utilisez votre index."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustration présentant l\'appareil et la position du capteur d\'empreinte digitale"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nom"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Ok"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Supprimer"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Commençons"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Toucher le capteur"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Placez votre doigt sur le capteur, puis soulevez-le lorsque vous sentez une vibration."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuer"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Déplacez légèrement votre doigt pour ajouter toutes les parties de votre empreinte digitale."</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Empreinte digitale ajoutée!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Chaque fois que vous voyez cette icône, vous pouvez utiliser votre empreinte digitale pour vous identifier ou pour autoriser un achat."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Il suffit de toucher le capteur d\'empreintes digitales pour activer et déverrouiller votre appareil."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Lorsque vous voyez cette icône, vous pouvez également autoriser des achats ou vous connecter à des applications."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Relevez le doigt, puis touchez le capteur à nouveau"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Déplacez légèrement votre doigt lorsque vous le relevez pour ajouter toutes les parties de votre empreinte digitale."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Empreinte digitale ajoutée"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Lorsque vous voyez cette icône, vous pouvez utiliser votre empreinte digitale pour vous identifier ou pour autoriser un achat."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ignorer config. empreintes digitales?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Vous avez choisi de déverrouiller votre téléphone à l\'aide de votre empreinte digitale. Si vous ignorez cette étape maintenant, vous devrez reprendre la configuration plus tard. L\'opération prend environ une minute."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurer le verrouil. de l\'écran"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Terminé"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Oups, ce n\'est pas le capteur"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utilisez capteur empreinte dig. sur appareil."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Touchez le capteur à l\'arrière de votre téléphone. Utilisez votre index."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"L\'enregistrement n\'est pas terminé"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Le temps attribué pour l\'enregistrement des empreintes digitales est écoulé. Veuillez essayer de nouveau."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"L\'enregistrement des empreintes digitales ne fonctionne pas. Essayez à nouveau ou utilisez un autre doigt."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cet appareil sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser ce téléphone sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Choisissez votre méthode secondaire de verrouillage d\'écran"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Options de verrouillage de l\'écran"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Options de verrouillage de l\'écran"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Verrouillage de l\'écran"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / immédiatement après la mise en veille"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / après <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> de veille"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Modifier le schéma"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Modifier le NIP de déverrouillage"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Modifier le mot de passe de déverrouillage"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Réessayez. Tentative <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> sur <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Dernière tentative"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Si vous entrez un schéma professionnel incorrect lors de cette tentative, votre profil professionnel et les données associées seront supprimés sur cet appareil."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Si vous entrez un NIP professionnel incorrect lors de cette tentative, votre profil professionnel et les données associées seront supprimés sur cet appareil."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Si vous entrez un mot de passe professionnel incorrect lors de cette tentative, votre profil professionnel et les données associées seront supprimés sur cet appareil."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Trop de tentatives incorrectes. Votre profil professionnel et les données associées seront supprimés sur cet appareil."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Fermer"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Réessayez. Tentative <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> sur <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Vos données seront supprimées"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Si vous entrez un schéma incorrect à la prochaine tentative, les données de cet appareil seront supprimées"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Si vous entrez un NIP incorrect à la prochaine tentative, les données de cet appareil seront supprimées"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Si vous entrez un mot de passe incorrect à la prochaine tentative, les données de cet appareil seront supprimées"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Si vous entrez un schéma incorrect à la prochaine tentative, cet utilisateur sera supprimé"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Si vous entrez un NIP incorrect à la prochaine tentative, cet utilisateur sera supprimé"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Si vous entrez un mot de passe incorrect à la prochaine tentative, cet utilisateur sera supprimé"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Si vous entrez un schéma incorrect à la prochaine tentative suivante, votre profil professionnel et ses données seront supprimés"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Si vous entrez un NIP incorrect à la prochaine tentative suivante, votre profil professionnel et ses données seront supprimés"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Si vous entrez un mot de passe incorrect à la prochaine tentative suivante, votre profil professionnel et ses données seront supprimés"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Trop de tentatives incorrectes. Les données de cet appareil seront supprimées."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Trop de tentatives incorrectes. Cet utilisateur sera supprimé."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Trop de tentatives incorrectes. Ce profil professionnel et ses données seront supprimés."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ignorer"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Doit comprendre au moins <xliff:g id="COUNT">%d</xliff:g> caractères"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Le NIP doit comprendre au moins <xliff:g id="COUNT">%d</xliff:g> chiffres"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuer"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Paramètres Bluetooth avancés"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Si la fonctionnalité Bluetooth est activée, l\'appareil peut communiquer avec les autres appareils Bluetooth à proximité"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Pour améliorer la précision de la localisation, les applications et les services système peuvent toujours détecter les appareils Bluetooth. Vous pouvez modifier ce paramètre dans les <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>paramètres de recherche<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Échec de la connexion. Réessayez."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Détails de l\'appareil"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Adresse Bluetooth de l\'appareil : <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Oubliez l\'appareil?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Votre téléphone ne sera plus associé avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Votre tablette ne sera plus associée à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Votre appareil ne sera plus associé avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Oublier l\'appareil"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Se connecter à…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio du support."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio en mains libres."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ne pas fournir"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ne pas valider"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Aucun certificat indiqué. Votre connexion ne sera pas privée."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Le nom du réseau est trop long."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Vous devez spécifier un domaine."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
@@ -809,7 +838,6 @@
       <item quantity="other">%d réseaux</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Paramètres Wi-Fi avancés"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurer le Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresse MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adresse IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Masque de sous-réseau"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Voulez-vous vraiment supprimer ce groupe?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Point d\'accès Wi-Fi mobile"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Point d\'accès Wi‑Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Utiliser la connexion cellulaire pour créer un réseau Wi‑Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"La connexion Internet de la tablette n\'est pas partagée par point d\'accès"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"La connexion Internet du téléphone n\'est pas partagée par point d\'accès"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Ne partage pas de connexion Internet ou de contenu avec d\'autres appareils"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"La connexion Internet de la tablette est partagée par point d\'accès"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"La connexion Internet du téléphone est partagée par point d\'accès"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"L\'application partage du contenu. Pour partager la connexion Internet, désactivez puis réactivez le point d\'accès."</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nom du réseau Wi-Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Activation du point d\'accès <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> en cours…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"D\'autres appareils peuvent se connecter à <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Mot de passe Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Bande du point d\'accès"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Un point d\'accès vous permet de créer un réseau Wi-Fi pour vos autres appareils. Il les connecte à Internet en utilisant votre connexion de données cellulaires. Des frais cellulaires supplémentaires peuvent s\'appliquer."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Les applications peuvent créer un point d\'accès pour partager du contenu avec les appareils à proximité."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Activation du point d\'accès Wi-Fi en cours…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Désactivation du point d\'accès Wi-Fi en cours…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> est actif"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Lorsque les appels Wi-Fi sont activés, votre téléphone peut transférer les appels par réseau Wi-Fi ou le réseau de votre fournisseur de services, en fonction de votre préférence et du signal le plus puissant. Avant d\'activer cette fonctionnalité, renseignez-vous auprès de votre fournisseur pour en savoir plus sur les frais et d\'autres détails."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Mise à jour l\'adresse d\'urgence"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"L\'adresse utilisée par les services d\'urgence pour déterminer votre position si vous faites un appel au 911 en utilisant le Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Aucun résultat"</string>
     <string name="display_settings" msgid="7965901687241669598">"Affichage"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotation auto de l\'écran"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Couleurs vives"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Changer automatiquement d\'orientation lors de la rotation de la tablette"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Changer automatiquement d\'orientation lors de la rotation"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Changer automatiquement d\'orientation lors de la rotation de la tablette"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimiser lumin. selon lumière ambiante. Lorsque cette fonction est activée, vous pouvez ajuster lumin. temporairement."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Éclairage nocturne"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Le mode Éclairage nocturne donne une teinte ambre à votre écran. Cela vous permet de le regarder plus facilement lorsque l\'éclairage est faible et peut vous aider à vous endormir plus facilement."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Calendrier"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"État"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Activer automatiquement"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Jamais"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Horaire personnalisé"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Du coucher au lever du soleil"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Calendrier"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Aucune"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"S\'active à l\'heure de votre choix"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"S\'active du coucher au lever du soleil"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Heure de début"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Heure de fin"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"État"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensité"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Désactivé. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Ne s\'activera jamais automatiquement"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Activer automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"S\'active automatiquement au coucher du soleil."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Activé. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Ne se désactivera jamais automatiquement"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Désactiver automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Se désactivera automatiquement au lever du soleil"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Désactivé : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Ne s\'activera jamais automatiquement"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"S\'activera automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"S\'activera automatiquement au coucher du soleil."</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Activé : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Ne se désactivera jamais automatiquement"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Se désactivera automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Se désactivera automatiquement au lever du soleil"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Veille"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"L\'écran s\'éteint"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Paramètres"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Soulever pour activer"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Affichage en mode Veille"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Affichage en mode Veille"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Toujours activé"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nouvelles notifications"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quand afficher"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nouvelles notifications"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activer l\'écran lorsque vous recevez des notifications"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Toujours activé"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Afficher l\'heure, les icônes de notifications et d\'autres renseignements"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Taille de police"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Agrandissez ou réduisez le texte"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Paramètres de verrouillage SIM"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"L\'APN est obligatoire."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Le champ MCC doit contenir 3 chiffres."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Le champ MNC doit contenir 2 ou 3 chiffres."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Le fournisseur de services n\'autorise pas l\'ajout de points d\'accès de type %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Restauration des paramètres APN par défaut en cours..."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Rétablir les valeurs par défaut"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"La réinitialisation des paramètres APN par défaut est terminée."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Effacer la carte SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Effacer toutes les données de la mémoire de stockage USB interne, telles que la musique ou les photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Effacer toutes les données de la carte SD, telles que la musique ou les photos"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Effacer les cartes eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Effacer toutes les cartes eSIM sur le téléphone. Cela n\'annulera pas votre forfait de services cellulaires."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Effacer toutes les cartes eSIM sur la tablette. Cela n\'annulera pas votre forfait de services cellulaires."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Réinitialiser la tablette"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Réinitialiser le téléphone"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Effacer toutes vos données personnelles et les applications téléchargées? Cette action est irréversible."</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Impossible de partager la connexion ou d\'utiliser des points d\'accès mobiles lorsque la fonction Économiseur de données est activée"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Partage de connexion par USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Connexion USB établie, cochez l\'option adéquate pour partager la connexion."</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Partage de connexion"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Impossible de partager la connexion lorsqu\'une mémoire de stockage USB est utilisée."</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB non connecté"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Connectez-vous pour activer cette fonction"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Erreur liée au partage de connexion via USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Partager la connexion Internet du téléphone par connexion USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Partager la connexion Internet de la tablette par connexion USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Par Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Connex. Internet de la tablette part. par Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Connex. Internet du téléph. partagée par Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Conn. Internet tablette. part. avec 1 appareil par Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Conn. Internet du téléph. part. avec 1 appareil par Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Conn. Internet tablette partagée avec <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> appareils par Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Conn. Internet téléph. partagée avec <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> appareils par Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Partager la connexion Internet de la tablette par Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Partager la connexion Internet du téléphone par Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Partager la connexion Internet de <xliff:g id="DEVICE_NAME">%1$d</xliff:g> par Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Conn. Internet tablette non partagée par Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Conn. Internet téléph. non partagée par Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Pas de partage de connexion."</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Partage connexion impossible au-delà de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> appareils."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Le partage de connexion avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g> va être annulé."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Utilisez un point d\'accès et le partage de connexion pour fournir un accès Internet à d\'autres appareils par l\'intermédiaire de votre connexion cellulaire."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Utilisez un point d\'accès et le partage de connexion pour fournir un accès Internet à d\'autres appareils par l\'intermédiaire de votre connexion cellulaire. Les applications peuvent aussi créer un point d\'accès pour partager du contenu avec d\'autres appareils à proximité."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Aide"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Réseau cellulaire"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Forfait de données cellulaires"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode de localisation"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Utiliser le GPS, le Wi‑Fi, le Bluetooth ou les réseaux cellulaires pour déterminer la position"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Utiliser le Wi‑Fi, le Bluetooth ou les réseaux cellulaires pour déterminer la position"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utiliser le GPS pour déterminer la position"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Utiliser le GPS et les capteurs de l\'appareil pour déterminer la position"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Recherche"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Recherche de réseaux Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Améliorer la précision de la localisation en autorisant les applications et les services système à rechercher les réseaux Wi-Fi à tout moment."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Vous n\'avez pas de connexion Internet. Pour consulter ces informations maintenant, accédez à %s depuis un ordinateur connecté à Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Chargement en cours..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Choisir votre mot de passe"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Pour util. empr. digit., config. m. de passe"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Choisir votre schéma"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Pour util. empr. digit., config. schéma"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choisir votre NIP"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Pour util. empr. digit., config. NIP"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirmez le mot de passe."</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmez votre schéma"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmez votre NIP."</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Paramètres de l\'application"</string>
     <string name="install_applications" msgid="4872012136210802181">"Sources inconnues"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Autoriser toutes sources appli"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Applications récemment ouvertes"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Afficher toutes les <xliff:g id="COUNT">%1$d</xliff:g> applications"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"Il y a <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Votre tablette et vos données personnelles sont plus vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être le seul responsable de tout dommage causé à votre tablette ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Votre téléphone et vos données personnelles sont plus vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être le seul responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Paramètres avancés"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Arrêter le service système?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Si vous arrêtez ce service, certaines fonctionnalités de votre tablette peuvent cesser de fonctionner correctement jusqu\'à ce que vous ayez éteint, puis rallumé votre appareil."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Si vous arrêtez ce service, certaines fonctionnalités de votre téléphone peuvent cesser de fonctionner correctement jusqu\'à ce que vous ayez éteint, puis rallumé votre appareil."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Langues, entrée et gestes"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Langues et modes d\'entrée"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Langues et modes d\'entrée"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Assistance d\'entrée"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> service d\'impression actif</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> services d\'impression actifs</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> tâche d\'impression</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tâches d\'impression</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Services d\'impression"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Aucun service installé"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Aucune imprimante trouvée"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Détails d\'utilisation"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Ajuster la consommation"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Modules inclus"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Applications qui drainent la pile"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Gardent l\'appareil actif"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Réveillent l\'appareil en arrière-plan"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Demandent la position fréquemment"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> applications se comportent de manière anormale"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Arrêter l\'application?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Votre téléphone n\'arrive pas à gérer sa pile normalement, car <xliff:g id="APP">%1$s</xliff:g> le garde en activité.\n\nPour corriger le problème, vous pouvez forcer l\'arrêt de l\'application.\n\nSi cela continue de se produire, il se peut que vous deviez désinstaller l\'application pour améliorer le rendement de la pile."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Votre tablette n\'arrive pas à gérer sa pile normalement, car <xliff:g id="APP">%1$s</xliff:g> le garde en activité.\n\nPour corriger le problème, vous pouvez forcer l\'arrêt de l\'application.\n\nSi cela continue de se produire, il se peut que vous deviez désinstaller l\'application pour améliorer le rendement de la pile."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Votre appareil n\'arrive pas à gérer sa pile normalement, car <xliff:g id="APP">%1$s</xliff:g> le garde en activité.\n\nPour corriger le problème, vous pouvez forcer l\'arrêt de l\'application.\n\nSi cela continue de se produire, il se peut que vous deviez désinstaller l\'application pour améliorer le rendement de la pile."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Arrêter l\'application"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Désactiver l\'utilisation en arrière-plan?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Votre téléphone n\'arrive pas à gérer sa pile normalement, car <xliff:g id="APP">%1$s</xliff:g> le réactive constamment.\n\nPour résoudre ce problème, votre téléphone peut empêcher cette application de s\'exécuter en arrière-plan."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Votre tablette n\'arrive pas à gérer sa pile normalement, car <xliff:g id="APP">%1$s</xliff:g> le réactive constamment.\n\nPour résoudre ce problème, votre tablette peut empêcher cette application de s\'exécuter en arrière-plan."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Votre appareil n\'arrive pas à gérer sa pile normalement, car <xliff:g id="APP">%1$s</xliff:g> le réactive constamment.\n\nPour résoudre ce problème, votre appareil peut empêcher cette application de s\'exécuter en arrière-plan."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Désactiver"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Désactiver la localisation?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Votre téléphone n\'arrive pas à gérer sa pile normalement, car <xliff:g id="APP">%1$s</xliff:g> demande constamment votre position lorsque vous n\'utilisez pas l\'application.\n\nPour résoudre ce problème, vous pouvez désactiver l\'accès à la localisation pour cette application."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Votre tablette n\'arrive pas à gérer sa pile normalement, car <xliff:g id="APP">%1$s</xliff:g> demande constamment votre position lorsque vous n\'utilisez pas l\'application.\n\nPour résoudre ce problème, vous pouvez désactiver l\'accès à la localisation pour cette application."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Votre appareil n\'arrive pas à gérer sa pile normalement, car <xliff:g id="APP">%1$s</xliff:g> demande constamment votre position lorsque vous n\'utilisez pas l\'application.\n\nPour résoudre ce problème, vous pouvez désactiver l\'accès à la localisation pour cette application."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Désactiver"</string>
     <string name="power_screen" msgid="3023346080675904613">"Écran"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lampe de poche"</string>
     <string name="power_camera" msgid="4976286950934622605">"Appareil photo"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Applications"</string>
     <string name="power_service" msgid="1599661212370831780">"Services"</string>
     <string name="power_system" msgid="8290455327965307383">"Système"</string>
-    <string name="power_user" msgid="1889728099253018005">"Utilisateur"</string>
+    <string name="power_user" msgid="3706143225319881667">"Autres utilisateurs"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Durée d\'utilisation totale de l\'UC"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"UC - Premier plan"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Maintenir activé"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Utilisation surestimée de la pile"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Temps d\'utilisation : <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Actif pendant <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Utilisation de l\'écran : <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilisé(s) par <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> de l\'utilisation totale de la pile"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Modifier le NIP"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Afficher les notifications"</string>
     <string name="help_label" msgid="6886837949306318591">"Aide et commentaires"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Articles d\'aide, assistance par téléphone et par clavardage"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Articles d\'aide, assistance par téléphone et par clavardage, premiers pas"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Compte pour contenu"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID de photo"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Menaces extrêmes"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="other">Afficher %d éléments masqués</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Réseau et Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, cellulaire, utilisation des données, point d\'accès sans fil"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"cellulaire"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"utilisation de données"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"point d\'accès sans fil"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Appareils connectés"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, diffuser"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Applications et notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Autorisations, applications par défaut"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Utilisateurs et comptes"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"geste"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"payer, toucher, paiements"</string>
     <string name="keywords_backup" msgid="470070289135403022">"sauvegarde, sauvegarder"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"geste, bordure, côté, côté actif, serrer, prise en main, assistance, assistant, presser, appuyer, ok google, assistant google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"geste, réactiver, notifications, écran, affichage, écran désactivé, écran activé, serrer, bordure, en veille, sommeil, prise en main"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"geste, silence, répéter, alarme, appel entrant, tranquille, écran, écran de verrouillage, serrer, prise en main, bordure, arrêter"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Créer une balise NFC par Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Écrire"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Touchez une balise pour pour écrire..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"N\'afficher aucune notification professionnelle"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Lorsque votre appareil est verrouillé, comment voulez-vous que les notifications de profil s\'affichent?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notifications de profil"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Notifications"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Notifications"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notifications de l\'application"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Catégorie de notifications"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Laisser l\'application décider"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgente"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Autoriser le son"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Ne pas émettre de son, activer le vibreur ni afficher ces notifications sur l\'écran actif."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Importance faible"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Importance moyenne"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importance élevée"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Importance urgente"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Assistant des notifications"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Accès aux notifications"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"L\'accès aux notifications du profil professionnel est bloqué"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Incrustation d\'image"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Autoriser l\'incrustation d\'image"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Autorisez cette application à créer une fenêtre d\'incrustation d\'image lorsqu\'elle est ouverte ou après l\'avoir quittée (par exemple, pour continuer de regarder une vidéo). Cette fenêtre se superpose aux autres applications en cours d\'utilisation."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Oui"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Non"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accès à « Ne pas déranger »"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Aune application installée n\'a demandé l\'accès au mode « Ne pas déranger »"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Le profil professionnel est géré par :"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Géré par <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Expérimentale)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Rotation de l\'appareil"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Pivoter le contenu de l\'écran"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Rester en mode portrait"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Rester en mode paysage"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Garder l\'orientation actuelle"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Démarrage sécurisé"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuer"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Pour améliorer la protection de cet appareil, vous pouvez exiger l\'entrée du NIP avant le démarrage. L\'appareil ne reçoit pas d\'appels, de messages ni de notifications, y compris les alertes, tant qu\'il n\'a pas démarré. \n\nCette fonctionnalité permet de protéger les données en cas de perte ou de vol de l\'appareil. Exiger le NIP pour démarrer l\'appareil?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Pour améliorer la protection de cet appareil, vous pouvez exiger l\'entrée du mot de passe avant le démarrage. L\'appareil ne reçoit pas d\'appels, de messages ni de notifications, y compris les alertes, tant qu\'il n\'a pas démarré. \n\nCette fonctionnalité permet de protéger les données en cas de perte ou de vol de l\'appareil. Exiger un mot de passe pour démarrer l\'appareil?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre NIP avant que l\'appareil ne démarre, en plus de la lecture de votre empreinte digitale. L\'appareil ne peut pas recevoir d\'appel, de message, de notification, ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger le NIP pour démarrer l\'appareil?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre schéma avant que l\'appareil ne démarre, en plus de la lecture de votre empreinte digitale. L\'appareil ne peut pas recevoir d\'appel, de message, de notification, ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger le schéma pour démarrer l\'appareil?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre mot de passe avant que l\'appareil ne démarre, en plus de la lecture de votre empreinte digitale. L\'appareil ne peut pas recevoir d\'appel, de message, de notification, ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger un mot de passe pour démarrer l\'appareil &gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre mot de passe avant que l\'appareil ne démarre, en plus de la lecture de votre empreinte digitale. L\'appareil ne peut pas recevoir d\'appel, de message, de notification, ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger un mot de passe pour démarrer l\'appareil?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Oui"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Non"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Exiger le NIP?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertes d\'utilisation"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Afficher l\'utilisation totale de l\'appareil"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Afficher utilisation des applis"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Utilisation élevée"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> application se comporte de manière anormale</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> applications se comportent de manière anormale</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Application qui draine la pile</item>
+      <item quantity="other">Applications qui drainent la pile</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Non optimisée"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Non optimisée"</string>
     <string name="high_power_off" msgid="3393904131961263278">"L\'utilisation de la pile est optimisée"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Afficher par-dessus autres applis"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> applis sur <xliff:g id="COUNT_1">%2$d</xliff:g> sont autorisées à aff. par-dessus autres applis"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Applications dotées de l\'autorisation"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Oui"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Non"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Autorisée"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Non autorisée"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"installer des applications provenant de sources inconnues"</string>
     <string name="write_settings" msgid="4797457275727195681">"Modifier paramètres système"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"écrire des modifications aux paramètres du système"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"L\'écran a une teinte ambre. Cela peut vous aider à vous endormir."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> autre(s)"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> suggestion</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="one">+<xliff:g id="COUNT">%1$d</xliff:g> suggestion</item>
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Supprimer"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Température des couleurs froides"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliser des couleurs plus froides à l\'écran"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Seuil à partir duquel un avertissement relatif à la consommation des données est envoyé : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Seuil à partir duquel un avertissement relatif à la consommation des données est envoyé : <xliff:g id="ID_1">%1$s</xliff:g> / Limite de consommation des données : <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Cycle de facturation"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Le cycle mensuel débute le <xliff:g id="ID_1">%1$s</xliff:g> de chaque mois"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Tous les mois à partir du <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Mensuel (<xliff:g id="ID_1">%1$s</xliff:g> jour du mois)"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Restrictions réseau"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restriction</item>
@@ -3316,7 +3408,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> applications sont autorisées à ignorer les restrictions lorsque la fonction Économiseur de données est activée</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Économiseur de données"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Accès non restreint données"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Données sans restrictions"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Les données en arrière-plan sont désactivées"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Activée"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Désactivée"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Gérer notifications écran verrouillage"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Afficher ou masquer le contenu des notifications"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Tous"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Assistance"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Assist. et astuces"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"La plus petite largeur"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Aucune application installée n\'a demandé l\'accès aux textos payants"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Les textos de cette catégorie peuvent être payants et s\'ajouter aux factures mensuelles de votre fournisseur de services. Si vous activez l\'autorisation pour une application, vous serez en mesure d\'envoyer des textos payants à l\'aide de cette dernière."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatique"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuel"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Libérer de l\'espace maintenant"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestes"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Raccourcis des gestes"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gestes rapides pour contrôler votre téléphone"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gestes rapides pour contrôler votre tablette"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gestes rapides pour contrôler votre appareil"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Passer à l\'appareil photo"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Pour ouvrir rapidement l\'appareil photo, il vous suffit d\'appuyer deux fois sur l\'interrupteur. Cela fonctionne à partir de n\'importe quel écran."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Ouvrez l\'appareil photo rapidement"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Appuyez deux fois sur l\'interrupteur pour ouvrir l\'app. photo"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Changer d\'appareil photo"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Prenez des égoportraits plus rapidement"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Pivotez deux fois le téléphone pour prendre un égoportrait"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Pivotez deux fois la tablette pour prendre un égoportrait"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Pivotez deux fois l\'appareil pour prendre un égoportrait"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Touchez deux fois pour le consulter"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Touchez l\'écran deux fois pour consulter votre tablette"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Touchez l\'écran deux fois pour consulter votre appareil"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Pour consulter rapidement vos notifications, touchez l\'écran deux fois."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Pour vérifier l\'heure, les icônes de notification et d\'autres renseignements, touchez deux fois l\'écran."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Consulter les notifications lorsque l\'écran est éteint"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Saisir le téléphone pour le consulter"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Saisissez la tablette pour consulter les notifications"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Saisissez l\'appareil pour consulter les notifications"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Pour consulter rapidement vos notifications, saisissez votre téléphone."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Pour consulter rapidement vos notifications, saisissez votre tablette."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Pour consulter rapidement vos notifications, saisissez votre appareil."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Pour vérifier l\'heure, les icônes de notification et d\'autres renseignements, saisissez votre téléphone."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Pour vérifier l\'heure, les icônes de notification et d\'autres renseignements, saisissez votre tablette."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Pour vérifier l\'heure, les icônes de notification et d\'autres renseignements, saisissez votre appareil."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Consulter les notifications lorsque l\'écran est éteint"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Balayer lecteur d\'empreintes pour voir notif."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le capteur d\'empreintes digitales à l\'arrière du téléphone."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le capteur d\'empreintes digitales à l\'arrière de la tablette."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le capteur d\'empreintes digitales à l\'arrière de l\'appareil."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Affichez les notifications rapidement"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Glissez un doigt vers le bas sur le capteur d\'empr. digitales"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Soulever le téléphone pour ouvrir l\'appareil photo"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Pour ouvrir automatiquement l\'appareil photo, soulevez votre téléphone dans une position de prise de photo (portrait ou paysage). Cela fonctionne lorsque votre téléphone est en veille ou verrouillé."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Prenez des photos quand le téléphone est en veille ou verrouillé"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Geste d\'assistance"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilité"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Voulez-vous supprimer cette application instantanée?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Jeux"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Fichiers audio"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Espace utilisé"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(désinst. pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(désactivé pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Service de remplissage automatique"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Application instantanée"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Désactiver le gestionnaire de stockage?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Applications de films et d\'émissions de télévision"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Espace utilisé"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Données d\'approvisionnement du fournisseur de services"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Déclencher l\'approvisionnement du fournisseur de services"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Quelles sont les nouveautés toutes chaudes?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Découvrez les cinq principales fonctionnalités"</string>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index de93bac..e8d1cb4 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Bonne"</item>
     <item msgid="8986346415847956850">"Excellente"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Toujours"</item>
-    <item msgid="844721238536786870">"Uniquement si l\'appareil est branché"</item>
-    <item msgid="1986753720941888596">"Jamais"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Toujours"</item>
-    <item msgid="7433294150916905997">"Uniquement si appareil branché"</item>
-    <item msgid="1390404486722375028">"Jamais"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 derniers jours"</item>
     <item msgid="6600989128423965319">"Définir cycle conso..."</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1a3922d..710f10d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Vous êtes désormais un développeur !"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Inutile, vous êtes déjà un développeur."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Veuillez tout d\'abord activer les options pour les développeurs."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Sans fil et réseaux"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Connexions"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Appareil"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Configuré par VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Appel vidéo géré"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Appel Wi-Fi géré"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Provisionnement EAB/Presence effectué"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Alimentation radio mobile"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Afficher le carnet d\'adresses de la carte SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Afficher les numéros autorisés"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Recherche d\'appareils"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Renommer cet appareil"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Renommer"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Déconnecter ?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Cela va mettre fin à votre connexion avec :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Déconnecter l\'appareil ?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Votre téléphone va se déconnecter de \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Votre tablette va se déconnecter de \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Votre appareil va se déconnecter de \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Déconnecter"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Vous n\'êtes pas autorisé à modifier les paramètres Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Associer un nouvel appareil"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Lorsque le Bluetooth est activé, votre <xliff:g id="DEVICE_NAME">%1$s</xliff:g> est visible par les appareils à proximité."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Adresse Bluetooth du téléphone : <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Adresse Bluetooth de la tablette : <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Adresse Bluetooth de l\'appareil : <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Déconnecter l\'appareil \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Diffusion"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Désactiver le profil ?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Demande d\'association Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Demande d\'association"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Appuyez pour associer l\'appareil à \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Afficher les fichiers reçus"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Fichiers reçus"</string>
     <string name="device_picker" msgid="4978696506172252813">"Sélectionner un appareil"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> requiert l\'activation du Bluetooth."</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> requiert la désactivation du Bluetooth."</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Une demande d\'accès à vos messages a été envoyée pour \"%1$s\". Accorder l\'accès à \"%2$s\" ?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Demande d\'accès à la carte SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"\"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>\" requiert l\'accès à votre carte SIM. Si vous l\'accordez, la connectivité des données sera désactivée sur votre appareil pour toute la durée de la connexion. Accorder l\'autorisation d\'accès à \"<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>\""</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible avec le nom \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" pour les autres appareils"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vos appareils"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Associer un nouvel appareil"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Date et heure"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Sélectionner le fuseau horaire"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Comptes"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localisation"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Comptes"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Sécurité et localisation"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Sécurité et localisation"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Chiffrement et identifiants"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Téléphone chiffré"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Appareil chiffré"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Déverrouillage avec empreinte"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Utiliser votre empreinte digitale"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"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.\n\nRemarque : Vos empreintes digitales peuvent être moins sécurisées qu\'un schéma ou un code fiables."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Il vous suffit d\'appuyer sur le lecteur d\'empreinte digitale pour autoriser les achats ou vous connecter aux applications. Toutes les personnes dont les empreintes digitales sont ajoutées peuvent effectuer ces opérations. Choisissez donc ces personnes avec soin.\n\nRemarque : vous ne pouvez pas utiliser votre empreinte digitale pour déverrouiller cet appareil. Pour plus d\'informations, contactez l\'administrateur de votre organisation."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"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.\n\nRemarque : Vos empreintes digitales peuvent être moins sécurisées qu\'un schéma ou un code fiables."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Annuler"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Ignorer"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Ajouter empr. digitale"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cette tablette en cas de perte ou de vol, ou si les données en sont effacées."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cet appareil en cas de perte ou de vol, ou si les données en sont effacées."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser ce téléphone en cas de perte ou de vol, ou si les données en sont effacées."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cette tablette en cas de perte ou de vol."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cet appareil en cas de perte ou de vol."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser ce téléphone en cas de perte ou de vol."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Suivant"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cette tablette en cas de perte, de vol ou de réinitialisation."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cet appareil en cas de perte, de vol ou de réinitialisation."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser ce téléphone en cas de perte, de vol ou de réinitialisation."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cette tablette en cas de perte ou de vol."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser cet appareil en cas de perte ou de vol."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Les fonctionnalités de protection de l\'appareil ne seront pas activées. Vous ne pourrez pas empêcher d\'autres personnes d\'utiliser ce téléphone en cas de perte ou de vol."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ignorer quand même"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Retour"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Localiser le lecteur"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localisez le lecteur d\'empreinte à l\'arrière du téléphone."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Poser le doigt sur le capteur"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Le capteur se trouve à l\'arrière du téléphone. Utilisez l\'index."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustration présentant l\'appareil et la position du lecteur d\'empreintes digitales"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nom"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Supprimer"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Commencer"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Poser le doigt sur le capteur"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Placez votre doigt sur le lecteur, puis soulevez-le lorsque vous sentez une vibration."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuer"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Déplacez légèrement votre doigt pour ajouter toutes les parties de votre empreinte digitale."</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Empreinte ajoutée"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Chaque fois que cette icône apparaît, vous pouvez utiliser votre empreinte pour vous identifier ou autoriser un achat."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Il vous suffit de toucher le lecteur d\'empreintes digitales pour activer et déverrouiller votre appareil."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Lorsque cette icône s\'affiche, vous pouvez également autoriser des achats ou vous connecter à des applications."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Lever le doigt, puis appuyer"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Maintenez le doigt relevé pour ajouter les différentes parties de votre empreinte digitale"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Empreinte digitale ajoutée"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Quand cette icône s\'affiche, utilisez votre empreinte digitale pour vous identifier ou pour approuver des achats."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ignorer config. empreintes digitales ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Vous avez choisi de déverrouiller votre téléphone à l\'aide de votre empreinte digitale. Si vous ignorez cette étape maintenant, vous devrez reprendre la configuration ultérieurement. L\'opération prend environ une minute."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Verrouillage de l\'écran"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"OK"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Petit problème… Il ne s\'agit pas du capteur"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utilisez le lecteur d\'empreintes intégré."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Posez l\'index sur le capteur à l\'arrière du téléphone."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"L\'enregistrement n\'est pas terminé."</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Délai d\'enregistrement de l\'empreinte digitale expiré. Veuillez réessayer."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"L\'enregistrement de l\'empreinte digitale n\'a pas fonctionné. Veuillez réessayer ou utiliser un autre doigt."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cet appareil sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser ce téléphone sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Choisissez une méthode supplémentaire pour verrouiller l\'écran."</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Options de verrouillage de l\'écran"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Options de verrouillage de l\'écran"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Verrouillage de l\'écran"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/Immédiatement après la mise en veille"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> après la mise en veille"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Modifier le schéma de déverrouillage"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Modifier le code PIN de déverrouillage"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Modifier le mot de passe de déverrouillage"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Réessayez. Tentative <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> sur <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Dernière tentative"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Si vous saisissez un schéma professionnel incorrect lors de cette tentative, votre profil professionnel et les données associées seront supprimés sur cet appareil."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Si vous saisissez un code professionnel incorrect lors de cette tentative, votre profil professionnel et les données associées seront supprimés sur cet appareil."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Si vous saisissez un mot de passe professionnel incorrect lors de cette tentative, votre profil professionnel et les données associées seront supprimés sur cet appareil."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Trop de tentatives incorrectes. Votre profil professionnel et les données associées seront supprimés sur cet appareil."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Ignorer"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Réessayez. Tentative <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> sur <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Vos données seront supprimées"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Si vous dessinez un schéma incorrect lors de la prochaine tentative, les données de l\'appareil seront supprimées"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Si vous saisissez un code incorrect lors de la prochaine tentative, les données de l\'appareil seront supprimées"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Si vous saisissez un mot de passe incorrect lors de la prochaine tentative, les données de l\'appareil seront supprimées"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Si vous dessinez un schéma incorrect lors de la prochaine tentative, ce compte utilisateur sera supprimé"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Si vous saisissez un code incorrect lors de la prochaine tentative, ce compte utilisateur sera supprimé"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Si vous saisissez un mot de passe incorrect lors de la prochaine tentative, ce compte utilisateur sera supprimé"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Si vous dessinez un schéma incorrect lors de la prochaine tentative, votre profil professionnel et les données associées seront supprimés"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Si vous saisissez un code incorrect lors de la prochaine tentative, votre profil professionnel et les données associées seront supprimés"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Si vous saisissez un mot de passe incorrect lors de la prochaine tentative, votre profil professionnel et les données associées seront supprimés"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Trop de tentatives incorrectes. Les données de cet appareil vont être supprimées."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Trop de tentatives incorrectes. Ce compte utilisateur va être supprimé."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Trop de tentatives incorrectes. Ce profil professionnel et les données associées vont être supprimés."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ignorer"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> caractères"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Le code doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> chiffres"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuer"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Paramètres Bluetooth avancés"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"L\'activation du Bluetooth permet à votre appareil de communiquer avec les appareils Bluetooth à proximité."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Pour améliorer la précision de la localisation, les applications et les services système peuvent toujours détecter les appareils Bluetooth. Vous pouvez modifier ce paramètre dans les <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>paramètres de recherche<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Impossible de se connecter. Réessayez."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Détails de l\'appareil"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Adresse Bluetooth de l\'appareil : <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Dissocier l\'appareil ?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Votre téléphone ne sera plus associé à \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Votre tablette ne sera plus associée à \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Votre appareil ne sera plus associé à \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Dissocier l\'appareil"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Se connecter à…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio du support."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio en mains libres."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ne pas fournir"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ne pas valider"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Aucun certificat indiqué. Votre connexion ne sera pas privée."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Le nom du réseau est trop long."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Vous devez spécifier un domaine."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
@@ -809,7 +838,6 @@
       <item quantity="other">%d réseaux</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Paramètres Wi-Fi avancés"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurer le Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresse MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adresse IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Masque de sous-réseau"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Voulez-vous vraiment supprimer ce groupe ?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Point d\'accès Wi-Fi mobile"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Point d\'accès Wi‑Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Utiliser la connexion mobile pour fournir un réseau Wi‑Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Connexion Internet de la tablette non partagée via un point d\'accès"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Connexion Internet du téléphone non partagée via un point d\'accès"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Connexion Internet ou contenu non partagés avec d\'autres appareils"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Connexion Internet de la tablette partagée via un point d\'accès"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Connexion Internet du téléphone partagée via un point d\'accès"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"L\'application partage du contenu. Pour partager la connexion Internet, désactivez le point d\'accès, puis réactivez-le"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nom du point d\'accès Wi-Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Activation du point d\'accès \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\"…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"D\'autres appareils peuvent se connecter au point d\'accès \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\""</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Mot de passe du point d\'accès Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Bande du point d\'accès"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Utilisez un point d\'accès afin de créer un réseau Wi‑Fi pour vos autres appareils. Un point d\'accès fournit un accès à Internet via votre connexion de données mobiles. Des frais supplémentaires peuvent s\'appliquer pour l\'utilisation des données mobiles."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Les applications peuvent créer un point d\'accès pour partager du contenu avec des appareils à proximité."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Activation du point d\'accès Wi-Fi en cours…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Désactivation du point d\'accès Wi-Fi en cours…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> est actif"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Lorsque les appels Wi-Fi sont activés, votre téléphone peut transférer les appels via les réseaux Wi-Fi ou le réseau de votre opérateur, en fonction de votre préférence et du signal le plus puissant. Avant d\'activer cette fonctionnalité, renseignez-vous auprès de votre opérateur pour en savoir plus sur les frais et d\'autres détails."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Mettre à jour l\'adresse d\'urgence"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Adresse utilisée par les services d\'urgence pour votre position si vous effectuez un appel d\'urgence à l\'aide du Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Aucun résultat"</string>
     <string name="display_settings" msgid="7965901687241669598">"Affichage"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotation auto de l\'écran"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Couleurs vives"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Changer automatiquement d\'orientation lors de la rotation de la tablette"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Changer automatiquement d\'orientation lors de la rotation du téléphone"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Changer automatiquement d\'orientation lors de la rotation de la tablette"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Adapte la luminosité selon l\'éclairage. Si l\'option est activée, un réglage temporaire est possible."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Éclairage nocturne"</string>
     <string name="night_display_text" msgid="1837277457033025056">"L\'éclairage nocturne colore votre écran en rouge ambré. Cela vous permet de le regarder ou de lire plus facilement lorsque l\'éclairage est faible, et peut vous aider à vous endormir."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Planifier"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"État"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Activer automatiquement"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Jamais"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Horaires personnalisés"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Du coucher au lever du soleil"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Planifier"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Aucun"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Actif à une heure définie"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Actif la nuit"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Heure de début"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Heure de fin"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"État"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensité"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Désactivé. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Ne jamais activer automatiquement"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Activer automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Activer automatiquement au coucher du soleil"</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Activé. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Ne jamais désactiver automatiquement"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Désactiver automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Désactiver automatiquement au lever du soleil"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Désactivé - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Ne jamais activer automatiquement"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Activer automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Activer automatiquement au coucher du soleil"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Activé - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Ne jamais désactiver automatiquement"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Désactiver automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Désactiver automatiquement au lever du soleil"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Veille"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"L\'écran s\'éteint"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Paramètres"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Soulever pour activer"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Affichage en mode Veille"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Affichage en mode Veille"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Toujours activé"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nouvelles notifications"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Activation du mode Veille"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nouvelles notifications"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activer l\'écran lors de la réception de notifications"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Toujours activé"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Afficher l\'heure, les icônes de notification et d\'autres informations"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Taille de la police"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Agrandir ou réduire le texte"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Paramètres verrouillage SIM"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"L\'APN est obligatoire."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Le champ MCC doit contenir 3 chiffres."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Le champ MNC doit contenir 2 ou 3 chiffres."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"L\'opérateur n\'autorise pas l\'ajout d\'APN de type %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Restauration des paramètres APN par défaut en cours..."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Rétablir param. par défaut"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"La réinitialisation des paramètres APN par défaut est terminée."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Formater la carte SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Effacer toutes les données de la mémoire de stockage USB interne, telles que la musique ou les photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Effacer toutes les données de la carte SD, telles que la musique ou les photos"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Effacer les cartes eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Supprimer toutes les cartes eSIM du téléphone. Cette opération n\'annulera pas votre forfait mobile."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Supprimer toutes les cartes eSIM de la tablette. Cette opération n\'annulera pas votre forfait mobile."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Réinitialiser la tablette"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Réinitialiser le téléphone"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Effacer toutes vos informations personnelles et les applications téléchargées ? Cette action est irréversible."</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Impossible de partager la connexion ou d\'utiliser des points d\'accès mobiles lorsque la sauvegarde des données est activée"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Via USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Activer pour partager la connexion lorsque le câble USB est connecté."</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Partage de connexion en cours"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Impossible de partager la connexion lorsqu\'une mémoire de stockage USB est utilisée."</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB non connecté"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Connecter pour activer"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Erreur liée au partage de connexion via USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Partager la connexion Internet du téléphone via un câble USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Partager la connexion Internet de la tablette via un câble USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Via Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Partage connexion Internet tablette via Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Partage connexion Internet téléphone via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Partage connex. Internet tablette avec 1 appareil via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Partage connex. Internet téléphone avec 1 appareil via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Partage connexion Internet tablette avec <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> appareils via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Partage connexion Internet téléphone avec <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> appareils via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Partager la connexion Internet de la tablette via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Partager la connexion Internet du téléphone via Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Partage de la connexion Internet de <xliff:g id="DEVICE_NAME">%1$d</xliff:g> via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Connexion Internet tablette non partagée via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Connexion Internet du téléphone non partagée via Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Pas de partage de connexion."</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Partage connexion impossible au-delà de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> appareils."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Le partage connexion avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g> va être annulé."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Utilisez un point d\'accès et le partage de connexion pour fournir un accès Internet à d\'autres appareils via votre connexion au réseau mobile."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Utilisez un point d\'accès et le partage de connexion pour fournir un accès à Internet à d\'autres appareils via votre connexion au réseau mobile. Les applications peuvent également créer un point d\'accès pour partager du contenu avec des appareils à proximité."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Aide"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Réseau mobile"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Forfait mobile"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode de localisation"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Utiliser le GPS, le Wi‑Fi, le Bluetooth ou les réseaux mobiles pour déterminer la position"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Utiliser le Wi‑Fi, le Bluetooth ou les réseaux mobiles pour déterminer la position"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utiliser le GPS pour déterminer la position"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Utiliser le GPS et les capteurs de l\'appareil pour déterminer la position"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Recherche"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Recherche Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Améliorez la précision de la localisation en autorisant les applications et les services système à rechercher les réseaux Wi-Fi à tout moment."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Vous n\'avez pas de connexion Internet. Pour consulter ces informations maintenant, accédez à %s depuis un ordinateur connecté à Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Chargement…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Choisir votre mot de passe"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Pour utiliser empreinte, définir mot passe"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Choisir votre schéma"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Pour utiliser empreinte, définir schéma"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choisir votre code PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Pour utiliser empreinte, définir code"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirmez le mot de passe."</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmez votre schéma"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmez votre code PIN."</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Paramètres des applications"</string>
     <string name="install_applications" msgid="4872012136210802181">"Sources inconnues"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Autoriser toutes sources appli"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Applications ouvertes récemment"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Afficher les <xliff:g id="COUNT">%1$d</xliff:g> applications"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"Il y a <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Votre tablette et vos données personnelles sont très vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être le seul responsable de tout dommage causé à votre tablette ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Votre téléphone et vos données personnelles sont très vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être le seul responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Paramètres avancés"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Arrêter le service système ?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Si vous arrêtez ce service, certaines fonctionnalités de votre tablette peuvent cesser de fonctionner correctement jusqu\'à ce que vous ayez éteint, puis rallumé votre appareil."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Si vous arrêtez ce service, certaines fonctionnalités de votre téléphone peuvent cesser de fonctionner correctement jusqu\'à ce que vous ayez éteint, puis rallumé votre appareil."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Langues, saisie et gestes"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Langues et saisie"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Langues et saisie"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Aide à la saisie"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> service d\'impression activé</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> services d\'impression activés</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> tâche d\'impression</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tâches d\'impression</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Services d\'impression"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Aucun service installé"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Aucune imprimante trouvée"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Détails d\'utilisation"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Ajuster la consommation"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Modules inclus"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Des applications déchargent la batterie"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Appareil maintenu activé"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Activation de l\'appareil en arrière-plan"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Position demandée fréquemment"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> applications ne fonctionnent pas correctement"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Arrêter l\'application ?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Votre téléphone ne peut pas gérer la batterie normalement, car <xliff:g id="APP">%1$s</xliff:g> le maintient activé.\n\nPour y remédier, vous pouvez forcer l\'arrêt de l\'application.\n\nSi le problème persiste, vous devrez peut-être désinstaller l\'application pour améliorer les performances de la batterie."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Votre tablette ne peut pas gérer la batterie normalement, car <xliff:g id="APP">%1$s</xliff:g> la maintient activée.\n\nPour y remédier, vous pouvez forcer l\'arrêt de l\'application.\n\nSi le problème persiste, vous devrez peut-être désinstaller l\'application pour améliorer les performances de la batterie."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Votre appareil ne peut pas gérer la batterie normalement, car <xliff:g id="APP">%1$s</xliff:g> le maintient activé.\n\nPour y remédier, vous pouvez forcer l\'arrêt de l\'application.\n\nSi le problème persiste, vous devrez peut-être désinstaller l\'application pour améliorer les performances de la batterie."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Arrêter l\'application"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Désactiver l\'utilisation en arrière-plan ?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Votre téléphone ne peut pas gérer la batterie normalement, car <xliff:g id="APP">%1$s</xliff:g> le maintient activé.\n\nPour résoudre ce problème, votre téléphone peut empêcher cette application de s\'exécuter en arrière-plan."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Votre tablette ne peut pas gérer la batterie normalement, car <xliff:g id="APP">%1$s</xliff:g> la maintient activée.\n\nPour résoudre ce problème, votre tablette peut empêcher cette application de s\'exécuter en arrière-plan."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Votre appareil ne peut pas gérer la batterie normalement, car <xliff:g id="APP">%1$s</xliff:g> le maintient activé.\n\nPour résoudre ce problème, votre appareil peut empêcher cette application de s\'exécuter en arrière-plan."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Désactiver"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Désactiver les services de localisation ?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Votre téléphone ne peut pas gérer la batterie normalement, car <xliff:g id="APP">%1$s</xliff:g> continue de demander votre position quand vous n\'utilisez pas l\'application.\n\nPour résoudre le problème, vous pouvez désactiver les services de localisation pour cette application."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Votre tablette ne peut pas gérer la batterie normalement, car <xliff:g id="APP">%1$s</xliff:g> continue de demander votre position quand vous n\'utilisez pas l\'application.\n\nPour résoudre le problème, vous pouvez désactiver les services de localisation pour cette application."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Votre appareil ne peut pas gérer la batterie normalement, car <xliff:g id="APP">%1$s</xliff:g> continue de demander votre position quand vous n\'utilisez pas l\'application.\n\nPour résoudre le problème, vous pouvez désactiver les services de localisation pour cette application."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Désactiver"</string>
     <string name="power_screen" msgid="3023346080675904613">"Écran"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lampe de poche"</string>
     <string name="power_camera" msgid="4976286950934622605">"Caméra"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Applications"</string>
     <string name="power_service" msgid="1599661212370831780">"Services"</string>
     <string name="power_system" msgid="8290455327965307383">"Système"</string>
-    <string name="power_user" msgid="1889728099253018005">"Utilisateur"</string>
+    <string name="power_user" msgid="3706143225319881667">"Autres utilisateurs"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Processeur - Durée totale"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Processeur - Premier plan"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Maintenir activé"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consommation surestimée"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Temps d\'utilisation : <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Active pendant <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Utilisation de l\'écran : <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilisé(s) par <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> de la batterie"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Modifier le code PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Afficher les notifications"</string>
     <string name="help_label" msgid="6886837949306318591">"Aide et commentaires"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Articles d\'aide, service d\'assistance par téléphone et par chat"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Articles d\'aide, téléphone et chat, premiers pas"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Compte pour contenu"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID de photo"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Menaces graves"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="other">Afficher %d éléments masqués</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Réseau et Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobile, consommation des données, point d\'accès"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobile"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"consommation des données"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"point d\'accès"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Appareils connectés"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Applications et notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Autorisations, applications par défaut"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Utilisateurs et comptes"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"geste"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"payer, appuyer, paiements"</string>
     <string name="keywords_backup" msgid="470070289135403022">"sauvegarde, sauvegarder"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"geste, bord, côté, bord actif, presser, prise en main, assistance, assistant, que l\'on presse, ok google, assistant google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"geste, activer, notifications, écran, affichage, écran désactivé, écran activé, presser, bord, veille, mode veille, prise en main"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"geste, silence, répéter, alarme, appel entrant, silencieux, affichage, écran de verrouillage, presser, prise en main, bord, arrêter"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Créer un tag NFC pour Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Modifier"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Appuyer sur un tag pour le modifier…"</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"N\'afficher aucune notification professionnelle"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Lorsque votre appareil est verrouillé, comment voulez-vous que les notifications du profil s\'affichent ?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notifications du profil"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Notifications"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Notifications"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notifications appli"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Catégorie de la notification"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Laisser l\'application décider"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgente"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Émettre un signal sonore"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Ne pas émettre de son, activer le vibreur ni afficher ces notifications sur l\'écran actif"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Importance faible"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Importance moyenne"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importance élevée"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgent"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Assistant de notifications"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Accès aux notifications"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"L\'accès aux notifications du profil professionnel est bloqué"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Autoriser le mode Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Autorisez cette application à créer une fenêtre Picture-in-picture lorsqu\'elle est ouverte ou après l\'avoir quittée (par exemple, pour continuer de regarder une vidéo). Cette fenêtre se superpose aux autres applications en cours d\'utilisation."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Oui"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Non"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accès \"Ne pas déranger\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Aucune demande d\'accès \"Ne pas déranger\" n\'a été envoyée par les applications installées."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours…"</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Ce profil professionnel est géré par"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Géré par <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Expérimental)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Rotation de l\'appareil"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Faire pivoter le contenu affiché à l\'écran"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Rester en mode portrait"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Rester en mode paysage"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Conserver l\'orientation actuelle"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Démarrage sécurisé"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuer"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Pour renforcer la protection de cet appareil, vous pouvez exiger la saisie de votre code avant que l\'appareil ne démarre. De cette façon, il ne pourra pas recevoir d\'appels, de messages, de notifications ni d\'alarmes tant qu\'il n\'aura pas démarré. \n\nCela permet de protéger les données en cas de perte ou de vol de l\'appareil. Voulez-vous exiger la saisie de votre code avant le démarrage de votre appareil ?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Pour renforcer la protection de cet appareil, vous pouvez exiger la saisie de votre mot de passe avant que l\'appareil ne démarre. De cette façon, il ne pourra pas recevoir d\'appels, de messages, de notifications ni d\'alertes tant qu\'il n\'aura pas démarré. \n\nCela permet de protéger les données en cas de perte ou de vol de l\'appareil. Voulez-vous exiger la saisie de votre mot de passe avant le démarrage de votre appareil ?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Outre la reconnaissance de votre empreinte digitale pour déverrouiller votre appareil, vous pouvez renforcer la sécurité en exigeant la saisie de votre code avant que l\'appareil ne démarre. De cette façon, il ne pourra pas recevoir d\'appels, de messages, de notifications, ni d\'alarmes tant qu\'il n\'aura pas démarré.\n\nCela permet de protéger les données de votre appareil en cas de perte ou de vol. Voulez-vous exiger la saisie de votre code avant le démarrage de votre appareil ?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Outre la reconnaissance de votre empreinte digitale pour déverrouiller votre appareil, vous pouvez renforcer la sécurité en exigeant la saisie de votre schéma avant que l\'appareil ne démarre. De cette façon, il ne pourra pas recevoir d\'appels, de messages, de notifications, ni d\'alarmes tant qu\'il n\'aura pas démarré.\n\nCela permet de protéger les données en cas de perte ou de vol de l\'appareil. Voulez-vous exiger la saisie de votre schéma avant le démarrage de votre appareil ?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Outre la reconnaissance de votre empreinte digitale pour déverrouiller votre appareil, vous pouvez renforcer la sécurité en exigeant la saisie de votre mot de passe avant que l\'appareil ne démarre. De cette façon, il ne pourra pas recevoir d\'appels, de messages, de notifications, ni d\'alarmes tant qu\'il n\'aura pas démarré.\n\nCela permet de protéger les données de votre appareil en cas de perte ou de vol. Voulez-vous exiger la saisie de votre mot de passe avant le démarrage de votre appareil &gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en demandant la saisie de votre mot de passe avant que l\'appareil ne démarre, en plus de la lecture de votre empreinte digitale. L\'appareil ne peut pas recevoir d\'appel, de message, de notification ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Voulez-vous exiger la saisie de votre mot de passe avant le démarrage de l\'appareil ?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Oui"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Non"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Exiger le code ?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertes d\'utilisation"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Afficher l\'utilisation de l\'appareil chargé"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Afficher utilisation appli"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Utilisation intensive"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> application présente un comportement anormal</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> applications présentent un comportement anormal</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Une application décharge la batterie</item>
+      <item quantity="other">Des applications déchargent la batterie</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Non optimisées"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Non optimisée"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Utilisation de la batterie optimisée"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Superposer aux autres applis"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> applis sur <xliff:g id="COUNT_1">%2$d</xliff:g> autorisées à se superposer à d\'autres"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Applications disposant de l\'autorisation"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Oui"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Non"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Autorisée"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Non autorisée"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"installer applications sources inconnues"</string>
     <string name="write_settings" msgid="4797457275727195681">"Modifier paramètres système"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"modifier paramètres système"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"L\'écran est teinté en rouge ambré. Ceci peut vous aider à vous endormir."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> autres"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> suggestion</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="one">+<xliff:g id="COUNT">%1$d</xliff:g> suggestion</item>
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Supprimer"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Température des couleurs froides"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliser des couleurs plus froides à l\'écran"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Limite déclenchant un avertissement sur la consommation des données : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Avertissement relatif aux données : <xliff:g id="ID_1">%1$s</xliff:g> / Limite de consommation des données : <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Cycle de facturation"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Le cycle mensuel débute le <xliff:g id="ID_1">%1$s</xliff:g> de chaque mois."</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Tous les mois à partir du <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Mensuel (le <xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Restrictions sur le réseau"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restriction</item>
@@ -3316,7 +3408,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> applications sont autorisées à utiliser des données illimitées lorsque l\'économiseur de données est activé</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Économiseur de données"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Accès non restreint aux données"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Données non restreintes"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Les données en arrière-plan sont désactivées."</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Activé"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Désactivé"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Contrôler notifications écran verrouillage"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Afficher ou masquer le contenu des notifications"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Tous"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Assistance"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Aide et conseils"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"La plus petite largeur"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Aucune demande d\'accès aux SMS premium n\'a été envoyée pour les applications installées."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Les SMS premium peuvent être payants et s\'ajouter aux factures de votre opérateur. Si vous activez l\'autorisation pour une application, vous serez en mesure d\'envoyer des SMS premium à l\'aide de cette dernière."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatique"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuels"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Libérer de l\'espace maintenant"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestes"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Raccourcis des gestes"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gestes rapides pour contrôler votre téléphone"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gestes rapides pour contrôler votre tablette"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gestes rapides pour contrôler votre appareil"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Accès rapide à l\'appareil photo"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Pour accéder rapidement à l\'appareil photo, appuyez deux fois sur le bouton Marche/Arrêt. Fonctionne à partir de n\'importe quel écran."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Ouvrir l\'appareil photo rapidement"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Appuyer 2 fois sur Marche/Arrêt pour ouvrir l\'appareil photo"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Activation du mode selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Prendre des selfies plus rapidement"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Double rotation du téléphone pour activer le mode selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Double rotation de la tablette pour activer le mode selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Double rotation de l\'appareil pour activer le mode selfie"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Appuyer deux fois sur tél. pour le consulter"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Appuyez deux fois sur la tablette pour la consulter"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Appuyez deux fois sur l\'appareil pour le consulter"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Pour vérifier rapidement vos notifications, appuyez deux fois sur l\'écran."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Pour afficher l\'heure, les icônes de notification et d\'autres informations, appuyez deux fois sur l\'écran."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Consulter les notifications lorsque l\'écran est éteint"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Saisir le téléphone pour le consulter"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Saisir la tablette pour la consulter"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Saisir l\'appareil pour le consulter"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Pour vérifier rapidement vos notifications, saisissez votre téléphone."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Pour vérifier rapidement vos notifications, saisissez votre tablette."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Pour vérifier rapidement vos notifications, saisissez votre appareil."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Pour afficher l\'heure, les icônes de notification et d\'autres informations, soulevez votre téléphone."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Pour afficher l\'heure, les icônes de notification et d\'autres informations, soulevez votre tablette."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Pour afficher l\'heure, les icônes de notification et d\'autres informations, soulevez votre appareil."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Consulter les notifications lorsque l\'écran est éteint"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Utilisation du lecteur d\'empreinte pour voir les notifications"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le lecteur d\'empreinte digitale à l\'arrière du téléphone."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le lecteur d\'empreinte digitale à l\'arrière de la tablette."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le lecteur d\'empreinte digitale à l\'arrière de l\'appareil."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Consulter les notifications rapidement"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Passer le doigt vers le bas sur le lecteur d\'empreinte"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Lever le téléphone pour ouvrir l\'appareil photo"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Pour ouvrir l\'appareil photo automatiquement, prenez votre téléphone et faites comme si vous alliez prendre une photo (en mode Portrait ou Paysage). Fonctionne même lorsque le téléphone est en veille ou verrouillé."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Prendre photos quand téléphone est en veille ou verrouillé"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Geste d\'assistance"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilité"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Voulez-vous supprimer cette appli instantanée ?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Jeux"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Fichiers audio"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Espace utilisé"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(désinstallé pour utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(désactivé pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Service de saisie automatique"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Appli instantanée"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Désactiver le gestionnaire d\'espace de stockage ?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Applications de films et séries"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Espace utilisé"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Informations de gestion des comptes opérateur"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Déclencher la gestion des comptes opérateur"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Nouveautés à découvrir"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Découvrez les cinq fonctionnalités clés"</string>
 </resources>
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index 9cd177a..99d2d5a 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Boa"</item>
     <item msgid="8986346415847956850">"Excelente"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Sempre"</item>
-    <item msgid="844721238536786870">"Só cando está conectada"</item>
-    <item msgid="1986753720941888596">"Nunca"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Sempre"</item>
-    <item msgid="7433294150916905997">"Só cando está conectada"</item>
-    <item msgid="1390404486722375028">"Nunca"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Últimos 30 días"</item>
     <item msgid="6600989128423965319">"Definir ciclo de uso..."</item>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 34d86de..4ff8adf 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Agora xa es programador."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Non é necesario, xa es un programador."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Activa primeiro as opcións de programador."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Sen fíos e redes"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Conexións"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Dispositivo"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Fornecemento VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videochamadas activadas"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Chamadas por wifi activadas"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/presenza fornecidos"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Alimentación da radio móbil"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Ver axenda de enderezos da SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ver números de marcación fixa"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Explorar dispositivos"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Cambiar nome deste dispositivo"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Cambiar o nome"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Desconectar?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Isto finalizará a túa conexión con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Desconectar dispositivo?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"O teléfono desconectarase de: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"A tableta desconectarase de: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"O dispositivo desconectarase de: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Desconect."</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Non tes permiso para cambiar a configuración de Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Sincronizar dispositivo novo"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será visible para dispositivos próximos coa configuración de Bluetooth activada."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Enderezo Bluetooth do teléfono: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Enderezo Bluetooth da tableta: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Enderezo Bluetooth do dispositivo: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Queres desconectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Difusión"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Desactivar o perfil?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitude de sincronización Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitude de sincronización"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Tocar para sincronizar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar ficheiros recibidos"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Ficheiros recibidos"</string>
     <string name="device_picker" msgid="4978696506172252813">"Escolle un dispositivo de Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> quere activar o Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> quere desactivar o Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s quere acceder ás túas mensaxes. Queres conceder acceso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitude de acceso á SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> quere acceder á túa tarxeta SIM. Ao outorgar acceso á tarxeta SIM desactivarase a conectividade de datos no teu dispositivo durante a conexión. Outorgar acceso a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para os demais dispositivos"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Os teus dispositivos"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sincronizar dispositivo novo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Seleccionar zona horaria"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localización"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Seguranza e localización"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encriptación e credenciais"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Teléfono encriptado"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"O dispositivo está encriptado"</string>
@@ -354,40 +367,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloquear coa impresión dixital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Usa a túa impresión dixital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Toca o sensor da impresión dixital para desbloquear o teléfono, autorizar compras ou iniciar sesión nas aplicacións. Ten coidado coas impresións dixitais que engades, pois mesmo cunha soa impresión dixital se pode facer todo o indicado previamente.\n\nNota: A túa impresión dixital é menos segura que un padrón seguro ou un PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Só tes que tocar o sensor de impresión dixital para autorizar compras ou iniciar sesión nas aplicacións. Ten coidado coas impresións dixitais que engades, pois mesmo cunha soa se pode facer todo o indicado previamente.\n\nNota: Non podes usar a túa impresión dixital para desbloquear este dispositivo. Para obter máis información, contacta co administrador da túa organización."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Toca o sensor da impresión dixital para desbloquear o teléfono, autorizar compras ou iniciar sesión nas aplicacións. Ten coidado coas impresións dixitais que engades, pois mesmo cunha soa impresión dixital se pode facer todo o indicado previamente.\n\nNota: A túa impresión dixital é menos segura que un padrón seguro ou un PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Omitir"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Engadir impr. dixital"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Non se activarán as funcións de protección do dispositivo. Non poderás impedir que outras persoas utilicen esta tableta en caso de perda, roubo ou borrado dos datos."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Non se activarán as funcións de protección do dispositivo. Non poderás impedir que outras persoas utilicen este dispositivo en caso de perda, roubo ou borrado dos datos."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Non se activarán as funcións de protección do dispositivo. Non poderás impedir que outras persoas utilicen este teléfono en caso de perda, roubo ou borrado dos datos."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Non se activarán as funcións de protección do dispositivo. Non poderás impedir que outras persoas utilicen esta tableta en caso de perda ou roubo."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Non se activarán as funcións de protección do dispositivo. Non poderás impedir que outras persoas utilicen este dispositivo en caso de perda ou roubo."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Non se activarán as funcións de protección do dispositivo. Non poderás impedir que outras persoas utilicen este teléfono en caso de perda ou roubo."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Seguinte"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"As funcións de protección do dispositivo non se activarán. Non poderás evitar que outros usuarios utilicen a tableta en caso de perda, roubo ou restablecemento"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"As funcións de protección do dispositivo non se activarán. Non poderás evitar que outros usuarios o utilicen en caso de perda, roubo ou restablecemento."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"As funcións de protección do dispositivo non se activarán. Non poderás evitar que outros usuarios utilicen este teléfono en caso de perda, roubo ou restablecemento."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"As funcións de protección do dispositivo non se activarán. Non poderás evitar que outros usuarios utilicen esta tableta en caso de perda ou roubo."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"As funcións de protección do dispositivo non se activarán. Non poderás evitar que outros usuarios o utilicen en caso de perda ou roubo."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"As funcións de protección do dispositivo non se activarán. Non poderás evitar que outros usuarios utilicen este teléfono en caso de perda ou roubo."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Omitir igualmente"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Volver"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Localiza o sensor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localiza o sensor de impresións dixitais na parte posterior do teléfono."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Toca o sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Está na parte posterior do teléfono. Utiliza o dedo índice."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"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="7086763077909041106">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Aceptar"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Eliminar"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Comecemos"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Toca o sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Coloca o dedo no sensor e levántao cando notes unha vibración."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Volve tocalo"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Move suavemente o dedo para engadir todas as partes diferentes da túa impresión dixital."</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Identificación engadida"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Cando vexas esta icona, podes usar a túa impresión dixital para a identificación ou para autorizar unha compra."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Simplemente toca o sensor de impresións dixitais para activar e desbloquear o teu dispositivo."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Cando vexas esta icona, tamén poderás autorizar compras ou iniciar sesión en aplicacións."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Levanta o dedo e volve tocar"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Continúa levantando o dedo para engadir as diferentes partes da túa impresión dixital"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Engadiuse a impresión dixital"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Cando vexas esta icona, utiliza a impresión dixital para efectuar a identificación ou autorizar as compras."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Omitir configuración impresión dixital?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Decidiches usar a túa impresión dixital para desbloquear o teu teléfono. Se omites este paso agora, terás que configuralo máis tarde. Non tardarás máis dun minuto en facelo."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueo da pantalla"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Feito"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Iso non é o sensor"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utiliza o sensor de impresión dixital."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Toca co dedo índice o sensor que está detrás do teléfono."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Non se completou a inscrición"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Esgotouse o tempo de espera da inscrición de impresión dixital. Téntao de novo."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"A inscrición de impresión dixital non funcionou. Téntao de novo ou utiliza outro dedo."</string>
@@ -449,6 +460,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activa as funcións de protección do dispositivo para evitar que outras persoas utilicen este dispositivo sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activa as funcións de protección do teléfono para evitar que outras persoas utilicen este teléfono sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Escolle o método de bloqueo da pantalla alternativo"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opcións de bloqueo da pantalla"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opcións de bloqueo da pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo da pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / inmediatamente despois de entrar en suspensión"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> despois de entrar en suspensión"</string>
@@ -519,13 +532,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Mudar padrón desbloq."</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN desbloq."</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mudar contrasinal desbloq."</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Téntao de novo. Intento <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Último intento"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Se introduces un padrón de traballo incorrecto neste intento, o teu perfil de traballo e os datos asociados eliminaranse deste dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Se introduces un PIN de traballo incorrecto neste intento, o teu perfil de traballo e os datos asociados eliminaranse deste dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Se introduces un contrasinal de traballo incorrecto neste intento, o teu perfil de traballo e os datos asociados eliminaranse deste dispositivo."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Realizaches demasiados intentos incorrectos. O teu perfil de traballo e os datos asociados eliminaranse deste dispositivo."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Ignorar"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Téntao de novo. Intento <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Eliminaranse os teus datos"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Se introduces un padrón incorrecto no seguinte intento, eliminaranse os datos deste dispositivo"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Se introduces un PIN incorrecto no seguinte intento, eliminaranse os datos deste dispositivo"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Se introduces un contrasinal incorrecto no seguinte intento, eliminaranse os datos deste dispositivo"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Se introduces un padrón incorrecto no seguinte intento, eliminarase este usuario"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Se introduces un PIN incorrecto no seguinte intento, eliminarase este usuario"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Se introduces un contrasinal incorrecto no seguinte intento, eliminarase este usuario"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Se introduces un padrón incorrecto no seguinte intento, eliminaranse o teu perfil de traballo e os datos asociados"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Se introduces un PIN incorrecto no seguinte intento, eliminaranse o teu perfil de traballo e os datos asociados"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Se introduces un contrasinal incorrecto no seguinte intento, eliminaranse o teu perfil de traballo e os datos asociados"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Realizaches demasiados intentos incorrectos. Eliminaranse os datos deste dispositivo."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Realizaches demasiados intentos incorrectos. Eliminarase este usuario."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Realizaches demasiados intentos incorrectos. Eliminaranse este perfil de traballo e os datos asociados."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ignorar"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Debe ter polo menos <xliff:g id="COUNT">%d</xliff:g> caracteres"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"O PIN debe ter polo menos <xliff:g id="COUNT">%d</xliff:g> díxitos"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
@@ -626,6 +647,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avanzado"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Co Bluetooth activado, o dispositivo pode comunicarse con outros dispositivos Bluetooth próximos."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Para mellorar a precisión da localización, as aplicacións do sistema e os servizos poden seguir detectando dispositivos Bluetooth. Podes cambiar esta opción na <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuración de busca<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Non se puido conectar. Téntao de novo."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Datos do dispositivo"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Enderezo Bluetooth do dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Queres esquecer o dispositivo?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"O teléfono non seguirá sincronizado con: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"A tableta non seguirá sincronizada con: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"O dispositivo non seguirá sincronizado con: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Esquecer dispositivo"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectar con..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> desconectarase do audio multimedia."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> desconectarase do audio do mans libres."</string>
@@ -778,6 +807,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Non fornecer"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Non validar"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Non se especificou ningún certificado. A túa conexión non será privada."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"O nome da rede é demasiado longo."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Debe especificarse un dominio."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dispoñible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dispoñible)"</string>
@@ -809,7 +839,6 @@
       <item quantity="one">1 rede</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wifi avanzada"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurar wifi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Enderezo MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Enderezo IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de subrede"</string>
@@ -846,9 +875,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Esquecer este grupo?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Zona wifi portátil"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Zona wifi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Usa a conexión móbil para a rede wifi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Non se comparte a conexión a Internet da tableta por zona wifi"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Non se comparte a conexión a Internet do teléfono a través de zona wifi"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Non se está compartindo a conexión a Internet nin contido con outros dispositivos"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Estase compartindo a conexión a Internet da tableta a través da zona wifi"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Estase compartindo a conexión a Internet do teléfono a través de zona wifi"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"A aplicación está compartindo contido. Para compartir a conexión a Internet, desactiva a zona wifi e volve activala"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nome da wifi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Activando a zona wifi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Outros dispositivos poden conectarse á zona wifi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Contrasinal da wifi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda AP"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Utiliza a zona wifi para crear unha rede wifi para os teus outros dispositivos. A zona wifi fornece Internet a través da túa conexión de datos móbiles. É posible que se apliquen tarifas de datos móbiles adicionais."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"As aplicacións poden crear unha zona wifi para compartir contido cos dispositivos que están cerca."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Activando zona wifi..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desactivando zona wifi..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> está activa"</string>
@@ -895,6 +932,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Cando están activadas as chamadas wifi, o teu teléfono pode enviar as túas chamadas a través de redes wifi ou da rede do teu operador, dependendo das túas preferencias e de cal teña o sinal máis forte. Antes de activar esta función, consulta co teu operador as tarifas e outra información."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Actualizar enderezo de emerxencia"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Enderezo que utilizan os servizos de emerxencia como a túa localización se chamas ao 911 a través da wifi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
@@ -952,6 +990,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Non hai resultados"</string>
     <string name="display_settings" msgid="7965901687241669598">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Xirar a pantalla automaticamente"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Cores vivas"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Cambia a orientación automaticamente ao xirar a tableta"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Cambia a orientación automaticamente ao xirar o teléfono"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Cambia a orientación automaticamente ao xirar a tableta"</string>
@@ -979,23 +1018,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimiza o nivel de brillo segundo a luz dispoñible. Cando estea activado, poderás axustar o brillo temporalmente."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Luz nocturna"</string>
     <string name="night_display_text" msgid="1837277457033025056">"A función Luz nocturna dálle un ton ámbar á pantalla pola noite para que che resulte máis fácil mirala con pouca luz e che axude a coller o sono."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Programar horario"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Estado"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Activar automaticamente"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nunca"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Programación personalizada"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Do anoitecer ao amencer"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Programar"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Nunca"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Activar en horario personalizado"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Activar do anoitecer ao amencer"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Hora de inicio"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de finalización"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Estado"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensidade"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Desactivado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nunca se activará automaticamente."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Activarase automaticamente ás <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Activarase automaticamente ao anoitecer."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Activado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nunca se desactivará automaticamente."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Desactivarase automaticamente ás <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Desactivarase automaticamente ao amencer."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Desactivado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Nunca se activará automaticamente"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Activarase automaticamente á seguinte hora: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Activarase automaticamente ao anoitecer"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Activado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Nunca se desactivará automaticamente"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Desactivarase automaticamente á seguinte hora: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Desactivarase automaticamente ao amencer"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspensión"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A pantalla apágase"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Despois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividade"</string>
@@ -1019,8 +1057,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Configuración"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para acender"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Pantalla ambiente"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Pantalla ambiente"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Sempre activado"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificacións"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Cando mostrar a pantalla"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Novas notificacións"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activa a pantalla cando recibes notificacións"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre activado"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostra a hora, as iconas de notificación e outra información"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño do tipo de letra"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Reduce ou amplía o texto"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Configuración de bloqueo da SIM"</string>
@@ -1272,6 +1316,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"O APN non pode estar baleiro."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"O campo MCC debe conter 3 díxitos."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"O campo MNC debe conter 2 ou 3 díxitos."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"O operador non permite engadir APN de tipo: %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Restaurando a configuración do APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Restablecer aos valores predeterminados"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Completouse o restablecemento da configuración de APN predeterminada."</string>
@@ -1301,6 +1346,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Borrar tarxeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Borra todos os datos do almacenamento USB interno, como a música ou as fotos"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Borra todos os datos da tarxeta SD, como a música ou as fotos"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Borrar as eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Borra todas as eSIM do teléfono. Esta acción non cancelará o teu plan de servizo móbil."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Borra todas as eSIM da tableta. Esta acción non cancelará o teu plan de servizo móbil."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer tableta"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restablecer teléfono"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Queres borrar toda a túa información persoal e as aplicacións descargadas? Non podes desfacer esta acción."</string>
@@ -1323,26 +1371,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Non se pode compartir a conexión nin utilizar zonas wifi portátiles mentres o economizador de datos estea activado"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Compartir conexión por USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB conectado, sen conexión compartida"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Conexión compartida"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Non se pode compartir a conexión se o almacenamento USB está en uso"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB non conectado"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Conectar para activar"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Erro de conexión compartida por USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Compartir a conexión a Internet do teléfono por USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Compartir a conexión a Internet da tableta por USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Conexión por Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Compartindo a conexión da tableta por Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Compartindo a conexión do teléfono por Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Compartindo conex. da tableta cun dispositivo por Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Compartindo conex. do teléfono cun dispositivo por Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Compartindo conexión da tableta con <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivos por Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Compartindo conexión a Internet do teléfono con <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivos por Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Compartir a conexión a Internet da tableta por Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Compartir a conexión a Internet do teléfono por Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Compartindo conexión a Internet de <xliff:g id="DEVICE_NAME">%1$d</xliff:g> por Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Non se comparte a conexión da tableta por Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Non se comparte a conexión do teléfono por Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Conexión non compartida"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Non se pode compartir a conexión con máis de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Desactivarase a conexión compartida de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Utiliza a zona wifi e a conexión compartida para proporcionar Internet a outros dispositivos mediante a túa conexión de datos móbiles."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Utiliza a zona wifi e a conexión compartida para proporcionar Internet a outros dispositivos mediante a túa conexión de datos móbiles. As aplicacións tamén poden crear unha zona wifi para compartir contido cos dispositivos que están cerca."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Axuda"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Rede de telefonía móbil"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plan móbil"</string>
@@ -1375,7 +1412,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localización"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Utiliza o GPS, a wifi, o Bluetooth ou as redes de telefonía móbil para determinar a localización"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Utiliza a wifi, o Bluetooth ou as redes de telefonía móbil para determinar a localización"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usa o GPS para determinar a localización"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Usa o GPS e os sensores do dispositivo para determinar a localización"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Busca de conexións"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Busca de redes wifi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Mellora a localización permitindo que as aplicacións do sistema e os servizos detecten redes wifi en calquera momento."</string>
@@ -1420,8 +1457,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Non tes conexión de datos. Para ver esta información agora, accede a %s desde calquera ordenador conectado a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Escolle o teu contrasinal"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Impresión dixital: contrasinal"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Selecciona o teu padrón"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Impresión dixital: padrón"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Selecciona o teu PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Impresión dixital: PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirma o teu contrasinal"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma o teu padrón"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirma o teu PIN"</string>
@@ -1490,6 +1530,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Configuración da aplicación"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fontes descoñecidas"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Permitir todas as fontes de aplicacións"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Aplicacións abertas recentemente"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Ver as <xliff:g id="COUNT">%1$d</xliff:g> aplicacións"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"Hai <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"A tableta e os datos persoais son máis vulnerables aos ataques de aplicacións descoñecidas. Ao instalar aplicacións desta fonte, aceptas que es responsable dos danos ocasionados na tableta ou da perda dos datos que se poden derivar do seu uso."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"O teléfono e os datos persoais son máis vulnerables aos ataques de aplicacións descoñecidas. Ao instalar aplicacións desta fonte, aceptas que es responsable dos danos ocasionados no teléfono ou da perda dos datos que se poden derivar do seu uso."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configuración avanzada"</string>
@@ -1658,6 +1701,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Queres deter o servizo do sistema?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Se detés este servizo, é posible que algunhas funcións da tableta deixen de funcionar correctamente ata que o apagues e o acendas de novo."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Se detés este servizo, é posible que algunhas funcións do teléfono deixen de funcionar correctamente ata que o apagues e o acendas de novo."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Idiomas, entrada e xestos"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Idiomas e introdución de texto"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Idiomas e introdución de texto"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Axuda para introdución de texto"</string>
@@ -1872,6 +1919,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> servizos de impresión activados</item>
       <item quantity="one">1 servizo de impresión activado</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> traballos de impresión</item>
+      <item quantity="one">1 traballo de impresión</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Servizos de impresión"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Non hai servizos instalados"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Non se encontrou ningunha impresora"</string>
@@ -1938,6 +1989,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Detalles de uso"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Axustar uso de enerxía"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Paquetes incluídos"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplicacións que están esgotando a batería"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Mantendo o dispositivo activo"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Activando o dispositivo en segundo plano"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Solicitando a localización con frecuencia"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplicacións funcionan incorrectamente"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Queres deter a aplicación?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"O teléfono non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP">%1$s</xliff:g> estao mantendo activo.\n\nPara tentar solucionar este problema, podes forzar a parada da aplicación.\n\nSe o problema persiste, é posible que necesites desinstalar a aplicación para mellorar o rendemento da batería."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"A tableta non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP">%1$s</xliff:g> estaa mantendo activa.\n\nPara tentar solucionar este problema, podes forzar a parada da aplicación.\n\nSe o problema persiste, é posible que necesites desinstalar a aplicación para mellorar o rendemento da batería."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"O dispositivo non pode xestionar a uso da batería con normalidade porque a aplicación <xliff:g id="APP">%1$s</xliff:g> estao mantendo activo.\n\nPara tentar solucionar este problema, podes forzar a parada da aplicación.\nSe o problema persiste\n, é posible que necesites desinstalar a aplicación para mellorar o rendemento da batería."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Deter aplicación"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Queres desactivar o uso en segundo plano?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"O teléfono non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP">%1$s</xliff:g> continúa activándoo.\n\nPara solucionar este problema, o teu teléfono pode evitar que a aplicación se execute en segundo plano."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"A tableta non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP">%1$s</xliff:g> continúa activándoa.\n\nPara solucionar este problema, a túa tableta pode evitar que a aplicación se execute en segundo plano."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"O dispositivo non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP">%1$s</xliff:g> continúa activándoo.\n\nPara solucionar este problema, o teu dispositivo pode evitar que a aplicación se execute en segundo plano."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Desactivar"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Queres desactivar a localización?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"O teléfono non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP">%1$s</xliff:g> continúa solicitando a túa localización cando non utilizas a aplicación.\n\nSe queres solucionar este problema, podes desactivar a localización para esta aplicación."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"A tableta non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP">%1$s</xliff:g> continúa solicitando a túa localización cando non utilizas a aplicación.\n\nSe queres solucionar este problema, podes desactivar a localización para esta aplicación."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"O dispositivo non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP">%1$s</xliff:g> continúa solicitando a túa localización cando non utilizas a aplicación.\n\nSe queres solucionar este problema, podes desactivar a localización para esta aplicación."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Desactivar"</string>
     <string name="power_screen" msgid="3023346080675904613">"Pantalla"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lanterna"</string>
     <string name="power_camera" msgid="4976286950934622605">"Cámara"</string>
@@ -1952,7 +2023,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Aplicacións"</string>
     <string name="power_service" msgid="1599661212370831780">"Servizos"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
-    <string name="power_user" msgid="1889728099253018005">"Usuario"</string>
+    <string name="power_user" msgid="3706143225319881667">"Outros usuarios"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primeiro plano da CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Activo"</string>
@@ -2004,6 +2075,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Reconto excesivo do uso de enerxía"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Tempo de utilización: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aplicación activa durante <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Uso da pantalla: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilizado por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da batería total"</string>
@@ -2563,7 +2635,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Cambiar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Amosar notificacións"</string>
     <string name="help_label" msgid="6886837949306318591">"Axuda e suxerencias"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Artigos de axuda, asistencia por teléfono e chat"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Artigos de axuda, teléfono e chat, como comezar"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Conta do contido"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ameazas graves"</string>
@@ -2653,9 +2725,12 @@
       <item quantity="one">Mostrar %d elemento oculto</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rede e Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wifi, móbil, uso de datos, zona wifi"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"rede de telefonía móbil"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"uso de datos"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"zona wifi"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicacións e notificacións"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permisos, aplicacións predeterminadas"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Usuarios e contas"</string>
@@ -2708,6 +2783,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"xesto"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, tocar, pagos"</string>
     <string name="keywords_backup" msgid="470070289135403022">"copia de seguranza, facer copia de seguranza"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"xesto, bordo, lado, bordo activo, apertar, agarrar, axudar, asistente, squeezy, que se pode apertar, ok google, asistente de google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"xesto, reactivar, notificacións, pantalla, pantalla apagada, pantalla activada, apertar, bordo, inactivo, en suspensión, agarrar"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"xesto, silencio, adiar, alarma, chamada entrante, silencio, pantalla, pantalla de bloqueo, apertar, agarrar, bordo, deter"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC wifi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escribir"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toca unha etiqueta para escribir..."</string>
@@ -2790,7 +2868,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Non mostrar ningunha notificación do traballo"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Cando o teu dispositivo estea bloqueado, como queres que se mostren as notificacións do perfil?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notificacións do perfil"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Notificacións"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Notificacións"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notificacións de aplicacións"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoría da notificación"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importancia"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Deixa que a aplicación decida"</string>
@@ -2805,6 +2884,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urxente"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Permitir son"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Non emitir son, vibrar nin mostrar estas notificacións na pantalla actual."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Importancia baixa"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Importancia media"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importancia alta"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Importancia urxente"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Asistente de notificacións"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Acceso a notificacións"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"O acceso ás notificacións do perfil de traballo está bloqueado"</string>
@@ -2832,8 +2915,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Pantalla superposta"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir pantalla superposta"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permite que esta aplicación cree unha ventá de pantalla superposta mentres que a aplicación está aberta ou despois de saír dela (por exemplo, para continuar visualizando un vídeo). Esta ventá móstrase sobre outras aplicacións que estás utilizando."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Si"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Non"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso en modo Non molestar"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ningunha aplicación instalada solicitou acceso en modo Non molestar"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicacións..."</string>
@@ -2964,11 +3045,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Este perfil de traballo está xestionado por:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Xestionado por <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Rotación do dispositivo"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Xirar o contido da pantalla"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Permanecer na vista vertical"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Permanecer na vista horizontal"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Permanecer na orientación actual"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Inicio seguro"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Podes aumentar a protección deste dispositivo se configuras que se solicite o teu PIN antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, notificacións nin tampouco alarmas. \n\nEsta acción axudará a protexer os datos en dispositivos perdidos ou roubados. Queres solicitar o PIN para iniciar o dispositivo?"</string>
@@ -2976,7 +3052,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Podes protexer aínda máis este dispositivo solicitando o teu contrasinal antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, notificacións nin tampouco alarmas. \n\nEsta acción axudará a protexer os datos en dispositivos perdidos ou roubados. Queres solicitar un contrasinal para iniciar o dispositivo?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Ademais de usar a túa impresión dixital para desbloquear o dispositivo, tamén podes aumentar a protección se configuras que se solicite o teu PIN antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, notificacións nin tampouco alarmas.\n\nEsta acción axudará a protexer os datos en dispositivos perdidos ou roubados. Queres solicitar un padrón para iniciar o dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Ademais de usar a túa impresión dixital para desbloquear o dispositivo, tamén podes protexelo solicitando o teu padrón antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, notificacións nin tampouco alarmas.\n\nEsta acción axudará a protexer os datos en dispositivos perdidos ou roubados. Queres solicitar un padrón para iniciar o dispositivo?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Ademais de usar a túa impresión dixital para desbloquear o dispositivo, tamén podes protexelo solicitando o teu contrasinal antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, notificacións nin tampouco alarmas.\n\nEsta acción axudará a protexer os datos en dispositivos perdidos ou roubados. Queres solicitar un contrasinal para iniciar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Ademais de usar a túa impresión dixital para desbloquear o dispositivo, tamén podes protexelo solicitando o teu contrasinal antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, notificacións, nin tan sequera alarmas.\n\nDeste xeito, axúdache a protexer os datos en caso de perda ou roubo dos dispositivos. Queres solicitar o contrasinal para iniciar o dispositivo?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Si"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Non"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Requirir PIN?"</string>
@@ -3094,6 +3170,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso completo do dispositivo"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso da aplicación"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Uso elevado"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplicacións presentan un comportamento anormal</item>
+      <item quantity="one">A aplicación <xliff:g id="APP">%1$s</xliff:g> presenta un comportamento anormal</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Aplicacións que están esgotando a batería</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> está esgotando a batería</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Sen optimizar"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Sen optimizar"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizando o uso da batería"</string>
@@ -3186,8 +3271,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Superpoñer sobre aplicacións"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"Aplicacións con permiso para superpoñerse a outras: <xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplicacións con permiso"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Si"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Non"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Aplicación permitida"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Aplicación non permitida"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instalar aplicacións fontes descoñecidas"</string>
     <string name="write_settings" msgid="4797457275727195681">"Modificar configuración"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"editar ou modificar axustes do sistema"</string>
@@ -3277,6 +3362,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"A pantalla ten un ton ámbar que che pode axudar a coller o sono."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suxestións"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> máis"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> suxestións</item>
+      <item quantity="one">1 suxestión</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> suxestións</item>
+      <item quantity="one">+1 suxestión</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Eliminar"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fría"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utiliza cores de visualización máis frías"</string>
@@ -3295,8 +3389,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Aviso de datos: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Aviso de datos: <xliff:g id="ID_1">%1$s</xliff:g>/Límite de datos: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciclo de facturación"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"O ciclo mensual comeza o día <xliff:g id="ID_1">%1$s</xliff:g> de cada mes"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mensual a partir do día <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Mensualmente o día <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Restricións de rede"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restricións</item>
@@ -3316,7 +3409,7 @@
       <item quantity="one">1 aplicación pode usar datos sen restricións cando o Economizador de datos está activado</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Economizador de datos"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Datos sen restricións"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Datos sen restricións"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Desactiváronse os datos en segundo plano"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Activado"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Desactivado"</string>
@@ -3380,8 +3473,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notificacións pantalla bloqueo"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar o contido das notificacións"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Todo"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Asistencia"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Asistencia e consellos"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Menor largura"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ningunha aplicación instalada solicitou acceso ás mensaxes premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"É posible que teñas que pagar polas mensaxes premium, cuxos custos se engadirán ás facturas do teu operador. Se activas o permiso para unha aplicación, poderás enviar mensaxes premium a través desa aplicación."</string>
@@ -3446,28 +3538,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automático"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liberar espazo agora"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Xestos"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Atallos de xestos"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Xestos rápidos para controlar o teléfono"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Xestos rápidos para controlar a tableta"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Xestos rápidos para controlar o dispositivo"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Acceso rápido á cámara"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Para abrir rapidamente a cámara, preme dúas veces o botón de acendido. Isto funciona en calquera pantalla."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Abre a cámara rapidamente"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Preme o botón de acendido dúas veces para abrir a cámara"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Voltear a cámara"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Fai autofotos máis rápido"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Xira o teléfono dúas veces para acceder ao modo autofoto"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Xira a tableta dúas veces para acceder ao modo autofoto"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Xira o dispositivo dúas veces para acceder ao modo autofoto"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tocar dúas veces para consultar o teléfono"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tocar dúas veces para consultar a tableta"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tocar dúas veces para consultar o dispositivo"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Toca dúas veces a pantalla para consultar rapidamente as notificacións."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Para consultar a hora, as iconas de notificación e outra información, toca a pantalla dúas veces."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Consulta as notificacións coa pantalla apagada"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levantar teléfono para consultalo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levantar a tableta para consultala"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levantar o dispositivo para consultalo"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Para consultar rapidamente as notificacións, levanta o teléfono."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Colle a tableta para consultar rapidamente as notificacións."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Colle o dispositivo para consultar rapidamente as notificacións."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Para consultar a hora, as iconas de notificación e outros datos, colle o teléfono."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Para consultar a hora, as iconas de notificación e outros datos, colle a tableta."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Para consultar a hora, as iconas de notificación e outros datos, colle o dispositivo."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Consulta as notificacións coa pantalla apagada"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Dedo no sensor para ver notificacións"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital situado na parte traseira do teléfono."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital situado na parte traseira da tableta."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital situado na parte traseira do dispositivo."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Consultar notificacións rapidamente"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Pasa o dedo cara abaixo no sensor de impresión dixital"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Levantar o teléfono para abrir a cámara"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Para abrir a cámara automaticamente, levanta o teléfono ata a posición de sacar fotos (horizontal ou vertical). Funciona cando o teléfono está en modo de suspensión ou bloqueado."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Tira fotos cando o teléfono está en suspensión ou bloqueado"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Asistencia cos xestos"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilidade"</string>
@@ -3571,6 +3676,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Queres eliminar esta aplicación instantánea?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Xogos"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Ficheiros de audio"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Espazo utilizado"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstalado polo usuario <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desactivado polo usuario <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Servizo de autocompletar"</string>
@@ -3584,5 +3690,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Aplicación instantánea"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Queres desactivar o xestor de almacenamento?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplicacións de películas e televisión"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Espazo utilizado"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Información de aprovisionamento do operador"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aprovisionamento do operador do activador"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Cales son as novidades fascinantes?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Consulta as 5 funcións principais"</string>
 </resources>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index bad1b55..525b5c4 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"સારી"</item>
     <item msgid="8986346415847956850">"ઉત્તમ"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"હંમેશા"</item>
-    <item msgid="844721238536786870">"ફક્ત પ્લગ ઇન હોય ત્યારે"</item>
-    <item msgid="1986753720941888596">"ક્યારેય નહીં"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"હંમેશા"</item>
-    <item msgid="7433294150916905997">"ફક્ત પ્લગ ઇન હોય ત્યારે"</item>
-    <item msgid="1390404486722375028">"ક્યારેય નહીં"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"છેલ્લા 30 દિવસ"</item>
     <item msgid="6600989128423965319">"વપરાશ સાયકલ સેટ કરો..."</item>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index d1a4d31..26a6cb92 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"તમે હવે વિકાસકર્તા છો!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"કોઈ જરૂર નથી, તમે પહેલાંથી જ એક વિકાસકર્તા છો."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"કૃપા કરીને પહેલાં વિકાસકર્તાના વિકલ્પો સક્ષમ કરો."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"વાયરલેસ અને નેટવર્ક્સ"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"કનેક્શંસ"</string>
     <string name="header_category_device" msgid="4544026001618307754">"ઉપકરણ"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ની જોગવાઈ કરી"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"વિડિઓ કૉલિંગની જોગવાઈ કરી"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi કૉલિંગની જોગવાઈ કરી"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/ઉપસ્થિતિની જોગવાઈ કરી"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"મોબાઇલ રેડિયો પાવર"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM સરનામાં પુસ્તિકા જુઓ"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ફિક્સ્ડ ડાયલિંગ નંબર્સ જુઓ"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"ઉપકરણો માટે સ્કૅન કરો"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"આ ઉપકરણનું નામ બદલો"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"નામ બદલો"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ડિસ્કનેક્ટ કરીએ?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"આ આની સાથે તમારા કનેક્શનને સમાપ્ત કરશે:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"ઉપકરણને ડિસ્કનેક્ટ કરીએ?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"તમારો ફોન <xliff:g id="DEVICE_NAME">%1$s</xliff:g>થી ડિસ્કનેક્ટ થઈ જશે."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"તમારું ટૅબ્લેટ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>થી ડિસ્કનેક્ટ થઈ જશે."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"તમારું ઉપકરણ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>થી ડિસ્કનેક્ટ થઈ જશે."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"ડિસ્કનેક્ટ"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"તમારી પાસે Bluetooth સેટિંગ્સ બદલવાની પરવાનગી નથી."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"નવા ઉપકરણની જોડી કરો"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"જ્યારે Bluetooth  સેટિંગ્સ ખુલ્લી હોય ત્યારે <xliff:g id="DEVICE_NAME">%1$s</xliff:g> નજીકનાં ઉપકરણોને દૃશ્યક્ષમ છે."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"ફોનનું Bluetooth સરનામું: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"ટૅબ્લેટનું Bluetooth સરનામું: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"ઉપકરણનું Bluetooth સરનામું: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ને ડિસ્કનેક્ટ કરીએ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"બ્રૉડકાસ્ટ કરી રહ્યાં છે"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"પ્રોફાઇલ અક્ષમ કરીએ?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth જોડી કરવાની વિનંતી"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"જોડી કરવાની વિનંતી"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> સાથે જોડી કરવા માટે ટૅપ કરો."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"પ્રપ્ત થયેલ ફાઇલો બતાવો"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"પ્રાપ્ત થયેલી ફાઇલો"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth ઉપકરણ પસંદ કરો"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g>, Bluetooth ચાલુ કરવા માગે છે"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g>, Bluetooth બંધ કરવા માગે છે"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s તમારા સંદેશા અ‍ૅક્સેસ કરવા માંગે છે. %2$s ને અ‍ૅક્સેસ આપીએ?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM ઍક્સેસ વિનંતી"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> તમારા SIM કાર્ડને અ‍ૅક્સેસ કરવા માગે છે. SIM કાર્ડની અ‍ૅક્સેસને મંજૂરી આપવું કનેક્શનના સમયગાળા માટે તમારા ઉપકરણ પર ડેટા કનેક્ટિવિટીને અક્ષમ કરશે. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> ને અ‍ૅક્સેસ આપો"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"અન્ય ઉપકરણોને \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' તરીકે દેખાય છે"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"તમારા ઉપકરણો"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"નવા ઉપકરણની જોડી કરો"</string>
     <string name="date_and_time" msgid="9062980487860757694">"તારીખ અને સમય"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"સમય ઝોન પસંદ કરો"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"એકાઉન્ટ્સ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"સ્થાન"</string>
     <string name="account_settings_title" msgid="626177544686329806">"એકાઉન્ટ્સ"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"સુરક્ષા અને સ્થાન"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"એન્ક્રિપ્શન અને ઓળખપત્રો"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ફોન એન્ક્રિપ્ટ કર્યો"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"ઉપકરણ એન્ક્રિપ્ટેડ છે"</string>
@@ -354,40 +367,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"ફિંગરપ્રિન્ટથી અનલૉક"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"તમારી ફિંગરપ્રિન્ટ વાપરો"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"તમારા ફોનને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા ઍપ્લિકેશનોમાં સાઇન ઇન કરવા માટે બસ ફિંગરપ્રિન્ટ સેન્સરને ટચ કરો. તમે કોની ફિંગરપ્રિન્ટ્સ ઉમેરી છે તે બાબતે સાવચેત રહો. એક ઉમેરેલ ફિંગરપ્રિન્ટ પણ આમાંની કોઈપણ વસ્તુઓ કરી શકે છે.\n\nનોંધ: તમારી ફિંગરપ્રિન્ટ એક સશક્ત પેટર્ન અથવા PIN કરતાં ઓછી સુરક્ષિત હોઈ શકે છે."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"ખરીદીઓ અધિકૃત કરવા અથવા ઍપ્લિકેશનોમાં સાઇન ઇન કરવા માટે બસ ફિંગરપ્રિન્ટ સેન્સરને ટચ કરો. તમે કોની ફિંગરપ્રિન્ટ્સ ઉમેરી છે તે બાબતે સાવચેત રહો.\n\nનોંધ: તમે આ ઉપકરણને અનલૉક કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરી શકતાં નથી. વધુ માહિતી માટે, તમારી સંસ્થાના વ્યવસ્થાપકનો સંપર્ક કરો."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"તમારા ફોનને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા ઍપ્લિકેશનોમાં સાઇન ઇન કરવા માટે બસ ફિંગરપ્રિન્ટ સેન્સરને ટચ કરો. તમે કોની ફિંગરપ્રિન્ટ્સ ઉમેરી છે તે બાબતે સાવચેત રહો. એક ઉમેરેલ ફિંગરપ્રિન્ટ પણ આમાંની કોઈપણ વસ્તુઓ કરી શકે છે.\n\nનોંધ: તમારી ફિંગરપ્રિન્ટ એક સશક્ત પેટર્ન અથવા PIN કરતાં ઓછી સુરક્ષિત હોઈ શકે છે."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"તમારા ફોનને અનલૉક કરવા અથવા ખરીદી મંજૂર કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરો.\n\nનોંધ: આ ઉપકરણને અનલૉક કરવા માટે તમે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ નહીં કરી શકો. વધુ માહિતી માટે, તમારી સંસ્થાના વ્યવસ્થાપકનો સંપર્ક કરો."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"તમારા ફોનને અનલૉક કરવા અથવા ખરીદી મંજૂર કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરો.\n\nનોંધ: સશક્ત પૅટર્ન અથવા PIN કરતાં તમારી ફિંગરપ્રિન્ટ ઓછી સુરક્ષિત હોઈ શકે છે."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"રદ કરો"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ચાલુ રાખો"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"છોડો"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"ફિંગરપ્રિન્ટ ઉમેરો"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"ઉપકરણ સુરક્ષા સુવિધાઓ સક્રિય કરવામાં આવશે નહીં. તમે અન્ય લોકોને આ ટેબ્લેટનો ઉપયોગ કરવાથી અટકાવી શકશો નહીં જો તે ગુમ થઈ ગયું હોય, ચોરાઈ ગયું હોય અથવા વાઇપ થઈ ગયું હોય."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"ઉપકરણ સુરક્ષા સુવિધાઓ સક્રિય કરવામાં આવશે નહીં. તમે અન્ય લોકોને આ ઉપકરણનો ઉપયોગ કરવાથી અટકાવી શકશો નહીં જો તે ગુમ થઈ ગયું હોય, ચોરાઈ ગયું હોય અથવા વાઇપ થઈ ગયું હોય."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"ઉપકરણ સુરક્ષા સુવિધાઓ સક્રિય કરવામાં આવશે નહીં. તમે અન્ય લોકોને આ ફોનનો ઉપયોગ કરવાથી અટકાવી શકશો નહીં જો તે ગુમ થઈ ગયો હોય, ચોરાઈ ગયો હોય અથવા વાઇપ થઈ ગયો હોય."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"ઉપકરણ સુરક્ષા સુવિધાઓ સક્રિય કરવામાં આવશે નહીં. તમે અન્ય લોકોને આ ટેબ્લેટનો ઉપયોગ કરવાથી અટકાવી શકશો નહીં જો તે ગુમ થઈ ગયું હોય અથવા ચોરાઈ ગયું હોય."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"ઉપકરણ સુરક્ષા સુવિધાઓ સક્રિય કરવામાં આવશે નહીં. તમે અન્ય લોકોને આ ઉપકરણનો ઉપયોગ કરવાથી અટકાવી શકશો નહીં જો તે ગુમ થઈ ગયું હોય અથવા ચોરાઈ ગયું હોય."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"ઉપકરણ સુરક્ષા સુવિધાઓ સક્રિય કરવામાં આવશે નહીં. તમે અન્ય લોકોને આ ફોનનો ઉપયોગ કરવાથી અટકાવી શકશો નહીં જો તે ગુમ થઈ ગયો હોય અથવા ચોરાઈ ગયો હોય."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"આગલી"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ઉપકરણની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ટૅબ્લેટ ખોવાઈ જાય, ચોરાઈ જાય કે રીસેટ કરવામાં આવે, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ઉપકરણની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ઉપકરણ ખોવાઈ જાય, ચોરાઈ જાય કે રીસેટ કરવામાં આવે, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ઉપકરણની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ફોન ખોવાઈ જાય, ચોરાઈ જાય કે રીસેટ કરવામાં આવે, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"ઉપકરણની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ટૅબ્લેટ ખોવાઈ કે ચોરાઈ જાય, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"ઉપકરણની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ઉપકરણ ખોવાઈ કે ચોરાઈ જાય, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"ઉપકરણની સુરક્ષાની સુવિધાઓ ચાલુ કરવામાં નહીં આવે. જો આ ફોન ખોવાઈ કે ચોરાઈ જાય, તો તમે અન્ય લોકોને તેનો ઉપયોગ કરતા અટકાવી નહીં શકો."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"કોઈપણ રીતે છોડો"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"પાછા જાઓ"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"સેન્સર શોધો"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"તમારા ફોનની પાછળની બાજુએ ફિંગરપ્રિન્ટ સેન્સર સ્થિત કરો."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"સેન્સરને ટચ કરો"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"તે તમારા ફોનના પાછળના ભાગ પર છે. તમારી પ્રથમ આંગળીનો ઉપયોગ કરો."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ઉપકરણ અને ફિંગરપ્રિન્ટ સેન્સર સ્થાન સાથેનું ચિત્ર"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"નામ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ઓકે"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"કાઢી નાખો"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"ચાલો શરૂ કરીએ"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"સેન્સરને ટચ કરો"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"સેન્સર પર તમારી આંગળી મૂકો અને વાઇબ્રેશનનો અનુભવ થવા પર ઉઠાવી લો"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ચાલુ રાખો"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"તમારી ફિંગરપ્રિન્ટના તમામ ભિન્ન ભાગોને ઉમેરવા માટે તમારી આંગળીને સહેજ ખસેડો"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"ફિંગરપ્રિન્ટ ઉમેરી!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"જ્યારે પણ તમે આ આઇકન જુઓ, તમે ઓળખ માટે અથવા ખરીદી અધિકૃત કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરી શકો છો."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"તમારા ઉપકરણને સક્રિય કરવા અને અનલૉક કરવા માટે માત્ર ફિંગરપ્રિન્ટ સેન્સરને ટચ કરો."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"જ્યારે તમને આ આઇકન દેખાય, ત્યારે તમે ખરીદીઓને અધિકૃત કરી અથવા તો ઍપ્લિકેશનોમાં સાઇન ઇન પણ કરી શકો છો."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"ઉપાડો, પછી ફરી ટચ કરો"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"તમારી ફિંગરપ્રિન્ટના વિવિધ ભાગ ઉમેરવા માટે તમારી આંગળી ઉપાડતા રહો"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"ફિંગરપ્રિન્ટ ઉમેરી"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"જ્યારે તમે આ આઇકન જુઓ, ત્યારે ઓળખ માટે અથવા ખરીદી મંજૂર કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરો."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ફિંગરપ્રિન્ટ સેટ કરવાનું છોડીએ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"તમે તમારા ફોનને અનલૉક કરવા માટેની એક રીત તરીકે તમારી ફિંગરપ્રિન્ટને ઉપયોગમાં લેવાનું પસંદ કર્યું છે. જો તમે હવે છોડી દો છો, તો તમારે આને પછીથી સેટ કરવું પડશે. સેટઅપમાં માત્ર એક મિનિટ અથવા તેથી વધુ સમય લાગે છે."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"સ્ક્રીન લૉક સેટ કરો"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"થઈ ગયું"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ઓહ, તે સેન્સર નથી"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"તમારા ઉપકરણ પર ફિંગરપ્રિન્ટ સેન્સરનો ઉપયોગ કરો."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"ફોનની પાછળના સેન્સરને અડો. પ્રથમ આંગળી વાપરો."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"નોંધણી પૂર્ણ થઈ ન હતી"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"ફિંગરપ્રિન્ટ નોંધણીની સમય મર્યાદા સુધી પહોંચી ગયાં. ફરીથી પ્રયાસ કરો."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ફિંગરપ્રિન્ટ નોંધણી કામ કરતી ન હતી. ફરીથી પ્રયાસ કરો અથવા એક અલગ આંગળીનો ઉપયોગ કરો."</string>
@@ -449,6 +460,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ઉપકરણ સુરક્ષા સુવિધાઓને સક્રિય કરીને તમારી પરવાનગી વિના અન્ય લોકોને આ ઉપકરણનો ઉપયોગ કરવાથી અટકાવો. તમે ઉપયોગમાં લેવા ઇચ્છો છો તે સ્ક્રીન લૉક પસંદ કરો."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ઉપકરણ સુરક્ષા સુવિધાઓને સક્રિય કરીને તમારી પરવાનગી વિના અન્ય લોકોને આ ફોનનો ઉપયોગ કરવાથી અટકાવો. તમે ઉપયોગમાં લેવા ઇચ્છો છો તે સ્ક્રીન લૉક પસંદ કરો."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"તમારી બેકઅપ સ્ક્રીન લૉક પદ્ધતિ પસંદ કરો"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"સ્ક્રીન લૉકના વિકલ્પો"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"સ્ક્રીન લૉકના વિકલ્પો"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"સ્ક્રીન લૉક કરો"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / નિદ્રા પછી તાત્કાલિક"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> નિદ્રા પછી"</string>
@@ -519,13 +532,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"અનલૉક પેટર્ન બદલો"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"અનલૉક PIN બદલો"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"અનલૉક પાસવર્ડ બદલો"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"ફરી પ્રયાસ કરો. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> માંથી <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> પ્રયત્ન."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"છેલ્લો પ્રયત્ન"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"જો તમે આ પ્રયત્ન પર ખોટી કાર્ય પેટર્ન દાખલ કરો છો, તો આ ઉપકરણ પરથી તમારી કાર્ય પ્રોફાઇલ અને સંકળાયેલો ડેટા દૂર કરવામાં આવશે."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"જો તમે આ પ્રયત્ન પર ખોટો કાર્ય PIN દાખલ કરો છો, તો આ ઉપકરણ પરથી તમારી કાર્ય પ્રોફાઇલ અને સંકળાયેલો ડેટા દૂર કરવામાં આવશે."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"જો તમે આ પ્રયત્ન પર ખોટો કાર્ય પાસવર્ડ દાખલ કરો છો, તો આ ઉપકરણ પરથી તમારી કાર્ય પ્રોફાઇલ અને સંકળાયેલો ડેટા દૂર કરવામાં આવશે."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"ઘણા બધા ખોટા પ્રયત્નો. આ ઉપકરણ પરથી તમારી કાર્ય પ્રોફાઇલ અને સંકળાયેલો ડેટા દૂર કરવામાં આવશે."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"છોડી દો"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"ફરી પ્રયાસ કરો. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> માંથી <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> પ્રયત્ન."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"તમારો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"જો તમે આગલા પ્રયત્નમાં ખોટી પેટર્ન દાખલ કરશો, તો આ ઉપકરણનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"જો તમે આગલા પ્રયત્નમાં ખોટો PIN દાખલ કરશો, તો આ ઉપકરણનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"જો તમે આગલા પ્રયત્નમાં ખોટો પાસવર્ડ દાખલ કરશો, તો આ ઉપકરણનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"જો તમે આગલા પ્રયત્નમાં ખોટી પેટર્ન દાખલ કરશો, તો આ વપરાશકર્તાને કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"જો તમે આગલા પ્રયત્નમાં ખોટો PIN દાખલ કરશો,તો આ વપરાશકર્તાને કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"જો તમે આગલા પ્રયત્નમાં ખોટો પાસવર્ડ દાખલ કરશો, તો આ વપરાશકર્તાને કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"જો તમે આગલા પ્રયત્નમાં ખોટી પેટર્ન દાખલ કરશો, તો તમારી કાર્ય પ્રોફાઇલ અને તેનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"જો તમે આગલા પ્રયત્નમાં ખોટો PIN દાખલ કરશો, તો તમારી કાર્ય પ્રોફાઇલ અને તેનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"જો તમે આગલા પ્રયત્નમાં ખોટો પાસવર્ડ દાખલ કરશો, તો તમારી કાર્ય પ્રોફાઇલ અને તેનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"ઘણા બધા ખોટા પ્રયત્નો. આ ઉપકરણોનો ડેટા કાઢી નાખવામાં આવશે."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"ઘણા બધા ખોટા પ્રયત્નો. આ વપરાશકર્તાને કાઢી નાખવામાં આવશે."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"ઘણા બધા ખોટા પ્રયત્નો. આ કાર્ય પ્રોફાઇલ અને તેનો ડેટા કાઢી નાખવામાં આવશે."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"છોડી દો"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"ઓછામાં ઓછા <xliff:g id="COUNT">%d</xliff:g> અક્ષર ધરાવતો હોવો જોઈએ"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN ઓછામાં ઓછા <xliff:g id="COUNT">%d</xliff:g> અંક ધરાવતો હોવો જોઈએ"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ચાલુ રાખો"</string>
@@ -626,6 +647,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"વિગતવાર Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"જ્યારે Bluetooth ચાલુ હોય, ત્યારે તમારું ઉપકરણ નજીકનાં અન્ય Bluetooth ઉપકરણો સાથે સંચાર કરી શકે છે."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"સ્થાન સચોટતા બહેતર બનાવવા માટે, સિસ્ટમ ઍપ્લિકેશનો અને સેવાઓ હજી પણ Bluetooth ઉપકરણો શોધી શકે છે. તમે આને <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>સ્કેનિંગ સેટિંગ્સ<xliff:g id="LINK_END_1">LINK_END</xliff:g>માં બદલી શકો છો."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"કનેક્ટ ન કરી શક્યાં. ફરી પ્રયાસ કરો."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"ઉપકરણની વિગતો"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"ઉપકરણનું Bluetooth સરનામું: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"ઉપકરણને ભૂલી જઈએ?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"હવેથી તમારા ફોનની <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ની સાથે જોડી કરવામાં નહીં આવે"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"હવેથી તમારા ટૅબ્લેટની <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ની સાથે જોડી કરવામાં નહીં આવે"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"હવેથી તમારા ઉપકરણની <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ની સાથે જોડી કરવામાં નહીં આવે"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"ઉપકરણને ભૂલી જાઓ"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"આની સાથે કનેક્ટ કરો..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> મીડિયા ઑડિઓથી ડિસ્કનેક્ટ થઈ જશે."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ને હેન્ડ્સફ્રી ઑડિઓમાંથી ડિસ્કનેક્ટ કરવામાં આવશે."</string>
@@ -778,6 +807,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"પ્રદાન કરશો નહીં"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"માન્ય કરશો નહીં"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"કોઇ પ્રમાણપત્ર સ્પષ્ટ કરેલ નથી. તમારું કનેક્શન ખાનગી રહેશે નહીં."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"નેટવર્કનું નામ ખૂબ લાંબુ છે."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"ડોમેનનો ઉલ્લેખ કરવો આવશ્યક છે."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ઉપલબ્ધ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ઉપલબ્ધ)"</string>
@@ -809,7 +839,6 @@
       <item quantity="other">%d નેટવર્ક</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"વિગતવાર Wi‑Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wi-Fi ગોઠવો"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC સરનામું"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP સરનામું"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"સબનેટ માસ્ક"</string>
@@ -846,9 +875,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"આ જૂથ ભૂલી જઈએ?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"પોર્ટેબલ Wi-Fi હોટસ્પોટ"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi હોટસ્પોટ"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Wi‑Fi નેટવર્ક પ્રદાન કરવા માટે મોબાઇલ કનેક્શનનો ઉપયોગ કરો"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"આ ટૅબ્લેટનું ઇન્ટરનેટ કનેક્શન હોટસ્પોટ દ્વારા શેર થતું નથી"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"આ ફોનનું ઇન્ટરનેટ કનેક્શન હોટસ્પોટ દ્વારા શેર થતું નથી"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"અન્ય ઉપકરણો સાથે ઇન્ટરનેટ અથવા કન્ટેન્ટ શેર કરી રહ્યાં નથી"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"આ ટૅબ્લેટનું ઇન્ટરનેટ કનેક્શન હૉટસ્પૉટ દ્વારા શેર થાય છે"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"આ ફોનનું ઇન્ટરનેટ કનેક્શન હૉટસ્પૉટ દ્વારા શેર થાય છે"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ઍપ્લિકેશન કન્ટેન્ટ શેર કરી રહી છે. ઇન્ટરનેટ કનેક્શન શેર કરવા માટે હૉટસ્પૉટને બંધ કરો, પછી ચાલુ કરો"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fiનું નામ"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ચાલુ કરીએ છીએ..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> સાથે અન્ય ઉપકરણો પણ કનેક્ટ કરી શકાય છે"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi પાસવર્ડ"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP બૅન્ડ"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"તમારા અન્ય ઉપકરણો માટે Wi‑Fi નેટવર્ક બનાવવા હૉટસ્પૉટનો ઉપયોગ કરો. હૉટસ્પૉટ તમારા મોબાઇલ ડેટા કનેક્શનનો ઉપયોગ કરીને ઇન્ટરનેટ પ્રદાન કરે છે. વધારાના મોબાઇલ ડેટા શુલ્ક લાગુ થઈ શકે છે."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ઍપ્લિકેશનો નજીકના ઉપકરણો સાથે કન્ટેન્ટ શેર કરવા માટે હૉટસ્પૉટ બનાવી શકે છે."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"હોટસ્પોટ ચાલુ કરી રહ્યું છે…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"હોટસ્પોટ બંધ કરી રહ્યું છે…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> સક્રિય છે"</string>
@@ -895,6 +932,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"જ્યારે Wi-Fi કૉલિંગ ચાલુ હોય, ત્યારે તમારી પસંદગી અને કયા સિગ્નલ મજબૂત છે તેને આધારે, તમારો ફોન Wi-Fi અથવા તમારા કેરીઅરના નેટવર્ક મારફતે કૉલ્સને રુટ કરી શકે છે. આ સુવિધાને ચાલુ કરતાં પહેલાં, ફી અને અન્ય વિગતો માટે તમારા કેરિઅર સાથે તપાસ કરો."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"કટોકટીના સરનામાંને અપડેટ કરો"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"જો તમે WiFi નો ઉપયોગ કરીને 911 કૉલ કરો તો કટોકટીની સેવાઓ દ્વારા તમારા સ્થાનનો સરનામા તરીકે ઉપયોગ કરવામાં આવે છે"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ડિસ્પ્લે"</string>
@@ -952,6 +990,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"કોઈ પરિણામ નથી"</string>
     <string name="display_settings" msgid="7965901687241669598">"પ્રદર્શન"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"સ્ક્રીનને સ્વતઃ-ફેરવો"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"આબેહૂબ રંગ"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ટેબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ફોનને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"ટેબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
@@ -979,23 +1018,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"ઉપલબ્ધ પ્રકાશ માટેનાં તેજ સ્તરને ઑપ્ટિમાઇઝ કરો. જ્યારે આ સુવિધા ચાલુ હોય, ત્યારે પણ તમે તેજને અસ્થાયી રૂપે સમાયોજિત કરી શકો છો."</string>
     <string name="night_display_title" msgid="2626451512200357686">"રાત્રિ પ્રકાશ"</string>
     <string name="night_display_text" msgid="1837277457033025056">"રાત્રિ પ્રકાશ, તમારી સ્ક્રીન પર પીળાશ પડતી નારંગી રંગછટા કરી દે છે. આ મંદ પ્રકાશમાં તમારી સ્ક્રીન પર જોવાનું અથવા વાંચવાનું સરળ બનાવે છે અને વધુ સહેલાઈથી ઊંઘવામાં તમારી સહાય કરી શકે છે."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"શેડ્યૂલ"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"સ્થિતિ"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"આપમેળે ચાલુ કરો"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"ક્યારેય નહીં"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"કસ્ટમ શેડ્યૂલ"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"સાંજથી સવાર"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"શેડ્યૂલ કરો"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"ક્યારેય નહીં"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"કસ્ટમ સમયે ચાલુ થાય છે"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"સૂર્યાસ્તથી સૂર્યોદય સુધી ચાલુ"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"પ્રારંભ સમય"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"સમાપ્તિ સમય"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"સ્થિતિ"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"તીવ્રતા"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"બંધ. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"આપમેળે ક્યારેય ચાલુ થશે નહીં."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g> વાગ્યે આપમેળે ચાલુ થઈ જશે."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"સાંજે આપમેળે ચાલુ થઈ જશે."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"ચાલુ. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"આપમેળે ક્યારેય બંધ થશે નહીં."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g> વાગ્યે આપમેળે બંધ થઈ જશે."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"સવારે આપમેળે બંધ થઈ જશે."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"બંધ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"આપમેળે ક્યારેય ચાલુ નહીં થાય"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g> વાગ્યે આપમેળે ચાલુ થઈ જશે"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"સૂર્યાસ્ત સમયે આપમેળે ચાલુ થઈ જશે"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"ચાલુ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"આપમેળે ક્યારેય બંધ નહીં થાય"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g> વાગ્યે આપમેળે બંધ થઈ જશે"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"સૂર્યોદય સમયે આપમેળે બંધ થઈ જશે"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"નિષ્ક્રિય થાઓ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"સ્ક્રીન બંધ કરે છે"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"નિષ્ક્રિયતાનાં <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> પછી"</string>
@@ -1019,8 +1057,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"સેટિંગ્સ"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"સ્વચલિત તેજ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"જાગૃત કરવા માટે લિફ્ટ કરો"</string>
-    <string name="doze_title" msgid="2259176504273878294">"વ્યાપક ડિસ્પ્લે"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"ઍમ્બિઅન્ટ પ્રદર્શન"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"હંમેશાં ચાલુ"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"નવી સૂચનાઓ"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ક્યારે બતાવવું"</string>
+    <string name="doze_title" msgid="2375510714460456687">"નવી સૂચનાઓ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"જ્યારે તમને સૂચનાઓ પ્રાપ્ત થાય ત્યારે સ્ક્રીન સક્રિય કરો"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"હંમેશાં ચાલુ"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"સમય, સૂચનાના આઇકન અને અન્ય માહિતી બતાવો"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ફોન્ટનું કદ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ટેક્સ્ટને નાની અથવા મોટી કરો"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM કાર્ડ લૉક સેટિંગ્સ"</string>
@@ -1272,6 +1316,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN ખાલી હોઇ શકતું નથી."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC ફીલ્ડ 3 આંકડાનું હોવું આવશ્યક છે."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC ફીલ્ડ 2 કે 3 આંકડાનું હોવું આવશ્યક છે."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"કૅરિઅર %s પ્રકારનું APN ઉમેરવાની મંજૂરી આપતું નથી."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"ડિફોલ્ટ APN સેટિંગ્સ પુનર્સ્થાપિત કરવી."</string>
     <string name="menu_restore" msgid="8260067415075573273">"ડીફોલ્ટ પર ફરીથી સેટ કરો"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ડિફોલ્ટ APN સેટિંગ્સ ફરીથી સેટ કરો પૂર્ણ થયું."</string>
@@ -1301,6 +1346,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD કાર્ડ કાઢી નાંખો"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"આંતરિક USB સંગ્રહમાંથી તમામ ડેટા કાઢી નાંખો, જેમ કે સંગીત અથવા ફોટા"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD કાર્ડ પરનો તમામ ડેટા કાઢી નાખો, જેમ કે સંગીત અથવા ફોટા"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM કાઢી નાખો"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"ફોન પરના બધા eSIM કાઢી નાખો. આ ક્રિયા તમારો મોબાઇલ સેવા પ્લાન રદ નહીં કરે."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"ટેબ્લેટ પરના બધા eSIM કાઢી નાખો. આ ક્રિયા તમારો મોબાઇલ સેવા પ્લાન રદ નહીં કરે."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ટેબ્લેટ ફરીથી સેટ કરો"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ફોન ફરીથી સેટ કરો"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"તમારી બધી વ્યક્તિગત માહિતી અને ડાઉનલોડ કરેલી એપ્લિકેશન્સને કાઢી નાખીએ? તમે આ ક્રિયાને પૂર્વવત્‌ કરી શકતા નથી!"</string>
@@ -1323,26 +1371,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ડેટા સેવર ચાલુ હોય તે વખતે ટીથર કરી શકતાં નથી અથવા તો પોર્ટેબલ હોટસ્પોટ્સનો ઉપયોગ કરી શકતાં નથી"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB ટિથરિંગ"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB કનેક્ટ થયું, ટિથર માટે તપાસો"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"ટિથર કર્યું"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USB સંગ્રહ ઉપયોગમાં હોય ત્યારે ટેથર કરી શકતાં નથી"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB કનેક્ટ થયેલ નથી"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"ચાલુ કરવા માટે કનેક્ટ કરો"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB ટિથરિંગ ભૂલ"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"USB મારફતે ફોનનું ઇન્ટરનેટ કનેક્શન શેર કરો"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"USB મારફતે ટૅબ્લેટનું ઇન્ટરનેટ કનેક્શન શેર કરો"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth ટિથરિંગ"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"ટૅબ્લેટનું ઇન્ટરનેટ Bluetooth દ્વારા શેર થાય છે"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"ફોનનું ઇન્ટરનેટ Bluetooth દ્વારા શેર થાય છે"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"ટૅબ્લેટનું ઇન્ટરનેટ Bluetooth દ્વારા 1 ઉપકરણ સાથે શેર થાય છે"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"ફોનનું ઇન્ટરનેટ Bluetooth દ્વારા 1 ઉપકરણ સાથે શેર થાય છે"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"ટૅબ્લેટનું ઇન્ટરનેટ Bluetooth દ્વારા <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ઉપકરણ સાથે શેર થાય છે"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"ફોનનું ઇન્ટરનેટ Bluetooth દ્વારા <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ઉપકરણ સાથે શેર થાય છે"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"ટૅબ્લેટનું ઇન્ટરનેટ કનેક્શન Bluetooth દ્વારા શેર કરો"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"ફોનનું ઇન્ટરનેટ કનેક્શન Bluetooth દ્વારા શેર કરો"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g>નું ઇન્ટરનેટ Bluetooth દ્વારા શેર થાય છે"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"ટૅબ્લેટનું ઇન્ટરનેટ Bluetooth દ્વારા શેર થતું નથી"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"ફોનનું ઇન્ટરનેટ Bluetooth દ્વારા શેર થતું નથી"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"ટીથર કરેલ નથી"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> થી વધુ ઉપકરણો સાથે ટિથર કરી શકતાં નથી."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> અનટિથર થશે."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"તમારા મોબાઇલ ડેટા કનેક્શન વડે અન્ય ઉપકરણોને ઇન્ટરનેટ પ્રદાન કરવા માટે હોટસ્પોટ અને ટિથરિંગનો ઉપયોગ કરો."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"તમારા મોબાઇલ ડેટા કનેક્શન દ્વારા અન્ય ઉપકરણોને ઇન્ટરનેટ પ્રદાન કરવા માટે હૉટસ્પૉટ અને ટિથરિંગનો ઉપયોગ કરો. ઍપ્લિકેશનો પણ નજીકના ઉપકરણો સાથે કન્ટેન્ટ શેર કરવા માટે હૉટસ્પૉટ બનાવી શકે છે."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"સહાય"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"મોબાઇલ નેટવર્ક"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"મોબાઇલ પ્લાન"</string>
@@ -1375,7 +1412,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"સ્થાન મોડ"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"સ્થાન નક્કી કરવા માટે GPS, Wi-Fi, Bluetooth અથવા મોબાઇલ નેટવર્કોનો ઉપયોગ કરો"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"સ્થાન નક્કી કરવા માટે Wi‑Fi, Bluetooth અથવા મોબાઇલ નેટવર્કોનો ઉપયોગ કરો"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"સ્થાન નક્કી કરવા માટે GPS નો ઉપયોગ કરો"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"સ્થાન નક્કી કરવા માટે GPS અને ઉપકરણ સેન્સરનો ઉપયોગ કરો"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"સ્કેન કરી રહ્યું છે"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi સ્કેનિંગ"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"કોઈપણ સમયે Wi‑Fi નેટવર્ક્સને શોધવા માટે સિસ્ટમ ઍપ્લિકેશનો અને સેવાઓને મંજૂરી આપીને સ્થાન બહેતર બનાવો."</string>
@@ -1420,8 +1457,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"તમારી પાસે ડેટા કનેક્શન નથી. આ માહિતી હમણાં જોવા માટે, ઇન્ટરનેટથી કનેક્ટ થયેલા કોઈપણ કમ્પ્યુટરથી %s પર જાઓ."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"લોડ કરી રહ્યું છે..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"તમારો પાસવર્ડ પસંદ કરો"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ફિંગરપ્રિન્ટ વાપરવા પાસવર્ડ સેટ કરો"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"તમારી પેટર્ન પસંદ કરો"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ફિંગરપ્રિન્ટ વાપરવા પેટર્ન સેટ કરો"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"તમારો PIN પસંદ કરો"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ફિંગરપ્રિન્ટ વાપરવા PIN સેટ કરો"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"તમારા પાસવર્ડની પુષ્ટિ કરો"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"તમારા પેટર્નની પુષ્ટિ કરો"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"તમારા PIN ની પુષ્ટિ કરો"</string>
@@ -1490,6 +1530,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"ઍપ્લિકેશન સેટિંગ્સ"</string>
     <string name="install_applications" msgid="4872012136210802181">"અજાણ્યા સ્ત્રોતો"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"બધા ઍપ્લિકેશન સ્રોતોને મંજૂરી આપો"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"તાજેતરમાં ખોલેલી ઍપ્લિકેશનો"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"બધી <xliff:g id="COUNT">%1$d</xliff:g> ઍપ્લિકેશન જુઓ"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> પહેલાં"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"તમારું ટૅબ્લેટ અને વ્યક્તિગત ડેટા અજાણી ઍપ્લિકેશનોના હુમલા પ્રતિ વધુ સંવેદનશીલ છે. આ સ્રોત પરથી ઍપ્લિકેશનો ઇન્સ્ટૉલ કરીને તમે સંમત થાઓ છો કે તેમનો ઉપયોગ કરવાના પરિણામે તમારા ટૅબ્લેટને થતી કોઈ પણ ક્ષતિ કે ડેટાના નુકસાન માટે તમે જવાબદાર છો."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"તમારો ફોન અને વ્યક્તિગત ડેટા અજાણી ઍપ્લિકેશનોના હુમલા પ્રતિ વધુ સંવેદનશીલ છે. આ સ્રોત પરથી ઍપ્લિકેશનો ઇન્સ્ટૉલ કરીને તમે સંમત થાઓ છો કે તેમનો ઉપયોગ કરવાના પરિણામે તમારા ફોનને થતી કોઈ પણ ક્ષતિ કે ડેટાના નુકસાન માટે તમે જવાબદાર છો."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"વિગતવાર સેટિંગ્સ"</string>
@@ -1658,6 +1701,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"સિસ્ટમ સેવા બંધ કરીએ?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"જો તમે આ સેવા બંધ કરો છો, તો તમારા ટેબ્લેટની કેટલીક સુવિધાઓ કાર્ય કરતી બંધ થઈ જશે જ્યાં સુધી તમે તેને પાવર બંધ કરીને ફરીથી ચાલુ ન કરો."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"જો તમે આ સેવા બંધ કરો છો, તો તમારા ફોનની કેટલીક સુવિધાઓ કાર્ય કરતી બંધ થઈ જશે જ્યાં સુધી તમે તેને પાવર બંધ કરીને ફરીથી ચાલુ ન કરો."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"ભાષાઓ, ઇનપુટ અને સંકેતો"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"ભાષા અને ઇનપુટ"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ભાષા અને ઇનપુટ"</string>
     <string name="input_assistance" msgid="7577795275222555487">"ઇનપુટ સહાયતા"</string>
@@ -1872,6 +1919,10 @@
       <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="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <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="print_settings_title" msgid="3685449667822217816">"પ્રિન્ટ સેવાઓ"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"કોઈ સેવાઓ ઇન્સ્ટોલ કરેલી નથી"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"કોઈ પ્રિન્ટર મળ્યા નથી"</string>
@@ -1938,6 +1989,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"વિગતોનો ઉપયોગ કરો"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"પાવર વપરાશ સમાયોજિત કરો"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"સમાવિષ્ટ પૅકેજીસ"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ઍપ્લિકેશનો અતિશય બૅટરી વાપરે છે"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"ઉપકરણને સક્રિય રાખે છે"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ઉપકરણને પૃષ્ઠભૂમિમાં સક્રિય કરે છે"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"વારંવાર સ્થાનની વિનંતી કરે છે"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ઍપ્લિકેશનો વિચિત્ર રીતે કાર્ય કરે છે"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"ઍપ્લિકેશન બંધ કરીએ?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"તમારો ફોન સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતો નથી, કારણ કે <xliff:g id="APP">%1$s</xliff:g> તમારા ફોનને સક્રિય રાખ્યા કરે છે.\n\nઆ સમસ્યા ઉકેલવા માટે, તમે ઍપ્લિકેશનને ફરજિયાત બંધ કરી શકો છો.\n\nજો આવું થયા કરે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમે ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરો તે જરૂરી હોઈ શકે છે."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"તમારું ટૅબ્લેટ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી, કારણ કે <xliff:g id="APP">%1$s</xliff:g> તમારા ટૅબ્લેટને સક્રિય રાખ્યા કરે છે.\n\nઆ સમસ્યા ઉકેલવા માટે, તમે ઍપ્લિકેશનને ફરજિયાત બંધ કરી શકો છો.\n\nજો આવું થયા કરે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમે ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરો તે જરૂરી હોઈ શકે છે."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"તમારું ઉપકરણ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી, કારણ કે <xliff:g id="APP">%1$s</xliff:g> તમારા ઉપકરણને સક્રિય રાખ્યા કરે છે.\n\nઆ સમસ્યા ઉકેલવા માટે, તમે ઍપ્લિકેશનને ફરજિયાત બંધ કરી શકો છો.\n\nજો આવું થયા કરે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમે ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરો તે જરૂરી હોઈ શકે છે."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"ઍપ્લિકેશન બંધ કરો"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"પૃષ્ઠભૂમિમાં ઉપયોગ બંધ કરીએ?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"તમારો ફોન સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતો નથી, કારણ કે <xliff:g id="APP">%1$s</xliff:g> તમારા ફોનને સક્રિય રાખ્યા કરે છે.\n\nઆ સમસ્યા ઉકેલવા માટે, તમારો ફોન આ ઍપ્લિકેશનને પૃષ્ઠભૂમિમાં ચાલવાથી અટકાવી શકે છે."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"તમારું ટૅબ્લેટ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી, કારણ કે <xliff:g id="APP">%1$s</xliff:g> તમારા ટૅબ્લેટને સક્રિય રાખ્યા કરે છે.\n\nઆ સમસ્યા ઉકેલવા માટે, તમારું ટૅબ્લેટ આ ઍપ્લિકેશનને પૃષ્ઠભૂમિમાં ચાલવાથી અટકાવી શકે છે."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"તમારું ઉપકરણ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી, કારણ કે <xliff:g id="APP">%1$s</xliff:g> તમારા ઉપકરણને સક્રિય રાખ્યા કરે છે.\n\nઆ સમસ્યા ઉકેલવા માટે, તમારું ઉપકરણ આ ઍપ્લિકેશનને પૃષ્ઠભૂમિમાં ચાલવાથી અટકાવી શકે છે."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"બંધ કરો"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"સ્થાન બંધ કરીએ?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"તમારો ફોન સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતો નથી, કારણ કે જ્યારે તમે ઍપ્લિકેશનનો ઉપયોગ ન કરતા હો ત્યારે <xliff:g id="APP">%1$s</xliff:g> તમારા સ્થાનની વિનંતી કર્યા કરે છે.\n\nઆ સમસ્યા ઉકેલવા માટે, તમે આ ઍપ્લિકેશન માટે સ્થાન બંધ કરી શકો છો."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"તમારું ટૅબ્લેટ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી, કારણ કે જ્યારે તમે ઍપ્લિકેશનનો ઉપયોગ ન કરતા હો ત્યારે <xliff:g id="APP">%1$s</xliff:g> તમારા સ્થાનની વિનંતી કર્યા કરે છે.\n\nઆ સમસ્યા ઉકેલવા માટે, તમે આ ઍપ્લિકેશન માટે સ્થાન બંધ કરી શકો છો."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"તમારું ઉપકરણ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી, કારણ કે જ્યારે તમે ઍપ્લિકેશનનો ઉપયોગ ન કરતા હો ત્યારે <xliff:g id="APP">%1$s</xliff:g> તમારા સ્થાનની વિનંતી કર્યા કરે છે.\n\nઆ સમસ્યા ઉકેલવા માટે, તમે આ ઍપ્લિકેશન માટે સ્થાન બંધ કરી શકો છો."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"બંધ કરો"</string>
     <string name="power_screen" msgid="3023346080675904613">"સ્ક્રીન"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"ફ્લેશલાઇટ"</string>
     <string name="power_camera" msgid="4976286950934622605">"કૅમેરો"</string>
@@ -1952,7 +2023,7 @@
     <string name="power_apps" msgid="2043554781293951327">"ઍપ્લિકેશનો"</string>
     <string name="power_service" msgid="1599661212370831780">"સેવાઓ"</string>
     <string name="power_system" msgid="8290455327965307383">"સિસ્ટમ"</string>
-    <string name="power_user" msgid="1889728099253018005">"વપરાશકર્તા"</string>
+    <string name="power_user" msgid="3706143225319881667">"અન્ય વપરાશકર્તાઓ"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU કુલ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU અગ્રભૂમિ"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"જાગૃત રહો"</string>
@@ -2004,6 +2075,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"વધુ-ગણાયેલ પાવર ઉપયોગ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> સુધી ઉપયોગ કરાયો"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"<xliff:g id="TIME">^1</xliff:g>થી સક્રિય"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"સ્ક્રીન વપરાશ <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> દ્વારા <xliff:g id="PERCENT">%1$s</xliff:g> વપરાયું"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"કુલ બૅટરીનું <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2563,7 +2635,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN બદલો"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"સૂચનાઓ બતાવો"</string>
     <string name="help_label" msgid="6886837949306318591">"સહાય અને પ્રતિસાદ"</string>
-    <string name="support_summary" msgid="8276116616493882830">"સહાય લેખ, ફોન અને ચૅટ સમર્થન"</string>
+    <string name="support_summary" msgid="2705726826263742491">"સહાય લેખ, ફોન અને ચૅટ, શરૂ થઈ રહ્યાં છે"</string>
     <string name="user_account_title" msgid="1127193807312271167">"સામગ્રી માટે એકાઉન્ટ"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ફોટો ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"આત્યંતિક જોખમો"</string>
@@ -2653,9 +2725,12 @@
       <item quantity="other">%d છુપાયેલ આઇટમ બતાવો</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"નેટવર્ક અને ઇન્ટરનેટ"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, મોબાઇલ, ડેટા વપરાશ, હોટસ્પોટ"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"મોબાઇલ"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ડેટા વપરાશ"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"હોટસ્પોટ"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"કનેક્ટ થયેલ ઉપકરણો"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, કાસ્ટ કરો, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, કાસ્ટ કરો"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ઍપ્લિકેશનો અને સૂચનાઓ"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"પરવાનગીઓ, ડિફૉલ્ટ ઍપ્લિકેશનો"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"વપરાશકર્તાઓ અને એકાઉન્ટો"</string>
@@ -2708,6 +2783,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"હાવભાવ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ચુકવણી કરો, ટૅપ કરો, ચુકવણીઓ"</string>
     <string name="keywords_backup" msgid="470070289135403022">"બૅકઅપ, બૅક અપ"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"સંકેત, ધાર, બાજુ, સક્રિય ધાર, દબાણ, પકડ, સહાય, સહાયક, squeezy, squeezie, squeezey, squeezee, ok google, google સહાયક"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"સંકેત, સક્રિય, સૂચનાઓ, સ્ક્રીન, પ્રદર્શન, સ્ક્રીન બંધ, સ્ક્રીન ચાલુ, દબાણ, ધાર, નિષ્ક્રિય, નિષ્ક્રિય, પકડ"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"સંકેત, મૌન, સ્નૂઝ, અલાર્મ, ઇનકમિંગ કૉલ, શાંત, પ્રદર્શન, લૉકસ્ક્રીન, દબાણ, પકડ, ધાર, રોકો"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ટેગ સેટ કરો"</string>
     <string name="write_tag" msgid="8571858602896222537">"લખો"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"લખવા માટે ટેગ પર ટેપ કરો..."</string>
@@ -2790,7 +2868,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"કાર્ય સૂચનાઓ બિલકુલ બતાવશો નહીં"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"જ્યારે તમારું ઉપકરણ લૉક કરેલું હોય, ત્યારે તમે પ્રોફાઇલ સૂચનાઓ કેવી રીતે બતાવવા માગો છો?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"પ્રોફાઇલ સૂચનાઓ"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"સૂચનાઓ"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"સૂચનાઓ"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"ઍપ્લિકેશન સૂચનાઓ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"સૂચના શ્રેણી"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"મહત્વ"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"ઍપ્લિકેશનને નક્કી કરવા દો"</string>
@@ -2805,6 +2884,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"તાત્કાલિક"</string>
     <string name="allow_sound" msgid="1820188704793497324">"ધ્વનિની મંજૂરી આપો"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"વર્તમાન સ્ક્રીન પર દૃશ્યમાં આ સૂચનાઓને અવાજ કરવા, વાઇબ્રેટ કરવા કે ઝબકારારૂપે દેખાવા દેશો નહીં."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"ઓછી મહત્ત્વની"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"સામાન્ય મહત્ત્વની"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"ખૂબ જ મહત્ત્વની"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"તાત્કાલિક મહત્ત્વની"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"સૂચના સહાયક"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"સૂચના ઍક્સેસ"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"કાર્ય પ્રોફાઇલ સૂચનાઓનો ઍક્સેસ અવરોધિત કરવામાં આવ્યો છે"</string>
@@ -2832,8 +2915,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ચિત્ર-માં-ચિત્ર"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"ચિત્રમાં-ચિત્રને મંજૂરી આપો"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"આ ઍપ્લિકેશનને જ્યારે ઍપ્લિકેશન ખુલ્લી હોય અથવા તમે તેને છોડી દીધી હોય (ઉદાહરણ તરીકે, વિડિઓ જોવા માટે), ત્યારે ચિત્રમાં-ચિત્ર વિંડો બનાવવાની મંજૂરી આપો. આ વિંડો તમે ઉપયોગમાં લો છો તે અન્ય ઍપ્લિકેશનોની ટોચે પ્રદર્શિત થાય છે."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"હા"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"ના"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ખલેલ પાડશો નહીં ઍક્સેસ કરો"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"કોઇ ઇન્સ્ટોલ કરેલ એપ્લિકેશન્સએ ખલેલ પાડશો નહીં ઍક્સેસ કરવાની વિનંતી કરી નથી"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ઍપ્લિકેશનો લોડ કરી રહ્યું છે..."</string>
@@ -2964,11 +3045,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"આ કાર્ય પ્રોફાઇલ આમના દ્વારા સંચાલિત થાય છે:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> દ્વારા સંચાલિત"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(પ્રાયોગિક)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"ઉપકરણ પરિભ્રમણ"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"સ્ક્રીનની સામગ્રીઓને ફેરવો"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"પોર્ટ્રેટ દૃશ્યમાં રહો"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"લેન્ડસ્કેપ દૃશ્યમાં રહો"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"વર્તમાન ઓરિએન્ટેશનમાં રહો"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"સુરક્ષિત પ્રારંભ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ચાલુ રાખો"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"તમે આ ઉપકરણ શરૂ થાય તે પહેલા તમારો પિન આવશ્યક બનાવીને તેને વધુ સુરક્ષિત કરી શકો છો. ઉપકરણ શરૂ ન થાય ત્યાં સુધી, તે એલાર્મ સહિત કૉલ, સંદેશા અથવા સૂચનાઓ પ્રાપ્ત કરી શકતું નથી. \n\nઆ ઉપકરણો ખોવાઈ અથવા ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે. તમારું ઉપકરણ શરૂ કરવા માટે પિન આવશ્યક છે?"</string>
@@ -2976,7 +3052,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"તમે આ ઉપકરણ શરૂ થાય તે પહેલા તમારો પાસવર્ડ આવશ્યક બનાવીને તેને વધુ સુરક્ષિત કરી શકો છો. ઉપકરણ શરૂ ન થાય ત્યાં સુધી, તે એલાર્મ સહિત કૉલ, સંદેશા અથવા સૂચનાઓ પ્રાપ્ત કરી શકતું નથી. \n\nઆ ઉપકરણો ખોવાઈ અથવા ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે. શું તમારું ઉપકરણ શરૂ કરવા માટે પાસવર્ડ આવશ્યક છે?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"તમારા ઉપકરણને અનલૉક કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરવા ઉપરાંત, તમે આ ઉપકરણને તે પ્રારંભ થાય તે પહેલાં તમારા પિન આવશ્યક બનાવીને તેને વધુ સુરક્ષિત કરી શકો છો. ઉપકરણ શરૂ ન થાય ત્યાં સુધી, તે એલાર્મ સહિત કૉલ, સંદેશા અથવા સૂચનાઓ પ્રાપ્ત કરી શકતું નથી. \n\nઆ ઉપકરણોના ખોવાઈ જવા કે ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે. શું તમારું ઉપકરણ શરૂ કરવા માટે પિન આવશ્યક છે?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"તમે આ ઉપકરણ શરૂ થાય તે પહેલા તમારી પેટર્ન આવશ્યક બનાવીને તેને વધુ સુરક્ષિત કરી શકો છો. ઉપકરણ શરૂ ન થાય ત્યાં સુધી, તે એલાર્મ સહિત કૉલ, સંદેશા અથવા સૂચનાઓ પ્રાપ્ત કરી શકતું નથી.\n\nઆ ઉપકરણો ખોવાઈ અથવા ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે. શું તમારું ઉપકરણ શરૂ કરવા માટે પેટર્ન આવશ્યક છે?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"તમારા ઉપકરણને અનલૉક કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરવા ઉપરાંત, તમે આ ઉપકરણ શરૂ થાય તે પહેલા તમારા પાસવર્ડને જરૂરી બનાવીને તેને વધુ સુરક્ષિત કરી શકો છો. ઉપકરણ શરૂ ન થાય ત્યાં સુધી, તે એલાર્મ સહિત કૉલ, સંદેશા અથવા સૂચનાઓ પ્રાપ્ત કરી શકતું નથી.\n\nઆ ઉપકરણો ખોવાઈ જવા કે ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે. શું તમારું ઉપકરણ શરૂ કરવા માટે પાસવર્ડ આવશ્યક છે&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"તમારા ઉપકરણને અનલૉક કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરવા ઉપરાંત, તમે આ ઉપકરણ શરૂ થાય તે પહેલા તમારો પાસવર્ડ જરૂરી બનાવીને તેને વધુ સુરક્ષિત કરી શકો છો. ઉપકરણ શરૂ ન થાય ત્યાં સુધી, તે અલાર્મ સહિત કૉલ, સંદેશા અથવા સૂચનાઓ પ્રાપ્ત કરી શકતું નથી.\n\nઆ ઉપકરણો ખોવાઈ કે ચોરાઈ જાય ત્યારે ડેટા સુરક્ષિત કરવામાં સહાય કરે છે. શું તમારું ઉપકરણ શરૂ કરવા માટે પાસવર્ડ આવશ્યક છે?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"હા"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"નહીં"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN ની જરૂર છે?"</string>
@@ -3094,6 +3170,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"વપરાશ સંબંધી ચેતવણીઓ"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"ઉપકરણનો સંપૂર્ણ વપરાશ બતાવો"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"ઍપ્લિકેશનનો વપરાશ બતાવો"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"ઉચ્ચ વપરાશ"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> ઍપ્લિકેશન અસાધારણ રીતે વર્તન કરી રહી છે</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ઍપ્લિકેશન અસાધારણ રીતે વર્તન કરી રહી છે</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">ઍપ્લિકેશનો અતિશય બૅટરી વાપરે છે</item>
+      <item quantity="other">ઍપ્લિકેશનો અતિશય બૅટરી વાપરે છે</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ઓપ્ટિમાઇઝ કરેલ નથી"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ઓપ્ટિમાઇઝ કરેલ નથી"</string>
     <string name="high_power_off" msgid="3393904131961263278">"બૅટરી વપરાશને ઓપ્ટિમાઇઝ કરી રહ્યું છે"</string>
@@ -3186,8 +3271,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"અન્ય ઍપ્સની ટોચે પ્રદર્શિત કરો"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g>માંથી <xliff:g id="COUNT_0">%1$d</xliff:g> ઍપ્સને અન્ય ઍપ્સની ટોચે પ્રદર્શિત થવાની મંજૂરી છે"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"પરવાનગી સાથેની ઍપ્લિકેશનો"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"હા"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"નહીં"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"મંજૂરી છે"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"મંજૂરી નથી"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"ઍપ્લિકેશનો ઇન્સ્ટૉલ કરો અજાણ્યા સ્રોતો"</string>
     <string name="write_settings" msgid="4797457275727195681">"સિસ્ટમ સેટિંગ્સ સંશોધિત કરો"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"સિસ્ટમ સેટિંગ્સ સંશોધિત કરો લખો"</string>
@@ -3277,6 +3362,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"સ્ક્રીનની રંગછટા પીળાશ પડતી નારંગી કરેલ છે. તે તમને ઊંઘવામાં સહાય કરી શકે છે."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"સૂચનો"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+વધુ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <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="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <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="suggestion_remove" msgid="904627293892092439">"દૂર કરો"</string>
     <string name="color_temperature" msgid="2070126836910615605">"કૂલ રંગ તાપમાન"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"વધુ કૂલ પ્રદર્શન રંગોનો ઉપયોગ કરો"</string>
@@ -3295,8 +3389,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> ડેટા ચેતવણી"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> ડેટા ચેતવણી / <xliff:g id="ID_2">%2$s</xliff:g> ડેટા મર્યાદા"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"બિલિંગ સાયકલ"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"દર મહિને <xliff:g id="ID_1">%1$s</xliff:g> તારીખે બિલિંગ સાયકલ શરૂ થાય છે"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"મહિનાનો પ્રારંભ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"દર મહિને <xliff:g id="ID_1">%1$s</xliff:g> તારીખે"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"નેટવર્ક નિયંત્રણો"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> પ્રતિબંધ</item>
@@ -3316,7 +3409,7 @@
       <item quantity="other">જ્યારે ડેટા સેવર ચાલુ હોય ત્યારે <xliff:g id="COUNT">%1$d</xliff:g> ઍપ્લિકેશનને અપ્રતિબંધિત ડેટાનો ઉપયોગ કરવાની મંજૂરી છે</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"ડેટા સેવર"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"અપ્રતિબંધિત ડેટા ઍક્સેસ"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"અપ્રતિબંધિત ડેટા"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"પૃષ્ઠભૂમિ ડેટા બંધ કર્યો છે"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"ચાલુ"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"બંધ"</string>
@@ -3380,8 +3473,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"લૉક સ્ક્રીન સૂચનાઓ નિયંત્રિત કરો"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"સૂચના સામગ્રી બતાવો અથવા છુપાવો"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"તમામ"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"સમર્થન"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"સમર્થન અને ટિપ"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"સૌથી નાની પહોળાઈ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"કોઈ ઇન્સ્ટૉલ કરેલ ઍપ્લિકેશનોએ પ્રીમિયમ SMS ઍક્સેસની વિનંતી કરી નથી"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"તમને પ્રીમિયમ SMS નો શુલ્ક લાગી શકે છે અને તમારા કૅરિઅર બિલ્સમાં ઉમેરવામાં આવશે. જો તમે કોઇ ઍપ્લિકેશન માટે પરવાનગી સક્ષમ કરો, તો તમે તે ઍપ્લિકેશનનો ઉપયોગ કરીને પ્રીમિયમ SMS મોકલવા માટે સમર્થ હશો."</string>
@@ -3446,28 +3538,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"સ્વચાલિત"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"મેન્યુઅલ"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"હમણાં સ્થાન ખાલી કરો"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"હાવભાવ"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"સંકેત માટેનાં શૉર્ટકટ"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"તમારા ફોનને નિયંત્રિત કરવા માટે ઝડપી હાવભાવ"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"તમારા ટેબ્લેટને નિયંત્રિત કરવા માટે ઝડપી હાવભાવ"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"તમારા ઉપકરણને નિયંત્રિત કરવા માટે ઝડપી હાવભાવ"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"કૅમેરા પર જાઓ"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"વધુ ઝડપથી કૅમેરો ખોલવા માટે, પાવર બટનને બે વાર દબાવો. કોઈપણ સ્ક્રીન પરથી કામ કરે છે."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"કૅમેરા ઝડપથી ખોલો"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"કૅમેરા ચાલુ કરવા માટે પાવર બટન બે વાર દબાવો"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"કૅમેરો ફ્લિપ કરો"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"વધે ઝડપથી સેલ્ફીઓ લો"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"સેલ્ફી મોડ માટે ફોનને બે વાર વાંકો કરો"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"સેલ્ફી મોડ માટે ટૅબ્લેટને બે વાર વાંકું કરો"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"સેલ્ફી મોડ માટે ઉપકરણને બે વાર વાંકું કરો"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"ફોનને જોવા માટે બે વાર ટૅપ કરો"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ટેબ્લેટને જોવા માટે બે વાર ટૅપ કરો"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"ઉપકરણને જોવા માટે બે વાર ટૅપ કરો"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"તમારી સૂચનાઓને વધુ ઝડપથી જોવા માટે, તમારી સ્ક્રીનને બે વાર ટૅપ કરો."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"સમય, સૂચનાના આઇકનો અને અન્ય માહિતી તપાસવા માટે તમારી સ્ક્રીન પર બે વાર ટૅપ કરો."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"જ્યારે સ્ક્રીન બંધ હોય, ત્યારે સૂચનાઓ તપાસો"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ફોનને જોવા માટે ઉઠાવો"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ટેબ્લેટને જોવા માટે ઉઠાવો"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"ઉપકરણને જોવા માટે ઉઠાવો"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"તમારી સૂચનાઓને વધુ ઝડપથી જોવા માટે, તમારો ફોન ઉઠાવો."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"તમારી સૂચનાઓને વધુ ઝડપથી જોવા માટે, તમારું ટેબ્લેટ ઉઠાવો."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"તમારી સૂચનાઓને વધુ ઝડપથી જોવા માટે, તમારું ઉપકરણ ઉઠાવો."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"સમય, સૂચનાના આઇકનો અને અન્ય માહિતી તપાસવા માટે તમારો ફોન ઉપાડો."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"સમય, સૂચનાના આઇકનો અને અન્ય માહિતી તપાસવા માટે તમારું ટૅબ્લેટ ઉપાડો."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"સમય, સૂચનાના આઇકનો અને અન્ય માહિતી તપાસવા માટે તમારું ઉપકરણ ઉપાડો."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"જ્યારે સ્ક્રીન બંધ હોય, ત્યારે સૂચનાઓ તપાસો"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"સૂચનાઓ માટે સંદર્ભ ફાઇલને સ્વાઇપ કરો"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"તમારી સૂચનાઓને જોવા માટે, તમારા ફોનની પાછળની બાજુએ ફિંગરપ્રિન્ટ સેન્સર પર નીચે સ્વાઇપ કરો."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"તમારી સૂચનાઓને જોવા માટે, તમારા ટેબ્લેટની પાછળની બાજુએ ફિંગરપ્રિન્ટ સેન્સર પર નીચે સ્વાઇપ કરો."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"તમારી સૂચનાઓને જોવા માટે, તમારા ઉપકરણની પાછળની બાજુએ ફિંગરપ્રિન્ટ સેન્સર પર નીચે સ્વાઇપ કરો."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"સૂચનાઓ ઝડપથી જુઓ"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"ફિંગરપ્રિન્ટ સેન્સર પર નીચે સ્વાઇપ કરો"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"કૅમેરા ચાલુ કરવા માટે ફોન ઊચકો"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"કૅમેરા આપમેળે ચાલુ થાય તે માટે, તમારા ફોનને ફોટો લેવાની સ્થિતિ (લૅન્ડસ્કેપ અથવા પોર્ટ્રેટ)માં ઊચકો. તમારો ફોન નિષ્ક્રિય અથવા લૉક હોય ત્યારે પણ કાર્ય કરે છે."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"જયારે ફોન નિષ્ક્રિય અથવા લૉક હોય ત્યારે ફોટા લો"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"સહાય હાવભાવ"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"સંવેદિતા"</string>
@@ -3571,6 +3676,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"શું તમે આ ઝટપટ ઍપ્લિકેશન દૂર કરવા માંગો છો?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"રમતો"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ઑડિઓ ફાઇલો"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"જગ્યા વપરાઈ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> માટે અનઇન્સ્ટૉલ કરેલ)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(વપરાશકર્તા <xliff:g id="USER">%s</xliff:g> માટે અક્ષમ કરેલ)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"સ્વતઃભરણ સેવા"</string>
@@ -3584,5 +3690,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"ઝટપટ ઍપ્લિકેશન"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"સ્ટોરેજ સંચાલકને બંધ કરીએ?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"મૂવી અને TV ઍપ્લિકેશનો"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"જગ્યા વપરાઈ"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"કૅરિઅર જોગવાઈ માહિતી"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"કૅરિઅર જોગવાઈ ટ્રિગર કરો"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"નવું અને રોમાંચક શું છે?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ટોચની 5 સુવિધાઓ તપાસો"</string>
 </resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index cfd28a1..8a2f33c 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"अच्छा"</item>
     <item msgid="8986346415847956850">"बेहतरीन"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"हमेशा"</item>
-    <item msgid="844721238536786870">"केवल प्‍लग इन करने पर"</item>
-    <item msgid="1986753720941888596">"कभी नहीं"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"हमेशा"</item>
-    <item msgid="7433294150916905997">"केवल प्‍लग इन करने पर"</item>
-    <item msgid="1390404486722375028">"कभी नहीं"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"पिछले 30 दिन"</item>
     <item msgid="6600989128423965319">"उपयोग चक्र सेट करें..."</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index cf8f7c1..64107ca 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"अब आप डेवलपर बन गए हैं!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"आवश्यकता नहीं, आप पहले से ही डेवलपर हैं."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"कृपया पहले डेवलपर विकल्‍प सक्षम करें."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"वायरलेस और नेटवर्क"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"कनेक्शन"</string>
     <string name="header_category_device" msgid="4544026001618307754">"डिवाइस"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE प्रावधान किया गया"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"वीडियो कॉल का प्रावधान किया गया"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"वाई-फ़ाई कॉल का प्रावधान किया गया"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/उपस्थिति का प्रावधान किया गया"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"मोबाइल रेडियो पावर"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"सिम पता पुस्तिका देखें"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"फ़िक्‍स्‍ड डायलिंग नंबर देखें"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"डिवाइस के लिए स्‍कैन"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"इस डिवाइस का नाम बदलें"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"नाम बदलें"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"डिस्‍कनेक्‍ट करें?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"इससे &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; के साथ आपका कनेक्‍शन समाप्त हो जाएगा"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"डिवाइस डिसकनेक्ट करना चाहते हैं?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"आपका फ़ोन <xliff:g id="DEVICE_NAME">%1$s</xliff:g> से डिसकनेक्ट हो जाएगा."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"आपका टैबलेट <xliff:g id="DEVICE_NAME">%1$s</xliff:g> से डिसकनेक्ट हो जाएगा."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"आपका डिवाइस <xliff:g id="DEVICE_NAME">%1$s</xliff:g> से डिसकनेक्ट हो जाएगा."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"डिसकनेक्ट करें"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"आपको ब्लूटूथ सेटिंग में बदलाव करने की अनुमति नहीं है."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"नया डिवाइस युग्मित करें"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"ब्लूटूथ सेटिंग खुली होने पर <xliff:g id="DEVICE_NAME">%1$s</xliff:g> आस-पास के डिवाइसों को दिखाई देता है."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"फ़ोन का ब्लूटूथ पता: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"टैबलेट का ब्लूटूथ पता: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"डिवाइस का ब्लूटूथ पता: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को डिसकनेक्ट करें?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"प्रसारण"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"प्रोफ़ाइल अक्षम करें?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"ब्लूटूथ युग्‍मन अनुरोध"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"युग्‍मन अनुरोध"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> से युग्मित करने के लिए टैप करें."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"प्राप्त फ़ाइलें दिखाएं"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"मिली फ़ाइलें"</string>
     <string name="device_picker" msgid="4978696506172252813">"ब्लूटूथ डिवाइस चुनें"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ को चालू करना चाहता है"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ को बंद करना चाहता है"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s आपके संदेशों को एक्सेस करना चाहता है. %2$s पर एक्सेस दें?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM ऐक्सेस के लिए अनुरोध"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> आपके SIM कार्ड को ऐक्सेस करना चाहता है. SIM कार्ड की ऐक्सेस देने से कनेक्शन की अवधि तक आपके डिवाइस पर डेटा कनेक्टिविटी अक्षम हो जाएगी. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> को ऐक्सेस दें"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"दूसरे डिवाइस को \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' के रूप में दिखाई देता है"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"आपके डिवाइस"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"नया डिवाइस युग्मित करें"</string>
     <string name="date_and_time" msgid="9062980487860757694">"दिनांक और समय"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"समय क्षेत्र चुनें"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"खाते"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"स्थान"</string>
     <string name="account_settings_title" msgid="626177544686329806">"खाते"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"सुरक्षा और स्‍थान"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"सुरक्षा और स्‍थान"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"एन्क्रिप्शन और क्रेडेंशियल"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"फ़ोन एन्क्रिप्ट किया गया है"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"एन्क्रिप्ट किया गया डिवाइस"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"फ़िंगरप्रिंट से अनलॉक"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"फ़िंगरप्रिंट का उपयोग करें"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"अपने फ़ोन को अनलॉक करने, खरीदारियों को प्राधिकृत करने या ऐप्लिकेशन में प्रवेश करने के लिए बस फ़िंगरप्रिंट सेंसर को छूएं. इसमें सावधानी रखें कि आप किस व्यक्ति के फ़िंगरप्रिंट जोड़ रहे हैं. यहां तक कि जोड़े गए एक भी प्रिंट से भी इनमें से कोई चीज़ हो सकती है.\n\nध्यान दें: हो सकता है कि आपका फ़िंगरप्रिंट किसी मज़बूत पैटर्न या पिन से कम सुरक्षित हो."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"खरीदारियों को प्राधिकृत करने या ऐप्लिकेशन में प्रवेश करने के लिए बस फ़िंगरप्रिंट सेंसर को छूएं. इसमें सावधानी रखें कि आप किस व्यक्ति के फ़िंगरप्रिंट जोड़ रहे हैं. यहां तक कि जोड़े गए एक भी प्रिंट से भी इनमें से कोई चीज़ हो सकती है.\n\nनोट: आप इस डिवाइस को अनलॉक करने के लिए अपने फ़िंगरप्रिंट का उपयोग नहीं कर सकते हैं. अधिक जानकारी के लिए, अपने संगठन के व्यवस्थापक से संपर्क करें."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"अपने फ़ोन को अनलॉक करने, खरीदारियों को प्राधिकृत करने या ऐप्लिकेशन में प्रवेश करने के लिए बस फ़िंगरप्रिंट सेंसर को छूएं. इसमें सावधानी रखें कि आप किस व्यक्ति के फ़िंगरप्रिंट जोड़ रहे हैं. यहां तक कि जोड़े गए एक भी प्रिंट से भी इनमें से कोई चीज़ हो सकती है.\n\nध्यान दें: हो सकता है कि आपका फ़िंगरप्रिंट किसी मज़बूत पैटर्न या पिन से कम सुरक्षित हो."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"अपना फ़ोन अनलॉक करने या खरीदारियों को स्वीकृति देने के लिए अपने फ़िंगरप्रिंट का उपयोग करें.\n\nनोट: आप इस डिवाइस को अनलॉक करने के लिए अपने फ़िंगरप्रिंट का उपयोग नहीं कर सकते हैं. अधिक जानकारी के लिए, अपने संगठन के व्यवस्थापक से संपर्क करें."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"अपना फ़ोन अनलॉक करने या खरीदारियों को स्वीकृति देने के लिए अपने फ़िंगरप्रिंट का उपयोग करें.\n\nनोट: आपका फ़िंगरप्रिंट किसी मज़बूत पैटर्न या पिन से कम सुरक्षित हो सकता है."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"अभी नहीं"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"जारी रखें"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"अभी नहीं"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"फ़िंगरप्रिंट जोड़ें"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"डिवाइस सुरक्षा सुविधाओं को सक्रिय नहीं किया जाएगा. यदि यह टैबलेट खो जाता है, चोरी चला जाता है या मिटा दिया जाता है तो आप इसे दूसरे लोगों द्वारा उपयोग किए जाने से नहीं रोक सकेंगे."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"डिवाइस सुरक्षा सुविधाओं को सक्रिय नहीं किया जाएगा. यदि यह डिवाइस खो जाता है, चोरी हो जाता है या मिटा दिया जाता है तो आप इसे दूसरे लोगों द्वारा उपयोग किए जाने से नहीं रोक सकेंगे."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"डिवाइस सुरक्षा सुविधाओं को सक्रिय नहीं किया जाएगा. यदि यह फ़ोन खो जाता है, चोरी हो जाता है या मिटा दिया जाता है तो आप इसे दूसरे लोगों द्वारा उपयोग किए जाने से नहीं रोक सकेंगे."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"डिवाइस सुरक्षा सुविधाओं को सक्रिय नहीं किया जाएगा. यदि यह टैबलेट खो जाता है या चोरी चला जाता है, तो आप इसे दूसरे लोगों द्वारा उपयोग किए जाने से नहीं रोक सकेंगे."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"डिवाइस सुरक्षा सुविधाओं को सक्रिय नहीं किया जाएगा. यदि यह डिवाइस खो जाता है या चोरी चला जाता है, तो आप इसे दूसरे लोगों द्वारा उपयोग किए जाने से नहीं रोक सकेंगे."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"डिवाइस सुरक्षा सुविधाओं को सक्रिय नहीं किया जाएगा. यदि यह फ़ोन खो जाता है या चोरी चला जाता है, तो आप इसे दूसरे लोगों द्वारा उपयोग किए जाने से नहीं रोक सकेंगे."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"अगला"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"डिवाइस सुरक्षा सुविधाओं को चालू नहीं किया जाएगा. अगर आपका टैबलेट खो जाता है, चोरी हो जाता है या उसे रीसेट कर दिया जाता है, तो आप दूसरों को इसका उपयोग करने से रोक नहीं पाएंगे."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"डिवाइस सुरक्षा सुविधाओं को चालू नहीं किया जाएगा. अगर आपका डिवाइस खो जाता है, चोरी हो जाता है या उसे रीसेट कर दिया जाता है, तो आप दूसरों को इसका उपयोग करने से रोक नहीं पाएंगे."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"डिवाइस सुरक्षा सुविधाओं को चालू नहीं किया जाएगा. अगर आपका फ़ोन खो जाता है, चोरी हो जाता है या उसे रीसेट कर दिया जाता है, तो आप दूसरों को इसका उपयोग करने से रोक नहीं पाएंगे."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"डिवाइस सुरक्षा सुविधाओं को चालू नहीं किया जाएगा. अगर आपका टैबलेट खो जाता है या चोरी हो जाता है, तो आप दूसरों को इसका उपयोग करने से रोक नहीं पाएंगे."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"डिवाइस सुरक्षा सुविधाओं को चालू नहीं किया जाएगा. अगर आपका डिवाइस खो जाता है या चोरी हो जाता है, तो आप दूसरों को इसका उपयोग करने से रोक नहीं पाएंगे."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"डिवाइस सुरक्षा सुविधाओं को चालू नहीं किया जाएगा. अगर आपका फ़ोन खो जाता है या चोरी हो जाता है, तो आप दूसरों को इसका उपयोग करने से रोक नहीं पाएंगे."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"फिर भी आगे बढ़ें"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"वापस जाएं"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"सेंसर ढूंढें"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"अपने फ़ोन के पीछे फ़िंगरप्रिंट सेंसर का पता लगाएं."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"सेंसर को स्पर्श करें"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"यह आपके फ़ोन के पीछे दिया गया है. अपने अंगूठे के पास की अंगुली का उपयोग करें."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"डिवाइस और उस पर फ़िंगरप्रिंट सेंसर की जगह बताने वाला चित्रण"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"नाम"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ठीक"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"हटाएं"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"आइए शुरू करें"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"सेंसर को स्पर्श करें"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"अपनी उंगली सेंसर पर रखें और कंपन का अनुभव होने पर उठा लें"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"जारी रखें"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"अपने फ़िंगरप्रिंट के सभी भिन्न भागों को जोड़ने के लिए अपनी अंगुली को धीरे से हिलाएं"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"अंगुली की छाप जोड़ा है!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"जब भी आपको यह आइकन दिखाई दे, आप पहचान के लिए या खरीदारी को अधिकृत करने के लिए अपने फ़िंगरप्रिंट का उपयोग कर सकते हैं."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"अपने डिवाइस को सक्रिय और अनलॉक करने के लिए बस फ़िंगरप्रिंट सेंसर को छूएं."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"यह आइकन दिखाई देने पर, आप खरीदारियां प्राधिकृत कर सकते हैं या ऐप्लिकेशन में प्रवेश भी कर सकते हैं."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"उठाएं, फिर दोबारा स्पर्श करें"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"अपने फ़िंगरप्रिंट के अलग-अलग भागों को जोड़ने के लिए अपनी अंगुली को उठाते रहें"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"फ़िंगरप्रिंट जोड़ा गया"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"जब आपको यह आइकन दिखाई दे, तब पहचान के लिए या खरीदारियों की स्वीकृति देने के लिए अपने फ़िंगरप्रिंट का उपयोग करें."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फ़िंगरप्रिंट सेटअप छोड़ें?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"आपने अपने फ़ोन को अनलॉक करने के एक तरीके के रूप में अपने फ़िंगरप्रिंट का उपयोग करने का चयन किया है. यदि आप इसे अभी छोड़ते हैं, तो आपको इसे बाद में सेट करना होगा. सेटअप में लगभग एक मिनट लगता है."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"स्‍क्रीन लॉक सेट करें"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"हो गया"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ओह, वह सेंसर नहीं है"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"डिवाइस पर फ़िंगरप्रिंट सेंसर का उपयोग करें."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"अपने फ़ोन के पीछे लगे सेंसर को स्पर्श करें. अपने अंगूठे के पास की अंगुली का उपयोग करें."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"नामांकन पूर्ण नहीं हुआ था"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"फ़िंगरप्रिंट नामांकन समय की सीमा पार हो गई है. फिर से प्रयास करें."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"फ़िंगरप्रिंट नामांकन ने काम नहीं किया. फिर से प्रयास करें या किसी दूसरी अंगुली का उपयोग करें."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस डिवाइस का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस फ़ोन का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"अपनी बैकअप स्‍क्रीन लॉक विधि चुनें"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"स्क्रीन लॉक विकल्प"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"स्क्रीन लॉक विकल्प"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"स्क्रीन लॉक"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / निष्क्रिय होने के तुरंत बाद"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> निष्क्रिय होने के बाद"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"अनलॉक आकार बदलें"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"अनलॉक पिन बदलें"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"अनलॉक पासवर्ड बदलें"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"पुनः प्रयास करें. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> में से <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> प्रयास."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"अंतिम प्रयास"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"यदि आप इस प्रयास में गलत कार्य पैटर्न डालेंगे, तो आपकी कार्य प्रोफ़ाइल और संबद्ध डेटा को इस डिवाइस से निकाल दिया जाएगा."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"यदि आप इस प्रयास में गलत कार्य पिन डालेंगे, तो आपकी कार्य प्रोफ़ाइल और संबद्ध डेटा को इस डिवाइस से निकाल दिया जाएगा."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"यदि आप इस प्रयास में कोई गलत कार्य पासवर्ड डालेंगे, तो आपकी कार्य प्रोफ़ाइल और संबद्ध डेटा को इस डिवाइस से निकाल दिया जाएगा."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"बहुत से गलत प्रयास. आपकी कार्य प्रोफ़ाइल और संबद्ध डेटा को इस डिवाइस से निकाल दिया जाएगा."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ख़ारिज करें"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"फिर से कोशिश करें. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> में से <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> कोशिश."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"आपका डेटा हटा दिया जाएगा"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"अगर आप अगली कोशिश में गलत पैटर्न डालते हैं, तो इस डिवाइस का डेटा हटा दिया जाएगा"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"अगर आप अगली कोशिश में गलत पिन डालते हैं, तो इस डिवाइस का डेटा हटा दिया जाएगा"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"अगर आप अगली कोशिश में गलत पासवर्ड डालते हैं, तो इस डिवाइस का डेटा हटा दिया जाएगा"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"अगर आप अगली कोशिश में गलत पैटर्न डालते हैं, तो इस उपयोगकर्ता को हटा दिया जाएगा"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"अगर आप अगली कोशिश में गलत पिन डालते हैं, तो इस उपयोगकर्ता को हटा दिया जाएगा"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"अगर आप अगली कोशिश में गलत पासवर्ड डालते हैं, तो इस उपयोगकर्ता को हटा दिया जाएगा"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"अगर आप अगली कोशिश में गलत पैटर्न डालते हैं, तो आपकी कार्य प्रोफ़ाइल और उसके डेटा को हटा दिया जाएगा"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"अगर आप अगली कोशिश में गलत पिन डालते हैं, तो आपकी कार्य प्रोफ़ाइल और उसके डेटा को हटा दिया जाएगा"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"अगर आप अगली कोशिश में गलत पासवर्ड डालते हैं, तो आपकी कार्य प्रोफ़ाइल और उसके डेटा को हटा दिया जाएगा"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"बहुत सारी गलत कोशिशें की गई हैं. इस डिवाइस का डेटा हटा दिया जाएगा"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"बहुत सारी गलत कोशिशें की गई हैं. इस उपयोगकर्ता को हटा दिया जाएगा."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"बहुत सारी गलत कोशिशें की गई हैं. इस कार्य प्रोफ़ाइल और इसके डेटा को हटा दिया जाएगा."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"खारिज करें"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"इसमें कम से कम <xliff:g id="COUNT">%d</xliff:g> वर्ण होने चाहिए"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"पिन में कम से कम <xliff:g id="COUNT">%d</xliff:g> अंक होने चाहिए"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"जारी रखें"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"उन्नत ब्लूटूथ"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ब्लूटूथ के चालू होने पर, आपका डिवाइस आसपास के अन्य ब्लूटूथ डिवाइसों से संचार कर सकता है."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"स्‍थान सटीकता को बेहतर बनाने के लिए, सिस्‍टम ऐप्‍स और सेवाएं अभी भी ब्‍लूटूथ डिवाइसों का पता लगा सकती हैं. आप इसे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्‍कैन करने की सेटिंग<xliff:g id="LINK_END_1">LINK_END</xliff:g> में बदल सकते हैं."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"कनेक्ट नहीं हो सका. फिर से कोशिश करें."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"डिवाइस विवरण"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"डिवाइस का ब्लूटूथ पता: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"क्या डिवाइस को भूलना चाहते हैं?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"आपका फ़ोन अब <xliff:g id="DEVICE_NAME">%1$s</xliff:g> के साथ युग्मित नहीं रहेगा"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"आपका टैबलेट अब <xliff:g id="DEVICE_NAME">%1$s</xliff:g> के साथ युग्मित नहीं रहेगा"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"आपका डिवाइस अब <xliff:g id="DEVICE_NAME">%1$s</xliff:g> के साथ युग्मित नहीं रहेगा"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"डिवाइस को भूल जाएं"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"इससे कनेक्‍ट करें…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को मीडिया ऑडियो से डिस्‍कनेक्‍ट कर दिया जाएगा."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को हैंड्सफ़्री ऑडियो से डिस्‍कनेक्‍ट कर दिया जाएगा."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"प्रदान न करें"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"मान्‍य न करें"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"कोई प्रमाणपत्र निर्दिष्‍ट नहीं है. आपका कनेक्‍शन निजी नहीं होगा."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"नेटवर्क का नाम बहुत लंबा है."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"डोमेन निर्दिष्ट करना आवश्यक है."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्‍ध"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्‍ध)"</string>
@@ -809,7 +838,6 @@
       <item quantity="other">%d नेटवर्क</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"अतिरिक्त सेटिंग"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"वाई-फ़ाई कॉन्‍फ़िगर करें"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC पता"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP पता"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"सबनेट मास्क"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"इस समूह को भूलें?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"पोर्टेबल वाई-फ़ाई  हॉटस्‍पॉट"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"वाई-फ़ाई हॉटस्पॉट"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"वाई-फ़ाई नेटवर्क देने के लिए मोबाइल कनेक्शन का उपयोग करें"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"इस टैबलेट का इंटरनेट कनेक्शन हॉटस्पॉट के ज़रिए साझा नहीं किया जा रहा है"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"इस फ़ोन का इंटरनेट कनेक्शन हॉटस्पॉट के ज़रिए साझा नहीं किया जा रहा है"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"दूसरे डिवाइस से इंटरनेट या सामग्री को साझा नहीं किया जा सकता है"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"हॉटस्पॉट के ज़रिए इस टैबलेट का इंटरनेट कनेक्शन साझा किया जा रहा है"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"हॉटस्पॉट के ज़रिए इस फ़ोन का इंटरनेट कनेक्शन साझा किया जा रहा है"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ऐप्लिकेशन सामग्री साझा कर रहा है. इंटरनेट कनेक्शन साझा करने के लिए, हॉटस्पॉट बंद करें, फिर उसे चालू करें"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"वाई-फ़ाई का नाम"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> चालू किया जा रहा है..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"दूसरे डिवाइस <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> से कनेक्ट हो सकते हैं"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"वाई-फ़ाई पासवर्ड"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP बैंड"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"हॉटस्पॉट का उपयोग करके अपने दूसरे डिवाइस के लिए वाई-फ़ाई नेटवर्क बनाएं. हॉटस्पॉट आपके मोबाइल डेटा कनेक्शन का उपयोग करके इंटरनेट देता है. अतिरिक्त मोबाइल डेटा शुल्क लागू हो सकते हैं."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ऐप्लिकेशन आस-पास के डिवाइस से सामग्री साझा करने के लिए कोई हॉटस्पॉट बना सकते हैं."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"हॉटस्‍पॉट को चालू किया जा रहा है…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"हॉटस्‍पॉट को बंद किया जा रहा है…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> सक्रिय है"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"वाई-फ़ाई कॉलिंग चालू होने पर, आपका फ़ोन आपकी प्राथमिकता और अधिक सशक्त सिग्‍नल के आधार पर वाई-फ़ाई नेटवर्क या आपके वाहक के नेटवर्क के द्वारा कॉल को रूट कर सकता है. इस सुविधा को चालू करने से पहले, शुल्‍क और अन्‍य विवरणों के बारे में अपने वाहक से बात करें."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"आपातकालीन पता अपडेट करें"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"जब आप वाई-फ़ाई का उपयोग करके 911 पर कॉल करते है तब आपातकालीन सेवाओं द्वारा आपके स्थान के रूप में उपयोग किया जाने वाला पता"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"स्क्रीन सेटिंग देखें"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"कोई परिणाम नहीं"</string>
     <string name="display_settings" msgid="7965901687241669598">"स्क्रीन सेटिंग"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"स्‍क्रीन अपनेआप घुमाएं"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"चमकीले रंग"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"टेबलेट घुमाने पर स्‍वचालित रूप से अभिविन्‍यास स्‍विच करें"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"फ़ोन घुमाने पर अभिविन्‍यास स्‍वचालित रूप से स्‍विच करें"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"टेबलेट घुमाने पर स्‍वचालित रूप से अभिविन्‍यास स्‍विच करें"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"मौजूदा रोशनी के लिए स्क्रीन की चमक का स्तर अनुकूलित करें. इस सुविधा के चालू होने पर, आप अभी भी स्क्रीन की रोशनी कुछ समय के लिए एडजस्ट कर सकते हैं."</string>
     <string name="night_display_title" msgid="2626451512200357686">"नाइट लाइट"</string>
     <string name="night_display_text" msgid="1837277457033025056">"नाइट लाइट आपकी स्क्रीन को हल्का एम्बर कर देती है. इससे मंद रोशनी में अपनी स्क्रीन देखना या पढ़ना आसान हो जाता है और आपको आसानी से नींद आने में सहायता मिल सकती है."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"शेड्यूल करें"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"स्थिति"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"अपने आप चालू करें"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"कभी नहीं"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"कस्टम शेड्यूल"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"सूर्यास्त से सूर्योदय तक"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"शेड्यूल करें"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"कोई नहीं"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"कस्टम समय पर चालू हो जाता है"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"सूर्यास्त से सूर्योदय तक चालू रहता है"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"प्रारंभ समय"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"समाप्ति समय"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"स्थिति"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"तीव्रता"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"बंद. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"कभी भी अपने आप चालू नहीं होगा."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g> बजे अपने आप चालू हो जाएगा."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"सूर्यास्त होने पर अपने आप चालू हो जाएगा."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"चालू. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"कभी भी अपने आप बंद नहीं होगा."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g> बजे अपने आप बंद हो जाएगा."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"सूर्योदय होने पर अपने आप बंद हो जाएगा."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"बंद / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"कभी भी अपने आप चालू नहीं होगा"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g> बजे अपने आप चालू हो जाएगा"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"सूर्यास्त होने पर अपने आप चालू हो जाएगा"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"चालू / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"कभी भी अपने आप बंद नहीं होगा"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g> बजे अपने आप बंद हो जाएगा"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"सूर्योदय होने पर अपने आप बंद हो जाएगा"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"उपयोग में नहीं"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"स्क्रीन बंद हो जाती है"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"नि‍ष्‍क्रि‍यता के <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> के बाद"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"सेटिंग"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"अपनेआप स्क्रीन की रोशनी"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"सक्रिय करने के लिए उठाएं"</string>
-    <string name="doze_title" msgid="2259176504273878294">"परिवेशी प्रदर्शन"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"व्यापक प्रदर्शन"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"हमेशा चालू"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"नए नोटिफ़िकेशन"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"कब दिखाना है"</string>
+    <string name="doze_title" msgid="2375510714460456687">"नए नोटिफ़िकेशन"</string>
     <string name="doze_summary" msgid="3846219936142814032">"आपको नोटिफ़िकेशन मिलने पर स्‍क्रीन सक्रिय करें"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"हमेशा चालू"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"शो का समय, नोटिफ़िकेशन आइकन और दूसरी जानकारी"</string>
     <string name="title_font_size" msgid="4405544325522105222">"अक्षरों का आकार"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"लेख को छोटा या बड़ा करें"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"सिम कार्ड लॉक सेटिंग"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN खाली नहीं हो सकता."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC फ़ील्‍ड में 3 अंक होने चाहिए."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MCC फ़ील्‍ड में 2 या 3 अंक होने चाहिए."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"वाहक %s प्रकार के APN जोड़ने की अनुमति नहीं देता."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"डिफ़ॉल्‍ट APN सेटिंग पुनर्स्थापित हो रही हैं."</string>
     <string name="menu_restore" msgid="8260067415075573273">"डिफ़ॉल्ट पर रीसेट करें"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"डिफ़ॉल्‍ट APN सेटिंग रीसेट करना पूर्ण हुआ."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD कार्ड मिटाएं"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"आंतरिक USB मेमोरी का सभी डेटा, जैसे संगीत या फ़ोटो, मिटाएं"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD कार्ड पर मौजूद सभी डेटा, जैसे संगीत या फ़ोटो, मिटाएं"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIMs मिटाएं"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"फ़ोन पर सभी eSIM मिटाएं. इससे आपकी मोबाइल सेवा योजना बंद नहीं होगी."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"टैबलेट पर सभी eSIM मिटाएं. इससे आपकी मोबाइल सेवा योजना बंद नहीं होगी."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"टेबलेट रीसेट करें"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"फ़ोन रीसेट करें"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"आपकी सभी व्यक्तिगत जानकारी और डाउनलोड किए गए ऐप्स मिटाएं? आप इस कार्रवाई को वापस नहीं ला सकते!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"डेटा बचतकर्ता चालू होने के दौरान टेदर नहीं किया जा सकता या पोर्टेबल हॉटस्पॉट का उपयोग नहीं किया जा सकता"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB टेदरिंग"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB कनेक्‍ट किया गया, टेदर के लिए जांचें"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"टेदर किया गया"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USB मेमोरी के उपयोग में होने पर टेदर नहीं हो सकता"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB कनेक्ट नहीं किया गया"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"चालू करने के लिए कनेक्ट करें"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB टेदरिंग गड़बड़ी"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"USB के ज़रिए फ़ोन का इंटरनेट कनेक्‍शन साझा करें"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"USB के ज़रिए टैबलेट का इंटरनेट कनेक्‍शन साझा करें"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ब्लूटूथ टेदरिंग"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"टैबलेट का इंटरनेट ब्लूटूथ के ज़रिए साझा हो रहा है"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"इस फ़ोन का इंटरनेट कनेक्शन ब्लूटूथ के ज़रिए साझा किया जा रहा है"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"टैबलेट का इंटरनेट ब्लूटूथ से 1 डिवाइस से साझा हो रहा है"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"फ़ोन का इंटरनेट ब्लूटूथ के ज़रिए 1 डिवाइस से साझा हो रहा है"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"टैबलेट का इंटरनेट ब्लूटूथ के ज़रिए <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> डिवाइस से साझा हो रहा है"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"टैबलेट का इंटरनेट ब्लूटूथ के ज़रिए <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> डिवाइस से साझा हो रहा है"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"ब्लूटूथ के ज़रिए टैबलेट का इंटरनेट कनेक्शन साझा करें"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"ब्लूटूथ के ज़रिए फ़ोन का इंटरनेट कनेक्शन साझा करें"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g> का इंटरनेट कनेक्शन ब्लूटूथ से साझा हो रहा है"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"टैबलेट का इंटरनेट ब्लूटूथ से साझा नहीं हो रहा है"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"फ़ोन का इंटरनेट ब्लूटूथ से साझा नहीं हो रहा है"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"टेदर नहीं किया गया"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> डिवाइस से अधिक को टेदर नहीं कर सकता."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को अनटेदर किया जाएगा."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"अपने मोबाइल डेटा कनेक्शन के ज़रिए दूसरे डिवाइसों को इंटरनेट देने के लिए हॉटस्पॉट और टेदरिंग का उपयोग करें."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"अपने मोबाइल डेटा कनेक्शन के ज़रिए दूसरे डिवाइसों को इंटरनेट देने के लिए हॉटस्पॉट और टेदरिंग का उपयोग करें. ऐप्लिकेशन आस-पास के डिवाइस से सामग्री साझा करने के लिए हॉटस्पॉट भी बना सकते हैं."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"सहायता"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"मोबाइल नेटवर्क"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"मोबाइल प्लान"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"स्थान मोड"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"स्थान पता करने के लिए GPS, वाई-फ़ाई, ब्‍लूटूथ या मोबाइल नेटवर्क का उपयोग करें"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"स्थान पता करने के लिए वाई-फ़ाई, ब्‍लूटूथ या मोबाइल नेटवर्क का उपयोग करें"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"स्‍थान निर्धारित करने के लिए GPS का उपयोग करें"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"स्थान पता करने के लिए GPS और डिवाइस के सेंसर का उपयोग करें"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"स्‍कैन करना"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"वाई-फ़ाई स्‍कैन करना"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"सिस्‍टम ऐप्‍स और सेवाओं को किसी भी समय वाई-फ़ाई नेटवर्कों का पता लगाने देकर स्‍थान सेवा को बेहतर बनाएं."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"आपके पास डेटा कनेक्‍शन नहीं है. इस जानकारी को अभी देखने के लिए, इंटरनेट से कनेक्‍ट किसी भी कंप्‍यूटर से %s पर जाएं."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"लोड हो रहा है..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"अपना पासवर्ड चुनें"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"फ़िंगरप्रिंट का उपयोग करने के लिए, पासवर्ड सेट करें"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"अपना आकार चुनें"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"फ़िंगरप्रिंट का उपयोग करने के लिए, पैटर्न सेट करें"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"अपना पिन चुनें"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"फ़िंगरप्रिंट का उपयोग करने के लिए, पिन सेट करें"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"अपने पासवर्ड की पुष्टि करें"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"अपने पैटर्न की पुष्टि करें"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"अपने पिन की पुष्टि करें"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"ऐप्स सेटिंग"</string>
     <string name="install_applications" msgid="4872012136210802181">"अज्ञात स्रोत"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"सभी ऐप्स स्रोतों को अनुमति दें"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"हाल ही में खोले गए ऐप्लिकेशन"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"सभी <xliff:g id="COUNT">%1$d</xliff:g> ऐप्लिकेशन देखें"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> पहले"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"आपके टैबलेट और व्यक्तिगत डेटा पर अनजान ऐप्लिकेशन की ओर से हमला किए जाने का जोखिम ज़्यादा है. इस स्रोत से आने वाले ऐप्लिकेशन इंस्टॉल करके, आप सहमति देते हैं कि उनके उपयोग के कारण आपके टैबलेट को होने वाले किसी भी नुकसान या डेटा की हानि के लिए आप ही ज़िम्मेदार हैं."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"आपके फ़ोन और व्यक्तिगत डेटा पर अनजान ऐप्लिकेशन की ओर से हमला किए जाने का जोखिम ज़्यादा है. इस स्रोत से आने वाले ऐप्लिकेशन इंस्टॉल करके, आप सहमति देते हैं कि उनके उपयोग के कारण आपके फ़ोन को होने वाले किसी भी नुकसान या डेटा की हानि के लिए आप ही ज़िम्मेदार हैं."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"अतिरिक्त सेटिंग"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"सिस्‍टम सेवा बंद करें?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"यदि आप यह सेवा रोकते हैं, तो हो सकता है कि आपके टेबलेट की कुछ सुविधाएं ठीक से कार्य करना बंद कर दें जब तक कि आप उसे बंद करके फिर से चालू  न कर लें."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"यदि आप यह सेवा रोकते हैं, तो हो सकता है कि आपके फ़ोन की कुछ सुविधाएं ठीक से कार्य करना बंद कर दें जब तक कि आप उसे बंद करके फिर से चालू  न कर लें."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"भाषाएं, इनपुट और हावभाव"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"भाषाएं और इनपुट"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"भाषाएं और इनपुट"</string>
     <string name="input_assistance" msgid="7577795275222555487">"इनपुट सहायता"</string>
@@ -1872,6 +1918,10 @@
       <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="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <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="print_settings_title" msgid="3685449667822217816">"प्रिंट सेवाएं"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"कोई सेवा इंस्‍टॉल नहीं है"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"कोई प्रिंटर नहीं मिला"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"विवरणों का उपयोग करें"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"पावर उपयोग एडजस्ट करें"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"शामिल पैकेज"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ऐप्लिकेशन बैटरी खा रहे हैं"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"डिवाइस को सक्रिय रखना"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"डिवाइस को बैकग्राउंड में सक्रिय करना"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"बार-बार स्थान का अनुरोध कर रहा है"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ऐप्लिकेशन ठीक से काम नहीं कर रहे हैं"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"ऐप्लिकेशन रोकना चाहते हैं?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"आपका फ़ोन सामान्य रूप से बैटरी को प्रबंधित नहीं कर सकता है क्योंकि <xliff:g id="APP">%1$s</xliff:g> आपके फ़ोन को सक्रिय रख रहा है.\n\nइस समस्या को ठीक करने की कोशिश करने के लिए, आप ऐप्लिकेशन को बलपूर्वक रोक सकते हैं.\n\nअगर ऐसा होता रहता है, तो बैटरी प्रदर्शन को बेहतर करने के लिए आपको ऐप्लिकेशन अनइंस्टॉल करना पड़ सकता है."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"आपका टैबलेट सामान्य रूप से बैटरी को प्रबंधित नहीं कर सकता है क्योंकि <xliff:g id="APP">%1$s</xliff:g> आपके टैबलेट को सक्रिय रख रहा है.\n\nइस समस्या को ठीक करने की कोशिश करने के लिए, आप ऐप्लिकेशन को बलपूर्वक रोक सकते हैं.\n\nअगर ऐसा होता रहता है, तो बैटरी प्रदर्शन को बेहतर करने के लिए आपको ऐप्लिकेशन अनइंस्टॉल करना पड़ सकता है."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"आपका डिवाइस सामान्य रूप से बैटरी को प्रबंधित नहीं कर सकता है क्योंकि <xliff:g id="APP">%1$s</xliff:g> आपके डिवाइस को सक्रिय रख रहा है.\n\nइस समस्या को ठीक करने के लिए, आप ऐप्लिकेशन को बलपूर्वक रोक सकते हैं.\n\nअगर ऐसा होता रहता है, तो बैटरी प्रदर्शन को बेहतर करने के लिए आपको ऐप्लिकेशन अनइंस्टॉल करना पड़ सकता है."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"ऐप्लिकेशन रोकें"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"क्या बैकग्राउंड उपयोग को बंद करना चाहते हैं?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"आपका फ़ोन सामान्य रूप से बैटरी को प्रबंधित नहीं कर सकता है क्योंकि <xliff:g id="APP">%1$s</xliff:g> आपके डिवाइस को सक्रिय करता रहता है.\n\nइस समस्या का समाधान करने के लिए, आपका फ़ोन इस ऐप्लिकेशन को बैकग्राउंड में चलने से रोक सकता है."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"आपका टैबलेट सामान्य रूप से बैटरी को प्रबंधित नहीं कर सकता है क्योंकि <xliff:g id="APP">%1$s</xliff:g> आपके डिवाइस को सक्रिय करता रहता है.\n\nइस समस्या का समाधान करने के लिए, आपका टैबलेट इस ऐप्लिकेशन को बैकग्राउंड में चलने से रोक सकता है."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"आपका डिवाइस सामान्य रूप से बैटरी को प्रबंधित नहीं कर सकता है क्योंकि <xliff:g id="APP">%1$s</xliff:g> आपके डिवाइस को सक्रिय करता रहता है.\n\nइस समस्या का समाधान करने के लिए, आपका डिवाइस इस ऐप्लिकेशन को बैकग्राउंड में चलने से रोक सकता है."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"बंद करें"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"स्थान बंद करना चाहते हैं?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"आपका फ़ोन सामान्य रूप से बैटरी को प्रबंधित नहीं कर सकता है क्योंकि <xliff:g id="APP">%1$s</xliff:g> तब भी आपके स्थान का अनुरोध करता रहता है जब आप ऐप्लिकेशन का उपयोग नहीं कर रहे होते हैं.\n\nइस समस्या को ठीक करने के लिए, आप इस ऐप्लिकेशन के लिए स्थान बंद कर सकते हैं."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"आपका टैबलेट सामान्य रूप से बैटरी को प्रबंधित नहीं कर सकता है क्योंकि <xliff:g id="APP">%1$s</xliff:g> तब भी आपके स्थान का अनुरोध करता रहता है जब आप ऐप्लिकेशन का उपयोग नहीं कर रहे होते हैं.\n\nइस समस्या को ठीक करने के लिए, आप इस ऐप्लिकेशन के लिए स्थान बंद कर सकते हैं."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"आपका डिवाइस सामान्य रूप से बैटरी को प्रबंधित नहीं कर सकता है क्योंकि <xliff:g id="APP">%1$s</xliff:g> तब भी आपके स्थान का अनुरोध करता रहता है जब आप ऐप्लिकेशन का उपयोग नहीं कर रहे होते हैं.\n\nइस समस्या को ठीक करने के लिए, आप इस ऐप्लिकेशन के लिए स्थान बंद कर सकते हैं."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"बंद करें"</string>
     <string name="power_screen" msgid="3023346080675904613">"स्क्रीन"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"फ़्लैशलाइट"</string>
     <string name="power_camera" msgid="4976286950934622605">"कैमरा"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"ऐप"</string>
     <string name="power_service" msgid="1599661212370831780">"सेवाएं"</string>
     <string name="power_system" msgid="8290455327965307383">"सिस्‍टम"</string>
-    <string name="power_user" msgid="1889728099253018005">"उपयोगकर्ता"</string>
+    <string name="power_user" msgid="3706143225319881667">"अन्य उपयोगकर्ता"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"कुल CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU अग्रभाग"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"सचेत रखें"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"पावर का अत्यधिक उपयोग"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> के लिए उपयोग किया गया"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"<xliff:g id="TIME">^1</xliff:g> के लिए सक्रिय"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"स्क्रीन उपयोग <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ने <xliff:g id="PERCENT">%1$s</xliff:g> उपयोग किया है"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"पूरी बैटरी का <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"पिन बदलें"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"नोटिफिकेशन दिखाएं"</string>
     <string name="help_label" msgid="6886837949306318591">"सहायता और फ़ीडबैक"</string>
-    <string name="support_summary" msgid="8276116616493882830">"सहायता लेख, फ़ोन और चैट सहायता"</string>
+    <string name="support_summary" msgid="2705726826263742491">"सहायता लेख, फ़ोन और चैट, शुरू करना"</string>
     <string name="user_account_title" msgid="1127193807312271167">"सामग्री के लिए खाता"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"फ़ोटो आईडी"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"गंभीर धमकियां"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="other">छिपे हुए %d आइटम दिखाएं</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"नेटवर्क और इंटरनेट"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"वाई-फ़ाई, मोबाइल, डेटा उपयोग, हॉटस्पॉट"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"मोबाइल"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"डेटा उपयोग"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"हॉटस्पॉट"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"कनेक्ट किए गए डिवाइस"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"ब्लूटूथ, कास्ट, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"ब्लूटूथ, कास्ट करें"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ऐप्लिकेशन और नोटिफ़िकेशन"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"अनुमतियां, डिफ़ॉल्ट ऐप"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"उपयोगकर्ता और खाते"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"हावभाव"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"भुगतान करें, टैप करें, भुगतान"</string>
     <string name="keywords_backup" msgid="470070289135403022">"बैकअप, बैक अप"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"हावभाव, किनारा, साइड, सक्रिय किनारे, दबाना, पकड़, सहायता, assistant, निचोड़, दबाएं, ok google, google assistant"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"हावभाव, सक्रिय करना, नोटिफ़िकेशन, स्क्रीन, प्रदर्शन, स्क्रीन बंद करना, स्क्रीन चालू करना, दबाना, किनारा, निष्क्रिय, सुप्त, पकड़"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"हावभाव, मौन, याद दिलाना, अलार्म, इनकमिंग कॉल, शांत, प्रदर्शन, लॉक-स्क्रीन, दबाना, पकड़, किनारा, रोकना"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"वाई-फ़ाई  NFC टैग सेट करें"</string>
     <string name="write_tag" msgid="8571858602896222537">"लिखें"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"लिखने के लिए टैग टैप करें..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"प्रोफ़ाइल नोटिफ़िकेशन बिल्कुल ना दिखाएं"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"जब आपका डिवाइस लॉक हो, तो आप प्रोफ़ाइल नोटिफिकेशन को किस प्रकार दिखाया जाना चाहेंगे?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"प्रोफ़ाइल नोटिफिकेशन"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"नोटिफिकेशन"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"नोटिफ़िकेशन"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"ऐप्स नोटिफिकेशन"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"नोटिफ़िकेशन की श्रेणी"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"महत्‍व"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"ऐप्लिकेशन को तय करने दें"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"बहुत ज़रूरी"</string>
     <string name="allow_sound" msgid="1820188704793497324">"ध्वनि की अनुमति दें"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"वर्तमान स्क्रीन पर इन नोटिफिकेशन के लिए ना तो ध्वनि करें, ना कंपन करें और ना ही झलक दिखाएं."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"कम महत्व"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"मध्यम महत्व"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"बहुत अधिक महत्व"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"तत्काल महत्व"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"नोटिफिकेशन सहायक"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"एक्सेस नोटिफ़िकेशन"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"कार्य प्रोफ़ाइल नोटिफ़िकेशन का एक्सेस अवरोधित है"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"तस्वीर-में-तस्वीर"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"तस्वीर-में-तस्वीर की अनुमति दें"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"इस ऐप्लिकेशन के खुले होने पर या आप उसे छोड़ दें, उसके बाद (उदाहरण के लिए, कोई वीडियो देखते रहने के लिए), उसे एक तस्वीर-में-तस्वीर विंडो बनाने दें. यह विंडो उन दूसरे ऐप्लिकेशन के ऊपर दिखाई देती है जिनका आप उपयोग कर रहे हैं."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"हां"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"नहीं"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"परेशान ना करें एक्सेस"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"इंस्टॉल किए गए किसी भी ऐप द्वारा परेशान ना करें ऐक्सेस का अनुरोध नहीं किया है"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ऐप्स लोड हो रहे हैं..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"यह कार्य प्रोफ़ाइल इनके द्वारा प्रबंधित की जाती है:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> द्वारा प्रबंधित"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रायोगिक)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"डिवाइस को घुमाना"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"स्क्रीन की सामग्री को घुमाएं"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"पोर्ट्रेट दृश्य में बने रहें"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"भू-दृश्य में बने रहें"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"वर्तमान अभिविन्यास में बने रहें"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"सुरक्षित स्‍टार्ट-अप"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"जारी रखें"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"आप इसके चालू होने से पहले अपना पिन डालना ज़रूरी बनाकर इसे और सुरक्षित बना सकते हैं. जब तक डिवाइस चालू नहीं होता, तब तक उसे अलार्म के साथ ही, कॉल, संदेश या नोटिफ़िकेशन नहीं मिल सकते हैं. \n\nइससे खोए या चोरी चले गए डिवाइसों पर मौजूद डेटा को सुरक्षित करने में सहायता मिलती है. क्या आप अपना डिवाइस चालू होने से पहले पिन डालना ज़रूरी बनाना चाहते हैं?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"आप इस डिवाइस के चालू होने से पहले अपने पासवर्ड को डालना ज़रूरी बनाकर इसे और भी सुरक्षित बना सकते हैं. जब तक डिवाइस चालू नहीं होता, तब तक उसे अलार्म के साथ ही, कॉल, संदेश या नोटिफ़िकेशन नहीं मिल सकते हैं. \n\nइससे खोए या चोरी चले गए डिवाइसों पर मौजूद डेटा को सुरक्षित करने में सहायता मिलती है. क्या आप अपना डिवाइस के चालू होने से पहले पासवर्ड डालना ज़रूरी बनाना चाहते हैं?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"अपने डिवाइस को अनलॉक करने के लिए अपने फ़िंगरप्रिंट का उपयोग करने के अलावा, आप इसके चालू होने से पहले अपने पिन को डालना ज़रूरी बनाकर इसे और भी सुरक्षित बना सकते हैं. जब तक डिवाइस चालू नहीं होता, तब तक उसे अलार्म के साथ ही, कॉल, संदेश या नोटिफ़िकेशन नहीं मिल सकते हैं.\n\nइससे खोए या चोरी चले गए डिवाइसों पर मौजूद डेटा को सुरक्षित करने में सहायता मिलती है. क्या आप अपना डिवाइस चालू होने से पहले पिन डालना ज़रूरी बनाना चाहते हैं?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"अपने डिवाइस को अनलॉक करने के लिए अपने फ़िंगरप्रिंट का उपयोग करने के अलावा, आप इसके चालू होने से पहले अपने पैटर्न को डालना ज़रूरी बनाकर इसे और भी सुरक्षित बना सकते हैं. जब तक डिवाइस शुरू नहीं होता, तब तक उसे अलार्म के साथ ही, कॉल, संदेश या नोटिफ़िकेशन नहीं मिल सकते हैं.\n\nइससे खोए या चोरी चले गए डिवाइसों पर मौजूद डेटा को सुरक्षित करने में सहायता मिलती है. क्या आप अपना डिवाइस चालू होने से पहले पैटर्न डालना ज़रूरी बनाना चाहते हैं?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"अपने डिवाइस को अनलॉक करने के लिए अपने फ़िंगरप्रिंट का उपयोग करने के अलावा, आप इसके चालू होने से पहले अपने पासवर्ड को डालना ज़रूरी बनाकर इसे और भी सुरक्षित बना सकते हैं. जब तक डिवाइस चालू नहीं होता, तब तक उसे अलार्म के साथ ही, कॉल, संदेश या नोटिफ़िकेशन नहीं मिल सकते हैं.\n\nइससे खोए या चोरी चले गए डिवाइसों पर मौजूद डेटा को सुरक्षित करने में सहायता मिलती है. क्या आप अपना डिवाइस चालू होने से पहले पासवर्ड डालना ज़रूरी बनाना चाहते हैं&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"अपने डिवाइस को अनलॉक करने के लिए अपने फ़िंगरप्रिंट का उपयोग करने के अलावा, आप इस डिवाइस के चालू होने से पहले अपना पासवर्ड डालना ज़रूरी बनाकर इसे और भी सुरक्षित कर सकते हैं. डिवाइस के चालू होने तक, उस पर कॉल संदेश या नोटिफ़िकेशन नहीं मिलेंगे और अलार्म भी काम नहीं करेगा.\n\nइससे खोए हुए या चोरी हो गए डिवाइस पर डेटा की सुरक्षा करने में सहायता मिलती है. अपना डिवाइस चालू करने के लिए पासवर्ड डालना ज़रूरी बनाना चाहते हैं?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"हां"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"नहीं"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"पिन आवश्‍यक है?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"उपयोग संबंधी सूचनाएं"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"डिवाइस का पूरा उपयोग दिखाएं"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"ऐप्लिकेशन का उपयोग दिखाएं"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"बहुत अधिक उपयोग"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> ऐप्लिकेशन असामान्य व्यवहार कर रहे हैं</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ऐप्लिकेशन असामान्य व्यवहार कर रहे हैं</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">ऐप्लिकेशन बैटरी खा रहे हैं</item>
+      <item quantity="other">ऐप्लिकेशन बैटरी खा रहे हैं</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ऑप्‍टिमाइज़ नहीं किया गया"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ऑप्‍टिमाइज़ नहीं किया गया"</string>
     <string name="high_power_off" msgid="3393904131961263278">"बैटरी उपयोग ऑप्‍टिमाइज़ किया जा रहा है"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"दूसरे ऐप्स पर प्रदर्शित करें"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> में से <xliff:g id="COUNT_0">%1$d</xliff:g> ऐप्स को दूसरे ऐप्स पर प्रदर्शित होने की अनुमति है"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"अनुमति वाले ऐप्‍स"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"हां"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"नहीं"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"अनुमति है"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"अनुमति नहीं है"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"अनजान स्रोतों से आने वाले ऐप्लिकेशन इंस्टॉल करें"</string>
     <string name="write_settings" msgid="4797457275727195681">"सिस्‍टम सेटिंग बदलें"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"सिस्‍टम सेटिंग में बदलाव करें लिखें"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"स्क्रीन हल्की एम्बर है. इससे आपको नींद आने में सहायता मिल सकती है."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"सुझाव"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> और"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <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="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <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="suggestion_remove" msgid="904627293892092439">"निकालें"</string>
     <string name="color_temperature" msgid="2070126836910615605">"शीतल रंग तापमान"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"अधिक शीतल प्रदर्शन रंगों का उपयोग करें"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> डेटा चेतावनी"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> डेटा चेतावनी / <xliff:g id="ID_2">%2$s</xliff:g> डेटा सीमा"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"बिलिंग चक्र"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"मासिक चक्र प्रत्येक माह की दिनांक <xliff:g id="ID_1">%1$s</xliff:g> को शुरू होगा"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"<xliff:g id="ID_1">%1$s</xliff:g> से मासिक रूप से शुरू"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"<xliff:g id="ID_1">%1$s</xliff:g> को मासिक"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"नेटवर्क प्रतिबंध"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> प्रतिबंध</item>
@@ -3316,7 +3408,7 @@
       <item quantity="other">डेटा बचतकर्ता चालू होने पर <xliff:g id="COUNT">%1$d</xliff:g> ऐप्‍स को अप्रतिबंधित डेटा का उपयोग करने की अनुमति है</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"डेटा बचतकर्ता"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"अप्रतिबंधित डेटा एक्‍सेस"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"अप्रतिबंधित डेटा"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"पृष्ठभूमि डेटा बंद है"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"चालू"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"बंद"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"लॉक स्क्रीन नोटिफ़िकेशन नियंत्रित करें"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"नोटिफ़िकेशन की सामग्री दिखाएं या छिपाएं"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"सभी"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"सहायता"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"सहायता और टिप्स"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"न्यूनतम चौड़ाई"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"इंस्टॉल किए गए किसी भी ऐप्लिकेशन ने प्रीमियम SMS एक्सेस का अनुरोध नहीं किया गया"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"प्रीमियम SMS से शुल्क लग सकता है और इससे आपके वाहक बिल में बढ़ोतरी हो जाएगी. यदि आप किसी ऐप्लिकेशन के लिए अनुमति सक्षम करते हैं, तो आप उस ऐप्लिकेशन का उपयोग करके प्रीमियम SMS भेज सकेंगे."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"स्वचालित"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"मैन्युअल"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"अभी स्पेस खाली करें"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"हावभाव"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"हावभाव के शॉर्टकट"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"अपना फ़ोन नियंत्रित करने के लिए त्वरित हावभाव"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"अपना टैबलेट नियंत्रित करने के लिए त्वरित हावभाव"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"अपना डिवाइस नियंत्रित करने के लिए त्वरित हावभाव"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"सीधे कैमरे पर जाएं"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"कैमरा तुरंत खोलने के लिए, पावर बटन दो बार दबाएं. ऐसा किसी भी स्क्रीन से किया जा सकता है."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"झटपट कैमरा खोलें"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"कैमरा खोलने के लिए पावर बटन को दो बार दबाएं"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"कैमरा फ़्लिप करें"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"और तेज़ी से खुद से स्वयं की फ़ोटो लें"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"खुद ली गई स्वयं की फ़ोटो मोड के लिए फ़ोन को दो बार घुमाएं"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"खुद ली गई स्वयं की फ़ोटो मोड के लिए टैबलेट को दो बार घुमाएं"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"खुद ली गई स्वयं की फ़ोटो मोड के लिए डिवाइस को दो बार घुमाएं"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"फ़ोन देखने के लिए डबल टैप करें"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"टैबलेट देखने के लिए डबल टैप करें"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"डिवाइस देखने के लिए डबल टैप करें"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"अपने नोटिफ़िकेशन तुरंत देखने के लिए, अपनी स्क्रीन पर डबल टैप करें."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"समय, नोटिफ़िकेशन आइकन और अन्य जानकारी देखने के लिए, अपनी स्क्रीन पर डबल-टैप करें."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"स्क्रीन बंद होने पर नोटिफ़िकेशन देखें"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"फ़ोन देखने के लिए लिफ़्ट करें"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"टैबलेट देखने के लिए लिफ़्ट करें"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"डिवाइस देखने के लिए लिफ़्ट करें"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"अपने नोटिफ़िकेशन तुरंत देखने के लिए, अपना फ़ोन उठाएं."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"अपने नोटिफ़िकेशन तुरंत देखने के लिए, अपना टैबलेट उठाएं."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"अपने नोटिफ़िकेशन तुरंत देखने के लिए, अपना डिवाइस उठाएं."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"समय, नोटिफ़िकेशन आइकन और अन्य जानकारी देखने के लिए, अपना फ़ोन उठाएं."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"समय, नोटिफ़िकेशन आइकन और अन्य जानकारी देखने के लिए, अपना टैबलेट उठाएं."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"समय, नोटिफ़िकेशन आइकन और अन्य जानकारी देखने के लिए, अपना डिवाइस उठाएं."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"स्क्रीन बंद होने पर नोटिफ़िकेशन देखें"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"नोटिफ़िकेशन के लिए फ़िंगरप्रिंट स्वाइप करें"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"अपने नोटिफ़िकेशन देखने के लिए, अपने फ़ोन के पीछे फ़िंगरप्रिंट सेंसर पर नीचे स्वाइप करें."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"अपने नोटिफ़िकेशन देखने के लिए, अपने टैबलेट के पीछे फ़िंगरप्रिंट सेंसर पर नीचे स्वाइप करें."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"अपने नोटिफ़िकेशन देखने के लिए, अपने डिवाइस के पीछे फ़िंगरप्रिंट सेंसर पर नीचे स्वाइप करें."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"झटपट नोटिफ़िकेशन देखें"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"फ़िंगरप्रिंट सेंसर पर नीचे स्वाइप करें"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"कैमरा खोलने के लिए उठाएं"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"अपने आप कैमरा खोलने के लिए, अपने फ़ोन को फ़ोटो लेने (भू-दृश्य या पोर्ट्रेट) जैसा उठाएं. यह तब काम करता है जब आपका फ़ोन निष्क्रिय या लॉक हो."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"फ़ोन की स्क्रीन बंद होने या फ़ोन लॉक होने पर फ़ोटो लें"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"सहायक हावभाव"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"संवेदनशीलता"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"क्या आप इस झटपट ऐप को निकालना चाहते हैं?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"गेम"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ऑडियो फ़ाइलें"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"उपयोग की गई जगह"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(उपयोगकर्ता <xliff:g id="USER">%s</xliff:g> के लिए अनइंस्टॉल है)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(उपयोगकर्ता <xliff:g id="USER">%s</xliff:g> के लिए अक्षम है)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"ऑटोमैटिक भरने की सेवा"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"झटपट ऐप"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"जगह प्रबंधक को बंद करना चाहते हैं?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"फ़िल्में और टीवी ऐप्लिकेशन"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"उपयोग की गई जगह"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"वाहक प्रावधान जानकारी"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"वाहक प्रावधान ट्रिगर करें"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"नया और रोमांचक क्या है?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"प्रमुख 5 सुविधाएं देखें"</string>
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index bf780f1..bcb125d 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Dobra"</item>
     <item msgid="8986346415847956850">"Izvrsna"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Uvijek"</item>
-    <item msgid="844721238536786870">"Samo kad je uključeno"</item>
-    <item msgid="1986753720941888596">"Nikad"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Uvijek"</item>
-    <item msgid="7433294150916905997">"Samo kad je priključen na napajanje"</item>
-    <item msgid="1390404486722375028">"Nikad"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Posljednjih 30 dana"</item>
     <item msgid="6600989128423965319">"Postavi ciklus uporabe..."</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e3cb179..5813cb7 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -31,6 +31,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Sad ste razvojni programer!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nema potrebe, već ste razvojni programer."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Najprije omogućite opcije za razvojne programere."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Bežično povezivanje i mreže"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Veze"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Uređaj"</string>
@@ -42,6 +43,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE omogućen"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Pružena usluga videopoziva"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Pružena usluga poziva putem Wi-Fi-ja"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Pruža se usluga EAB-a/prisutnosti"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Snaga mobilnog radija"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Prikaži imenik SIM-a"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Prikaži brojeve za fiksno biranje"</string>
@@ -107,10 +109,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Skeniranjem traži uređaje"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Preimenuj ovaj uređaj"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Preimenuj"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Isključiti?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"To će prekinuti vašu vezu s uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Prekinuti vezu uređaja?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Vaš će telefon prekinuti vezu s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Vaš će tablet prekinuti vezu s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Vaš će uređaj prekinuti vezu s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Prekini"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Nemate dopuštenje za promjenu postavki Bluetootha."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Upari novi uređaj"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> vidljiv je uređajima u blizini dok su postavke Bluetootha otvorene."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Bluetooth adresa telefona: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Bluetooth adresa tableta: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth adresa uređaja: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Želite li prekinuti vezu s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Emitiranje"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Onemogućiti profil?"</string>
@@ -122,7 +131,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Zahtjev za uparivanje Bluetoothom"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Zahtjev za uparivanje"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Dodirnite za uparivanje s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Prikaži primljene datoteke"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Primljene datoteke"</string>
     <string name="device_picker" msgid="4978696506172252813">"Odaberite Bluetooth uređaj"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi isključiti Bluetooth"</string>
@@ -158,6 +167,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s želi pristupiti vašim porukama. Želite li dati pristup korisniku %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Zahtjev za pristup SIM-u"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> želi pristupiti SIM kartici. Dopuštanjem pristupa SIM kartici onemogućit će se podatkovna veza na uređaju za vrijeme povezanosti. Dopustite pristup uređaju <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Drugim uređajima vidljiv kao \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\""</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaši uređaji"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Uparivanje novog uređaja"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum i vrijeme"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Odabir vremenske zone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -331,7 +343,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Računi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Sigurnost i lokacija"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Sigurnost i lokacija"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkripcija i vjerodajnice"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon je kriptiran"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Uređaj je kriptiran"</string>
@@ -357,40 +369,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Otključavanje otiskom"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Upotreba otiska prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Jednostavno dodirnite senzor otiska prsta da biste otključali telefon, autorizirali kupnje ili se prijavili na aplikacije. Pazite čije otiske dodajete. Svaki otisak koji dodate može se upotrijebiti za sve te radnje.\n\nNapomena: otisak prsta nije toliko siguran kao snažan uzorak ili PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Jednostavno dodirnite senzor otiska prsta da biste autorizirali kupnje ili se prijavili u aplikacije. Pazite čije otiske dodajete. Svaki otisak koji dodate može se upotrijebiti za sve te radnje.\n\nNapomena: ovaj uređaj ne možete otključati otiskom prsta. Više informacija možete dobiti od administratora u svojoj organizaciji."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Jednostavno dodirnite senzor otiska prsta da biste otključali telefon, autorizirali kupnje ili se prijavili na aplikacije. Pazite čije otiske dodajete. Svaki otisak koji dodate može se upotrijebiti za sve te radnje.\n\nNapomena: otisak prsta nije toliko siguran kao snažan uzorak ili PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"Otključajte telefon ili odobrite kupnje otiskom prsta.\n\nNapomena: otisak prst može biti manje siguran od snažnog uzorka ili PIN-a."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Otkaži"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Nastavi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Preskoči"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Dodaj otisak prsta"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Značajke zaštite uređaja neće se aktivirati. Nećete moći blokirati upotrebu tableta u slučaju gubitka, krađe ili brisanja podataka s njega."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Značajke zaštite uređaja neće se aktivirati. Nećete moći blokirati upotrebu uređaja u slučaju gubitka, krađe ili brisanja podataka s njega."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Značajke zaštite uređaja neće se aktivirati. Nećete moći blokirati upotrebu telefona u slučaju gubitka, krađe ili brisanja podataka s njega."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Značajke zaštite uređaja neće se aktivirati. Nećete moći blokirati upotrebu tableta u slučaju gubitka ili krađe."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Značajke zaštite uređaja neće se aktivirati. Nećete moći blokirati upotrebu uređaja u slučaju gubitka ili krađe."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Značajke zaštite uređaja neće se aktivirati. Nećete moći blokirati upotrebu telefona u slučaju gubitka ili krađe."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Dalje"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Značajke za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge da upotrebljavaju ovaj tablet u slučaju gubitka, krađe ili vraćanja na zadano."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Značajke za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge da upotrebljavaju ovaj uređaj u slučaju gubitka, krađe ili vraćanja na zadano."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Značajke za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge da upotrebljavaju ovaj telefon u slučaju gubitka, krađe ili vraćanja na zadano."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Značajke za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge da upotrebljavaju ovaj tablet u slučaju gubitka ili krađe."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Značajke za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge da upotrebljavaju ovaj uređaj u slučaju gubitka ili krađe."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Značajke za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge da upotrebljavaju ovaj telefon u slučaju gubitka ili krađe."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Svejedno preskoči"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Natrag"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Traženje senzora"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Pronađite senzor otiska prsta na stražnjoj strani telefona."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Dodirnite senzor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Nalazi se na stražnjoj strani telefona. Upotrijebite kažiprst."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustracija uređaja i lokacije senzora otiska prsta"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Naziv"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"U redu"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Izbriši"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Počnimo"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Dodirnite senzor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Stavite prst na senzor i podignite ga kada osjetite vibraciju"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Nastavite"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Lagano pomaknite prst da biste ostavili potpuni otisak prsta"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Otisak prsta je dodan!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kada se prikaže ta ikona, možete se identificirati ili autorizirati kupnju otiskom prsta."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Jednostavno dodirnite senzor otiska prsta da biste aktivirali i otključali uređaj."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Kada vidite ovu ikonu, možete autorizirati kupnje ili se prijaviti u aplikacije."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Podignite i ponovo dodirnite"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Nastavite podizati prst da biste dodali različite dijelove otiska prsta"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Otisak prsta dodan"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Kada se prikaže ta ikona, upotrijebite otisak prsta da biste se identificirali ili odobrili kupnju."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Preskočiti postavljanje otiska prsta?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Odlučili ste se za otisak prsta kao jedan od načina za otključavanje telefona. Ako sad preskočite, morat ćete ga postaviti kasnije. Postavljanje traje samo otprilike jednu minutu."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Postavi zaključavanje zaslona"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Gotovo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, to nije senzor"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Upotrijebite senzor otiska prsta na uređaju."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Kažiprstom dodirnite senzor na stražnjoj strani telefona."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registracija nije dovršena"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Isteklo je vremensko ograničenje za registraciju otiska prsta. Pokušajte ponovo."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Registracija otiska prsta nije uspjela. Pokušajte ponovo ili prislonite neki drugi prst."</string>
@@ -452,6 +462,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj uređaj bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj telefon bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Odaberite pričuvni način zaključavanja zaslona"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opcije zaključavanja zaslona"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opcije zaključavanja zaslona"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zaključavanje zaslona"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/odmah nakon mirovanja"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> nakon mirovanja"</string>
@@ -522,13 +534,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Izmijeni uzorak za otključavanje"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Promijeni PIN za otključavanje"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Promijeni zaporku za otključavanje"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Pokušajte ponovo. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. pokušaj od <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Posljednji pokušaj"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Ako pri ovom pokušaju unesete netočan uzorak za posao, vaš će se radni profil i povezani podaci ukloniti s uređaja."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Ako pri ovom pokušaju unesete netočan PIN za posao, vaš će se radni profil i povezani podaci ukloniti s uređaja."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Ako pri ovom pokušaju unesete netočnu zaporku za posao, vaš će se radni profil i povezani podaci ukloniti s uređaja."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Previše netočnih pokušaja. Vaš radni profil i povezani podaci uklonit će se s uređaja."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Odbaci"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Pokušajte ponovo. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. pokušaj od <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Vaši će se podaci izbrisati"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ako pri sljedećem pokušaju unesete netočan uzorak, izbrisat će se podaci s ovog uređaja"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ako pri sljedećem pokušaju unesete netočan PIN, izbrisat će se podaci s ovog uređaja"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ako pri sljedećem pokušaju unesete netočnu zaporku, izbrisat će se podaci s ovog uređaja"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ako pri sljedećem pokušaju unesete netočan uzorak, ovaj će se korisnik izbrisati"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ako pri sljedećem pokušaju unesete netočan PIN, ovaj će se korisnik izbrisati"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ako pri sljedećem pokušaju unesete netočnu zaporku, ovaj će se korisnik izbrisati"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ako pri sljedećem pokušaju unesete netočan uzorak, izbrisat će se vaš radni profil i njegovi podaci"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ako pri sljedećem pokušaju unesete netočan PIN, izbrisat će se vaš radni profil i njegovi podaci"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ako pri sljedećem pokušaju unesete netočnu zaporku, izbrisat će se vaš radni profil i njegovi podaci"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Previše netočnih pokušaja. S uređaja će se izbrisati podaci."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Previše netočnih pokušaja. Ovaj će se korisnik izbrisati."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Previše netočnih pokušaja. Ovaj će se radni profil izbrisati zajedno sa svim svojim podacima."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Odbaci"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Broj znakova ne smije biti manji od <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Broj znamenki u PIN-u ne smije biti maji od <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Nastavi"</string>
@@ -637,6 +657,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Napredni Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kada je Bluetooth uključen, uređaj može komunicirati s ostalim Bluetooth uređajima u blizini."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Radi poboljšanja preciznosti lokacije aplikacije i usluge sustava i dalje mogu otkriti Bluetooth uređaje. To možete promijeniti u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>postavkama traženja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Povezivanje nije uspjelo. Pokušajte ponovo."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Pojedinosti o uređaju"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Bluetooth adresa uređaja: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Zaboraviti uređaj?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Vaš telefon više neće biti uparen s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Vaš tablet više neće biti uparen s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Vaš uređaj više neće biti uparen s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Zaboravi uređaj"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Poveži se na..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bit će isključen sa zvuka medija."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Handsfree zvuk za uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bit će isključen."</string>
@@ -789,6 +817,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Nemoj pružiti"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Nemoj potvrditi"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nije naveden nijedan certifikat. Veza neće biti privatna."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Mreža ima predugačak naziv."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Mora navoditi domenu."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dostupan"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dostupan)"</string>
@@ -821,7 +850,6 @@
       <item quantity="other">%d mreža</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Napredni Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfiguriranje Wi‑Fi-ja"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC adresa"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP adresa"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podmreže"</string>
@@ -858,9 +886,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Zaboraviti ovu grupu?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prijenosna Wi-Fi žarišna točka"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi žarišna točka"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Koristi mobilnu vezu za pružanje Wi-Fi mreže"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Internetska veza ovog tableta ne dijeli se putem žarišne točke"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Internetska veza ovog telefona ne dijeli se putem žarišne točke"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Internetska veza i sadržaj ne dijele se s drugim uređajima"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internetska veza ovog tableta dijeli se putem žarišne točke"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internetska veza ovog telefona dijeli se putem žarišne točke"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikacija dijeli sadržaj. Da biste dijelili internetsku vezu, isključite žarišnu točku, a zatim je ponovo uključite"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Naziv Wi‑Fi-ja"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Uključivanje žarišne točke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Drugi uređaji mogu se povezati sa žarišnom točkom <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Zaporka za Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Frekvencija pristupne točke"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Upotrijebite žarišnu točku da biste izradili Wi‑Fi mrežu za ostale uređaje. Žarišna točka omogućuje povezivanje s internetom putem podatkovne veze vašeg mobilnog uređaja. Mogući su dodatni troškovi za prijenos podataka na mobilnom uređaju."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacije mogu izraditi žarišnu točku radi dijeljenja sadržaja s uređajima u blizini."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Uključivanje žarišne točke…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Isključivanje žarišne točke…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivan"</string>
@@ -907,6 +943,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Kada su Wi-Fi pozivi uključeni, telefon može usmjeravati pozive putem Wi-Fi mreža ili mreže vašeg mobilnog operatera, ovisno o vašoj želji i o tome koji je signal jači. Prije nego što uključite tu značajku, raspitajte se o naknadi i ostalim pojedinostima kod mobilnog operatera."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Ažuriranje adrese za hitne slučajeve"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Adresa koju će hitne službe koristiti kao vašu lokaciju ako nazovete 112 putem Wi-Fi-ja"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Prikaz"</string>
@@ -964,6 +1001,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nema rezultata"</string>
     <string name="display_settings" msgid="7965901687241669598">"Prikaz"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatski zakreni zaslon"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Žive boje"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Prebaci orijentaciju automatski pri rotaciji tabletnog uređaja"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Promijeni orijentaciju automatski kod rotacije telefona"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Prebaci orijentaciju automatski pri rotaciji tabletnog uređaja"</string>
@@ -991,23 +1029,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimizira razinu svjetline s obzirom na okolno osvjetljenje. Kad je ta značajka uključena, i dalje možete privremeno prilagoditi svjetlinu."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Noćno svjetlo"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Noćno svjetlo boji zaslon uređaja žuto. To olakšava gledanje zaslona i čitanje pri slabom svjetlu i može vam pomoći da lakše zaspite."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Raspored"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Uključi automatski"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nikad"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Prilagođeni raspored"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Od zalaska do izlaska sunca"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Raspored"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ništa"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Uključi u prilagođeno vrijeme"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Od zalaska do izlaska sunca"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Vrijeme početka"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Vrijeme završetka"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intenzitet"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Isključeno. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nikad se ne uključuje automatski."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Uključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Uključuje se automatski kad sunce zađe."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Uključeno. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nikad se ne isključuje automatski."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Isključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Isključuje se automatski kad sunce izađe."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Isključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Nikad se ne uključuje automatski"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Uključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Uključuje se automatski kad sunce zađe"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Uključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Nikad se ne isključuje automatski"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Isključuje se automatski u <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Isključuje se automatski kad sunce izađe"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Mirovanje"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Zaslon se isključuje"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Kada prođe <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
@@ -1031,8 +1068,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Postavke"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatska svjetlina"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aktivacija podizanjem"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Ambijentalni zaslon"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambijentalni zaslon"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Uvijek uključeno"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nove obavijesti"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kada prikazati"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nove obavijesti"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktiviraj zaslon kada stigne obavijest"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Uvijek uključeno"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Prikazivanje vremena, ikona obavijesti i drugih informacija"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Smanjite ili povećajte tekst"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Postavke zaklj. SIM kartice"</string>
@@ -1285,6 +1328,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN ne može biti prazan."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC polje mora imati 3 znamenke."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Polje MNC mora imati 2 ili 3 znamenke."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Mobilni operater ne dopušta dodavanje APN-ova vrste %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Vraćanje zadanih APN postavki"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Vrati na zadano"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Poništavanje zadanih postavki APN-a dovršeno."</string>
@@ -1315,6 +1359,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Izbriši SD karticu"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Izbrisati sve podatke u unutarnjoj USB pohrani, poput glazbe ili fotografija"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Brišu se svi podaci na SD kartici, na primjer, glazba ili fotografije"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Izbriši eSIM-ove"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Izbrišite sve eSIM-ove na telefonu. Time se neće poništiti plan mobilne usluge."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Izbrišite sve eSIM-ove na tabletu. Time se neće poništiti plan mobilne usluge."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Poništi tabletni uređaj"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Poništi telefon"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Želite li izbrisati sve osobne podatke i preuzete aplikacije? Radnju nije moguće poništiti!"</string>
@@ -1337,26 +1384,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Dok je Ušteda podataka uključena, ne možete upotrebljavati modemsko povezivanje ni prijenosne žarišne točke"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Dijeljenje USB-om"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB priključen, uključite za modemsko povezivanje"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Ograničeno"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Modemsko povezivanje nije moguće ako se upotrebljava USB pohrana"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB nije priključen"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Povežite se radi uključivanja"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Pogreška ograničenja USB-a"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Dijeljenje internetske veze telefona putem USB-a"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Dijeljenje internetske veze tableta putem USB-a"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Dijeljenje veze Bluetoothom"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Dijeljenje int. veze tableta putem Bluetootha"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Dijeljenje int. veze telefona putem Bluetootha"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Int. veza tableta dijeli se s 1 uređajem putem Bluetootha"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Int. veza telefona dijeli se s 1 uređajem putem Bluetootha"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Br. ur. s kojima se dijeli int. veza tab. putem Bluetootha: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Br. ur. s kojima se dijeli int. veza tel. putem Bluetootha: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Dijelite internetsku vezu tableta pomoću Bluetootha"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Dijelite internetsku vezu telefona pomoću Bluetootha"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Dijeljenje int. veze uređaja <xliff:g id="DEVICE_NAME">%1$d</xliff:g> putem Bluetootha"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Int. veza tableta ne dijeli se putem Bluetootha"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Int. veza telefona ne dijeli se putem Bluetootha"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Nema modemskog povezivanja"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Veza se ne može dijeliti s više od <xliff:g id="MAXCONNECTION">%1$d</xliff:g> uređaja."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> će biti oslobođen."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Pomoću žarišne točke i modemskog povezivanja drugi se uređaji mogu povezati s internetom putem podatkovne veze vašeg mobilnog uređaja."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Pomoću žarišne točke i modemskog povezivanja drugi se uređaji mogu povezati s internetom putem podatkovne veze vašeg mobilnog uređaja. Žarišnu točku mogu izraditi i aplikacije radi dijeljenja sadržaja s uređajima u blizini."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoć"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobilna mreža"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilni paket"</string>
@@ -1389,7 +1425,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Način lokacije"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Upotreba GPS-a, Wi‑Fi-ja, Bluetootha ili mobilnih mreža za utvrđivanje lokacije"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Upotreba Wi‑Fi-ja, Bluetootha ili mobilnih mreža za utvrđivanje lokacije"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Upotreba GPS-a za utvrđivanje lokacije"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Upotreba GPS-a i senzora uređaja za utvrđivanje lokacije"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skeniranje"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Traženje Wi‑Fi-ja"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Poboljšajte lokaciju tako što ćete dopustiti aplikacijama i uslugama sustava otkrivanje Wi-Fi mreža u bilo kojem trenutku."</string>
@@ -1434,8 +1470,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nemate podatkovnu vezu. Da biste tu informaciju vidjeli sada, idite na stranicu %s s bilo kojeg računala povezanog s internetom."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Učitavanje…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Odaberite zaporku"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Otisak prsta zahtijeva zaporku"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Odaberite uzorak"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Otisak prsta zahtijeva uzorak"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Odaberite PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Otisak prsta zahtijeva PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potvrdite zaporku"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrdite uzorak"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potvrdite svoj PIN"</string>
@@ -1504,6 +1543,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Postavke aplikacije"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nepoznati izvori"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Dopusti sve izvore aplikacija"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Nedavno otvorene aplikacije"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Pogledajte sve aplikacije (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"prije <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Vaš tablet i osobni podaci izloženiji su napadima nepoznatih aplikacija. Instaliranjem aplikacija iz takvog izvora prihvaćate odgovornost za svu štetu nastalu na tabletu  ili gubitak podataka uzrokovan upotrebom tih aplikacija."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Vaš telefon i osobni podaci izloženiji su napadima nepoznatih aplikacija. Instaliranjem aplikacija iz takvog izvora prihvaćate odgovornost za svu štetu nastalu na telefonu ili gubitak podataka uzrokovan upotrebom tih aplikacija."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Napredne postavke"</string>
@@ -1673,6 +1715,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Zaustaviti sistemsku uslugu?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Ako zaustavite ovu uslugu, neke značajke vašeg tabletnog računala mogu prestati raditi ispravno dok ga ne isključite i ponovo ne uključite."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ako zaustavite ovu uslugu, neke značajke vašeg telefona mogu prestati raditi ispravno dok ga ne isključite i ponovo ne uključite."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Jezici, unos i pokreti"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Jezici i unos"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Jezici i unos"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Pomoć pri unosu"</string>
@@ -1893,6 +1939,11 @@
       <item quantity="few">Uključene su <xliff:g id="COUNT">%1$d</xliff:g> usluge ispisa</item>
       <item quantity="other">Uključeno je <xliff:g id="COUNT">%1$d</xliff:g> usluga ispisa</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> zadatak ispisa</item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> zadatka ispisa</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> zadataka ispisa</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Usluge ispisa"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nema instaliranih usluga"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nije pronađen nijedan pisač"</string>
@@ -1959,6 +2010,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Detalji upotrebe"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Podesi potrošnju energije"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Uključeni paketi"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplikacije prazne bateriju"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Zadržava uređaj u aktivnom stanju"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Aktivira uređaj u pozadini"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Često traži lokaciju"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Aplikacije koje ne funkcioniraju dobro: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Zaustaviti aplikaciju?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Vaš telefon ne može upravljati baterijom na uobičajen način jer ga <xliff:g id="APP">%1$s</xliff:g> zadržava u aktivnom stanju.\n\nDa biste pokušali riješiti taj problem, možete prisilno zaustaviti tu aplikaciju.\n\nAko se problem ponovi, možda biste trebali deinstalirati tu aplikaciju da biste smanjili potrošnju baterije."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Vaš tablet ne može upravljati baterijom na uobičajen način jer ga <xliff:g id="APP">%1$s</xliff:g> zadržava u aktivnom stanju.\n\nDa biste pokušali riješiti taj problem, možete prisilno zaustaviti tu aplikaciju.\n\nAko se problem ponovi, možda biste trebali deinstalirati tu aplikaciju da biste smanjili potrošnju baterije."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Vaš uređaj ne može upravljati baterijom na uobičajen način jer ga <xliff:g id="APP">%1$s</xliff:g> zadržava u aktivnom stanju.\n\nDa biste pokušali riješiti taj problem, možete prisilno zaustaviti tu aplikaciju.\n\nAko se problem ponovi, možda biste trebali deinstalirati tu aplikaciju da biste smanjili potrošnju baterije."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Zaustavi aplikaciju"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Isključiti upotrebu u pozadini?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Vaš telefon ne može upravljati baterijom na uobičajen način jer ga <xliff:g id="APP">%1$s</xliff:g> neprestano aktivira.\n\nDa biste riješili taj problem, telefon može spriječiti izvođenje te aplikacije u pozadini."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Vaš tablet ne može upravljati baterijom na uobičajen način jer ga <xliff:g id="APP">%1$s</xliff:g> neprestano aktivira.\n\nDa biste riješili taj problem, tablet može spriječiti izvođenje te aplikacije u pozadini."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Vaš uređaj ne može upravljati baterijom na uobičajen način jer ga <xliff:g id="APP">%1$s</xliff:g> neprestano aktivira.\n\nDa biste riješili taj problem, uređaj može spriječiti izvođenje te aplikacije u pozadini."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Isključi"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Isključiti lokaciju?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Vaš telefon ne može upravljati baterijom na uobičajen način jer aplikacija <xliff:g id="APP">%1$s</xliff:g> neprestano zahtijeva vašu lokaciju kada je ne upotrebljavate.\n\nDa biste riješili taj problem, možete isključiti lokaciju za tu aplikaciju."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Vaš tablet ne može upravljati baterijom na uobičajen način jer aplikacija <xliff:g id="APP">%1$s</xliff:g> neprestano zahtijeva vašu lokaciju kada je ne upotrebljavate.\n\nDa biste riješili taj problem, možete isključiti lokaciju za tu aplikaciju."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Vaš uređaj ne može upravljati baterijom na uobičajen način jer aplikacija <xliff:g id="APP">%1$s</xliff:g> neprestano zahtijeva vašu lokaciju kada je ne upotrebljavate.\n\nDa biste riješili taj problem, možete isključiti lokaciju za tu aplikaciju."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Isključi"</string>
     <string name="power_screen" msgid="3023346080675904613">"Zaslon"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Svjetiljka"</string>
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparat"</string>
@@ -1973,7 +2044,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Aplikacije"</string>
     <string name="power_service" msgid="1599661212370831780">"Usluge"</string>
     <string name="power_system" msgid="8290455327965307383">"Sustav"</string>
-    <string name="power_user" msgid="1889728099253018005">"Korisnik"</string>
+    <string name="power_user" msgid="3706143225319881667">"Drugi korisnici"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Ukupno CPU-a"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Glavni zadatak CPU-a"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zadrži u aktivnom stanju"</string>
@@ -2025,6 +2096,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Previše obračunata potrošnja energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Upotrebljava se <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktivno <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Upotreba zaslona <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> upotrebljava <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ukupne potrošnje baterije"</string>
@@ -2588,7 +2660,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Promjena PIN-a"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Prikaži obavijesti"</string>
     <string name="help_label" msgid="6886837949306318591">"Pomoć/povratne inf."</string>
-    <string name="support_summary" msgid="8276116616493882830">"Članci pomoći, podrška telefonom i chatom"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Članci pomoći, telefoniranje i chat, početak"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Račun za sadržaj"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografije"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ekstremne prijetnje"</string>
@@ -2679,9 +2751,12 @@
       <item quantity="other">Prikaži %d skrivenih stavki</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Mreža i internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobilna mreža, upotreba podataka, žarišna točka"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilna mreža"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"potrošnja podataka"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"žarišna točka"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Povezani uređaji"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, emitiranje, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, emitiranje"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije i obavijesti"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Dopuštenja, zadane aplikacije"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Korisnici i računi"</string>
@@ -2734,6 +2809,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"pokret"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"plati, dodir, plaćanja"</string>
     <string name="keywords_backup" msgid="470070289135403022">"sigurnosno kopirati, sigurnosna kopija"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"pokret, rub, strana, aktivni rub, stisnuti, stegnuti, pomoć, asistent, squeezy, squeezie, squeezey, squeezee, ok google, google asistent"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"pokret, aktivirati, obavijesti, zaslon, prikaz, zaslon isključen, zaslon uključen, stisnuti, rub, mirovanje, neaktivnost, stegnuti"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"pokret, bešumno, odgoda, alarm, dolazni poziv, tiho, zaslon, zaključan zaslon, stisnuti, stegnuti, rub, zaustaviti"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Postavite oznaku NFC za Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Piši"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Dodirnite oznaku da biste zapisali podatke..."</string>
@@ -2817,7 +2895,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Uopće ne prikazuj obavijesti radnog profila"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kako želite da se prikazuju obavijesti profila kada je uređaj zaključan?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Obavijesti profila"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Obavijesti"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Obavijesti"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Obavijesti aplikacije"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorija obavijesti"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Važnost"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Neka odluči aplikacija"</string>
@@ -2832,6 +2911,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Hitna"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Dopusti zvuk"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Nemoj emitirati zvuk, vibrirati niti prikazivati obavijesti na trenutačnom zaslonu."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Mala važnost"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Srednja važnost"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Velika važnost"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Hitno"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Pomoćnik za obavijesti"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Pristup obavijestima"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Blokiran je pristup obavijestima radnog profila"</string>
@@ -2860,8 +2943,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Slika u slici"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Dopusti sliku u slici"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Omogućite da ova aplikacija stvori prozor sa slikom u slici dok je otvorena ili kad izađete iz nje (npr. da biste nastavili gledati videozapis). Taj se prozor prikazuje iznad drugih aplikacija koje upotrebljavate."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Da"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Ne"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Pristup opciji Ne ometaj"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nijedna instalirana aplikacija nije zatražila pristup opciji Ne ometaj"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavanje aplikacija..."</string>
@@ -2996,11 +3077,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Ovim radnim profilom upravlja:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Upravlja <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentalno)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Zakretanje uređaja"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Zakreni sadržaj zaslona"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Ostani u okomitom prikazu"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Ostani u vodoravnom prikazu"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ostani u trenutačnom usmjerenju"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Sigurno pokretanje"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Nastavi"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Ovaj uređaj možete dodatno zaštititi zahtijevanjem PIN-a kako bi se pokrenuo. Dok se ne pokrene, uređaj ne može primati pozive, poruke ili obavijesti, uključujući alarme.\n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima. Želite li zahtijevati PIN za pokretanje uređaja?"</string>
@@ -3008,7 +3084,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Ovaj uređaj možete dodatno zaštititi zahtijevanjem zaporke kako bi se pokrenuo. Dok se ne pokrene, uređaj ne može primati pozive, poruke ni obavijesti, uključujući alarme. \n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima. Želite li zahtijevati zaporku za pokretanje uređaja?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Osim otključavanja uređaja otiskom prsta, uređaj možete dodatno zaštititi zahtijevanjem PIN-a kako bi se pokrenuo. Dok se ne pokrene, uređaj ne može primati pozive, poruke ili obavijesti, uključujući alarme.\n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima. Želite li zahtijevati PIN za pokretanje uređaja?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Osim otključavanja uređaja otiskom prsta, uređaj možete dodatno zaštititi zahtijevanjem uzorka kako bi se pokrenuo. Dok se ne pokrene, uređaj ne može primati pozive, poruke ili obavijesti, uključujući alarme.\n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima. Želite li zahtijevati uzorak za pokretanje uređaja?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Osim otključavanja uređaja otiskom prsta, uređaj možete dodatno zaštititi zahtijevanjem zaporke kako bi se pokrenuo. Dok se ne pokrene, uređaj ne može primati pozive, poruke ili obavijesti, uključujući alarme.\n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima. Želite li zahtijevati zaporku za pokretanje uređaja?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Osim otključavanja uređaja otiskom prsta, ovaj uređaj možete zaštititi i zahtijevanjem zaporke prije pokretanja. Dok se uređaj ne pokrene, ne može primati pozive, poruke i obavijesti, uključujući alarme.\n\nTime se štite podaci na izgubljenim i ukradenim uređajima. Želite li zahtijevati zaporku za pokretanje uređaja?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Da"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ne"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Zahtijevanje PIN-a?"</string>
@@ -3130,6 +3206,17 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Upozorenja o upotrebi"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Prikaži potpunu upotrebu uređaja"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Prikaži upotrebu aplikacije"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Visoka potrošnja"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacija ne ponaša se na uobičajen način</item>
+      <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacije ne ponašaju se na uobičajen način</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacija ne ponaša se na uobičajen način</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Aplikacije prazne bateriju</item>
+      <item quantity="few">Aplikacije prazne bateriju</item>
+      <item quantity="other">Aplikacije prazne bateriju</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Nije optimizirano"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nije optimizirano"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimiziranje upotrebe baterije"</string>
@@ -3223,8 +3310,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Prikaz iznad drugih aplikacija"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"Broj aplikacija koje se mogu prikazivati iznad drugih: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacije s dopuštenjem"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Da"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Ne"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Dopušteno"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Nije dopušteno"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instalacija aplikacije nepoznati izvori"</string>
     <string name="write_settings" msgid="4797457275727195681">"Izmjena postavki sustava"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"pisanje izmjena postavki sustava"</string>
@@ -3315,6 +3402,17 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Zaslon je obojen žuto. To bi vam moglo pomoći da zaspite."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Prijedlozi"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"Više od <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"i još <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> prijedlog</item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> prijedloga</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> prijedloga</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="one">+<xliff:g id="COUNT">%1$d</xliff:g> prijedlog</item>
+      <item quantity="few">+<xliff:g id="COUNT">%1$d</xliff:g> prijedloga</item>
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> prijedloga</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Ukloni"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Hladna temperatura boje"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Upotrebljavaj hladnije boje prikaza"</string>
@@ -3333,8 +3431,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Upozori na potrošnju podataka na <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Upozorenje o potrošnji podataka za <xliff:g id="ID_1">%1$s</xliff:g>/Podaci su ograničeni na <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciklus naplate"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Mjesečni ciklus počinje <xliff:g id="ID_1">%1$s</xliff:g> svakog mjeseca"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mjesečno počevši od <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Svaki mjesec na <xliff:g id="ID_1">%1$s</xliff:g>. dan"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Mrežna ograničenja"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> ograničenje</item>
@@ -3356,7 +3453,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija smije upotrebljavati neograničene podatke kada je Ušteda podataka uključena</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Ušteda podataka"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Neograničen pristup podacima"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Neograničeni podaci"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Pozadinski su podaci isključeni"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Uključeno"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Isključeno"</string>
@@ -3421,8 +3518,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrola obavijesti zaključanog zaslona"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Prikazivanje ili sakrivanje sadržaja obavijesti"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Sve"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Podrška"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Podrška i savjeti"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Najmanja širina"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nijedna instalirana aplikacija nije zatražila pristup premium SMS-ovima"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS-ovi mogu se dodatno naplaćivati i povećat će vaš račun. Ako nekoj aplikaciji date to dopuštenje, moći ćete slati premium SMS-ove pomoću te aplikacije."</string>
@@ -3490,28 +3586,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatski"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Priručnik"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Oslobodi prostor odmah"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Pokreti"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Prečaci pokreta"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Brzi pokreti za upravljanje telefonom"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Brzi pokreti za upravljanje tabletom"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Brzi pokreti za upravljanje uređajem"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Otvaranje fotoaparata"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Da biste brzo otvorili fotoaparat, dvaput pritisnite tipku za uključivanje/isključivanje. Funkcionira na svim zaslonima."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Brzo otvaranje fotoaparata"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Dvaput pritisnite tipku za uklj. da bi se otvorio fotoaparat"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Prebacivanje fotoaparata"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Brže snimanje selfieja"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Dvaput okrenite telefon da biste snimili selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Dvaput okrenite tablet da biste snimili selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Dvaput okrenite uređaj da biste snimili selfie"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dvaput dodirnite da biste provjerili telefon"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dvaput dodirnite da biste provjerili tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dvaput dodirnite da biste provjerili uređaj"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Da biste brzo pogledali obavijesti, dvaput dodirnite zaslon."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Da biste pogledali vrijeme, ikone obavijesti i druge informacije, dvaput dodirnite zaslon."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Pročitajte obavijesti kada je zaslon isključen"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Podignite za provjeru telefona"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Podignite da biste provjerili tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Podignite da biste provjerili uređaj"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Da biste brzo pogledali obavijesti, podignite telefon."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Da biste brzo pogledali obavijesti, podignite tablet."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Da biste brzo pogledali obavijesti, podignite uređaj."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Da biste pogledali vrijeme, ikone obavijesti i druge informacije, podignite telefon."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Da biste pogledali vrijeme, ikone obavijesti i druge informacije, podignite tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Da biste pogledali vrijeme, ikone obavijesti i druge informacije, podignite uređaj."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Pročitajte obavijesti kada je zaslon isključen"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Povlačenje prstom za obavijesti"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Da biste pogledali obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani telefona."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Da biste pogledali obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani tableta."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Da biste pogledali obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani uređaja."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Brz pregled obavijesti"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Prijeđite nadolje po senzoru otiska prsta"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Podignite da biste otvorili fotoaparat"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Da biste automatski otvorili fotoaparat, podignite telefon u položaj za snimanje (vodoravno ili okomito). Funkcionira kada je telefon u stanju mirovanja ili zaključan."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Fotografirajte dok je telefon u mirovanju ili zaključan"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Pomoćni pokret"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Osjetljivost"</string>
@@ -3622,6 +3731,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Želite li ukloniti tu instant aplikaciju?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Igre"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audiodatoteke"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Iskorišteni prostor"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(deinstalirano za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(onemogućeno za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Usluga automatskog popunjavanja"</string>
@@ -3635,5 +3745,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Instant aplikacija"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Isključiti upravitelja pohrane?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplikacije za filmove i TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Iskorišteni prostor"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Informacije o uslugama mobilnog operatera"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Pokretanje usluga mobilnog operatera"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Što je novo i uzbudljivo?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Pogledajte pet najboljih značajki"</string>
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 46f9234..6034bac 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Jó"</item>
     <item msgid="8986346415847956850">"Kiváló"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Mindig"</item>
-    <item msgid="844721238536786870">"Csak ha töltőn van"</item>
-    <item msgid="1986753720941888596">"Soha"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Mindig"</item>
-    <item msgid="7433294150916905997">"Csak ha töltőn van"</item>
-    <item msgid="1390404486722375028">"Soha"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Legutóbbi 30 nap"</item>
     <item msgid="6600989128423965319">"Ciklus beállítása…"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 14d2122..bd2b1c6 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Ön mostantól már fejlesztő!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nincs rá szükség, Ön már fejlesztő."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Előbb engedélyeznie kell a fejlesztői beállításokat"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Vezeték nélküli és egyéb hálózatok"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Kapcsolatok"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Eszköz"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE-jelző"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videohívás beütemezve"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi-hívás beütemezve"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Engedélyezett jelenlét"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Mobil rádióadó hatótávolsága"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM-kártya telefonkönyvének megtekintése"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Fix hívószámok megtekintése"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Eszközök keresése"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Eszköz átnevezése"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Átnevezés"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Leválasztja?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Ezzel befejezi a kapcsolatot a következővel:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Leválasztja az eszközt?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Telefonját leválasztja a következő eszközről: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Táblagépét leválasztja a következő eszközről: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Eszközét leválasztja a következő eszközről: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Leválaszt"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Nincs engedélye a Bluetooth-beállítások módosítására."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Új eszköz párosítása"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"A(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> látható a közeli eszközök számára, ha a Bluetooth-beállítások nyitva vannak."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"A telefon Bluetooth-címe: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"A táblagép Bluetooth-címe: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Az eszköz Bluetooth-címe: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Leválasztja a következőt: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Sugárzás"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil tiltása?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth párosítási kérelem"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Párosítási kérelem"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Koppintson rá a(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszközzel való párosításhoz."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Fogadott fájlok megjelenítése"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Fogadott fájlok"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth-eszköz kiválasztása"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> szeretné bekapcsolni a Bluetooth funkciót"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> szeretné kikapcsolni a Bluetooth funkciót"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"A(z) %1$s hozzáférést kér üzeneteihez. Biztosítja a(z) %2$s számára a hozzáférést?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM-hozzáférési kérelem"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"A következő eszköz szeretne hozzáférni az Ön SIM kártyájához: <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>. A hozzáférés megadásával letiltja eszközén az adatkapcsolatot a csatlakozás idejére. Hozzáférés megadása a következőnek: <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"A többi eszköz számára „<xliff:g id="DEVICE_NAME">^1</xliff:g>” néven jelenik meg"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Eszközei"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Új eszköz párosítása"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dátum és idő"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Válasszon időzónát"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Fiókok"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Tartózkodási hely"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Fiókok"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Biztonság és hely"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Biztonság és hely"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Titkosítás és hitelesítési adatok"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon titkosítva"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Az eszköz titkosítva"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Feloldás ujjlenyomattal"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Az ujjlenyomat használata"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Egyszerűen érintse meg az ujjlenyomat-érzékelőt telefonja feloldásához, a vásárlások engedélyezéséhez vagy az alkalmazásokba való bejelentkezéshez. Akár egyetlen hozzáadott ujjlenyomat képes mindezek végrehajtására, ezért fontolja meg, hogy kinek az ujjlenyomatát adja hozzá.\n\nMegjegyzés: Előfordulhat, hogy az ujjlenyomat kevésbé biztonságos, mint egy bonyolult minta vagy PIN-kód."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Egyszerűen érintse meg az ujjlenyomat-érzékelőt a vásárlások engedélyezéséhez, illetve az alkalmazásokba való bejelentkezéshez. Akár egyetlen hozzáadott ujjlenyomat képes mindezek végrehajtására, ezért fontolja meg, hogy kinek az ujjlenyomatát adja hozzá.\n\nMegjegyzés: Az ujjlenyomat az eszköz feloldására nem használható. Ha további információt szeretne kapni, forduljon szervezete rendszergazdájához."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Egyszerűen érintse meg az ujjlenyomat-érzékelőt telefonja feloldásához, a vásárlások engedélyezéséhez vagy az alkalmazásokba való bejelentkezéshez. Ügyeljen arra, hogy kinek az ujjlenyomatát adja hozzá az eszközhöz. A megadott ujjlenyomatok feljogosítják tulajdonosukat a felsoroltakra.\n\nMegjegyzés: Előfordulhat, hogy az ujjlenyomat kevésbé biztonságos, mint egy bonyolult minta vagy PIN-kód."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Mégse"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Tovább"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Kihagyás"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Ujjlenyomat hozzáadása"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Az eszköz védelmi funkciói nem aktiválódnak. Nem fogja tudni megakadályozni, hogy mások használják a táblagépet, ha elveszíti, ellopják, illetve törlik."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Az eszköz védelmi funkciói nem aktiválódnak. Nem fogja tudni megakadályozni, hogy mások használják az eszközt, ha elveszíti, ellopják, illetve törlik."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Az eszköz védelmi funkciói nem aktiválódnak. Nem fogja tudni megakadályozni, hogy mások használják a telefont, ha elveszíti, ellopják, illetve törlik."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Az eszköz védelmi funkciói nem aktiválódnak. Nem fogja tudni megakadályozni, hogy mások használják a táblagépet, ha elveszíti, illetve ellopják."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Az eszköz védelmi funkciói nem aktiválódnak. Nem fogja tudni megakadályozni, hogy mások használják az eszközt, ha elveszíti, illetve ellopják."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Az eszköz védelmi funkciói nem aktiválódnak. Nem fogja tudni megakadályozni, hogy mások használják a telefont, ha elveszíti, illetve ellopják."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Következő"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Az eszköz védelmi funkcióit nem lehet bekapcsolni. Nem fogja tudni megakadályozni, hogy mások használják a táblagépet, ha elveszett, ellopták vagy visszaállították."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Az eszköz védelmi funkcióit nem lehet bekapcsolni. Nem fogja tudni megakadályozni, hogy mások használják az eszközt, ha elveszett, ellopták vagy visszaállították."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Az eszköz védelmi funkcióit nem lehet bekapcsolni. Nem fogja tudni megakadályozni, hogy mások használják a telefont ha elveszett, ellopták vagy visszaállították."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Az eszköz védelmi funkcióit nem lehet bekapcsolni. Nem fogja tudni megakadályozni, hogy mások használják a táblagépet, ha elveszett vagy ellopták."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Az eszköz védelmi funkcióit nem lehet bekapcsolni. Nem fogja tudni megakadályozni, hogy mások használják az eszközt, ha elveszett vagy ellopták."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Az eszköz védelmi funkcióit nem lehet bekapcsolni. Nem fogja tudni megakadályozni, hogy mások használják a telefont, ha elveszett vagy ellopták."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Kihagyás"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Vissza"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Keresse az érzékelőt"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Telefonja hátoldalán keresse meg az ujjlenyomat-érzékelőt."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Érintse meg az érzékelőt"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"A telefon hátoldalán találja. Használja a mutatóujját."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"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="7086763077909041106">"Név"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Törlés"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Lásson neki!"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Érintse meg az érzékelőt"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Helyezze az ujját az érzékelőre, és emelje fel a rezgést követően"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Folytassa"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Óvatosan mozgassa ujját a teljes ujjlenyomat levételéhez"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Ujjlenyomat hozzáadva!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ha ezt az ikont látja, akkor lehetősége van arra, hogy ujjlenyomatával azonosítsa magát, vagy engedélyezze a vásárlást."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Csak érintse meg az ujjlenyomat-érzékelőt az eszköz felébresztéséhez és feloldásához."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Ha ezt az ikont látja, akkor vásárlásokat hagyhat jóvá, és alkalmazásokba is bejelentkezhet."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Emelje fel, majd érintse újra"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Tartsa ujját felemelve az ujjlenyomat részleteinek hozzáadásához"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Ujjlenyomat hozzáadva"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"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="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Átugorja az ujjllenyomat-beállítást?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Kiválasztotta, hogy ujjlenyomattal is feloldhassa telefonját. Ha most kihagyja a lépéseket, később kell majd beállítania a funkciót. Ez hozzávetőlegesen 1 percet vesz igénybe."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Képernyőzár beállítása"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Kész"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hoppá! Az nem az érzékelő"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Használja az eszköz ujjlenyomat-érzékelőjét."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Érintse meg a hátsó érzékelőt mutatóujjával."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"A regisztráció nincs kész"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Letelt az ujjlenyomat-regisztráció időkorlátja. Próbálja újra."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Az ujjlenyomat regisztrációja nem sikerült. Próbálja újra, vagy próbálkozzon egy másik ujjával."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják az eszközt. Válassza ki a használni kívánt képernyőlezárási módot."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják a telefont. Válassza ki a használni kívánt képernyőlezárási módot."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Válassza ki a biztonsági képernyő-zárolási módszert"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"A képernyőzár beállításai"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"A képernyőzár beállításai"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Képernyő zárolása"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Közvetlenül az alvó mód kezdete után"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Az alvó mód kezdete után ennyivel: <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g>"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Feloldási minta módosítása"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"A feloldó PIN-kód módosítása"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Feloldási jelszó módosítása"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Próbálja újra. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. kísérlet, összesen: <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Utolsó próbálkozás"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Amennyiben most helytelen munkahelyi mintát ad meg, a rendszer eltávolítja munkaprofilját és a kapcsolódó adatokat erről az eszközről."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Amennyiben most helytelen munkahelyi PIN-kódot ad meg, a rendszer eltávolítja munkaprofilját és a kapcsolódó adatokat erről az eszközről."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Amennyiben most helytelen jelszót ad meg, a rendszer eltávolítja munkaprofilját és a kapcsolódó adatokat erről az eszközről."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Túl sok sikertelen próbálkozás. A rendszer eltávolítja munkaprofilját és a kapcsolódó adatokat erről az eszközről."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Elvetés"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Próbálja újra. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. kísérlet, összesen: <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Adatai törlődni fognak"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Amennyiben helytelen mintát ad meg a következő kísérletnél, a rendszer törli az adatokat erről az eszközről"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Amennyiben helytelen PIN-kódot ad meg a következő kísérletnél, a rendszer törli az adatokat erről az eszközről"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Amennyiben helytelen jelszót ad meg a következő kísérletnél, a rendszer törli az adatokat erről az eszközről."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Amennyiben helytelen mintát ad meg a következő kísérletnél, a rendszer törli ezt a felhasználót"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Amennyiben helytelen PIN-kódot ad meg a következő kísérletnél, a rendszer törli ezt a felhasználót"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Amennyiben helytelen jelszót ad meg a következő kísérletnél, a rendszer törli ezt a felhasználót."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Amennyiben helytelen mintát ad meg a következő kísérletnél, a rendszer törli munkaprofilját és a kapcsolódó adatokat"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Amennyiben helytelen PIN-kódot ad meg a következő kísérletnél, a rendszer törli munkaprofilját és a kapcsolódó adatokat"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Amennyiben helytelen jelszót ad meg a következő kísérletnél, a rendszer törli munkaprofilját és a kapcsolódó adatokat."</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Túl sok sikertelen próbálkozás. A rendszer törli az adatokat az eszközről."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Túl sok sikertelen próbálkozás. A rendszer törli ezt a felhasználót."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Túl sok sikertelen próbálkozás. A rendszer törli ezt a munkaprofilt és a kapcsolódó adatokat."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Elvetés"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Legalább <xliff:g id="COUNT">%d</xliff:g> karakter hosszúnak kell lennie"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"A PIN-kódnak legalább <xliff:g id="COUNT">%d</xliff:g> számjegyből kell állnia"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Folytatás"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Speciális Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Ha a Bluetooth aktív, az eszköz képes kommunikálni a közelben lévő Bluetooth-eszközökkel."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"A pontosabb helyadatok érdekében a rendszeralkalmazások és -szolgáltatások továbbra is kereshetnek Bluetooth-eszközöket. Ezt a <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>keresési beállításoknál<xliff:g id="LINK_END_1">LINK_END</xliff:g> módosíthatja."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"A csatlakozás sikertelen. Próbálja újra."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Eszközadatok"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Az eszköz Bluetooth-címe: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Elfelejti az eszközt?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Telefonja a továbbiakban nem lesz párosítva a következő eszközzel: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Táblagépe a továbbiakban nem lesz párosítva a következő eszközzel: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Eszköze a továbbiakban nem lesz párosítva a következő eszközzel: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Eszköz elfelejtése"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Csatlakozás a következőhöz..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> leválasztásra kerül a hordozóeszköz hangkimenetéről."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> leválasztásra kerül a kihangosító hangkimenetéről."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ne adja meg"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ne hitelesítse"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nincs megadva tanúsítvány. A kapcsolat nem privát jellegű lesz."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"A hálózat neve túl hosszú."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"A domain megadása kötelező."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS elérhető"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS elérhető)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 hálózat</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Speciális Wi-Fi-beállítások"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wi‑Fi beállítása"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-cím"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-cím"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Alhálózati maszk"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Elfelejtse ezt a csoportot?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Hordozható wifi-hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wifi-hotspot"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Wi-Fi-hálózat szolgáltatása mobiladat-kapcsolattal"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"A táblagép internetkapcsolata nincs megosztva hotspoton keresztül"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"A telefon internetkapcsolata nincs megosztva hotspoton keresztül"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Nincs internet- és tartalommegosztás más eszközökkel"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Táblagép internetkapcsolatának megosztása hotspoton keresztül"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Telefon internetkapcsolatának megosztása hotspoton keresztül"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Az alkalmazás tartalmat oszt meg. Internetkapcsolat megosztásához kapcsolja ki, majd újra be a hotspotot."</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi-Fi-név"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> bekapcsolása…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Más eszközök is csatlakozhatnak a(z) <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> hotspothoz"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-jelszó"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-sáv"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Hotspot használatával hozzon létre Wi‑Fi-hálózatot további eszközei számára. A hotspot internetet biztosít mobiladat-kapcsolata használatával. A szolgáltató további díjat számíthat fel."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Az alkalmazások létrehozhatnak hotspotokat tartalom megosztására a közeli eszközökkel."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Hotspot bekapcsolása..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot kikapcsolása..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktív"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Ha be van kapcsolva a Wi-Fi-hívás, akkor a telefon az Ön beállításaitól és a jelerősségtől függően vagy a Wi-Fi-hálózaton, vagy a mobilszolgáltató hálózatán át vezeti a hívásokat. A funkció bekapcsolása előtt tájékozódjon mobilszolgáltatójánál a díjakról és egyéb részletekről."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Segélyhívási cím frissítése"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"A készenléti szervek számára megadott tartózkodási hely Wi-Fi-hálózatról kezdeményezett segélyhívás esetén"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Megjelenítés"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nincs találat"</string>
     <string name="display_settings" msgid="7965901687241669598">"Megjelenítés"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatikus képernyőforgatás"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Élénk színek"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Tájolás automatikus váltása a táblagép forgatásakor"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Tájolás automatikus váltása a telefon elfordításakor"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Tájolás automatikus váltása a táblagép forgatásakor"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"A fényerőt a rendelkezésre álló fényhez optimalizálja. Átmenetileg továbbra is módosíthatja a fényerőt, ha be van kapcsolva a funkció."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Éjszakai fény"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Az Éjszakai fény borostyánsárga árnyalatúra színezi a képernyőt, hogy gyenge fény mellett se legyen kellemetlen a képernyőre nézni. Emellett az elalvást is megkönnyítheti."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Ütemezés"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Állapot"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Automatikus bekapcsolás"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Soha"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Egyéni ütemezés"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Napnyugtától napkeltéig"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Ütemezés"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Nincs"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Adott időpontban kapcsol be"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Napnyugtától napkeltéig kapcsol be"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Kezdés ideje"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Befejezés ideje"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Állapot"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intenzitás"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Ki. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Soha nem kapcsol be automatikusan."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Automatikusan bekapcsol a következő időpontban: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Automatikusan bekapcsol napnyugtakor."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Be. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Soha nem kapcsol ki automatikusan."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Automatikusan kikapcsol a következő időpontban: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Automatikusan kikapcsol napkeltekor."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Ki (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Soha nem kapcsol be automatikusan"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Automatikusan bekapcsol a következő időpontban: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Automatikusan bekapcsol napnyugtakor"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Be (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Soha nem kapcsol ki automatikusan"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Automatikusan kikapcsol a következő időpontban: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Automatikusan kikapcsol napkeltekor"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Alvó mód"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A kijelző kikapcsol"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitás után"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Beállítások"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatikus fényerő"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Felébresztéshez emelje meg"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Környezeti kijelző"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Környezeti kijelző"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Mindig bekapcsolva"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Új értesítések"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Mikor jelenjen meg"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Új értesítések"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Képernyő felébresztése értesítés érkezésekor"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Mindig bekapcsolva"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Az idő, az értesítési ikonok és egyéb információk megjelenítése"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Betűméret"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Szöveg nagyítása és kicsinyítése"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kártya lezárási beállításai"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Az APN nem lehet üres."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Az MCC mezőnek három számjegyet kell tartalmaznia."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Az MNC mezőbe 2 vagy 3 számjegyet kell írni."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"A szolgáltató nem engedélyezi a következő típusú APN-ek hozzáadását: %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Alapértelmezett APN-beállítások visszaállítása."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Visszaállítás alaphelyzetbe"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Az alapértelmezett APN-beállítások visszaállítása befejeződött."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD-kártya törlése"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Minden adat, például zenék és képek törlése a belső USB-tárról"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Minden adat, például zenék és képek törlése az SD-kártyáról"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"e-SIM-kártyák törlése"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"A telefonon található összes e-SIM-kártya törlése. Ezzel nem szünteti meg mobil-előfizetését."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"A táblagépen található összes e-SIM-kártya törlése. Ezzel nem szünteti meg mobil-előfizetését."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Táblagép visszaállítása"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefon visszaállítása"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Törli az összes személyes információt és letöltött alkalmazást? A műveletet nem lehet visszavonni."</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Ha az Adatforgalom-csökkentő be van kapcsolva, nem lehet használni az internetmegosztás és a hordozható hotspot funkciókat"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-megosztás"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB csatlakoztatva, jelölje be a megosztáshoz"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Megosztva"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Nem lehet összekötni, ha az USB-tároló használatban van"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Nincs USB-kapcsolat"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"A bekapcsoláshoz csatlakozzon"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB-megosztási hiba"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"A telefon internetkapcsolatának megosztása USB-n keresztül"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"A táblagép internetkapcsolatának megosztása USB-n keresztül"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth megosztása"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Internetkapcsolat megosztása Bluetooth-on"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Internetkapcsolat megosztása Bluetooth-on"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Internetkapcsolat megosztása Bluetooth-on 1 eszközzel"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Internetkapcsolat megosztása Bluetooth-on 1 eszközzel"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Internetkapcsolat megosztása Bluetooth-on <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> eszközzel"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Internetkapcsolat megosztása Bluetooth-on <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> eszközzel"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Táblagép internetkapcsolatának megosztása Bluetooth-on"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Telefon internetkapcsolatának megosztása Bluetooth-on"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g> internetkapcsolatának megosztása Bluetooth-on"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Nincs internetkapcsolat-megosztás Bluetooth-on"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Nincs internetkapcsolat-megosztás Bluetooth-on"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Nincs összekötve"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Nem köthető több mint <xliff:g id="MAXCONNECTION">%1$d</xliff:g> eszközhöz."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> megosztása meg lesz szüntetve."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Hotspot és internetmegosztás használata annak érdekében, hogy internetet biztosítson más eszközöknek mobiladat-kapcsolat segítségével."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Hotspot és internetmegosztás használata annak érdekében, hogy internetet biztosítson más eszközöknek mobiladat-kapcsolat segítségével. Az alkalmazások is létrehozhatnak hotspotokat tartalom megosztására a közeli eszközökkel."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Súgó"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobilhálózat"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobil-előfizetés"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Helymeghatározási mód"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"GPS, Wi‑Fi, Bluetooth és mobilhálózatok használata a tartózkodási hely megállapításához"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Wi‑Fi, Bluetooth és mobilhálózatok használata a tartózkodási hely megállapításához"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS használata a tartózkodási hely meghatározásához"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"A GPS-nek és az eszköz érzékelőinek használata a hely meghatározásához"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Beolvasás"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi-alapú keresés"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"A pontosabb helyadatokért a rendszeralkalmazások és -szolgáltatások Wi-Fi-hálózatokat kereshetnek bármikor."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nincs adatkapcsolat. Az információ azonnali megtekintéséhez keresse fel a következő helyet bármelyik számítógépről, amely csatlakozik az internethez: %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Betöltés…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Adjon meg egy jelszót"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Jelszó az ujjlenyomathoz"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Válassza ki a mintát"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Minta az ujjlenyomathoz"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Adja meg PIN-kódját"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN-kód az ujjlenyomathoz"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Jelszó megerősítése"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Erősítse meg a mintát"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN-kód megerősítése"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Alkalmazásbeállítások"</string>
     <string name="install_applications" msgid="4872012136210802181">"Ismeretlen források"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Összes forrás engedélyezése"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Az utoljára megnyitott alkalmazások"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Mind a(z) <xliff:g id="COUNT">%1$d</xliff:g> alkalmazás megjelenítése"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"Ennyi ideje: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Az ismeretlen alkalmazások nagyobb eséllyel támadják meg táblagépét és személyes adatait. Az ebből a forrásból származó alkalmazások telepítésével egyidejűleg kijelenti, hogy Ön viseli a felelősséget az alkalmazások használatából eredő, táblagépét vagy személyes adatait ért bármilyen kár vagy bármilyen adatvesztés esetén."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Az ismeretlen alkalmazások nagyobb eséllyel támadják meg telefonját és személyes adatait. Az ebből a forrásból származó alkalmazások telepítésével egyidejűleg kijelenti, hogy Ön viseli a felelősséget az alkalmazások használatából eredő, telefonját vagy személyes adatait ért bármilyen kár vagy adatvesztés esetén."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Speciális beállítások"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Leállítja a rendszerszolgáltatásokat?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Ha leállítja ezt a szolgáltatást, táblagépének néhány funkciója hibásan működhet, amíg ki, majd újra be nem kapcsolja azt."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ha leállítja ezt a szolgáltatást, telefonjának néhány funkciója hibásan működhet, amíg ki, majd újra be nem kapcsolja azt."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Nyelvek és kézmozdulatok"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Nyelvek és bevitel"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Nyelvek és bevitel"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Beviteli segítség"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> nyomtatási szolgáltatás bekapcsolva</item>
       <item quantity="one">1 nyomtatási szolgáltatás bekapcsolva</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> nyomtatási feladat</item>
+      <item quantity="one">1 nyomtatási feladat</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Nyomtatási szolgáltatások"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nincs telepített szolgáltatás"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nem található nyomtató"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Használat részletei"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Az energiafelhasználás beállítása"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Mellékelt csomagok"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Az akkumulátort lemerítő alkalmazások"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Eszköz ébren tartása"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Eszköz felébresztése a háttérben"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Tartózkodási hely gyakori lekérése"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> nem megfelelően működő alkalmazás"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Leállítja az alkalmazást?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Telefonja nem képes az akkumulátor normál kezelésére, mivel a(z) <xliff:g id="APP">%1$s</xliff:g> alkalmazás ébren tartja az eszközt.\n\nA probléma megoldásához kényszerítheti az alkalmazás leállítását.\n\nHa nem szűnik meg, akkor az akkumulátor teljesítményének javításához szükség lehet az alkalmazás eltávolítására."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Táblagépe nem képes az akkumulátor normál kezelésére, mivel a(z) <xliff:g id="APP">%1$s</xliff:g> alkalmazás ébren tartja az eszközt.\n\nA probléma megoldásához kényszerítheti az alkalmazás leállítását.\n\nHa nem szűnik meg, akkor az akkumulátor teljesítményének javításához szükség lehet az alkalmazás eltávolítására."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Eszköze nem képes az akkumulátor normál kezelésére, mivel a(z) <xliff:g id="APP">%1$s</xliff:g> alkalmazás ébren tartja az eszközt.\n\nA probléma megoldásához kényszerítheti az alkalmazás leállítását.\n\nHa nem szűnik meg, akkor az akkumulátor teljesítményének javításához szükség lehet az alkalmazás eltávolítására."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Alkalmazás leállítása"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Kikapcsolja a háttérben történő használatot?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Telefonja nem képes az akkumulátor normál kezelésére, mivel a(z) <xliff:g id="APP">%1$s</xliff:g> alkalmazás folyton felébreszti az eszközt.\n\nA probléma megoldásához az eszköz megakadályozhatja, hogy ez az alkalmazás a háttérben fusson."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Táblagépe nem képes az akkumulátor normál kezelésére, mivel a(z) <xliff:g id="APP">%1$s</xliff:g> alkalmazás folyton felébreszti az eszközt.\n\nA probléma megoldásához az eszköz megakadályozhatja, hogy ez az alkalmazás a háttérben fusson."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Eszköze nem képes az akkumulátor normál kezelésére, mivel a(z) <xliff:g id="APP">%1$s</xliff:g> alkalmazás folyton felébreszti az eszközt.\n\nA probléma megoldásához az eszköz megakadályozhatja, hogy ez az alkalmazás a háttérben fusson."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Kikapcsolás"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Kikapcsolja a tartózkodási helyet?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Telefonja nem képes az akkumulátor normál kezelésére, mivel a(z) <xliff:g id="APP">%1$s</xliff:g> alkalmazás gyakran lekéri a tartózkodási helyét, amikor nem használja.\n\nA probléma megoldásához kikapcsolhatja az alkalmazásnál a tartózkodási helyet."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Táblagépe nem képes az akkumulátor normál kezelésére, mivel a(z) <xliff:g id="APP">%1$s</xliff:g> alkalmazás gyakran lekéri a tartózkodási helyét, amikor nem használja.\n\nA probléma megoldásához kikapcsolhatja az alkalmazásnál a tartózkodási helyet."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Eszköze nem képes az akkumulátor normál kezelésére, mivel a(z) <xliff:g id="APP">%1$s</xliff:g> alkalmazás gyakran lekéri a tartózkodási helyét, amikor nem használja.\n\nA probléma megoldásához kikapcsolhatja az alkalmazásnál a tartózkodási helyet."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Kikapcsolás"</string>
     <string name="power_screen" msgid="3023346080675904613">"Képernyő"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Zseblámpa"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Alkalmazások"</string>
     <string name="power_service" msgid="1599661212370831780">"Szolgáltatások"</string>
     <string name="power_system" msgid="8290455327965307383">"Rendszer"</string>
-    <string name="power_user" msgid="1889728099253018005">"Felhasználó"</string>
+    <string name="power_user" msgid="3706143225319881667">"Egyéb felhasználók"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU teljes"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-használat az előtérben"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ébren tartás"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Túlbecsült energiafogyasztás"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Használat ideje: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktív ennyi ideig: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Képernyőhasználat: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"A(z) <xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g>-ot használt"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Az akkumulátor teljes töltöttségi szintjének <xliff:g id="PERCENT">%1$s</xliff:g>-a"</string>
@@ -2565,7 +2636,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN-kód módosítása"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Értesítések megjelenítése"</string>
     <string name="help_label" msgid="6886837949306318591">"Súgó és visszajelzés"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Súgócikkek, támogatás telefonon és csevegőn keresztül"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Súgócikkek, telefon és csevegő, kezdő lépések"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Tartalom fiókja"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Fotóazonosító"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Extrém veszélyek"</string>
@@ -2655,9 +2726,12 @@
       <item quantity="one">%d rejtett elem megjelenítése</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Hálózat és internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobil, adathasználat, hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobil"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"adathasználat"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Társított eszközök"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, átküldés, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Alkalmazások és értesítések"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Engedélyek, alapértelmezett alkalmazások"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Felhasználók és fiókok"</string>
@@ -2710,6 +2784,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"kézmozdulat"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"fizetés, koppintás, kifizetések"</string>
     <string name="keywords_backup" msgid="470070289135403022">"biztonsági másolat, biztonsági mentés"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"kézmozdulat, él, oldal, aktív él, összenyomás, fogás, segít, segéd, összenyomható, összenyomós, összenyomó, ok google, google segéd"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"kézmozdulat, ébresztés, értesítések, képernyő, kijelző, képernyő kikapcsolva, képernyő bekapcsolva, összenyomás, él, alvás, alszik, fogás"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"kézmozdulat, némítás, szundi, ébresztés, bejövő hívás, csendes, kijelző, képernyőzár, összenyomás, fogás, él, leállítás"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC-címke beállítása"</string>
     <string name="write_tag" msgid="8571858602896222537">"Írás"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Az íráshoz érintsen meg egy címkét…"</string>
@@ -2792,7 +2869,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Semmilyen munkaprofil-értesítés ne jelenjen meg"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Ha az eszköz zárolva van, hogyan szeretné megjeleníteni a profilértesítéseket?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profilértesítések"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Értesítések"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Értesítések"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Alkalmazásértesítések"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Értesítés kategóriája"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Fontosság"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Döntsön az alkalmazás"</string>
@@ -2807,6 +2885,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Sürgős"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Hang engedélyezése"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Ne legyen hangjelzés vagy rezgés, illetve az értesítések ne jelenjenek meg rövid időre sem az aktuális képernyőn."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Kevésbé fontos"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Átlagos"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Fontos"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Sürgős"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Értesítési segéd"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Hozzáférés értesítésekhez"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"A munkaprofil értesítéseihez való hozzáférés letiltva"</string>
@@ -2834,8 +2916,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Kép a képben"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Kép a képben funkció engedélyezése"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Annak engedélyezése, hogy ez az alkalmazás kép a képben ablakot hozzon létre, miközben meg van nyitva, vagy miután Ön kilépett (például azért, hogy tovább nézzen egy videót). Az említett ablak az Ön által használt többi alkalmazás fölött jelenik majd meg."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Igen"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Nem"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"„Ne zavarjanak” elérés"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Egy telepített alkalmazás sem kért „Ne zavarjanak” elérést"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Alkalmazások betöltése…"</string>
@@ -2966,11 +3046,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"A munkahelyi profil kezelője:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Kezeli: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Kísérleti)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Eszközforgatás"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Az oldal tartalmának forgatása"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Álló nézet megtartása"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Fekvő nézet megtartása"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Jelenlegi tájolás megtartása"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Biztonságos indítás"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Tovább"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"További védelmet adhat az eszköznek, ha elindítása előtt PIN-kódot kér. Amíg az eszköz el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is).\n\nEz segít az elvesztett vagy ellopott eszközökön lévő adatok védelmében. Beállítja PIN-kód kérését az eszköz indítása előtt?"</string>
@@ -2978,7 +3053,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"További védelmet nyújthat az eszköz számára, ha elindítása előtt jelszót kér. Amíg az eszköz el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is). \n\nEz segít az elvesztett vagy ellopott eszközökön lévő adatok védelmében. Beállítja jelszó kérését az eszköz indítása előtt?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Amellett, hogy ujjlenyomattal oldja fel eszköze zárolását, további védelmet jelenthet, ha az eszköz rendszerindítás előtt PIN-kódot kér. Amíg az eszköz el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is).\n\nEz segít az elvesztett vagy ellopott eszközökön lévő adatok védelmében. Beállítja PIN-kód kérését az eszköz indítása előtt?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Amellett, hogy ujjlenyomattal oldja fel eszköze zárolását, további védelmet jelenthet, ha az eszköz rendszerindítás előtt mintát kér. Amíg az eszköz el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is).\n\nEz segít az elvesztett vagy ellopott eszközökön lévő adatok védelmében. Beállítja minta kérését az eszköz indítása előtt?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Amellett, hogy ujjlenyomattal oldja fel eszköze zárolását, további védelmet jelenthet, ha az eszköz rendszerindítás előtt jelszót kér. Amíg az eszköz el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is).\n\nEz segít az elvesztett vagy ellopott eszközökön lévő adatok védelmében. Beállítja jelszó kérését az eszköz indítása előtt?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Amellett, hogy ujjlenyomattal oldja fel eszköze zárolását, további védelmet nyújthat az eszköznek, ha jelszó magadásához köti a rendszerindítást. Amíg az eszköz el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is).\n\nEz segíti az elvesztett vagy ellopott eszközökön lévő adatok védelmét. Beállítja jelszó kérését az eszköz indítása előtt?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Igen"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nem"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Kérjen PIN-kódot?"</string>
@@ -3096,6 +3171,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Használati értesítések"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Teljes eszközhasználat megjelenítése"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Alkalmazáshasználat mutatása"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Magas energiafelhasználás"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> alkalmazás szokatlanul működik</item>
+      <item quantity="one">A(z) <xliff:g id="APP">%1$s</xliff:g> szokatlanul működik</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Az akkumulátort lemerítő alkalmazások</item>
+      <item quantity="one">Az akkumulátort lemerítő <xliff:g id="APP">%1$s</xliff:g></item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Nincs optimalizálva"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nincs optimalizálva"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Akkumulátorhasználat optimalizálása"</string>
@@ -3188,8 +3272,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"A többi alkalmazás fölött"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"A(z) <xliff:g id="COUNT_1">%2$d</xliff:g> alkalmazásból <xliff:g id="COUNT_0">%1$d</xliff:g> jelenhet meg más alkalmazások fölött"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Engedéllyel rendelkező alkalmazások"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Igen"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Nem"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Engedélyezett"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Nem engedélyezett"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"alkalmazások telepítése ismeretlen források"</string>
     <string name="write_settings" msgid="4797457275727195681">"Rendszerbeállítások módosítása"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"rendszerbeállítások írása és módosítása"</string>
@@ -3279,6 +3363,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"A képernyő borostyánsárga árnyalatúra színeződött; ez megkönnyítheti az elalvást."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Javaslatok"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"több mint <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> további"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> javaslat</item>
+      <item quantity="one">1 javaslat</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> javaslat</item>
+      <item quantity="one">+1 javaslat</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Eltávolítás"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Hideg színhőmérséklet"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Hidegebb színhőmérséklet használata a kijelzőn"</string>
@@ -3297,8 +3390,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> adatforgalmi figyelmeztetés"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> – adatforgalmi figyelmeztetés / <xliff:g id="ID_2">%2$s</xliff:g> – adatforgalom korlátozása"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Számlázási ciklus"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"A havi ciklus minden hónap <xliff:g id="ID_1">%1$s</xliff:g>. napján kezdődik"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Havonta a hónap <xliff:g id="ID_1">%1$s</xliff:g>. napján"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Minden hónap <xliff:g id="ID_1">%1$s</xliff:g>. napján"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Hálózati korlátozások"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> korlátozás</item>
@@ -3318,7 +3410,7 @@
       <item quantity="one">1 alkalmazás számára engedélyezett a korlátlan adathasználat, ha az Adatforgalom-csökkentő be van kapcsolva</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Adatforgalom-csökkentő"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Korlátlan adathozzáférés"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Korlátlan adat"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Háttéradatok kikapcsolva"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Be"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Ki"</string>
@@ -3382,8 +3474,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Lezárási képernyő értesítéseinek kezelése"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Értesítéstartalom megjelenítése vagy elrejtése"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Összes"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Támogatás"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Súgó és tippek"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Legkeskenyebb szélesség"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Egy telepített alkalmazás sem kért hozzáférést a Prémium sms-ekhez"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"A Prémium sms-ek használata pénzbe kerülhet Önnek, és a szolgáltató által kiállított számlák végösszegét növeli. Ha engedélyt ad valamelyik alkalmazásnak, akkor azzal lehetősége lesz prémium sms-eket küldeni."</string>
@@ -3448,28 +3539,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatikus"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Kézi"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Szabadítson fel tárhelyet most"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Kézmozdulatok"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Kézmozdulatos parancsok"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gyors kézmozdulatok telefonja kezeléséhez"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gyors kézmozdulatok táblagépe kezeléséhez"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gyors kézmozdulatok eszköze kezeléséhez"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kamera megnyitása"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"A kamera gyors megnyitásához nyomja meg a bekapcsológombot kétszer. Bármelyik képernyőről működik."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Kamera gyors megnyitása"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"A kamera megnyitásához nyomja meg kétszer a bekapcsológombot"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kameraváltás"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Gyors szelfikészítés"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"A szelfi módhoz forgassa el a telefont kétszer"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"A szelfi módhoz forgassa el a táblagépet kétszer"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"A szelfi módhoz forgassa el az eszközt kétszer"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Koppintson duplán a telefon képernyőjének megtekintéséhez"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Koppintson duplán a táblagép képernyőjének megtekintéséhez"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Koppintson duplán az eszköz képernyőjének megtekintéséhez"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Az értesítések gyors megtekintéséhez koppintson duplán a képernyőre."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Az idő, az értesítési ikonok és egyéb információk megjelenítéséhez koppintson kétszer a képernyőre."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Ellenőrizze az értesítéseket, ha a képernyő ki van kapcsolva"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Ellenőrzés a telefon felemelésével"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Ellenőrzés a táblagép felemelésével"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Ellenőrzés az eszköz felemelésével"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Az értesítések gyors megtekintéséhez vegye a kezébe telefonját."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Az értesítések gyors megtekintéséhez vegye a kezébe táblagépét."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Az értesítések gyors megtekintéséhez vegye a kezébe eszközét."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Az idő, az értesítési ikonok és egyéb információk megjelenítéséhez vegye a kezébe telefonját."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Az idő, az értesítési ikonok és egyéb információk megjelenítéséhez vegye a kezébe táblagépét."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Az idő, az értesítési ikonok és egyéb információk megjelenítéséhez vegye a kezébe eszközét."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Ellenőrizze az értesítéseket, ha a képernyő ki van kapcsolva"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Értesítések ujjlenyomattal"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Megtekintheti értesítéseit, ha ujját lefelé húzza a telefonja hátulján található ujjlenyomat-érzékelőn."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Megtekintheti értesítéseit, ha ujját lefelé húzza a táblagépe hátulján található ujjlenyomat-érzékelőn."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Megtekintheti értesítéseit, ha ujját lefelé húzza az eszköze hátulján található ujjlenyomat-érzékelőn."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Értesítések gyors megtekintése"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Az ujj gyors csúsztatása az ujjlenyomat-érzékelőn"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Eszköz felemelése a kamera megnyitásához"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"A kamera automatikus megnyitásához emelje a telefont olyan helyzetbe, mintha fényképezne vele (fekvő vagy álló módban). Akkor működik, ha a telefon alvó módban vagy zárolva van."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Fotók készítése, ha a telefon alszik vagy le van zárva"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Segítő kézmozdulat"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Érzékenység"</string>
@@ -3573,6 +3677,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Eltávolítja ezt az azonnali alkalmazást?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Játékok"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Hangfájlok"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Felhasznált tárhely"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(eltávolítva <xliff:g id="USER">%s</xliff:g> esetében)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(letiltva <xliff:g id="USER">%s</xliff:g> számára)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Automatikus kitöltés"</string>
@@ -3586,5 +3691,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Azonnali alkalmazás"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Kikapcsolja a tárhelykezelőt?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Filmes és tévés alkalmazások"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Felhasznált tárhely"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Információ a szolgáltatói hozzáférésről"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Szolgáltatói ellátás aktiválása"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Mi új és említésre méltó?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Tekintse meg az 5 legnépszerűbb funkciót"</string>
 </resources>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index e774cf8..ae3c28b 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Լավ"</item>
     <item msgid="8986346415847956850">"Հիանալի"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Միշտ"</item>
-    <item msgid="844721238536786870">"Միայն երբ միացված է"</item>
-    <item msgid="1986753720941888596">"Երբեք"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Միշտ"</item>
-    <item msgid="7433294150916905997">"Միայն երբ միացված է"</item>
-    <item msgid="1390404486722375028">"Երբեք"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Վերջին 30 օրում"</item>
     <item msgid="6600989128423965319">"Սահմանել օգտագործման ցիկլը..."</item>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 1078581..36aa806 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Դուք արդեն ծրագրավորո՛ղ եք:"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Կարիք չկա, դուք արդեն իսկ ծրագրավորող եք:"</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Խնդրում ենք նախ միացնել մշակողի ընտրանքները:"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Անլար կապ և ցանցեր"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Կապեր"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Սարք"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE-ի տրամադրում"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Տեսազանգերի նախապատրաստում"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi զանգերի նախապատրաստում"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/ներկայության տրամադրում"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Բջջային ռադիոազդանշանի հզորությունը"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Դիտել SIM քարտի հասցեագիրքը"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Տեսնել ամրակցված հեռախոսահամարները"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Սկանավորել` սարքեր գտնելու համար"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Վերանվանել այս սարքը"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Վերանվանել"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Անջատե՞լ"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Սա կավարտի կապը &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&amp;gt-ի հետ"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Անջատե՞լ սարքը:"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Ձեր հեռախոսը կանջատվի <xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքից:"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Ձեր պլանշետը կանջատվի <xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքից:"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Ձեր սարքը կանջատվի <xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքից:"</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Անջատել"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Դուք թույլտվություն չունեք փոխելու Bluetooth կարգավորումները:"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Նոր սարքի զուգակցում"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ը տեսանելի է մոտակա սարքերի համար, քանի դեռ Bluetooth-ի կարգավորումները բաց են:"</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Հեռախոսի Bluetooth հասցեն՝ <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Պլանշետի Bluetooth հասցեն՝ <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Սարքի Bluetooth հասցեն՝ <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Անջատե՞լ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ը:"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Հեռարձակում"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Կասեցնե՞լ պրոֆիլը:"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth զուգավորման հայց"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Զուգավորման հայց"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Հպեք` <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի հետ զուգակցելու համար:"</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Ցուցադրել ստացված ֆայլերը"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Ստացված ֆայլեր"</string>
     <string name="device_picker" msgid="4978696506172252813">"Ընտրեք Bluetooth սարք"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածը ցանկանում է միացնել Bluetooth-ը"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածը ցանկանում է անջատել Bluetooth-ը"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s-ը ցանկանում է մատչել ձեր հաղորդագրությունները: Մուտք տա՞լ %2$s-ին:"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM քարտից օգտվելու հարցում"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> սարքը ցանկանում է օգտվել ձեր SIM քարտի տվյալներից: Եթե թույլ տաք օգտվել SIM քարտից, տվյալների կապակցելիությունը կանջատվի սարքի վրա կապակցման ընթացքում: Թույլատրել <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> սարքին"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Այլ սարքերին տեսանելի է որպես «<xliff:g id="DEVICE_NAME">^1</xliff:g>»"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ձեր սարքերը"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Նոր սարքի զուգակցում"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Ամսաթիվ և ժամ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Ընտրել ժամային գոտին"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Հաշիվներ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Տեղադրություն"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Հաշիվներ"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Անվտանգություն և տեղորոշում"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Անվտանգություն &amp; տեղադրություն"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Գաղտնագրում և հավատարմագրեր"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Հեռախոսը գաղտնագրված է"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Սարքը գաղտնագրված է"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Ապակողպում մատնահետքով"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Օգտագործեք ձեր մատնահետքը"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Հեռախոսն ապակողպելու, գնումները թույլատրելու կամ հավելվածներ մուտք գործելու համար պարզապես մատը հպեք մատնահետքի սենսորին: Այդ գործողությունները հնարավոր է անել հեռախոսում ավելացված ցանկացած մատնահետքի միջոցով, այնպես որ մտածված ավելացրեք նոր մարդկանց մատնահետքերը:\n\nՆշում. ապակողպման հուսալի նախշը կամ PIN կոդը կարող է մատնահետքից ավելի ապահով լինել:"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Գնումները թույլատրելու կամ հավելվածներ մուտք գործելու համար պարզապես հպեք մատնահետքերի սկաներին: Այդ գործողությունները հնարավոր է անել ավելացված ցանկացած մատնահետքի միջոցով, այնպես որ մտածված ավելացրեք նոր մարդկանց մատնահետքերը:\n\nՆշում. այս սարքն ապակողպելու համար չեք կարող օգտագործել ձեր մատնահետքը: Լրացուցիչ տեղեկություններ ստանալու համար դիմեք ձեր կազմակերպության ադմինիստրատորին:"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Հեռախոսն ապակողպելու, գնումները թույլատրելու կամ հավելվածներ մուտք գործելու համար պարզապես մատը հպեք մատնահետքի սենսորին: Այդ գործողությունները հնարավոր է անել հեռախոսում ավելացված ցանկացած մատնահետքի միջոցով, այնպես որ մտածված ավելացրեք նոր մարդկանց մատնահետքերը:\n\nՆշում. ապակողպման հուսալի նախշը կամ PIN կոդը կարող է մատնահետքից ավելի ապահով լինել:"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Օգտագործեք ձեր մատնահետքը՝ հեռախոսն ապակողպելու կամ գնումները թույլատրելու համար:\n\nՆշում. այս սարքն ապակողպելու համար չեք կարող օգտագործել ձեր մատնահետքը: Լրացուցիչ տեղեկություններ ստանալու համար դիմեք ձեր կազմակերպության ադմինիստրատորին:"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Օգտագործեք ձեր մատնահետքը՝ հեռախոսն ապակողպելու կամ գնումները թույլատրելու համար:\n\nՆշում. ապակողպման հուսալի նախշը կամ PIN կոդը կարող է մատնահետքից ավելի ապահով լինել:"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Չեղարկել"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Շարունակել"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Բաց թողնել"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Ավելացնել մատնահետք"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"	Սարքի պաշտպանությունը չի ակտիվացվի: Եթե հեռախոսը կորցնեք կամ այն գողանան կամ բոլոր տվյալները ջնջվեն, այն կկարողանան օգտագործել կողմնակի անձինք։"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Սարքի պաշտպանությունը չի ակտիվացվի: Եթե հեռախոսը կորցնեք կամ այն գողանան կամ բոլոր տվյալները ջնջվեն, այն կկարողանան օգտագործել կողմնակի անձինք։"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Սարքի պաշտպանությունը չի ակտիվացվի: Եթե հեռախոսը կորցնեք կամ այն գողանան կամ բոլոր տվյալները ջնջվեն, այն կկարողանան օգտագործել կողմնակի անձինք։"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Սարքի պաշտպանությունը չի ակտիվացվի: Եթե հեռախոսը կորցնեք կամ այն գողանան, ապա այն կկարողանան օգտագործել կողմնակի անձինք։"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Սարքի պաշտպանությունը չի ակտիվացվի: Եթե հեռախոսը կորցնեք կամ այն գողանան, այն կկարողանան օգտագործել կողմնակի անձինք։"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Սարքի պաշտպանությունը չի ակտիվացվի: Եթե հեռախոսը կորցնեք կամ այն գողանան, ապա այն կկարողանան օգտագործել կողմնակի անձինք։"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Հաջորդը"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Սարքի պաշտպանության գործառույթները չեն միացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս պլանշետի օգտագործումը՝ այն կորցնելու, գողանալու կամ վերակայելու դեպքում:"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Սարքի պաշտպանության գործառույթները չեն միացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս սարքի օգտագործումը՝ այն կորցնելու, գողանալու կամ վերակայելու դեպքում:"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Սարքի պաշտպանության գործառույթները չեն միացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս հեռախոսի օգտագործումը՝ այն կորցնելու, գողանալու կամ վերակայելու դեպքում:"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Սարքի պաշտպանության գործառույթները չեն միացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս պլանշետի օգտագործումը՝ այն կորցնելու կամ գողանալու դեպքում:"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Սարքի պաշտպանության գործառույթները չեն միացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս սարքի օգտագործումը՝ այն կորցնելու կամ գողանալու դեպքում:"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Սարքի պաշտպանության գործառույթները չեն միացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս հեռախոսի օգտագործումը՝ այն կորցնելու կամ գողանալու դեպքում:"</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Բաց թողնել"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Վերադառնալ"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Գտեք սենսորը"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Գտեք հեռախոսի հետևում գտնվող մատնահետքի սենսորը:"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Հպեք սկաներին"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Այն գտնվում է ձեր հեռախոսի հետևի մասում: Օգտագործեք ձեր ցուցամատը:"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Սարքի և մատնահետքի սենսորի տեղադրության պատկեր"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Անուն"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Հաստատել"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Ջնջել"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Սկսե՛նք"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Հպեք սկաներին"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Դրեք ձեր մատը սենսորի վրա և բարձրացրեք թրթռոց զգալուց հետո"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Շարունակեք"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Մի փոքր շարժեք մատը՝ ամբողջ մատնահետքը ստանալու համար"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Մատնահետքն ավելացվեց:"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Եթե տեսնում եք այս պատկերակը, դա նշանակում է, որ կարող եք օգտագործել մատնահետքը նույնականացման կամ գնումներ հաստատելու համար։"</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Սարքը քնի ռեժիմից հանելու և ապակողպելու համար պարզապես հպեք մատնահետքի սենսորին:"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Այս պատկերակը տեսնելու դեպքում կարող եք նաև թույլատրել գնումները կամ մուտք գործել հավելվածներ:"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Բարձրացրեք, ապա կրկին հպեք"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Շարունակեք բարձրացնել ձեր մատը՝ մատնահետքի տարբեր հատվածներ ավելացնելու համար"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Մատնահետքն ավելացվեց"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Երբ տեսնեք այս պատկերակը, օգտագործեք ձեր մատնահետքը՝ նույնականացման կամ գնումները թույլատրելու համար:"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Բաց թողնե՞լ մատնահետքի կարգավորումը:"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Դուք ընտրել եք մատնահետքի օգտագործումը որպես հեռախոսն ապակողպելու եղանակներից մեկը: Եթե բաց թողնեք հիմա, ապա ձեզ անհրաժեշտ կլինի կատարել կարգավորումն ավելի ուշ: Կարգավորումը տևում է ընդամենը մոտ մեկ րոպե:"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Էկրանի կողպման կարգավորում"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Պատրաստ է"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Դա սենսորը չէ"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Օգտագործեք մատնահետքի սենսորը:"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Ցուցամատով հպեք հեռախոսի հետևում գտնվող սկաներին:"</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Գրանցումը չի ավարտվել"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Մատնահետքի գրանցման ժամանակը սպառվել է: Փորձեք նորից:"</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Մատնահետքը չգրանցվեց: Փորձեք նորից կամ փորձեք այլ մատ:"</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Կանխեք այս սարքի չթույլատրված օգտագործումն այլ անձանց կողմից՝ ակտիվացնելով սարքի պաշտպանության գործառույթները: Ընտրեք էկրանի կողպման ցանկալի եղանակը:"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Կանխեք այս հեռախոսի չթույլատրված օգտագործումն այլ անձանց կողմից՝ ակտիվացնելով սարքի պաշտպանության գործառույթները: Ընտրեք էկրանի կողպման ցանկալի եղանակը:"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Ընտրեք էկրանի կողպման պահուստային եղանակը"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Էկրանի կողպման ընտրանքներ"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Էկրանի կողպման ընտրանքներ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Էկրանի կողպում"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Անմիջապես քնից հետո"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> քնից հետո"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Փոխել ապակողպման նախշը"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Փոխել ապակողպման PIN-ը"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Փոխել ապակողպման գաղտնաբառը"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Փորձեք նորից: Փորձ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>՝ <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>-ից:"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Վերջին փորձը"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Եթե այս անգամ էլ մուտքագրեք սխալ աշխատանքային նախշ, ապա ձեր աշխատանքային պրոֆիլը և դրա հետ կապակցված տվյալները կհեռացվեն այս սարքից:"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Եթե այս անգամ էլ մուտքագրեք սխալ աշխատանքային PIN կոդ, ապա ձեր աշխատանքային պրոֆիլը և դրա հետ կապակցված տվյալները կհեռացվեն այս սարքից:"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Եթե այս անգամ էլ մուտքագրեք սխալ աշխատանքային գաղտնաբառ, ապա ձեր աշխատանքային պրոֆիլը և դրա հետ կապակցված տվյալները կհեռացվեն այս սարքից:"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Դուք կատարել եք չափից ավելի անհաջող փորձեր: Ձեր աշխատանքային պրոֆիլը և դրա հետ կապակցված տվյալները կհեռացվեն այս սարքից:"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Փակել"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Փորձեք նորից: Փորձ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>՝ <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>-ից:"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Ձեր տվյալները կջնջվեն"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Հաջորդ փորձի ընթացքում սխալ նախշ մուտքագրելու դեպքում սարքի տվյալները կջնջվեն"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Հաջորդ փորձի ընթացքում սխալ PIN մուտքագրելու դեպքում սարքի տվյալները կջնջվեն"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Հաջորդ փորձի ընթացքում սխալ գաղտնաբառ մուտքագրելու դեպքում սարքի տվյալները կջնջվեն"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Հաջորդ փորձի ընթացքում սխալ նախշ մուտքագրելու դեպքում օգտատերը կջնջվի"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Հաջորդ փորձի ընթացքում սխալ PIN մուտքագրելու դեպքում օգտատերը կջնջվի"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Հաջորդ փորձի ընթացքում սխալ գաղտնաբառ մուտքագրելու դեպքում այս օգտատերը կջնջվի"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Հաջորդ փորձի ընթացքում սխալ նախշ մուտքագրելու դեպքում ձեր աշխատանքային պրոֆիլը և դրա տվյալները կջնջվեն"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Հաջորդ փորձի ընթացքում սխալ PIN մուտքագրելու դեպքում աշխատանքային պրոֆիլը և դրա տվյալները կջնջվեն"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Հաջորդ փորձի ընթացքում սխալ գաղտնաբառ մուտքագրելու դեպքում աշխատանքային պրոֆիլը և դրա տվյալները կջնջվեն"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Չափից շատ սխալ փորձեր: Այս սարքի տվյալները կջնջվեն:"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Չափից շատ սխալ փորձեր։ Oգտատերը կջնջվի:"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Չափից շատ սխալ փորձեր։ Աշխատանքային պրոֆիլը և դրա տվյալները կջնջվեն:"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Փակել"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Պետք է պարունակի առնվազն <xliff:g id="COUNT">%d</xliff:g> գրանշան"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN-ը պետք է պարունակի առնվազն <xliff:g id="COUNT">%d</xliff:g> թվանշան"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Շարունակել"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Ընդլայնված Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Երբ Bluetooth-ը միացված է, ձեր սարքը կարող է հաղորդակցվել մոտակայքում գտնվող Bluetooth սարքերի հետ:"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Տեղորոշման ճշգրտությունը բարելավելու նպատակով համակարգի հավելվածներն ու ծառայությունները կարող են շարունակել Bluetooth սարքերի հայտնաբերումը: Այս ընտրանքը կարող եք փոխել <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>որոնման կարգավորումներում<xliff:g id="LINK_END_1">LINK_END</xliff:g>:"</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Չհաջողվեց կապակցվել: Փորձեք նորից:"</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Սարքի տվյալները"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Սարքի Bluetooth հասցեն՝ <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Մոռանա՞լ սարքը:"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Ձեր հեռախոսը <xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքի հետ այլևս զուգակցված չի լինի"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Ձեր պլանշետը <xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքի հետ այլևս զուգակցված չի լինի"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Ձեր սարքը <xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքի հետ այլևս զուգակցված չի լինի"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Մոռանալ սարքը"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Միացում…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ը կանջատվի մեդիա աուդիոյից:"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ը կանջատվի անձեռն աուդիոյից:"</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Չտրամադրել"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Չվավերացնել"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Վկայականը նշված չէ: Միացումը գաղտնի չի լինի:"</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Ցանցի անունը չափազանց երկար է։"</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Անհրաժեշտ է նշել տիրույթը:"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS-ը հասանելի է"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS-ը հասանելի է)"</string>
@@ -809,7 +838,6 @@
       <item quantity="other">%d ցանց</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Ընդլայնված Wi‑Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Կազմաձևել Wi-Fi-ը"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC հասցե"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP հասցե"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Ենթացանցի դիմակ"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Մոռանա՞լ այս խումբը:"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Դյուրակիր Wi‑Fi թեժ կետ"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi թեժ կետ"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Օգտագործել բջջային կապը՝ Wi-Fi ցանց տրամադրելու համար"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Պլանշետի ինտերնետ կապը թեժ կետով չի տարածվում"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Ինտերնետ կապը հասանելի չէ թեժ կետի միջոցով"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Ինտերնետ կապը կամ բովանդակությունը այլ սարքերին չի տրամադրում"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Այս պլանշետն ինտերնետ կապը տրամադրվում է թեժ կետի միջոցով"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Այս հեռախոսն ինտերնետ կապը տրամադրվում է թեժ կետի միջոցով"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Հավելվածը տրամադրում է բովանդակություն: Ինտերնետ կապ տրամադրելու համար անջատեք, ապա կրկին միացրեք թեժ կետը"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi-ի անվանումը"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-ը միանում է…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Այլ սարքերը կարող են միանալ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-ին"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-ի գաղտնաբառը"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Հաճախականությունների դիապազոն"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Թեժ կետն օգտագործեք ձեր այլ սարքերի համար Wi‑Fi ցանց ստեղծելու համար: Թեժ կետը տրամադրում է ինտերնետ կապ բջջային ցանցի միջոցով: Բջջային ինտերնետի համար կարող են լրացուցիչ վճարներ գանձվել:"</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Հավելվածները կարող են ստեղծել թեժ կետ՝ բովանդակությունը մոտակա սարքերին փոխանցելու համար:"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Թեժ կետի միացում…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Թեժ կետերը անջատվում են..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ցանցն ակտիվ է"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Երբ Wi-Fi-ի միջոցով զանգերը միացված են, հեռախոսը կարող է ուղարկել զանգերը Wi-Fi ցանցերի կամ ձեր օպերատորի ցանցի միջոցով՝ կախված ձեր նախընտրություններից և ազդանշանի ուժգնությունից: Մինչ այս գործառույթը միացնելը՝ տեղեկացեք վճարների և այլ մանրամասների մասին ձեր օպերատորից:"</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Թարմացնել արտակարգ իրավիճակների հասցեն"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"WiFi-ի միջոցով 911 զանգ կատարելու դեպքում արտակարգ իրավիճակների ծառայությունները այս հասցեն դիտարկում են որպես ձեր տեղադրությունը"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Էկրան"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Արդյունքներ չկան"</string>
     <string name="display_settings" msgid="7965901687241669598">"Էկրան"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Ավտոմատ պտտել էկրանը"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Վառ գույներ"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Ավտոմատ փոխել դիրքավորումը պլանշետը պտտելիս"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Ավտոմատ փոխել դիրքավորումը հեռախոսը պտտելիս"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Գրասալիկը պտտեցնելիս ինքնաշխատ փոխել դիրքավորումը"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Լույսի պայծառության մակարդակի օպտիմալացում: Նույնիսկ երբ այս գործառույթը միացված է, դուք կարող եք ժամանակավորապես կարգավորել պայծառությունը:"</string>
     <string name="night_display_title" msgid="2626451512200357686">"Գիշերային լույս"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Գիշերային լույսը սաթե երանգ է հաղորդում էկրանին: Դա թույլ է տալիս ավելի հանգիստ նայել էկրանին կամ կարդալ խավար լուսավորության պայմաններում և չի խանգարում քնելուն:"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Ժամանակացույց"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Կարգավիճակ"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Միացնել ավտոմատ կերպով"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Երբեք"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Անհատականացված ժամանակացույց"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Մայրամուտից արևածագ"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Ժամանակացույց"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Չկա"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Միանում է սահմանված ժամին"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Միանում է մայրամուտից մինչև արևածագ"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Մեկնարկի ժամը"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Ավարտի ժամը"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Կարգավիճակ"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Ինտենսիվություն"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Անջատված է: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Ավտոմատ կերպով չի միացվի:"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Ավտոմատ կերպով կմիացվի <xliff:g id="ID_1">%1$s</xliff:g>-ին:"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Ավտոմատ կերպով կմիացվի մայրամուտին:"</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Միացված է: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Ավտոմատ կերպով չի անջատվի:"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Ավտոմատ կերպով կանջատվի <xliff:g id="ID_1">%1$s</xliff:g>-ին:"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Ավտոմատ կերպով կանջատվի արևածագին:"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Անջատած է / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Ավտոմատ կերպով չի միանա"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Ավտոմատ կերպով կմիանա <xliff:g id="ID_1">%1$s</xliff:g>-ին"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Ավտոմատ կերպով կմիանա մայրամուտին"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Միացված է / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Ավտոմատ կերպով չի անջատվի"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Ավտոմատ կերպով կանջատվի <xliff:g id="ID_1">%1$s</xliff:g>-ին"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Ավտոմատ կերպով կանջատվի արևածագին"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Քնի ռեժիմ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Էկրանը անջատվում է"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> անգործուն լինելուց հետո"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Կարգավորումներ"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ավտոմատ պայծառություն"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Բարձրացնել՝ միանալու համար"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Քնելու ռեժիմի արգելք"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Անգործուն ռեժիմի էկրան"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Միշտ միացված է"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Նոր ծանուցումներ"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Երբ ցուցադրել"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Նոր ծանուցումներ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ակտիվացնել էկրանը ծանուցումներ ստանալու դեպքում"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Միշտ միացված է"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Ցուցադրել ժամանակը, ծանուցումների պատկերակները և այլ տեղեկություններ"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Տառաչափ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Տառաչափի մեծացում կամ փոքրացում"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM քարտի կողպման կարգավորումներ"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN-ը չի կարող դատարկ լինել:"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC դաշտը պետք է 3 նիշ ունենա:"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC դաշտը պետք է լինի առնվազն 2 կամ 3 թվանշան:"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Օպերատորը չի թույլատրում ավելացնել %s տեսակի APN-ներ:"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Լռելյայն APN կարգավորումների վերականգնում:"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Վերականգնել լռելյայնը"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Սկզբնական APN կարգավորումների վերակարգավորումն ավարտված է:"</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Ջնջել SD քարտը"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ջնջել ներքին USB կրիչի բոլոր տվյալները, ինչպիսիք են երաժշտությունը կամ լուսանկարները"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ջնջել SD քարտի բոլոր տվյալները, ինչպիսիք են երաժշտությունը կամ լուսանկարները"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Ջնջել էլեկտրոնային SIM քարտերը"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Ջնջել հեռախոսի բոլոր էլեկտրոնային SIM քարտերը: Սա չի չեղարկի ձեր բջջային ծառայությունների փաթեթը:"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Ջնջել պլանշետի բոլոր էլեկտրոնային SIM քարտերը: Սա չի չեղարկի ձեր բջջային ծառայությունների փաթեթը:"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Վերակայել պլանշետը"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Վերակայել հեռախոսը"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Ջնջե՞լ բոլոր անձնական տեղեկությունները և ներբեռնված հավելվածները: Այլևս չեք կարող հետարկել այս գործողությունը:"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Երբ թրաֆիկի տնտեսումն ակտիվ է, հնարավոր չէ կապել կամ օգտագործել շարժական հասանելիության կետերը"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB մոդեմ"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB սարքը միացված է, ստուգեք կապը"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Միացված է"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Հնարավոր չէ միանալ, երբ USB կրիչը օգտագործման մեջ է"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB-ն միացված չէ"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Միացրեք USB-ն"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB միացման սխալ"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Տրամադրել հեռախոսի ինտերնետ կապը USB-ի միջոցով"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Տրամադրել պլանշետի ինտերնետ կապը USB-ի միջոցով"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth մոդեմ"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Պլանշետի ինտերնետ կապը տարածվում է Bluetooth-ով"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Հեռախոսի ինտերնետ կապը հասանելի է Bluetooth-ի միջոցով"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Պլանշետի ինտերնետ կապը Bluetooth-ով տրամադրվում է 1 սարքի"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Հեռախոսի ինտերնետ կապը հասանելի է 1 սարքի՝ Bluetooth-ի միջոցով"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Պլանշետի ինտերնետ կապը Bluetooth-ով տրամադրվում է <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> սարքերի"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Հեռախոսի ինտերնետ կապը հասանելի է <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> սարքի՝ Bluetooth-ի միջոցով"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Տարածել պլանշետի Ինտերնետ կապը Bluetooth-ի միջոցով"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Տարածել հեռախոսի Ինտերնետ կապը Bluetooth-ի միջոցով"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Այս <xliff:g id="DEVICE_NAME">%1$d</xliff:g> սարքի ինտերնետ կապը տարածվում է Bluetooth-ով"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Պլանշետի ինտերնետ կապը Bluetooth-ով չի տարածվում"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Ինտերնետ կապը հասանելի չէ Bluetooth-ի միջոցով"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Միացված չէ"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Հնարավոր չէ միանալ ավելի քան <xliff:g id="MAXCONNECTION">%1$d</xliff:g> սարքերի հետ:"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ը կանջատվի:"</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Օգտագործեք թեժ կետն ու մոդեմի ռեժիմը՝ բջջային ցանցի միջոցով այլ սարքերի ինտերնետ կապ տրամադրելու համար:"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Օգտագործեք թեժ կետն ու մոդեմի ռեժիմը՝ բջջային ցանցի միջոցով այլ սարքերին ինտերնետ կապ տրամադրելու համար: Հավելվածները կարող են ստեղծել թեժ կետ նաև բովանդակությունը մոտակա սարքերին փոխանցելու համար:"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Օգնություն"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Բջջային ցանց"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Բջջային փաթեթ"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Տեղորոշում"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Տեղորոշելու համար օգտագործել GPS, Wi‑Fi, Bluetooth կամ բջջային ցանցեր"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Տեղորոշելու համար օգտագործել Wi‑Fi, Bluetooth կամ բջջային ցանցեր"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Տեղորոշելու համար օգտագործել GPS-ը"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Տեղորոշելու համար օգտագործել GPS-ը և սարքի սենսորները"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Սկանավորում"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi ցանցերի որոնում"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Ավելի ճշգրիտ տեղորոշել՝ թույլատրելով համակարգի հավելվածներին և ծառայություններին անընդհատ Wi-Fi ցանցեր որոնել"</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Դուք չունեք տվյալների կապ: Այս տեղեկատվությունը հիմա դիտելու համար անցեք %s` ցանկացած ինտերնետ կապ ունեցող համակարգչով:"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Բեռնում..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Ընտրեք ձեր գաղտնաբառը"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Մատնահետքն օգտագործելու համար տեղադրեք գաղտնաբառ"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Ընտրեք ձեր կաղապարը"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Մատնահետքն օգտագործելու համար տեղադրեք նախշ"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Ընտրեք ձեր PIN-ը"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Մատնահետքն օգտագործելու համար տեղադրեք PIN կոդ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Հաստատեք ձեր գաղտնաբառը"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Հաստատեք ձեր կաղապարը"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Հաստատեք ձեր PIN-ը"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Ծրագրային կարգավորումներ"</string>
     <string name="install_applications" msgid="4872012136210802181">"Անհայտ աղբյուրներ"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Թույլ է տալիս ծրագրերի բոլոր աղբյուրները"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Վերջին օգտագործված հավելվածները"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Տեսնել բոլոր <xliff:g id="COUNT">%1$d</xliff:g> հավելվածները"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> առաջ"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Ձեր պլանշետն ու անձնական տվյալներն առավել խոցելի են անհայտ հավելվածների գրոհների նկատմամբ: Տեղադրելով հավելվածներ այս աղբյուրից՝ դուք ընդունում եք, որ պատասխանատվություն եք կրում ձեր պլանշետին պատճառած ցանկացած վնասի կամ տվյալների կորստի համար, որը կարող է տեղի ունենալ դրանք օգտագործելու արդյունքում:"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Ձեր սարքն ու անձնական տվյալներն առավել խոցելի են անհայտ հավելվածների գրոհների նկատմամբ: Տեղադրելով հավելվածներ այս աղբյուրից՝ դուք ընդունում եք, որ պատասխանատվություն եք կրում ձեր սարքին պատճառած ցանկացած վնասի կամ տվյալների կորստի համար, որը կարող է տեղի ունենալ դրանք օգտագործելու արդյունքում:"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Ընդլայնված կարգավորումներ"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Դադարեցնե՞լ համակարգի ծառայությունը:"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Եթե դուք դադարեցնեք այս ծառայությունը, պլանշետի որոշ հատկություններ կարող են դադարել ճիշտ գործել, մինչև այն չանջատեք և նորից միացնեք:"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Եթե դուք կասեցնեք այս ծառայությունը, հեռախոսի որոշ հատկություններ կարող են դադարել ճիշտ գործել, մինչև այն չանջատեք և վերամիացնեք:"</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Լեզուներ, ներածում և ժեստեր"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Լեզուներ և ներածում"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Լեզուներ և ներածում"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Ներածման աջակցում"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> տպման ծառայություն միացված է</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> print jobs</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> տպելու առաջադրանք</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Տպման ծառայություններ"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Տեղադրված ծառայաթյուններ չկան"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Տպիչներ չեն գտնվել"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Օգտագործման մանրամասները"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Կարգավորել հոսանքի օգտագործումը"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Ներառված փաթեթները"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Մարտկոցի լիցքն արագ սպառող հավելվածներ"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Սարքին թույլ չի տալիս անցնել քնի ռեժիմ"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Սարքը հանում է քնի ռեժիմից ֆոնում"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Հայցում է տեղադրության տվյալները շատ հաճախ"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> հավելված ցուցաբերում է արտասովոր պահվածք"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Փակե՞լ հավելվածը:"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Ձեր հեռախոսը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP">%1$s</xliff:g> հավելվածը հեռախոսին թույլ չի տալիս անցնել քնի ռեժիմ:\n\nԿարող եք փորձել լուծել այս խնդիրը հավելվածի աշխատանքը հարկադրաբար դադարեցնելու միջոցով:\n\nԵթե խնդիրը չվերանա, ապա հնարավոր է, որ ձեզ հարկավոր լինի հեռացնել հավելվածը՝ մարտկոցի աշխատանքը բարելավելու համար:"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Ձեր պլանշետը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP">%1$s</xliff:g> հավելվածը պլանշետին թույլ չի տալիս անցնել քնի ռեժիմ:\n\nԿարող եք փորձել լուծել այս խնդիրը հավելվածի աշխատանքը հարկադրաբար դադարեցնելու միջոցով:\n\nԵթե խնդիրը չվերանա, ապա հնարավոր է, որ ձեզ հարկավոր լինի հեռացնել հավելվածը՝ մարտկոցի աշխատանքը բարելավելու համար:"</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Ձեր սարքը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP">%1$s</xliff:g> հավելվածը սարքին թույլ չի տալիս անցնել քնի ռեժիմ:\n\nԿարող եք փորձել լուծել այս խնդիրը հավելվածի աշխատանքը հարկադրաբար դադարեցնելու միջոցով:\n\nԵթե խնդիրը չվերանա, ապա հնարավոր է, որ ձեզ հարկավոր լինի հեռացնել հավելվածը՝ մարտկոցի աշխատանքը բարելավելու համար:"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Փակել հավելվածը"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Անջատե՞լ ֆոնային օգտագործումը:"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Ձեր հեռախոսը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP">%1$s</xliff:g> հավելվածն այն պարբերաբար հանում է քնի ռեժիմից:\n\nԱյս խնդիրը լուծելու համար ձեր հեռախոսը կարող է արգելափակել տվյալ հավելվածի աշխատանքը ֆոնային ռեժիմում:"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Ձեր պլանշետը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP">%1$s</xliff:g> հավելվածն այն պարբերաբար հանում է քնի ռեժիմից:\n\nԱյս խնդիրը լուծելու համար ձեր պլանշետը կարող է արգելափակել տվյալ հավելվածի աշխատանքը ֆոնային ռեժիմում:"</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Ձեր սարքը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP">%1$s</xliff:g> հավելվածն այն պարբերաբար հանում է քնի ռեժիմից:\n\nԱյս խնդիրը լուծելու համար ձեր սարքը կարող է արգելափակել տվյալ հավելվածի աշխատանքը ֆոնային ռեժիմում:"</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Անջատել"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Անջատե՞լ տեղորոշումը:"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Ձեր հեռախոսը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP">%1$s</xliff:g> հավելվածը պարբերաբար հայցում է տեղադրության տվյալները, երբ դուք այն չեք օգտագործում:\n\nԽնդիրը շտկելու համար կարող եք անջատել այս հավելվածի տեղորոշման ընտրանքը:"</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Ձեր պլանշետը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP">%1$s</xliff:g> հավելվածը պարբերաբար հայցում է տեղադրության տվյալները, երբ դուք այն չեք օգտագործում:\n\nԽնդիրը շտկելու համար կարող եք անջատել այս հավելվածի տեղորոշման ընտրանքը:"</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Ձեր սարքը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP">%1$s</xliff:g> հավելվածը պարբերաբար հայցում է տեղադրության տվյալները, երբ դուք այն չեք օգտագործում:\n\nԽնդիրը շտկելու համար կարող եք անջատել այս հավելվածի տեղորոշման ընտրանքը:"</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Անջատել"</string>
     <string name="power_screen" msgid="3023346080675904613">"Էկրան"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Լապտեր"</string>
     <string name="power_camera" msgid="4976286950934622605">"Տեսախցիկ"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Հավելվածներ"</string>
     <string name="power_service" msgid="1599661212370831780">"Ծառայություններ"</string>
     <string name="power_system" msgid="8290455327965307383">"Համակարգ"</string>
-    <string name="power_user" msgid="1889728099253018005">"Օգտվող"</string>
+    <string name="power_user" msgid="3706143225319881667">"Այլ օգտատերեր"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU-ի ընդհանուրը"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU առաջնատեսք"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Արթուն պահել"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Մարտկոցի գերօգտագործում"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Օգտագործվել է <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Ակտիվ է <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"էկրանի օգտագործում՝ <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> օգտագործվել է <xliff:g id="APP">%2$s</xliff:g> հավելվածի կողմից"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Մարտկոցի ընդհանուր լիցքի <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Փոխել PIN-ը"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Տեսնել ծանուցումները"</string>
     <string name="help_label" msgid="6886837949306318591">"Օգնություն և հետադարձ կապ"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Օգնության հոդվածներ, հեռախոսի և զրույցի աջակցում"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Օգնության հոդվածներ, հեռախոս և զրույց, սկսվում է"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Հաշիվ բովանդակության համար"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Լուսանկար ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Կարևոր ահազանգեր"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="other">Ցույց տալ %d թաքնված տարրեր</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Ցանց և ինտերնետ"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, շարժական, տվյալների օգտագործում, թեժ կետ"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"բջջային"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"տվյալների օգտագործում"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"թեժ կետ"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Միացված սարքեր"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Հավելվածներ և ծանուցումներ"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Թույլտվություններ, կանխադրված հավելվածներ"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Օգտատերեր և հաշիվներ"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"ժեստ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"վճարել, հպել, վճարումներ"</string>
     <string name="keywords_backup" msgid="470070289135403022">"պահուստավորում, պահուստավորել"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"ժեստ, եզր, կողք, ակտիվ եզր, ճզմել, սեղմել, օգնություն, օգնական, squeezy, squeezie, squeezey, squeezee, OK Google, Google-ի օգնական"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"ժեստ, արթնացնել, ծանուցումներ, էկրան, ցուցադրել, էկրանն անջատված, էկրանը միացված, ճզմել, եզր, քնած, քուն, սեմել"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"ժեստ, լռություն, հետաձգում, զարթուցիչ, մուտքային զանգ, անձայն, էկրան, կողպէկրան, ճզմել, սեմել, եզր, դադարեցնել"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Կարգավորել Wi-Fi NFC պիտակը"</string>
     <string name="write_tag" msgid="8571858602896222537">"Գրել"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Հպեք պիտակի վրա՝ գրելու համար..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Աշխատանքային ոչ մի ծանուցում ցույց չտալ"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Ինչպե՞ս ցուցադրել պրոֆիլի ծանուցումները, երբ սարքը կողպված է:"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Պրոֆիլի ծանուցումները"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Ծանուցումներ"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Ծանուցումներ"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Ծրագրերի ծանուցումներ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Ծանուցման կատեգորիա"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Կարևորություն"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Թույլ տալ, որ սարքը որոշի"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Շտապ"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Թույլատրել ձայնը"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Ձայնային ազդանշան չհնչեցնել, չթրթռալ և ընթացիկ էկրանին այս ծանուցումները չցուցադրել:"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Ցածր կարևորություն"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Միջին կարևորություն"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Բարձր կարևորություն"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Հրատապ կարևորություն"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Ծանուցումների օգնական"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Ծանուցումների օգտագործում"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Աշխատանքային պրոֆիլի ծանուցումների մուտքն արգելափակված է"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Նկար նկարի մեջ"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Թույլատրել «նկարը նկարի մեջ» ռեժիմը"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Թույլ տալ այս հավելվածին ստեղծել «նկարը նկարի մեջ» պատուհան՝ երբ հավելվածը բաց է կամ այն լքելուց հետո (օրինակ՝ տեսանյութի դիտումը շարունակելու համար): Այս պատուհանը ցուցադրվում է ձեր կողմից օգտագործվող այլ հավելվածների վերևում:"</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Այո"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Ոչ"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Հասանելիությունը՝ «չանհանգստացնել»"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Տեղադրված հավելվածներից ոչ մեկը Չանհանգստացնել հարցում չի ուղարկել"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ծրագրերը բեռնվում են..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Այս աշխատանքային պրոֆիլը կառավարվում է այս հավելվածի օգնությամբ՝"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Կառավարիչ՝ <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Փորձնական)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Սարքի պտտում"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Պտտեցնել էկրանի բովանդակությունը"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Մնալ դիմանկարային դիրքով"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Մնալ լանդշաֆտային դիրքով"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Մնալ ընթացիկ դիրքով"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Ապահով մեկնարկ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Շարունակել"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Այս սարքը կարող եք նաև պաշտպանել՝ պահանջելով մուտքագրել PIN կոդը նախքան դրա գործարկումը: Մինչև գործարկումը սարքը չի կարող ստանալ զանգեր, հաղորդագրություններ կամ ծանուցումներ, այդ թվում նաև զարթուցիչի ազդանշաններ: \n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացված սարքերում: Պահանջե՞լ մուտքագրել PIN կոդը՝ ձեր սարքը գործարկելու համար:"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Այս սարքը կարող եք նաև պաշտպանել՝ պահանջելով մուտքագրել գաղտնաբառը նախքան դրա գործարկումը: Մինչև գործարկումը սարքը չի կարող ստանալ զանգեր, հաղորդագրություններ կամ ծանուցումներ, այդ թվում նաև զարթուցիչի ազդանշաններ: \n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացված սարքերում: Պահանջե՞լ գաղտնաբառ՝ ձեր սարքը գործարկելու համար:"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Դուք նաև կարող եք ընտրել, որ ապակողպվելու համար սարքը PIN կոդ պահանջի՝ որպես լրացուցիչ պաշտպանության միջոց։ Այդ դեպքում, քանի դեռ սարքը կողպված է, այն չի կարող ստանալ զանգեր, հաղորդագրություններ և ծանուցումներ, այդ թվում նաև զարթուցիչի ազդանշաններ:\n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացած սարքերում: Պահանջե՞լ PIN կոդ"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Դուք նաև կարող եք ընտրել, որ ապակողպվելու համար սարքը ապակողպման նախշ պահանջի՝ որպես լրացուցիչ պաշտպանության միջոց։ Այդ դեպքում, քանի դեռ սարքը կողպված է, այն չի կարող ստանալ զանգեր, հաղորդագրություններ և ծանուցումներ, այդ թվում նաև զարթուցիչի ազդանշաններ:\n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացած սարքերում: Պահանջե՞լ նախշ"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Դուք նաև կարող եք ընտրել, որ ապակողպվելու համար սարքը գաղտնաբառ պահանջի՝ որպես լրացուցիչ պաշտպանության միջոց։ Այդ դեպքում, քանի դեռ սարքը կողպված է, այն չի կարող ստանալ զանգեր, հաղորդագրություններ և ծանուցումներ, այդ թվում նաև զարթուցիչի ազդանշաններ:\n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացած սարքերում: Պահանջե՞լ գաղտնաբառ"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Դուք նաև կարող եք ընտրել, որ ապակողպվելու համար սարքը գաղտնաբառ պահանջի՝ որպես լրացուցիչ պաշտպանության միջոց։ Այդ դեպքում, քանի դեռ սարքը կողպված է, այն չի կարող ստանալ զանգեր, հաղորդագրություններ և ծանուցումներ, այդ թվում նաև զարթուցիչի ազդանշաններ:\n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացած սարքերում: Պահանջե՞լ գաղտնաբառ"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Այո"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ոչ"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Պահանջե՞լ PIN-ը:"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Օգտագործման զգուշացումներ"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Ցույց տալ ամբողջ սարքի օգտագործումը"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Ցույց տալ հավելվածների օգտագործումը"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Գերօգտագործում"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> հավելված ցուցաբերում է արտասովոր պահվածք</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Apps draining battery</item>
+      <item quantity="other">Մարտկոցի լիցքն արագ սպառող հավելվածներ</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Չեն տնտեսում լիցքը"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Չօպտիմալացված"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Մարտկոցի սպառման օպտիմալացում"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Ցույց տալ այլ հավելվածների վրա"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g>-ից <xliff:g id="COUNT_0">%1$d</xliff:g> հավելվածներ կարող են ցուցադրվել այլ հավելվածների վրա"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Թույլտվություն ունեցող հավելվածներ"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Այո"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Ոչ"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Թույլատրված է"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Արգելված է"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"տեղադրել հավելվածներ անհայտ աղբյուրներից"</string>
     <string name="write_settings" msgid="4797457275727195681">"Փոփոխել կարգավորումները"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"փոփոխել համակարգի կարգավորումները"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Էկրանը սաթե երանգավորում է ստացել: Դա թույլ կտա ձեզ քնել:"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Հուշումներ"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> ավելին"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <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="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <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="suggestion_remove" msgid="904627293892092439">"Հեռացնել"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Գույնի սառը ջերմաստիճան"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Օգտագործել էկրանի ավելի սառը գույներ"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Տվյալների օգտագործման նախազգուշացում` <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Տվյալների օգտագործման նախազգուշացում` <xliff:g id="ID_1">%1$s</xliff:g> / Տվյալների օգտագործման սահմանաչափ` <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Վճարային ցիկլ"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Վճարային ցիկլն սկսվում է ամեն ամսվա <xliff:g id="ID_1">%1$s</xliff:g>-ին"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Ամսական՝ սկսած <xliff:g id="ID_1">%1$s</xliff:g>-ից"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Ամեն ամիս, ամսի <xliff:g id="ID_1">%1$s</xliff:g>-ին"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Ցանցային սահմանափակումներ"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
@@ -3316,7 +3408,7 @@
       <item quantity="other">Թրաֆիկի տնտեսման ռեժիմում <xliff:g id="COUNT">%1$d</xliff:g> հավելված կարող է օգտագործել բջջային ինտերնետն առանց սահմանափակումների</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Թրաֆիկի տնտեսում"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Անսահմանափակ բջջային ինտերնետ"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Տվյալների անսահմանափակ օգտագործում"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Ֆոնային տվյալներն անջատված են"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Միացված է"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Անջատված է"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Վերահսկել կողպէկրանի ծանուցումները"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Ցույց տալ կամ թաքցնել ծանուցման բովանդակությունը"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Բոլորը"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Աջակցում"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Աջակցություն և խորհուրդներ"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ամենափոքր լայնությունը"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Տեղադրված հավելվածներից ոչ մեկը վճարովի SMS-ների օգտագործման հարցում չի կատարել"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Վճարովի SMS-ները կարող են լրացուցիչ ծախսեր առաջացնել: Հավելվածին թույտվություն տալու դեպքում կկարողանաք դրա միջոցով վճարովի SMS-ներ ուղարկել։"</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Ավտոմատ"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ձեռքով"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Ազատել տարածք հիմա"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Ժեստեր"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Ժեստային դյուրացումներ"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Հեռախոսի կառավարման արագ ժեստեր"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Պլանշետի կառավարման արագ ժեստեր"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Սարքի կառավարման արագ ժեստեր"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Անցում տեսախցիկին"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Տեսախցիկն արագ գործարկելու համար երկու անգամ սեղմեք սնուցման կոճակը: Դա կարող եք անել ցանկացած էկրանից:"</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Արագ գործարկեք տեսախցիկը"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Երկու անգամ սեղմեք սնուցման կոճակը՝ տեսախցիկը բացելու համար"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Տեսախցիկի շրջում"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Լուսանկարեք սելֆիներ ավելի արագ"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Երկու անգամ պտտեք հեռախոսը՝ սելֆիի ռեժիմ անցնելու համար"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Երկու անգամ պտտեք պլանշետը՝ սելֆիի ռեժիմ անցնելու համար"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Երկու անգամ պտտեք սարքը՝ սելֆիի ռեժիմ անցնելու համար"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Կրկնակի հպեք՝ հեռախոսը ստուգելու համար"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Կրկնակի հպեք՝ պլանշետը ստուգելու համար"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Կրկնակի հպեք՝ սարքը ստուգելու համար"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Ծանուցումներն արագ տեսնելու համար կրկնակի հպեք էկրանին:"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Ժամանակը, ծանուցումների պատկերակները և այլ տեղեկությունները տեսնելու համար երկու անգամ հպեք էկրանին:"</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Տեսեք ծանուցումները երբ էկրանն անջատված է"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Բարձրացնել՝ հեռախոսը ստուգելու համար"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Բարձրացրեք՝ պլանշետը ստուգելու համար"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Բարձրացրեք՝ սարքը ստուգելու համար"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Ծանուցումներն արագ տեսնելու համար վերցրեք հեռախոսը:"</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Ծանուցումներն արագ տեսնելու համար վերցրեք պլանշետը:"</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Ծանուցումներն արագ տեսնելու համար վերցրեք սարքը:"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Ժամանակը, ծանուցումների պատկերակները և այլ տեղեկությունները տեսնելու համար բարձրացրեք ձեր հեռախոսը:"</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ժամանակը, ծանուցումների պատկերակները և այլ տեղեկությունները տեսնելու համար բարձրացրեք ձեր պլանշետը:"</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ժամանակը, ծանուցումների պատկերակները և այլ տեղեկությունները տեսնելու համար բարձրացրեք ձեր սարքը:"</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Տեսեք ծանուցումները երբ էկրանն անջատված է"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Ծանուցումները դիտելու համար օգտագործել մատնահետքերի սկաները"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Ծանուցումները տեսնելու համար՝ մատը սահեցրեք ներքև հեռախոսի հետևի մասում գտնվող մատնահետքերի սկաների վրա"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Ծանուցումները տեսնելու համար պլանշետի հետևի մասում գտնվող մատնահետքերի սկաների վրա մատը ներքև սահեցրեք:"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Ծանուցումները տեսնելու համար սարքի հետևի մասում գտնվող մատնահետքերի սկաների վրա մատը ներքև սահեցրեք:"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Արագ դիտեք ծանուցումները"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Մատնահետքերի սկաներին մատը սահեցրեք վար"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Բարձրացնել՝ տեսախցիկը միացնելու համար"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Տեսախցիկն ավտոմատ կերպով բացելու համար հեռախոսը բարձրացրեք նկարահանման դիրք (ուղղաձիգ կամ հորիզոնական)։ Գործում է երբ հեռախոսը գտնվում է գնի ռեժիմում կամ կողպված է։"</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Լուսանկարել, երբ հեռախոսը քնի ռեժիմում է կամ կողպված"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Օժանդակ ժեստ"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Զգայունություն"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Հեռացնե՞լ այս ակնթարթորեն գործարկվող հավելվածը։"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Խաղեր"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Ձայնային ֆայլեր"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Օգտագործած տարածքը"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(հեռացված է <xliff:g id="USER">%s</xliff:g> օգտատիրոջ համար)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(անջատված է <xliff:g id="USER">%s</xliff:g> օգտատիրոջ համար)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Ինքնալրացման ծառայություն"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Ակնթարթորեն գործարկվող հավելված"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Անջատե՞լ հիշողության կառավարիչը:"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Ֆիլմեր և սերիալներ"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Օգտագործած տարածքը"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Օպերատորի նախապատրաստման տվյալներ"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Գործարկել օպերատորի նախապատրաստումը"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Ի՞նչ հետաքրքիր նորույթներ կան:"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Փորձեք լավագույն 5 գործառույթները"</string>
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index d8a418a..b6c0aab 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Baik"</item>
     <item msgid="8986346415847956850">"Sangat bagus"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Selalu"</item>
-    <item msgid="844721238536786870">"Hanya ketika terhubung ke sumber daya"</item>
-    <item msgid="1986753720941888596">"Tidak pernah"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Selalu"</item>
-    <item msgid="7433294150916905997">"Hanya saat trhbng ke smbr daya"</item>
-    <item msgid="1390404486722375028">"Tidak pernah"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 hari terakhir"</item>
     <item msgid="6600989128423965319">"Setel alur penggunaan..."</item>
@@ -325,7 +315,7 @@
     <item msgid="6093344633066170692">"Membaca kalender"</item>
     <item msgid="1334886368750347692">"Ubah kalender"</item>
     <item msgid="1638204101698708656">"Lokasi"</item>
-    <item msgid="2154671955760380322">"Notifikasi pos"</item>
+    <item msgid="2154671955760380322">"Notifikasi postingan"</item>
     <item msgid="4282477730595931828">"Lokasi"</item>
     <item msgid="4891423912898525905">"Telepon"</item>
     <item msgid="2623604824935968113">"Baca SMS/MMS"</item>
@@ -407,7 +397,7 @@
     <item msgid="4733815704128258753">"Default"</item>
     <item msgid="3217099060748617005">"Tidak ada"</item>
     <item msgid="7467615139904599420">"Garis batas"</item>
-    <item msgid="5623165557468608975">"Bayangan jatuh"</item>
+    <item msgid="5623165557468608975">"Drop shadow"</item>
     <item msgid="8088451174058214588">"Dinaikkan"</item>
     <item msgid="3821418743395480313">"Diturunkan"</item>
   </string-array>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index f721093..3de0134 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Sekarang Anda adalah seorang pengembang!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Tidak perlu, Anda sudah menjadi pengembang."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Aktifkan opsi developer terlebih dahulu."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Jaringan &amp; nirkabel"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Sambungan"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Perangkat"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE Disediakan"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Video Call Disediakan"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Panggilan Wi-Fi Disediakan"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presence Disediakan"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Daya Radio Seluler"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Lihat Buku Alamat SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Lihat Nomor Panggilan Tetap"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Memindai perangkat"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Ganti nama perangkat ini"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Ganti nama"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Putuskan sambungan?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Ini akan mengakhiri sambungan Anda dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Putuskan sambungan perangkat?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Sambungan ponsel Anda ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan terputus."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Sambungan tablet Anda ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan terputus."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Sambungan perangkat Anda ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan terputus."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Putuskan sambungan"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Anda tidak memiliki izin untuk mengubah setelan Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Sambungkan perangkat baru"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> dapat dilihat oleh perangkat lain di sekitar saat Setelan Bluetooth dibuka."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Alamat Bluetooth ponsel: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Alamat Bluetooth tablet: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Alamat Bluetooth perangkat: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Putuskan sambungan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Penyiaran"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Nonaktifkan profil?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Permintaan penyandingan bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Permintaan penyandingan"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Ketuk untuk menyandingkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Tampilkan file yang diterima"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"File yang diterima"</string>
     <string name="device_picker" msgid="4978696506172252813">"Pilih perangkat Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ingin mengaktifkan Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ingin menonaktifkan Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ingin mengakses pesan Anda. Berikan akses pada %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Permintaan akses SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ingin mengakses kartu SIM. Memberi akses ke kartu SIM akan menonaktifkan konektivitas data di perangkat selama tersambung. Berikan akses ke <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Terlihat sebagai \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' oleh perangkat lain"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Perangkat Anda"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sambungkan perangkat baru"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Tanggal &amp; waktu"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pilih zona waktu"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Akun"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokasi"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Akun"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Keamanan &amp; Lokasi"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Keamanan &amp; lokasi"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkripsi &amp; kredensial"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telepon dienkripsi"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Perangkat dienkripsi"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Membuka kunci dengan sidik jari"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Menggunakan sidik jari"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Cukup sentuh sensor sidik jari untuk membuka kunci perangkat, mengotorisasi pembelian, atau masuk ke aplikasi. Berhati-hatilah dengan sidik jari yang ditambahkan. Sidik jari yang ditambahkan dapat melakukan semua hal ini.\n\nCatatan: Sidik jari mungkin kurang aman dibanding pola atau PIN yang rumit."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Cukup sentuh sensor sidik jari untuk mengotorisasi pembelian, atau masuk ke aplikasi. Berhati-hatilah dengan sidik jari yang ditambahkan. Sidik jari yang ditambahkan dapat melakukan semua hal ini.\n\nCatatan: Anda tidak dapat menggunakan sidik jari untuk membuka kunci perangkat ini. Untuk informasi selengkapnya, hubungi admin organisasi."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Cukup sentuh sensor sidik jari untuk membuka kunci ponsel, mengotorisasi pembelian, atau masuk ke aplikasi. Berhati-hatilah dengan sidik jari yang ditambahkan. Sidik jari yang ditambahkan dapat melakukan semua hal ini.\n\nCatatan: Sidik jari mungkin kurang aman dibanding pola atau PIN yang rumit."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Batal"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Lanjutkan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Lewati"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Tambahkan sidik jari"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan tablet ini jika hilang, dicuri, atau dihapus."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan perangkat ini jika hilang, dicuri, atau dihapus."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan ponsel ini jika hilang, dicuri, atau dihapus."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak dapat mencegah orang lain menggunakan tablet ini jika hilang atau dicuri."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak dapat mencegah orang lain menggunakan perangkat ini jika hilang atau dicuri."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak dapat mencegah orang lain menggunakan ponsel ini jika hilang atau dicuri."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Berikutnya"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan tablet ini jika hilang, dicuri, atau disetel ulang."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan perangkat ini jika hilang, dicuri, atau disetel ulang."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain ponsel perangkat ini jika hilang, dicuri, atau disetel ulang."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan tablet ini jika hilang atau dicuri."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan perangkat ini jika hilang atau dicuri."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan ponsel ini jika hilang atau dicuri."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Tetap lewati"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Kembali"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Temukan sensor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Cari sensor sidik jari di bagian belakang ponsel."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Sentuh sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Ada di bagian belakang ponsel. Gunakan jari telunjuk Anda."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustrasi dengan perangkat dan lokasi sensor sidik jari"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nama"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Oke"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Hapus"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Ayo mulai"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Sentuh sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Letakkan jari Anda di sensor dan angkat setelah merasakan getaran"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Teruskan"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Gerakkan jari Anda sedikit untuk menambahkan semua bagian lain dari sidik jari Anda"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Sidik jari ditambahkan!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Setiap kali melihat ikon ini, Anda dapat menggunakan sidik jari untuk identifikasi atau mengotorisasi pembelian."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Cukup sentuh sensor sidik jari untuk membangunkan dan membuka kunci perangkat."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Jika melihat ikon ini, Anda juga dapat mengotorisasi pembelian atau masuk ke aplikasi."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Angkat, kemudian sentuh lagi"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Terus angkat jari Anda untuk menambahkan bagian lain dari sidik jari Anda"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Sidik jari ditambahkan"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Saat melihat ikon ini, gunakan sidik jari untuk identifikasi atau menyetujui pembelian."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Lewati penyiapan sidik jari?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Anda telah memilih untuk menggunakan sidik jari sebagai satu cara untuk membuka kunci perangkat. Jika dilewati sekarang, Anda harus menyiapkannya nanti. Penyiapan hanya memerlukan waktu sekitar satu menit."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Siapkan kunci layar"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Selesai"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, bukan itu sensornya"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Gunakan sensor sidik jari di perangkat."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Sentuh sensor di bagian belakang ponsel. Gunakan jari telunjuk Anda."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Pendaftaran tidak selesai"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Batas waktu pendaftaran sidik jari tercapai. Coba lagi."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Pendaftaran sidik jari tidak berhasil. Coba lagi atau gunakan jari lain."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Cegah orang lain menggunakan perangkat ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Cegah orang lain menggunakan ponsel ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Pilih metode kunci layar cadangan"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opsi kunci layar"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opsi kunci layar"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Kunci layar"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Langsung setelah tidur"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> setelah tidur"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Ubah pola pembuka kunci"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Ubah PIN pembuka kunci"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ubah sandi pembuka kunci"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Coba lagi. Mencoba <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> kali dari <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> kali."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Mencoba terakhir kali"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Jika Anda memasukkan pola yang salah saat mencoba sekarang, profil kerja dan data terkait akan dihapus dari perangkat ini."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Jika Anda memasukkan PIN yang salah saat mencoba sekarang, profil kerja dan data terkait akan dihapus dari perangkat ini."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Jika Anda memasukkan sandi yang salah saat mencoba sekarang, profil kerja dan data terkait akan dihapus dari perangkat ini."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Terlalu sering mencoba dengan salah. Profil kerja dan data terkait akan dihapus dari perangkat ini."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Tutup"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Coba lagi. Mencoba <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> kali dari <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> kali."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Data akan dihapus"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Jika Anda memasukkan pola yang salah saat mencoba lagi, data perangkat ini akan dihapus"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Jika Anda memasukkan PIN yang salah saat mencoba lagi, data perangkat ini akan dihapus"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Jika Anda memasukkan sandi yang salah saat mencoba lagi, data perangkat ini akan dihapus"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Jika Anda memasukkan pola yang salah saat mencoba lagi, pengguna ini akan dihapus"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Jika Anda memasukkan PIN yang salah saat mencoba lagi, pengguna ini akan dihapus"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Jika Anda memasukkan sandi yang salah saat mencoba lagi, pengguna ini akan dihapus"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Jika Anda memasukkan pola yang salah saat mencoba lagi, profil kerja dan datanya akan dihapus"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Jika Anda memasukkan PIN yang salah saat mencoba lagi, profil kerja dan datanya akan dihapus"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Jika Anda memasukkan sandi yang salah saat mencoba lagi, profil kerja dan datanya akan dihapus"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Terlalu sering mencoba dengan salah. Data perangkat akan dihapus."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Terlalu sering mencoba dengan salah. Pengguna ini akan dihapus."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Terlalu sering mencoba dengan salah. Profil kerja ini dan datanya akan dihapus."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Tutup"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Minimal berisi <xliff:g id="COUNT">%d</xliff:g> karakter"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN minimal <xliff:g id="COUNT">%d</xliff:g> digit"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Lanjutkan"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth Lanjutan"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Saat Bluetooth aktif, perangkat dapat berkomunikasi dengan perangkat Bluetooth terdekat lainnya."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Untuk meningkatkan akurasi lokasi, aplikasi dan layanan sistem tetap dapat mendeteksi perangkat Bluetooth. Anda dapat mengubahnya di <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>setelan pemindaian<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Tidak dapat tersambung. Coba lagi."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Detail perangkat"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Alamat Bluetooth perangkat: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Lupakan perangkat?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Ponsel Anda tidak akan disambungkan lagi dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Tablet Anda tidak akan disambungkan lagi dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Perangkat Anda tidak akan disambungkan lagi dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Lupakan perangkat"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Sambungkan ke…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari audio media."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari audio handsfree."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Jangan berikan"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Jangan validasi"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Sertifikat tidak ditentukan. Sambungan tidak bersifat pribadi."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Nama jaringan terlalu panjang."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Harus menentukan domain."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tersedia"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tersedia)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 jaringan</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi Lanjutan"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Mengonfigurasi Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Alamat MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Alamat IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Lupakan grup ini?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Hotspot Wi-Fi portabel"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Hotspot Wi‑Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Gunakan sambungan seluler untuk menyediakan jaringan Wi‑Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Tidak membagikan sambungan internet tablet ini melalui hotspot"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Tidak membagikan sambungan internet ponsel ini melalui hotspot"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Tidak berbagi sambungan Internet atau konten dengan perangkat lainnya"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Membagikan sambungan internet tablet ini melalui hotspot"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Membagikan sambungan Internet ponsel ini melalui hotspot"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikasi membagikan konten. Untuk membagikan sambungan Internet, nonaktifkan hotspot, kemudian aktifkan kembali"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nama Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Mengaktifkan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Perangkat lainnya dapat terhubung ke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Sandi Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pita AP"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Gunakan hotspot guna membuat jaringan Wi‑Fi untuk perangkat Anda lainnya. Hotspot menyediakan sambungan Internet menggunakan sambungan data seluler Anda. Biaya data tambahan mungkin berlaku."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikasi dapat membuat hotspot untuk berbagi konten dengan perangkat di sekitar."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Menyalakan hotspot..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Mematikan hotspot..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktif"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Jika panggilan Wi-Fi aktif, ponsel dapat merutekan panggilan telepon melalui jaringan Wi-Fi atau jaringan operator, bergantung pada preferensi dan sinyal mana yang lebih kuat. Sebelum mengaktifkan fitur ini, sebaiknya tanyakan info biaya dan detail lainnya ke operator."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Perbarui Alamat Darurat"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Alamat yang digunakan oleh layanan darurat sebagai lokasi Anda jika Anda melakukan panggilan 911 menggunakan Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tampilan"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Tidak ada hasil"</string>
     <string name="display_settings" msgid="7965901687241669598">"Tampilan"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotasi layar otomatis"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Warna jernih"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Ubah orientasi secara otomatis ketika memutar tablet"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Berganti orientasi secara otomatis ketika memutar ponsel"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Ubah orientasi secara otomatis ketika memutar tablet"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimalkan tingkat kecerahan untuk cahaya di sekitar. Jika fitur ini diaktifkan, Anda tetap dapat mengatur kecerahan sementara."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Cahaya Malam"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Cahaya Malam memberi rona kuning pada layar. Membuat Anda dapat melihat layar atau membaca dengan lebih mudah saat cahaya redup, serta membantu Anda lebih mudah tidur."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Jadwal"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Aktifkan otomatis"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Jangan pernah"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Jadwal khusus"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Matahari terbenam s.d. terbit"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Jadwal"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Tidak ada"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Aktifkan pada waktu khusus"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Aktifkan saat matahari terbenam hingga matahari terbit"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Waktu mulai"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Waktu selesai"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensitas"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Nonaktif. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Tidak akan aktif otomatis."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Akan aktif otomatis pukul <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Akan aktif otomatis saat matahari terbenam."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Aktif. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Tidak akan nonaktif otomatis."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Akan nonaktif otomatis pukul <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Akan nonaktif otomatis saat matahari terbit."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Nonaktif / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Tidak akan aktif otomatis"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Akan aktif otomatis pada <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Akan aktif otomatis saat matahari terbenam"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Aktif / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Tidak akan nonaktif otomatis"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Akan nonaktif otomatis pukul <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Akan nonaktif otomatis saat matahari terbit"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Tidur"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Layar mati"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Setelah tidak aktif selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Setelan"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan otomatis"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Angkat untuk membangunkan"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Tampilan ruangan"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Tampilan ambien"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Selalu aktif"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Notifikasi baru"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Waktu ditampilkan"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Notifikasi baru"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Membangunkan layar saat Anda menerima notifikasi"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Selalu aktif"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Tampilkan waktu, ikon notifikasi, dan info lainnya"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Ukuran font"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Membuat teks menjadi lebih besar atau lebih kecil"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setelan kunci kartu SIM"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN wajib diisi."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Bidang MCC harus terdiri dari 3 digit."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Bidang MNC harus 2 atau 3 digit."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operator tidak mengizinkan penambahan APN jenis %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Memulihkan setelan APN default."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Setel ulang ke default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Penyetelan ulang setelan APN default selesai."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Hapus kartu SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Hapus semua data di penyimpanan USB internal, seperti musik atau foto."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Hapus semua data di kartu SD, seperti musik atau foto"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Hapus eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Hapus semua eSIM di ponsel. Tindakan ini tidak akan membatalkan paket layanan seluler."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Hapus semua eSIM di tablet. Tindakan ini tidak akan membatalkan paket layanan seluler."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Setel ulang tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Setel ulang ponsel"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Hapus semua informasi pribadi dan aplikasi yang didownload? Tindakan ini tidak dapat diurungkan!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Tidak dapat tethering atau menggunakan hotspot portabel saat Penghemat Data aktif"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Tethering USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB tersambung, aktifkan untuk tethering"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Tertambat"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Tidak bisa menambatkan ketika penyimpanan USB sedang digunakan"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB tidak tersambung"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Sambungkan untuk mengaktifkan"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Kesalahan penambatan USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Berbagi sambungan internet ponsel melalui USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Berbagi sambungan Internet tablet melalui USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Tethering bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Berbagi sambungan internet tablet via Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Berbagi sambungan internet ponsel via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Berbagi sambungan internet tablet ke 1 perangkat via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Berbagi sambungan internet ponsel ke 1 perangkat via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Berbagi sambungan internet tablet ke <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> perangkat via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Berbagi sambungan internet ponsel ke <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> perangkat via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Berbagi sambungan Internet tablet melalui Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Berbagi sambungan Internet ponsel melalui Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Berbagi sambungan internet <xliff:g id="DEVICE_NAME">%1$d</xliff:g> ini via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Tak berbagi sambungan internet tablet via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Tidak membagikan sambungan internet ponsel ini melalui Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Tidak ditambatkan"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Tidak dapat menambatkan ke lebih dari <xliff:g id="MAXCONNECTION">%1$d</xliff:g> perangkat."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas dari penambatan."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Gunakan hotspot dan tethering untuk menyediakan koneksi internet bagi perangkat lain melalui sambungan data seluler Anda."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Gunakan hotspot dan tethering untuk menyediakan sambungan Internet untuk perangkat lainnya melalui sambungan data seluler Anda. Aplikasi juga dapat membuat hotspot untuk membagikan konten dengan perangkat di sekitar."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Bantuan"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Jaringan seluler"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Paket seluler"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode lokasi"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Menggunakan GPS, Wi-Fi, Bluetooth, atau jaringan seluler untuk menentukan lokasi"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Pakai Wi-Fi, Bluetooth, atau jaringan seluler untuk menentukan lokasi"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Gunakan GPS untuk menentukan lokasi"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Gunakan sensor perangkat dan GPS untuk menentukan lokasi"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Memindai"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Pemindaian Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Meningkatkan akurasi lokasi dengan mengizinkan aplikasi dan layanan sistem untuk mendeteksi jaringan Wi-Fi kapan saja"</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Anda tidak memiliki koneksi data. Untuk menampilkan informasi ini sekarang, buka %s dari komputer mana pun yang tersambung ke internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Memuat…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Pilih sandi Anda"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Setel sandi guna memakai sidik jari"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Pilih pola Anda"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Setel pola guna memakai sidik jari"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Pilih PIN Anda"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Setel PIN guna memakai sidik jari"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Konfirmasi sandi Anda"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Konfirmasi pola Anda"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Konfirmasi PIN Anda"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Setelan apl"</string>
     <string name="install_applications" msgid="4872012136210802181">"Sumber tidak dikenal"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Izinkan semua sumber aplikasi"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Aplikasi yang baru dibuka"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Lihat <xliff:g id="COUNT">%1$d</xliff:g> aplikasi semuanya"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> yang lalu"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tablet dan data pribadi lebih rentan terhadap serangan oleh aplikasi yang tidak dikenal. Dengan menginstal aplikasi dari sumber ini, Anda setuju bahwa Anda bertanggung jawab atas kerusakan tablet atau kehilangan data yang mungkin terjadi akibat penggunaannya."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Ponsel dan data pribadi lebih rentan terhadap serangan oleh aplikasi yang tidak dikenal. Dengan menginstal aplikasi dari sumber ini, Anda setuju bahwa Anda bertanggung jawab atas kerusakan ponsel atau kehilangan data yang mungkin terjadi akibat penggunaannya."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Setelan lanjutan"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Hentikan layanan sistem?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Jika Anda menghentikan layanan ini, beberapa fitur tablet mungkin tidak bekerja dengan semestinya sampai Anda mematikan dan menghidupkannya lagi."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Jika Anda menghentikan layanan ini, beberapa fitur ponsel mungkin tidak bekerja dengan semestinya sampai Anda mematikan dan menyalakannya lagi."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Bahasa, masukan &amp; gestur"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Bahasa &amp; masukan"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Bahasa &amp; masukan"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Bantuan masukan"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> layanan cetak aktif</item>
       <item quantity="one">1 layanan cetak aktif</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> pekerjaan cetak</item>
+      <item quantity="one">1 pekerjaan cetak</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Layanan cetak"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Tidak ada layanan terpasang"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Tidak ditemukan printer"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Detail penggunaan"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Sesuaikan penggunaan daya"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Termasuk paket"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplikasi yang menguras baterai"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Membuat perangkat tetap aktif"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Mengaktifkan perangkat di latar belakang"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Meminta informasi lokasi terlalu sering"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplikasi mengalami gangguan"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Hentikan aplikasi?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Ponsel Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> membuat ponsel tetap aktif.\n\nUntuk mencoba memperbaiki masalah ini, Anda dapat menghentikan aplikasi tersebut secara paksa.\n\nJika masalah ini terus berlanjut, Anda mungkin perlu menguninstal aplikasi untuk meningkatkan performa baterai."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Tablet Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> membuat tablet tetap aktif.\n\nUntuk mencoba memperbaiki masalah ini, Anda dapat menghentikan aplikasi tersebut secara paksa.\n\nJika masalah ini terus berlanjut, Anda mungkin perlu menguninstal aplikasi untuk meningkatkan performa baterai."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Perangkat Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> membuat perangkat tetap aktif.\n\nUntuk mencoba memperbaiki masalah ini, Anda dapat menghentikan aplikasi tersebut secara paksa.\n\nJika masalah ini terus berlanjut, Anda mungkin perlu menguninstal aplikasi untuk meningkatkan performa baterai."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Hentikan aplikasi"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Nonaktifkan penggunaan latar belakang?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Ponsel Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> membuat ponsel tetap aktif.\n\nUntuk mengatasi masalah ini, perangkat Anda dapat mencegah aplikasi ini berjalan di latar belakang."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Tablet Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> membuat tablet tetap aktif.\n\nUntuk mengatasi masalah ini, perangkat Anda dapat mencegah aplikasi ini berjalan di latar belakang."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Perangkat Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> membuat perangkat tetap aktif.\n\nUntuk mengatasi masalah ini, perangkat Anda dapat mencegah aplikasi ini berjalan di latar belakang."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Nonaktifkan"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Nonaktifkan lokasi?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Ponsel Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> terus meminta informasi lokasi saat Anda tidak menggunakan aplikasi tersebut.\n\nUntuk memperbaiki ini, Anda dapat menonaktifkan lokasi untuk aplikasi ini."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Tablet Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> terus meminta informasi lokasi saat Anda tidak menggunakan aplikasi tersebut.\n\nUntuk memperbaiki ini, Anda dapat menonaktifkan lokasi untuk aplikasi ini."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Perangkat Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> terus meminta informasi lokasi saat Anda tidak menggunakan aplikasi tersebut.\n\nUntuk memperbaiki ini, Anda dapat menonaktifkan lokasi untuk aplikasi ini."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Nonaktifkan"</string>
     <string name="power_screen" msgid="3023346080675904613">"Layar"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lampu senter"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Aplikasi"</string>
     <string name="power_service" msgid="1599661212370831780">"Layanan"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistem"</string>
-    <string name="power_user" msgid="1889728099253018005">"Pengguna"</string>
+    <string name="power_user" msgid="3706143225319881667">"Pengguna lainnya"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Latar depan CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Tetap aktif"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Penggunaan daya yang dihitung berlebih"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Digunakan selama <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktif selama <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Penggunaan layar <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> digunakan oleh <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> dari seluruh penggunaan baterai"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Ubah PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Tampilkan notifikasi"</string>
     <string name="help_label" msgid="6886837949306318591">"Bantuan &amp; masukan"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Artikel bantuan, ponsel &amp; dukungan chat"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Artikel bantuan, ponsel &amp; chat, memulai"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Akun untuk konten"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID Foto"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ancaman ekstrem"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Tampilkan %d item tersembunyi</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Jaringan &amp; Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobile, penggunaan data, hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"seluler"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"penggunaan data"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Perangkat yang terhubung"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikasi &amp; notifikasi"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Izin, aplikasi default"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Pengguna &amp; akun"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"isyarat"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"bayar, tap, pembayaran"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gestur, tepi, sisi, tepi aktif, remas, pegangan, membantu, asisten, mudah diremas, Ok Google, Asisten Google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gestur, aktif, notifikasi, layar, tampilan, layar nonaktif, layar aktif, remas, tepi, tidur, tidur, pegangan"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gestur, senyap, tunda, alarm, panggilan masuk, diam, tampilan, layar kunci, remas, pegangan, tepi, berhenti"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Siapkan Tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Tulis"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Ketuk tag untuk menulis..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Jangan menampilkan notifikasi kerja sama sekali"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Saat perangkat dikunci, Anda ingin notifikasi ditampilkan seperti apa?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notifikasi profil"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Notifikasi"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Notifikasi"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notifikasi apl"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategori notifikasi"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Tingkat Kepentingan"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Biarkan aplikasi memutuskan"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Penting"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Izinkan suara"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Jangan bersuara, bergetar, atau mengintip notifikasi tersebut untuk ditampilkan di layar saat ini."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Tingkat kepentingan rendah"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Tingkat kepentingan sedang"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Tingkat kepentingan tinggi"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Tingkat kepentingan darurat"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Asisten notifikasi"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Akses notifikasi"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Akses ke notifikasi profil kerja diblokir"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Gambar-dalam-gambar"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Izinkan gambar-dalam-gambar"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Mengizinkan aplikasi ini membuat jendela gambar-dalam-gambar saat aplikasi terbuka atau setelah Anda membiarkannya terbuka (misalnya, untuk melanjutkan menonton video). Jendela ini ditampilkan di atas aplikasi lain yang sedang digunakan."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Ya"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Tidak"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Akses Jangan Ganggu"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Tidak ada aplikasi terpasang yang meminta akses Jangan Ganggu"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Memuat aplikasi..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Profil kerja ini dikelola oleh:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Dikelola oleh <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimental)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Rotasi perangkat"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Putar konten layar"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Tetap dalam tampilan potret"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Tetap dalam tampilan lanskap"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Tetap dalam orientasi saat ini"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Proses memulai dengan aman"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Lanjutkan"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Anda dapat melindungi perangkat ini lebih lanjut dengan meminta PIN sebelum memulai perangkat. Perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm sampai perangkat dimulai. \n\nHal ini membantu melindungi data pada perangkat yang hilang atau dicuri. Minta PIN untuk memulai perangkat?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Anda dapat melindungi perangkat lebih lanjut dengan meminta sandi sebelum memulai perangkat. Perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm sampai perangkat dimulai. \n\nHal ini membantu melindungi data pada perangkat yang hilang atau dicuri. Minta sandi untuk memulai perangkat?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Selain menggunakan sidik jari untuk membuka kunci, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta PIN sebelum memulai perangkat. Perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm sampai perangkat dimulai.\n\nHal ini membantu melindungi data pada perangkat yang hilang atau dicuri. Minta PIN untuk memulai perangkat?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Selain menggunakan sidik jari untuk membuka kunci, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta pola sebelum memulai perangkat. Perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm sampai perangkat dimulai.\n\nHal ini membantu melindungi data pada perangkat yang hilang atau dicuri. Minta pola untuk memulai perangkat?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Selain menggunakan sidik jari untuk membuka kunci, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta sandi sebelum memulai perangkat. Perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm sampai perangkat dimulai.\n\nHal ini membantu melindungi data pada perangkat yang hilang atau dicuri. Minta sandi untuk memulai perangkat&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Selain menggunakan sidik jari untuk membuka kunci perangkat, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta sandi sebelum mulai mengaktifkan perangkat. Jika perangkat belum aktif, panggilan telepon, SMS, atau notifikasi, termasuk alarm, tidak dapat diterima.\n\nIni membantu melindungi data di perangkat yang hilang atau dicuri. Minta sandi untuk mulai mengaktifkan perangkat?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ya"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Tidak"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Perlu PIN?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Pemberitahuan penggunaan"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Tampilkan penggunaan perangkat penuh"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Tampilkan penggunaan aplikasi"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Banyak dipakai"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikasi berperilaku tidak normal</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> berperilaku tidak normal</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Aplikasi yang menguras baterai</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> yang menguras baterai</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Tidak dioptimalkan"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Tidak dioptimalkan"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Mengoptimalkan penggunaan baterai"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Tampilkan di atas aplikasi lain"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> dari <xliff:g id="COUNT_1">%2$d</xliff:g> aplikasi diizinkan untuk ditampilkan di atas aplikasi lain"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikasi yang memiliki izin"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Ya"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Tidak"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Diizinkan"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Tidak diizinkan"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instal aplikasi dari sumber yang tidak dikenal"</string>
     <string name="write_settings" msgid="4797457275727195681">"Ubah setelan sistem"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"tulis ubah setelan sistem"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Layar berona kuning. Mungkin dapat membantu Anda tidur."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Saran"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"Lebih dari +<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> lagi"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> saran</item>
+      <item quantity="one">1 saran</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> saran</item>
+      <item quantity="one">+1 saran</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Hapus"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Suhu foto sejuk"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gunakan suhu tampilan yang lebih sejuk"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Peringatan data <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Peringatan data <xliff:g id="ID_1">%1$s</xliff:g> / Batas data <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Siklus penagihan"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Siklus bulanan dimulai pada tanggal ke-<xliff:g id="ID_1">%1$s</xliff:g> setiap bulan"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Setiap bulan mulai tanggal ke-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Bulanan pada tanggal <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Batasan jaringan"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> pembatasan</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 aplikasi diizinkan untuk menggunakan data yang tidak dibatasi jika Penghemat Data aktif</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Penghemat data"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Akses data tidak dibatasi"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Data tidak dibatasi"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Data latar belakang nonaktif"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Aktif"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Nonaktif"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Mengontrol notifikasi layar kunci"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Menampilkan atau menyembunyikan konten notifikasi"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Semua"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Dukungan"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Dukungan &amp; tips"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Lebar terkecil"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Tidak ada aplikasi yang terpasang yang meminta akses SMS Premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS Premium mungkin memerlukan biaya dan akan menambah tagihan operator. Jika izin aplikasi diaktifkan, Anda dapat mengirim SMS premium menggunakan aplikasi tersebut."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Otomatis"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Kosongkan ruang sekarang"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Isyarat"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Pintasan gestur"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Isyarat cepat untuk mengontrol ponsel"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Isyarat cepat untuk mengontrol tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Isyarat cepat untuk mengontrol perangkat"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Beralih ke kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Untuk membuka kamera dengan cepat, tekan tombol daya dua kali. Berfungsi di layar mana pun."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Buka kamera dengan cepat"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Tekan tombol power dua kali untuk membuka kamera"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Balikkan kamera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Mengambil foto selfie dengan lebih cepat"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Putar ponsel dua kali untuk mode selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Putar tablet dua kali untuk mode selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Putar perangkat dua kali untuk mode selfie"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tap dua kali untuk memeriksa ponsel"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tap dua kali untuk memeriksa tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tap dua kali untuk memeriksa perangkat"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Untuk memeriksa notifikasi dengan cepat, tap layar dua kali."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Untuk memeriksa waktu, ikon notifikasi, dan info lainnya, tap layar dua kali."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Periksa notifikasi saat layar nonaktif"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Angkat untuk memeriksa ponsel"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Angkat untuk memeriksa tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Angkat untuk memeriksa perangkat"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Untuk memeriksa notifikasi dengan cepat, ambil ponsel."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Untuk memeriksa notifikasi dengan cepat, ambil tablet."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Untuk memeriksa notifikasi dengan cepat, ambil perangkat."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Untuk memeriksa waktu, ikon notifikasi, dan info lainnya, ambil ponsel."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Untuk memeriksa waktu, ikon notifikasi, dan info lainnya, ambil tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Untuk memeriksa waktu, ikon notifikasi, dan info lainnya, ambil perangkat."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Periksa notifikasi saat layar nonaktif"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Gesek sidik jari untuk melihat notifikasi"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Untuk memeriksa notifikasi, gesek ke bawah pada sensor sidik jari di bagian belakang ponsel."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Untuk memeriksa notifikasi, gesek ke bawah pada sensor sidik jari di bagian belakang tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Untuk memeriksa notifikasi, gesek ke bawah pada sensor sidik jari di bagian belakang perangkat."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Melihat notifikasi dengan lebih cepat"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Geser ke bawah pada sensor sidik jari"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Angkat untuk membuka kamera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Untuk membuka kamera secara otomatis, angkat ponsel ke posisi mengambil foto (lanskap atau potret). Berfungsi jika ponsel dalam mode tidur atau terkunci."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Ambil foto saat ponsel tidur atau terkunci"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gestur panduan"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensitivitas"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Ingin menghapus aplikasi instan ini?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Game"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"File audio"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Ruang penyimpanan yang digunakan"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(di-uninstal untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(dinonaktifkan untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Layanan IsiOtomatis"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Aplikasi instan"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Nonaktifkan pengelola penyimpanan?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplikasi film &amp; TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Ruang penyimpanan yang digunakan"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Info Provisioning Operator"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Memicu Provisioning Operator"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Apa yang baru dan menarik?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Lihat 5 fitur teratas"</string>
 </resources>
diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml
index e42514d..5f69299 100644
--- a/res/values-is/arrays.xml
+++ b/res/values-is/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Gott"</item>
     <item msgid="8986346415847956850">"Frábært"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Alltaf"</item>
-    <item msgid="844721238536786870">"Aðeins þegar tækið er í sambandi"</item>
-    <item msgid="1986753720941888596">"Aldrei"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Alltaf"</item>
-    <item msgid="7433294150916905997">"Aðeins þegar tækið er í sambandi"</item>
-    <item msgid="1390404486722375028">"Aldrei"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Síðustu 30 dagar"</item>
     <item msgid="6600989128423965319">"Velja notkunartímabil..."</item>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index de5545e..eab049b 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Nú ertu orðin(n) þróunaraðili!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Þetta er óþarfi; þú ert nú þegar þróunaraðili."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Virkjaðu valkosti þróunaraðila fyrst."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Þráðlaus net og símkerfi"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Tengingar"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Tæki"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE-úthlutun"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Myndsímtali úthlutað"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi símtali úthlutað"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Viðveru úthlutað"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Loftnetsstyrkur farsíma"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Skoða símaskrá SIM-korts"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Skoða læst númeraval"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Leita að tækjum"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Endurnefna þetta tæki"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Endurnefna"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Aftengja?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Þetta slítur tengingunni við:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Aftengja tæki?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Tenging símans við <xliff:g id="DEVICE_NAME">%1$s</xliff:g> verður rofin."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Tenging spjaldtölvunnar við <xliff:g id="DEVICE_NAME">%1$s</xliff:g> verður rofin."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Tenging tækisins við <xliff:g id="DEVICE_NAME">%1$s</xliff:g> verður rofin."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Aftengja"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Þú hefur ekki heimild til að breyta Bluetooth-stillingum."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Para nýtt tæki"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> er sýnilegt nálægum tækjum á meðan Bluetooth-stillingar eru opnar."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Bluetooth-vistfang símans: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Bluetooth-vistfang spjaldtölvunnar: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth-vistfang tækis: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Viltu aftengja <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Útsending"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Gera snið óvirkt?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Beiðni um Bluetooth-pörun"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Beiðni um pörun"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Ýttu til að para við <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Sýna mótteknar skrár"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Mótteknar skrár"</string>
     <string name="device_picker" msgid="4978696506172252813">"Veldu Bluetooth-tæki"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> vill kveikja á Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> vill slökkva á Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vill fá aðgang að skilaboðunum þínum. Viltu gefa %2$s aðgang?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Beiðni um aðgang að SIM-korti"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vill fá aðgang að SIM-kortinu þínu. Ef þú veitir aðgang að SIM-kortinu er slökkt á gagnatengingu tækisins á meðan tengingin varir. Veita <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> aðgang"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Sýnilegt öðrum tækjum sem „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Tækin þín"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Para nýtt tæki"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dagsetning og tími"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Veldu tímabelti"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Reikningar"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Staðsetning"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Reikningar"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Öryggi og staðsetning"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Dulkóðun og skilríki"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Sími dulkóðaður"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Tæki dulkóðað"</string>
@@ -354,40 +367,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Opna með fingrafari"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Nota fingrafarið þitt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Snertu fingrafaralesarann til að opna símann, heimila kaup eða skrá þig inn á forrit. Hafðu gát á því hverjum þú leyfir að bæta við fingraförum. Hvert fingrafar sem bætt er við nægir til að gera allt það sem upp var talið.\n\nAthugið: Minna öryggi gæti verið með því að nota fingrafar heldur en ef notast er við sterkt mynstur eða PIN-númer."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Snertu einfaldlega fingrafaralesarann til að heimila kaup eða skrá þig inn á forrit. Gættu vel að því hvaða fingraförum þú bætir við. Eitt fingrafar sem er bætt við getur gert allt þetta.\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="3635924459027832861">"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. Hvert fingrafar sem bætt er við dugir til að gera allt það sem upp var talið.\n\nAthugaðu: Fingrafarið er hugsanlega ekki eins öruggt og öflugt mynstur eða PIN-númer."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Hætta við"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Halda áfram"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Sleppa"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Bæta fingrafari við"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti spjaldtölvuna ef hún týnist, henni er stolið eða gögnin eru þurrkuð út af henni."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti tækið ef það týnist, er stolið eða gögnin þurrkuð af því."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti símann ef hann týnist, er stolið eða gögnin þurrkuð af honum."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti spjaldtölvuna ef hún týnist eða henni er stolið."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti tækið ef það týnist eða því er stolið."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti símann ef hann týnist eða honum er stolið."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Áfram"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti spjaldtölvuna ef hún týnist, er stolið eða endurstillt."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti tækið ef það týnist, er stolið eða endurstillt."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti símann ef hann týnist, er stolið eða endurstilltur."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti spjaldtölvuna ef hún týnist eða er stolið."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti tækið ef það týnist eða er stolið."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Öryggiseiginleikar til að vernda tækið verða ekki gerðir virkir. Þú munt ekki geta komið í veg fyrir að aðrir noti símann ef hann týnist eða er stolið."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Sleppa samt"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Til baka"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Finndu skynjarann"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Finndu fingrafaraskynjarann aftan á símanum."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Snertu lesarann"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Hann er aftan á símanum. Notaðu vísifingurinn."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Teikning af tæki og staðsetningu fingrafaraskynjara"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Heiti"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Í lagi"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Eyða"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Við skulum byrja"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Snertu lesarann"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Settu fingurinn á skynjarann og lyftu honum þegar þú finnur titring"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Haltu áfram"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Færðu fingurinn svolítið til að bæta við mismunandi hlutum fingrafarsins"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingrafari bætt við!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Alltaf þegar þú sérð þetta tákn geturðu notað fingrafarið þitt til að auðkenna þig eða til að heimila kaup."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Snertu einfaldlega fingrafaraskynjarann til að taka tækið úr biðstöðu og lás."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Þegar þú sérð þetta tákn geturðu heimilað kaup eða skráð þig inn í forrit."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Lyftu fingrinum og settu hann niður aftur"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Lyftu fingrinum endurtekið til að bæta við mismunandi hlutum fingrafarsins"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Fingrafari bætt við"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Þegar þú sérð þetta tákn skaltu nota fingrafarið til að auðkenna þig eða samþykkja kaup."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Viltu sleppa uppsetningu fingrafars?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Þú hefur valið að nota fingrafar þitt sem leið til að opna símann þinn. Ef þú sleppir þessu núna þarftu að setja þetta upp seinna. Uppsetningin tekur einungis um eina mínútu."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Setja upp skjálás"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Lokið"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Úbbs, þetta er ekki skynjarinn"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Notaðu fingrafaraskynjarann á tækinu."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Snertu lesarann aftan á símanum. Notaðu vísifingur."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Innritun var ekki lokið"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Fingrafarsinnritun rann út á tíma. Reyndu aftur."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Fingrafarsinnritun virkaði ekki. Reyndu aftur eða notaðu annan fingur."</string>
@@ -449,6 +460,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Komdu í veg fyrir að aðrir noti þetta tæki í heimildarleysi með því að virkja varnareiginleika tækisins. Veldu þann skjálás sem þú vilt nota."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Komdu í veg fyrir að aðrir noti þennan síma í heimildarleysi með því að virkja varnareiginleika símans. Veldu þann skjálás sem þú vilt nota."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Veldu varaleið fyrir skjálás"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Valkostir skjálæsingar"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Valkostir skjálæsingar"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skjálás"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / strax eftir svefn"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> eftir svefn"</string>
@@ -519,13 +532,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Breyta opnunarmynstri"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Breyta PIN-númeri"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Breyta aðgangsorði opnunar"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Reyndu aftur. Tilraun <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> af <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Síðasta tilraun"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Ef þú slærð inn rangt vinnumynstur í þessari tilraun verða vinnusniðið þitt og tengd gögn fjarlægð úr þessu tæki."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Ef þú slærð inn rangt PIN-númer fyrir vinnu í þessari tilraun verða vinnusniðið þitt og tengd gögn fjarlægð úr þessu tæki."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Ef þú slærð inn rangt vinnuaðgangsorð í þessari tilraun verða vinnusniðið þitt og tengd gögn fjarlægð úr þessu tæki."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Of margar rangar tilraunir. Vinnusniðið þitt og tengd gögn verða fjarlægð úr þessu tæki."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Hunsa"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Reyndu aftur. Tilraun <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> af <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Gögnunum þínum verður eytt"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ef þú slærð inn rangt mynstur í næstu tilraun verður gögnum þessa tækis eytt"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ef þú slærð inn rangt PIN-númer í næstu tilraun verður gögnunum eytt af þessu tæki"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ef þú slærð inn rangt aðgangsorð í næstu tilraun verður gögnunum eytt af þessu tæki."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ef þú slærð inn rangt mynstur í næstu tilraun verður þessum notanda eytt"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ef þú slærð inn rangt PIN-númer í næstu tilraun verður þessum notanda eytt"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ef þú slærð inn rangt aðgangsorð í næstu tilraun verður þessum notanda eytt"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ef þú slærð inn rangt mynstur í næstu tilraun verður vinnusniðinu þínu og gögnum þess eytt"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ef þú slærð inn rangt PIN-númer í næstu tilraun verður vinnusniðinu þínu og gögnum þess eytt"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ef þú slærð inn rangt aðgangsorð í næstu tilraun verður vinnusniðinu þínu og gögnum þess eytt"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Of margar rangar tilraunir. Gögnum tækisins verður eytt."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Of margar rangar tilraunir. Þessum notanda verður eytt."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Of margar rangar tilraunir. Þessu vinnusniði og gögnum þess verður eytt."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Hunsa"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Verður að vera að minnsta kosti <xliff:g id="COUNT">%d</xliff:g> stafir"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN-númerið verður að vera að minnsta kosti <xliff:g id="COUNT">%d</xliff:g> tölustafir"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Halda áfram"</string>
@@ -626,6 +647,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Ítarlegar Bluetooth-stillingar"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Þegar kveikt er á Bluetooth getur tækið átt í samskiptum við önnur nálæg Bluetooth tæki."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Til þess að auka staðsetningarnákvæmni geta kerfisforrit og þjónusta áfram fundið Bluetooth-tæki. Hægt er að breyta þessu í <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>leitarstillingum<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Ekki tókst að tengjast. Reyndu aftur."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Upplýsingar um tæki"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Bluetooth-vistfang tækis: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Gleyma tæki?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Síminn verður ekki lengur paraður við <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Spjaldtölvan verður ekki lengur pöruð við <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Tækið verður ekki lengur parað við <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Gleyma tæki"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Tengjast…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verður aftengt frá hljóði efnisspilunar."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verður aftengt frá hljóði handfrjáls búnaðar."</string>
@@ -778,6 +807,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ekki bjóða upp á"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ekki staðfesta"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Ekkert vottorð tilgreint. Tengingin verður ekki lokuð."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Heiti netkerfis er of langt."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Tilgreina þarf lén."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tiltækt"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tiltækt)"</string>
@@ -809,7 +839,6 @@
       <item quantity="other">%d netkerfi</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Ítarlegar Wi-Fi stillingar"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Stilla Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-vistfang"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-tala"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Undirnetssía"</string>
@@ -846,9 +875,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Gleyma þessum hópi?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Heitur Wi-Fi reitur"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Heitur Wi-Fi reitur"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Nota farsímakerfistengingu til að bjóða upp á Wi-Fi net"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Internettengingu þessarar spjaldtölvu er ekki deilt um heitan reit"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Internettengingu þessa síma er ekki deilt um heitan reit"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Deilir ekki nettengingu eða efni með öðrum tækjum"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internettengingu þessarar spjaldtölvu er deilt um heitan reit"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internettengingu þessa síma er deilt um heitan reit"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Forrit deilir efni. Til að deila nettengingu skaltu slökkva á heita reitnum og kveikja á honum aftur."</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Heiti Wi‑Fi reits"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Kveikir á <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Önnur tæki geta tengst <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi aðgangsorð"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Tíðnisvið"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Notaðu heitan reit til að búa til Wi-Fi net fyrir önnur tæki. Heitir reitir bjóða upp á internetaðgang með því að nota farsímagagnatenginguna þína. Viðbótargjöld vegna farsímagagna kunna að eiga við."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Forrit geta búið til heitan reit til að deila efni með nálægum tækjum."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Kveikir á heitum reit…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Slekkur á heitum reit…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> er virkt"</string>
@@ -895,6 +932,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Þegar kveikt er á Wi-Fi símtölum getur síminn beint símtölum um Wi-Fi net eða kerfi símafyrirtækisins, eftir því hvað þú velur og hvor tengingin er betri. Kannaðu verðskrá og aðrar upplýsingar hjá símafyrirtækinu þínu áður en þú kveikir á þessu."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Uppfæra neyðarheimilisfang"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Heimilisfang sem neyðarþjónustur nota sem staðsetningu þína ef þú hringir í neyðarlínuna gegnum Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skjár"</string>
@@ -952,6 +990,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Engar niðurstöður"</string>
     <string name="display_settings" msgid="7965901687241669598">"Skjár"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Snúa skjá sjálfkrafa"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Skærir litir"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Snúa skjámynd sjálfkrafa þegar spjaldtölvu er snúið"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Breyta stefnu sjálfkrafa þegar símanum er snúið"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Snúa skjámynd sjálfkrafa þegar spjaldtölvu er snúið"</string>
@@ -979,23 +1018,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Stilla birtustig eftir umhverfisbirtu. Þegar kveikt er á þessu má enn breyta birtustigi tímabundið."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Næturljós"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Næturljós gefur skjánum gulbrúnan litblæ. Þetta gerir þér auðveldara að skoða skjáinn í litlu ljósi og gæti auðveldað þér að sofna."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Dagskrá"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Staða"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Kveikja sjálfkrafa"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Aldrei"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Sérsniðin dagskrá"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Sólsetur til sólarupprásar"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Áætlun"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ekkert"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Kveikt á tilgreindum tíma"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Kveikt frá sólsetri til sólarupprásar"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Upphafstími"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Lokatími"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Staða"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Styrkur"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Slökkt. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Kveikir aldrei sjálfkrafa."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Kveikir sjálfkrafa kl. <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Kveikir sjálfkrafa við sólsetur."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Kveikt. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Slekkur aldrei sjálfkrafa."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Slekkur sjálfkrafa kl. <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Slekkur sjálfkrafa við sólarupprás."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Slökkt / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Kveikir aldrei sjálfkrafa"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Kveikir sjálfkrafa kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Kveikir sjálfkrafa við sólsetur"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Kveikt / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Slekkur aldrei sjálfkrafa"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Slekkur sjálfkrafa kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Slekkur sjálfkrafa við sólarupprás"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Hvíld"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Slökkt er á skjánum"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Eftir <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> af aðgerðaleysi"</string>
@@ -1019,8 +1057,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Stillingar"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Sjálfvirk birtustilling"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lyfta til að vekja"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Umhverfisskjár"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Umhverfisskjár"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Alltaf kveikt"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nýjar tilkynningar"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Sýnt hvenær"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nýjar tilkynningar"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Vekja skjáinn þegar þú færð tilkynningar"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Alltaf kveikt"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Sýna tíma, tilkynningartákn og aðrar upplýsingar"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Leturstærð"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Gera texta stærri eða minni"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Stillingar SIM-kortaláss"</string>
@@ -1272,6 +1316,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Heiti aðgangsstaðar má ekki vera autt."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC-reitur verður að innihalda 3 tölustafi."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC-reitur verður að innihalda 2 eða 3 tölustafi."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Símafyrirtækið leyfir ekki að APN af gerðinni %s sé bætt við."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Endurheimtir sjálfgefnar stillingar aðgangsstaðar."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Núllstilla"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Sjálfgefnar stillingar aðgangsstaðar endurheimtar."</string>
@@ -1301,6 +1346,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Hreinsa út af SD-korti"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Eyða öllum gögnum í innbyggðu USB-geymslunni, svo sem tónlist eða myndum"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Eyða öllum gögnum á SD-korti, svo sem tónlist eða ljósmyndum"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Eyða eSIM-kortum"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Eyða öllum eSIM-kortum úr símanum. Með þessu segir þú ekki upp farsímaáskrift þinni."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Eyða öllum eSIM-kortum úr spjaldtölvunni. Með þessu segir þú ekki upp farsímaáskrift þinni."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Endurstilla spjaldtölvuna"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Endurstilla símann"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Eyða öllum persónuupplýsingum og sóttum forritum? Ekki er hægt að afturkalla þessa aðgerð."</string>
@@ -1323,26 +1371,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Ekki er hægt að tjóðra eða nota heita reiti á meðan kveikt er á gagnasparnaði"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-tjóðrun"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB tengt, hakaðu við til að tjóðra"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Tjóðrað"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Ekki er hægt að tjóðra þegar USB-geymsla er í notkun"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB ekki tengt"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Tengjast til að kveikja"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Villa í USB-tjóðrun"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Deildu nettengingu símans gegnum USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Deildu nettengingu spjaldtölvunnar gegnum USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-tjóðrun"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Internettengingu þessarar spjaldtölvu er deilt um Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Internettengingu þessa síma er deilt um Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Internettengingu þessarar spjaldtölvu er deilt með 1 tæki um Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Internettengingu þessa síma er deilt með 1 tæki um Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Internettengingu þessarar spjaldtölvu er deilt með <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> tækjum um Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Internettengingu þessa síma er deilt með <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> tækjum um Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Deildu internettengingu spjaldtölvunnar um Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Deildu internettengingu símans um Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Internettengingu <xliff:g id="DEVICE_NAME">%1$d</xliff:g> er deilt um Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Internettengingu þessarar spjaldtölvu er ekki deilt um Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Internettengingu þessa síma er ekki deilt um Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Ekki tjóðrað"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Ekki er hægt að tjóðra fleiri en <xliff:g id="MAXCONNECTION">%1$d</xliff:g> tæki."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Tjóðrun <xliff:g id="DEVICE_NAME">%1$s</xliff:g> verður slitið."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Notaðu heitan reit og tjóðrun til að tengja önnur tæki við internetið í gegnum farsímagagnatenginguna þína."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Notaðu heitan reit og tjóðrun til að tengja önnur tæki við internetið í gegnum farsímagagnatenginguna þína. Forrit geta einnig búið til heitan reit til að deila efni með nálægum tækjum."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjálp"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Farsímakerfi"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Farsímaáskrift"</string>
@@ -1375,7 +1412,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Staðsetningarstilling"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Nota GPS, Wi-Fi, Bluetooth eða farsímakerfi til að ákvarða staðsetningu"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Nota Wi-Fi, Bluetooth eða farsímakerfi til að ákvarða staðsetningu"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Nota GPS til að ákvarða staðsetningu"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Nota GPS og skynjara tækisins til að ákvarða staðsetningu"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skönnun"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi leit"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Bæta staðsetningu með því að leyfa kerfisforritum og þjónustu að finna Wi-Fi net hvenær sem er."</string>
@@ -1420,8 +1457,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Engin gagnatenging er fyrir hendi. Til að skoða þessar upplýsingar núna skaltu fara á %s úr nettengdri tölvu."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Hleður…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Veldu aðgangsorð"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Aðgangsorð þarf fyrir fingrafar"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Veldu þér mynstur"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Mynstur þarf fyrir fingrafar"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Veldu þér PIN-númer"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN-númer þarf fyrir fingrafar"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Staðfestu aðgangsorðið"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Staðfestu mynstrið"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Staðfestu PIN-númerið"</string>
@@ -1490,6 +1530,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Forritastillingar"</string>
     <string name="install_applications" msgid="4872012136210802181">"Óþekktur uppruni"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Leyfa forrit frá öllum"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Nýlega opnuð forrit"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Sjá öll <xliff:g id="COUNT">%1$d</xliff:g> forritin"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"fyrir <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Spjaldtölvan þín og persónuleg gögn eru berskjaldaðri fyrir árásum forrita af óþekktum uppruna. Þú samþykkir að bera fulla ábyrgð á hverju því tjóni sem verða kann á spjaldtölvunni eða gagnatapi sem leiða kann af uppsetningu forrita frá þessari veitu."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Síminn þinn og persónuleg gögn eru berskjaldaðri fyrir árásum forrita af óþekktum uppruna. Þú samþykkir að bera fulla ábyrgð á hverju því tjóni sem verða kann á símanum eða gagnatapi sem leiða kann af uppsetningu forrita frá þessari veitu."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Ítarlegar stillingar"</string>
@@ -1658,6 +1701,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Stöðva kerfisþjónustu?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Ef þú stöðvar þessa þjónustu getur verið að einhverjir eiginleikar spjaldtölvunnar hætti að virka rétt þar til þú slekkur á henni og kveikir á henni aftur."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ef þú stöðvar þessa þjónustu getur verið að einhverjir eiginleikar símans hætti að virka rétt þar til þú slekkur á honum og kveikir á honum aftur."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Tungumál, innsláttur og bendingar"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Tungumál og inntak"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Tungumál og inntak"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Innsláttaraðstoð"</string>
@@ -1872,6 +1919,10 @@
       <item quantity="one">Kveikt á <xliff:g id="COUNT">%1$d</xliff:g> prentþjónustu</item>
       <item quantity="other">Kveikt á <xliff:g id="COUNT">%1$d</xliff:g> prentþjónustum</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> prentverk</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> prentverk</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Prentþjónusta"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Engin þjónusta uppsett"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Engar prentarar fundust"</string>
@@ -1938,6 +1989,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Notkunarupplýsingar"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Stilla orkunotkun"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Innifaldir pakkar"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Forrit sem nota mikla rafhlöðuorku"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Heldur tækinu vakandi"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Vekur tækið í bakgrunni"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Biður oft um staðsetningu"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> forrit vinna ekki rétt"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Stöðva forritið?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Rafhlöðunotkun símans er ekki með eðlilegum hætti vegna þess að <xliff:g id="APP">%1$s</xliff:g> heldur símanum vakandi.\n\nTil að bregðast við þessu vandamáli getur þú þvingað lokun á forritinu.\n\nEf þetta gerist ítrekað gætirðu þurft að fjarlægja forritið til að bæta rafhlöðunýtinguna."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Rafhlöðunotkun spjaldtölvunnar er ekki með eðlilegum hætti vegna þess að <xliff:g id="APP">%1$s</xliff:g> heldur tölvunni vakandi.\n\nTil að bregðast við þessu vandamáli getur þú þvingað lokun á forritinu.\n\nEf þetta gerist ítrekað gætirðu þurft að fjarlægja forritið til að bæta rafhlöðunýtinguna."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Rafhlöðunotkun tækisins er ekki með eðlilegum hætti vegna þess að <xliff:g id="APP">%1$s</xliff:g> heldur tækinu vakandi.\n\nTil að bregðast við þessu vandamáli getur þú þvingað lokun á forritinu.\n\nEf þetta gerist ítrekað gætirðu þurft að fjarlægja forritið til að bæta rafhlöðunýtinguna."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Stöðva forrit"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Slökkva á notkun í bakgrunni?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Rafhlöðunotkun símans er ekki með eðlilegum hætti vegna þess að <xliff:g id="APP">%1$s</xliff:g> vekur símann í sífellu.\n\nTil að bregðast við þessu vandamáli getur þú látið símann koma í veg fyrir að þetta forrit keyri í bakgrunni."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Rafhlöðunotkun spjaldtölvunnar er ekki með eðlilegum hætti vegna þess að <xliff:g id="APP">%1$s</xliff:g> vekur tölvuna í sífellu.\n\nTil að bregðast við þessu vandamáli getur þú látið spjaldtölvuna koma í veg fyrir að þetta forrit keyri í bakgrunni."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Rafhlöðunotkun tækisins er ekki með eðlilegum hætti vegna þess að <xliff:g id="APP">%1$s</xliff:g> vekur tækið í sífellu.\n\nTil að bregðast við þessu vandamáli getur þú látið símann koma í veg fyrir að þetta forrit keyri í bakgrunni."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Slökkva"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Slökkva á staðsetningaraðgangi?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Rafhlöðunotkun símans er ekki með eðlilegum hætti vegna þess að <xliff:g id="APP">%1$s</xliff:g> biður í sífellu um staðsetningu þína þegar þú ert ekki að nota forritið.\n\nTil að bregðast við þessu vandamáli getur þú slökkt á staðsetningaraðgangi fyrir þetta forrit."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Rafhlöðunotkun spjaldtölvunnar er ekki með eðlilegum hætti vegna þess að <xliff:g id="APP">%1$s</xliff:g> biður í sífellu um staðsetningu þína þegar þú ert ekki að nota forritið.\n\nTil að bregðast við þessu vandamáli getur þú slökkt á staðsetningaraðgangi fyrir þetta forrit."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Rafhlöðunotkun tækisins er ekki með eðlilegum hætti vegna þess að <xliff:g id="APP">%1$s</xliff:g> biður í sífellu um staðsetningu þína þegar þú ert ekki að nota forritið.\n\nTil að bregðast við þessu vandamáli getur þú slökkt á staðsetningaraðgangi fyrir þetta forrit."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Slökkva"</string>
     <string name="power_screen" msgid="3023346080675904613">"Skjár"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Vasaljós"</string>
     <string name="power_camera" msgid="4976286950934622605">"Myndavél"</string>
@@ -1952,7 +2023,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Forrit"</string>
     <string name="power_service" msgid="1599661212370831780">"Þjónusta"</string>
     <string name="power_system" msgid="8290455327965307383">"Kerfi"</string>
-    <string name="power_user" msgid="1889728099253018005">"Notandi"</string>
+    <string name="power_user" msgid="3706143225319881667">"Aðrir notendur"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Örgjörvi samtals"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Örgjörvi í forgrunni"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Halda vakandi"</string>
@@ -2004,6 +2075,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Oftalin orkunotkun"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Notað fyrir <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Virkt í <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Skjánotkun <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> notuð af <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> af heildarrafhlöðuorku"</string>
@@ -2563,7 +2635,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Breyta PIN-númeri"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Sýna tilkynningar"</string>
     <string name="help_label" msgid="6886837949306318591">"Hjálp og ábendingar"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Hjálpargreinar, aðstoð í síma og í spjalli"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Hjálpargreinar, aðstoð í síma og í spjalli, aðstoð við að hefjast handa"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Reikningur fyrir efni"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Myndauðkenni"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Alvarlegar ógnir"</string>
@@ -2653,9 +2725,12 @@
       <item quantity="other">Sýna %d falin atriði</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Netkerfi og internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, farsími, gagnanotkun, heitur reitur"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"farsími"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"gagnanotkun"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"heitur reitur"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Tengd tæki"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Forrit og tilkynningar"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Heimildir, sjálfgefin forrit"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Notendur og reikningar"</string>
@@ -2708,6 +2783,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"bendingar"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"borga, ýta, greiðslur"</string>
     <string name="keywords_backup" msgid="470070289135403022">"afrita, afritun"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"bending, brún, hlið, virk brún, kreista, grípa, aðstoð, aðstoðarmaður, kreist, squeezy, squeezie, squeezey, ok google, ókei google, google aðstoðarmaður"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"bending, vekja, tilkynningar, skjár, slökkt á skjá, kveikt á skjá, kreista, brún, sofandi, sofa, grípa"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"bending, þögn, blunda, vekjari, símtal berst, þögult, skjár, lásskjár, kreista, grípa, brú, stöðva"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Setja upp Wi-Fi NFC-merki"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skrifa"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Snertu merki til að skrifa..."</string>
@@ -2790,7 +2868,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Ekki sýna neinar tilkynningar"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Hvernig viltu að tilkynningar frá sniði birtist þegar tækið er læst?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Sniðtilkynningar"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Tilkynningar"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Tilkynningar"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Forritatilkynningar"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Tilkynningaflokkur"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Mikilvægi"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Leyfa forritinu að ákveða"</string>
@@ -2805,6 +2884,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Áríðandi"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Leyfa hljóð"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Ekki nota hljóð, titring eða birta tilkynningar á núverandi skjá."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Ekki svo mikilvægt"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Í meðallagi mikilvægt"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Mjög mikilvægt"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Afar áríðandi"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Tilkynningaaðstoð"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Tilkynningaaðgangur"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Lokað er fyrir aðgang að tilkynningu vinnuprófíls"</string>
@@ -2832,8 +2915,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Mynd í mynd"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Leyfa mynd í mynd"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Leyfa þessu forriti að opna mynd í mynd þegar forritið er opið eða hætt er að nota það (t.d. til að halda áfram að horfa á myndskeið). Þessi gluggi birtist ofan á öðrum opnum forritum."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Já"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Nei"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"„Ónáðið ekki“ aðgangur"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Engin uppsett forrit hafa óskað eftir „Ónáðið ekki“ aðgangi"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Hleður forrit..."</string>
@@ -2964,11 +3045,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Þessu vinnusniði er stjórnað af:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Stjórnað af <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Tilraun)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Snúningur tækisins"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Snúa innihaldi skjásins"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Halda skammsniði"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Halda langsniði"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Halda þessari stefnu"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Örugg ræsing"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Halda áfram"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Þú getur aukið vernd tækisins með því að krefjast PIN-númers áður en það ræsir sig. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig. \n\nÞetta bætir gagnavernd á tækjum sem glatast eða er stolið. Viltu krefjast PIN-númers til að ræsa tækið þitt?"</string>
@@ -2976,7 +3052,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Þú getur aukið vernd tækisins með því að krefjast aðgangsorðs áður en það ræsir sig. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig. \n\nÞetta bætir gagnavernd á tækjum sem glatast eða er stolið. Viltu krefjast aðgangsorðs til að ræsa tækið þitt?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Til viðbótar við að nota fingrafarið til að opna tækið geturðu aukið vernd tækisins með því að krefjast PIN-númers áður en það ræsir sig. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig. \n\nÞetta bætir gagnavernd á tækjum sem glatast eða er stolið. Viltu krefjast PIN-númers til að ræsa tækið þitt?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Til viðbótar við að nota fingrafarið til að opna tækið geturðu aukið vernd tækisins með því að krefjast mynsturs áður en það ræsir sig. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig. \n\nÞetta bætir gagnavernd á tækjum sem glatast eða er stolið. Viltu krefjast mynsturs til að ræsa tækið þitt?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Til viðbótar við að nota fingrafarið til að opna tækið geturðu aukið vernd tækisins með því að krefjast aðgangsorðs áður en það ræsir sig. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig. \n\nÞetta bætir gagnavernd á tækjum sem glatast eða er stolið. Viltu krefjast aðgangsorðs til að ræsa tækið þitt?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Auk þess að nota fingrafarið til að taka tækið úr lás geturðu aukið vernd tækisins með því að krefjast aðgangsorðsins áður en það kveikir á sér. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, vekjarar þar með taldir, þar til það hefur kveikt á sér.\n\nÞetta bætir gagnavernd á tækjum sem hafa týnst eða þeim verið stolið. Krefjast aðgangsorðs til að ræsa tækið?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Já"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nei"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Krefjast PIN-númers?"</string>
@@ -3094,6 +3170,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Notkunartilkynningar"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Sýna alla notkun tækis"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Sýna forritanotkun"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Mikil notkun"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> forrit sýnir óeðlilega virkni</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> forrit sýna óeðlilega virkni</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Forrit ganga hratt á rafhlöðuna</item>
+      <item quantity="other">Forrit ganga hratt á rafhlöðuna</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Enginn sparnaður"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Enginn sparnaður"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Sparar rafhlöðunotkun"</string>
@@ -3186,8 +3271,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Opna ofan á öðrum forritum"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> af <xliff:g id="COUNT_1">%2$d</xliff:g> forritum mega opnast ofan á öðrum forritum"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Forrit með heimild"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Já"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Nei"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Heimilað"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Ekki heimilað"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"setja upp forrit óþekktur uppruni"</string>
     <string name="write_settings" msgid="4797457275727195681">"Breyta kerfisstillingum"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"skrifa breyta kerfisstillingar"</string>
@@ -3277,6 +3362,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Skjárinn er með gulbrúnum blæ. Þetta getur hjálpað þér að sofna."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Tillögur"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> í viðbót"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> tillaga</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tillögur</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="one">+<xliff:g id="COUNT">%1$d</xliff:g> tillaga</item>
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> tillögur</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Fjarlægja"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Svalur litblær skjás"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Nota svalari skjáliti"</string>
@@ -3295,8 +3389,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> gagnaviðvörun"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> gagnaviðvörun / <xliff:g id="ID_2">%2$s</xliff:g> gagnamörk"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Greiðslutímabil"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Greiðslutímabil hefst <xliff:g id="ID_1">%1$s</xliff:g>. hvers mánaðar"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Hefst <xliff:g id="ID_1">%1$s</xliff:g>. hvers mánaðar"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"<xliff:g id="ID_1">%1$s</xliff:g>. dag hvers mánaðar"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Takmarkanir nets"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> takmörkun</item>
@@ -3316,7 +3409,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> forrit mega nota ótakmörkuð gögn þegar kveikt er á gagnasparnaði</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Gagnasparnaður"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Ótakmarkaður gagnaaðgangur"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Engin takmörkun á gögnum"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Slökkt er á bakgrunnsgögnum"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Kveikt"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Slökkt"</string>
@@ -3380,8 +3473,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Stjórna skjálásstilkynningum"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Sýna eða fela efni tilkynninga"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Allar"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Aðstoð"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Aðstoð og ábendingar"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Minnsta breidd"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Engin uppsett forrit hafa óskað eftir sérstökum SMS-aðgangi"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Sérstök SMS-skilaboð geta kostað þig peninga og munu bætast við símreikninginn þinn. Ef þú virkjar leyfi fyrir forrit geturðu sent sérstök SMS með því forriti."</string>
@@ -3446,28 +3538,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Sjálfvirkt"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Handbók"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Losa geymslupláss núna"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Bendingar"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Bendingaflýtileiðir"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Flýtibendingar til að stjórna símanum"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Flýtibendingar til að stjórna spjaldtölvunni"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Flýtibendingar til að stjórna tækinu"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Opna myndavél"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Til að opna myndavélina hratt skaltu ýta tvisvar á aflrofann. Þetta virkar á hvaða skjá sem er."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Opna myndavélina hratt"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Ýttu tvisvar á aflrofann til að opna myndavélina"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Skipt milli myndavéla"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Taka sjálfsmyndir hraðar"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Snúðu símanum tvisvar til að opna sjálfsmyndastillingu"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Snúðu spjaldtölvunni tvisvar til að opna sjálfsmyndastillingu"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Snúðu tækinu tvisvar til að opna sjálfsmyndastillingu"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Ýta tvisvar til að athuga síma"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Ýta tvisvar til að athuga spjaldtölvu"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Ýta tvisvar til að athuga tæki"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Ýttu tvisvar á skjáinn til að skoða tilkynningar með hraði."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Til að sjá hvað klukkan er og sjá tilkynningatákn og aðrar upplýsingar skaltu pikka tvisvar á skjáinn."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Skoða tilkynningar þegar slökkt er á skjánum"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Taka upp til að athuga síma"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Taka upp til að athuga spjaldtölvu"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Taka upp til að athuga tæki"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Taktu upp símann til að skoða tilkynningar með hraði."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Taktu upp spjaldtölvuna til að skoða tilkynningar með hraði."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Taktu upp tækið til að skoða tilkynningar með hraði."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Til að sjá hvað klukkan er og sjá tilkynningatákn og aðrar upplýsingar skaltu taka símann upp."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Til að sjá hvað klukkan er og sjá tilkynningatákn og aðrar upplýsingar skaltu taka spjaldtölvuna upp."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Til að sjá hvað klukkan er og sjá tilkynningatákn og aðrar upplýsingar skaltu taka tækið upp."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Skoða tilkynningar þegar slökkt er á skjánum"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Fingrafar til að opna tilkynningar"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Strjúktu niður á fingrafaraskynjaranum aftan á símanum til að skoða tilkynningarnar."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Strjúktu niður á fingrafaraskynjaranum aftan á spjaldtölvunni til að skoða tilkynningarnar."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Strjúktu niður á fingrafaraskynjaranum aftan á símanum til að skoða tilkynningarnar."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Sjá tilkynningar í snatri"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Strjúktu fingri yfir fingrafaralesarann niður á við"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Lyfta til að opna myndavélina"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Til að opna myndavélina sjálfkrafa skaltu lyfta símanum upp í myndatökustöðu (lárétta eða lóðrétta). Þetta virkar þó síminn sé í hvíldarstöðu eða læstur."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Taktu myndir þegar síminn er biðstöðu eða læstur"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Aðstoðarbending"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Næmi"</string>
@@ -3571,6 +3676,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Fjarlægja þetta skyndiforrit?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Leikir"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Hljóðskrár"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Notað geymslupláss"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(fjarlægt fyrir notandann <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(óvirkt fyrir notandann <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Sjálfvirk útfyllingarþjónusta"</string>
@@ -3584,5 +3690,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Skyndiforrit"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Viltu slökkva á geymslustjórnun?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Kvikmynda- og sjónvarpsforrit"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Notað geymslupláss"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Úthlutunarupplýsingar símafyrirtækis"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Kveikja á úthlutun símafyrirtækis"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Hvað er nýtt og spennandi?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Skoðaðu fimm helstu eiginleikana"</string>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index d766957..33a6e9f 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Buona"</item>
     <item msgid="8986346415847956850">"Ottima"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Sempre"</item>
-    <item msgid="844721238536786870">"Solo quando collegato"</item>
-    <item msgid="1986753720941888596">"Mai"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Sempre"</item>
-    <item msgid="7433294150916905997">"Solo quando collegato"</item>
-    <item msgid="1390404486722375028">"Mai"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Ultimi 30 giorni"</item>
     <item msgid="6600989128423965319">"Imp. ciclo di utilizzo..."</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 7b89958..0d8b561 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Ora sei uno sviluppatore."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Non è necessario, sei già uno sviluppatore."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Attiva prima Opzioni sviluppatore."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Wireless e reti"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Connessioni"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Dispositivo"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Provisioning VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videochiamate fornite"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Chiamate tramite Wi-Fi fornite"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Provisioning EAB/Presence completato"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Potenza del segnale radio mobile"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Visualizza rubrica SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Visualizza numeri selezione fissa"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Cerca dispositivi"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Rinomina questo dispositivo"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Rinomina"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Disconnettere?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Questa operazione terminerà la connessione con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Scollegare il dispositivo?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Il telefono verrà scollegato da <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Il tablet verrà scollegato da <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Il dispositivo verrà scollegato da <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Scollega"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Non sei autorizzato a modificare le impostazioni Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Accoppia nuovo dispositivo"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Con le impostazioni Bluetooth aperte, <xliff:g id="DEVICE_NAME">%1$s</xliff:g> è rilevabile da altri dispositivi vicini."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Indirizzo Bluetooth del telefono: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Indirizzo Bluetooth del tablet: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Indirizzo Bluetooth del dispositivo: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnetti <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Trasmissione"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disattivare il profilo?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Richiesta accoppiamento Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Richiesta accoppiamento"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Tocca per l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostra file ricevuti"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"File ricevuti"</string>
     <string name="device_picker" msgid="4978696506172252813">"Scegli il dispositivo Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> chiede di attivare il Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> chiede di disattivare il Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s desidera accedere ai tuoi messaggi. Dare accesso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Richiesta di accesso alla SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> desidera accedere alla tua scheda SIM. Se consenti l\'accesso, la connettività dati sul dispositivo sarà disattivata per tutta la durata della connessione. Consentire l\'accesso a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>?"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visibile come <xliff:g id="DEVICE_NAME">^1</xliff:g> agli altri dispositivi"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"I tuoi dispositivi"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Accoppia nuovo dispositivo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data e ora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Scegli il fuso orario"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Account"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Geolocalizzazione"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Account"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Sicurezza e posizione"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Sicurezza e posizione"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Crittografia e credenziali"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefono criptato"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Dispositivo criptato"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Sblocca con l\'impronta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Usa la tua impronta digitale"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Tocca il sensore delle impronte digitali per sbloccare il telefono, autorizzare gli acquisti o accedere alle app desiderate. Scegli con attenzione chi aggiungere: le operazioni sopra elencate possono essere svolte con qualsiasi impronta digitale aggiunta.\n\nNota. La tua impronta digitale potrebbe essere meno sicura di una sequenza o un PIN complesso."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Tocca il sensore di impronte digitali per autorizzare gli acquisti o per accedere alle app. Scegli con attenzione chi aggiungere: le operazioni sopra elencate possono essere svolte con qualsiasi impronta digitale aggiunta.\n\nNota. Non puoi utilizzare la tua impronta per sbloccare il dispositivo. Per ulteriori informazioni, contatta l\'amministratore dell\'organizzazione."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Tocca il sensore delle impronte digitali per sbloccare il telefono, autorizzare gli acquisti o accedere alle app. Scegli con attenzione chi aggiungere: le operazioni sopra elencate possono essere svolte con qualsiasi impronta digitale aggiunta.\n\nNota. La tua impronta digitale potrebbe essere meno sicura di una sequenza o un codice PIN complessi."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Utilizza la tua impronta digitale per sbloccare il telefono o approvare un acquisto.\n\nNota: non puoi utilizzare la tua impronta digitale per sbloccare questo dispositivo. Per ulteriori informazioni, contatta l\'amministratore dell\'organizzazione."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Utilizza la tua impronta digitale per sbloccare il telefono o approvare un acquisto.\n\nNota: la tua impronta digitale potrebbe essere meno sicura di una sequenza o un codice PIN complessi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Annulla"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continua"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Ignora"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Aggiungi impronta"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altri di utilizzare il tablet se lo perdi, ti viene rubato o vengono cancellati i dati."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altri di utilizzare il dispositivo se lo perdi, ti viene rubato o se vengono cancellati i dati."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altri di utilizzare il telefono se lo perdi, ti viene rubato o se vengono cancellati i dati."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altri di utilizzare il tablet in caso di furto o smarrimento."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altri di utilizzare il dispositivo in caso di furto o smarrimento."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altri di utilizzare il telefono in caso di furto o smarrimento."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Avanti"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altre persone di utilizzare questo tablet se viene smarrito, rubato o reimpostato."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altre persone di utilizzare questo dispositivo se viene smarrito, rubato o reimpostato."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altre persone di utilizzare questo telefono se viene smarrito, rubato o reimpostato."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altre persone di utilizzare questo tablet se viene smarrito o rubato."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altre persone di utilizzare questo dispositivo se viene smarrito o rubato."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altre persone di utilizzare questo telefono se viene smarrito o rubato."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ignora comunque"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Torna indietro"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Trova il sensore"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Individua il sensore di impronte digitali sul retro del telefono."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Tocca il sensore"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Si trova sulla parte posteriore del telefono. Utilizza il dito indice."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustrazione con il dispositivo e la posizione del sensore di impronte digitali"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Elimina"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Inizia"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Tocca il sensore"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Appoggia il dito sul sensore e sollevalo quando sentirai una vibrazione"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continua a toccare"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Muovi leggermente il dito per aggiungere tutte le diverse parti della tua impronta digitale"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Impronta aggiunta"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quando viene visualizzata questa icona, puoi utilizzare la tua impronta digitale per l\'identificazione o per autorizzare un acquisto."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Tocca il sensore delle impronte digitali per riattivare e sbloccare il dispositivo."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Quando vedi questa icona, puoi anche autorizzare acquisti o accedere alle app."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Solleva, quindi tocca di nuovo"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Continua a sollevare il dito per aggiungere le diverse parti dell\'impronta digitale"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Impronta aggiunta"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Quando vedi questa icona, utilizza l\'impronta digitale per identificarti o autorizzare un acquisto."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Saltare configurazione impronta digitale?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Hai scelto anche l\'utilizzo dell\'impronta digitale tra i vari metodi per sbloccare il telefono. Se salti la configurazione ora, dovrai eseguirla in un secondo momento. Basta un minuto."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Imposta blocco schermo"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Fine"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ops, questo non è il sensore"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Usa il sensore delle impronte sul dispositivo"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Tocca il sensore sulla parte posteriore del telefono. Utilizza il dito indice."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"L\'iscrizione non è stata completata"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Timeout iscrizione mediante impronta digitale. Riprova."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Iscrizione mediante impronta digitale non riuscita. Riprova o utilizza un dito diverso."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Impedisci ad altri di utilizzare il dispositivo senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Impedisci ad altri di utilizzare il telefono senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Scegli il metodo di backup per il blocco dello schermo"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opzioni di blocco schermo"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opzioni di blocco schermo"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blocco schermo"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/Subito dopo la sospensione"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> dopo sospensione"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Cambia sequenza di sblocco"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambia PIN di sblocco"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambia password di sblocco"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Riprova. Tentativo <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> di <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Ultimo tentativo"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Se inserirai una sequenza di lavoro sbagliata per questo tentativo, il profilo di lavoro e i dati associati verranno rimossi da questo dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Se inserirai un PIN di lavoro sbagliato per questo tentativo, il profilo di lavoro e i dati associati verranno rimossi da questo dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Se inserirai una password di lavoro sbagliata per questo tentativo, il profilo di lavoro e i dati associati verranno rimossi da questo dispositivo."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Troppi tentativi sbagliati. Il profilo di lavoro e i dati associati verranno rimossi da questo dispositivo."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Ignora"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Riprova. Tentativo <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> di <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"I tuoi dati verranno eliminati"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Se al prossimo tentativo inserirai una sequenza sbagliata, i dati del dispositivo verranno eliminati"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Se al prossimo tentativo inserirai un PIN sbagliato, i dati del dispositivo verranno eliminati"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Se al prossimo tentativo inserirai una password sbagliata, i dati del dispositivo verranno eliminati"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Se al prossimo tentativo inserirai una sequenza sbagliata, questo utente verrà eliminato"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Se al prossimo tentativo inserirai un PIN sbagliato, questo utente verrà eliminato"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Se al prossimo tentativo inserirai una password sbagliata, questo utente verrà eliminato"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Se al prossimo tentativo inserirai una sequenza sbagliata, il tuo profilo di lavoro e i relativi dati verranno eliminati"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Se al prossimo tentativo inserirai un PIN sbagliato, il tuo profilo di lavoro e i relativi dati verranno eliminati"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Se al prossimo tentativo inserirai una password sbagliata, il tuo profilo di lavoro e i relativi dati verranno eliminati"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Troppi tentativi sbagliati. I dati del dispositivo verranno eliminati."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Troppi tentativi sbagliati. Questo utente verrà eliminato."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Troppi tentativi sbagliati. Questo profilo di lavoro e i relativi dati verranno eliminati."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ignora"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> caratteri"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Il PIN deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> numeri"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continua"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avanzato"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Quando il Bluetooth è attivato, il dispositivo può comunicare con altri dispositivi che si trovano nelle vicinanze."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Per una maggiore precisione della geolocalizzazione, le app e i servizi di sistema possono ancora rilevare i dispositivi Bluetooth. Puoi modificare questa impostazione nelle <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>impostazioni di ricerca<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Connessione non riuscita. Riprova."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Dettagli dispositivo"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Indirizzo Bluetooth del dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Ignorare il dispositivo?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Il telefono non sarà più accoppiato con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Il tablet non sarà più accoppiato con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Il dispositivo non sarà più accoppiato con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Ignora dispositivo"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Connessione a…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dall\'audio multimediale."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dall\'audio vivavoce."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Non fornire"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Non convalidare"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nessun certificato specificato. La connessione non sarà privata."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Il nome della rete è troppo lungo"</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Specifica un dominio."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponibile"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibile)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 rete</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi‑Fi avanzate"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configura Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Indirizzo MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Indirizzo IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Eliminare questo gruppo?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Hotspot Wi‑Fi portatile"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Hotspot Wi‑Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Usa connessione mobile per fornire rete Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Connessione Internet del tablet non condivisa tramite hotspot"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Connessione Internet del telefono non condivisa tramite hotspot"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Connessione Internet o contenuti non condivisi con altri dispositivi"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Connessione Internet del tablet condivisa tramite hotspot"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Connessione Internet del telefono condivisa tramite hotspot"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"L\'app sta condividendo contenuti. Per condividere la connessione Internet, disattiva e riattiva l\'hotpsot"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nome Wi-Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Attivazione di <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Gli altri dispositivi possono collegarsi a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Password Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda AP"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Utilizza un hotspot per creare una rete Wi-Fi per altri dispositivi. Gli hotspot forniscono l\'accesso a Internet utilizzando la connessione dati mobili. Potrebbero essere applicate tariffe aggiuntive per i dati mobili."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Le app possono creare un hotspot per condividere contenuti con i dispositivi vicini."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Attivazione hotspot..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Disattivazione hotspot..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> è attivo"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Se le chiamate Wi-Fi sono attive, il tuo telefono può instradare le chiamate tramite reti Wi-Fi o la rete del tuo operatore, in base alle tue preferenze e alla potenza del segnale. Prima di attivare questa funzione, verifica tariffe e ulteriori dettagli con il tuo operatore."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"aggiorna indirizzo di emergenza"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Indirizzo utilizzato dai servizi di emergenza per fornire la tua posizione se effettui una chiamata al 911 tramite Wi-Fi."</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nessun risultato"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotazione automatica"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Colori vivaci"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Cambia automaticamente l\'orientamento quando il tablet viene ruotato"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Cambia automaticamente quando il cellulare viene ruotato"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Cambia automaticamente l\'orientamento quando il tablet viene ruotato"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Ottimizza il livello di luminosità per la luce disponibile. Quando questa funzione è attiva, puoi comunque regolare la luminosità temporaneamente."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Luminosità notturna"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Con la funzione Luminosità notturna, il tuo schermo diventa color ambra. In questo modo potrai guardarlo senza sforzare la vista o leggere in condizioni di luce attenuata e potrai addormentarti più facilmente."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Pianificazione"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Stato"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Attiva automaticamente"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Mai"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Pianificazione personalizzata"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Dal tramonto all\'alba"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Pianifica"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Nessuno"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Attiva in un orario personalizzato"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Attiva dal tramonto all\'alba"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Ora inizio"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Ora fine"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Stato"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensità"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Disattivata. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Non verrà mai attivata automaticamente."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Verrà attivata automaticamente alle ore <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Verrà attivata automaticamente al tramonto."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Attiva. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Non verrà mai disattivata automaticamente."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Verrà disattivata automaticamente alle ore <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Verrà disattivata automaticamente al tramonto."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Non verrà mai attivata automaticamente"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Verrà attivata automaticamente alle ore <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Verrà attivata automaticamente al tramonto"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Non verrà mai disattivata automaticamente"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Verrà disattivata automaticamente alle ore <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Verrà disattivata automaticamente al tramonto"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sospensione"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Lo schermo si spegne"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Impostazioni"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminosità automatica"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Solleva per riattivare"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Display Ambient"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Display Ambient"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Sempre attivo"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nuove notifiche"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quando mostrare"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nuove notifiche"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Lo schermo viene riattivato quando ricevi notifiche"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre attivo"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostra ora, icone di notifica e altre informazioni"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Dimensioni carattere"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Ingrandisci o riduci il testo"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Impostazioni blocco SIM"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Il campo APN non può essere vuoto."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Il campo MCC deve contenere 3 cifre."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Il campo MNC deve contenere 2 o 3 cifre."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"L\'operatore non consente di aggiungere APN di tipo %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Ripristino delle impostazioni APN predefinite."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Ripristina impostazioni predefinite"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ripristino delle impostazioni APN predefinite completato."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Cancella scheda SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Cancella tutti i dati nell\'archivio USB interno, come musica o foto"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Cancella tutti i dati sulla scheda SD, come musica o foto"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Resetta le eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Resetta tutte le eSIM del telefono. Il tuo piano di servizio dati mobile non verrà annullato."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Resetta tutte le eSIM del tablet. Il tuo piano di servizio dati mobile non verrà annullato."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Reimposta tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Ripristina telefono"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Cancellare tutte le informazioni personali e le app scaricate? Questa azione è irreversibile."</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Impossibile eseguire il tethering o utilizzare hotspot portatili con Risparmio dati attivo"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Tethering USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB collegata, seleziona per impostare tethering"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Con tethering"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Tethering non possibile quando è in uso l\'archivio USB"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB non connessa"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Connettiti per attivare"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Errore tethering USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Condividi la connessione Internet del telefono via USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Condividi la connessione Internet del tablet via USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Tethering Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Connessione Internet del tablet condivisa con Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Connessione Internet del telefono condivisa con Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Connessione Internet del tablet a 1 dispositivo condivisa con Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Connessione Internet del telefono a 1 dispositivo condivisa con Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Connessione Internet del tablet a <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivi condivisa con Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Connessione Internet del telefono a <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivi condivisa con Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Condividi la connessione Internet del tablet via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Condividi la connessione Internet del telefono via Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Connessione Internet del dispositivo <xliff:g id="DEVICE_NAME">%1$d</xliff:g> condivisa con Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Connessione Internet del tablet non condivisa con Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Connessione Internet del telefono non condivisa con Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Senza tethering"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Tethering impossibile con più di <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivi."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Sarà annullato il tethering per <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Utilizza hotspot e tethering per consentire ad altri dispositivi di accedere a Internet tramite la connessione dati mobili."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Utilizza hotspot e tethering per consentire ad altri dispositivi di accedere a Internet tramite la connessione dati mobili. Le app possono, inoltre, creare un hotspot per condividere contenuti con i dispositivi vicini."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Guida"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Rete mobile"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Piano dati mobile"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modalità geolocalizzazione"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Utilizza reti mobili, Bluetooth, Wi-Fi o GPS per stabilire la posizione"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Utilizza reti mobili, Bluetooth o Wi-Fi per stabilire la posizione"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utilizza il GPS per stabilire la posizione"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Utilizza il GPS e i sensori del dispositivo per stabilirne la posizione"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Ricerca"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Ricerca di reti Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Migliora la geolocalizzazione consentendo ad app e servizi di sistema di rilevare reti Wi-Fi in qualsiasi momento."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nessuna connessione dati disponibile. Per visualizzare ora le informazioni, visita il sito %s da qualsiasi computer collegato a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Caricamento..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Scegli la tua password"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Per usare l\'impronta digitale, imposta la password"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Scegli la tua sequenza"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Per usare l\'impronta digitale, imposta la sequenza"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Scegli il tuo PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Per usare l\'impronta digitale, imposta il PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Conferma la tua password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Conferma la tua sequenza"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Conferma il tuo PIN"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Impostazioni applicazioni"</string>
     <string name="install_applications" msgid="4872012136210802181">"Origini sconosciute"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Consenti tutte le fonti di app"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"App aperte di recente"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Mostra tutte le <xliff:g id="COUNT">%1$d</xliff:g> app"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> fa"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Il tablet e i dati personali sono più vulnerabili agli attacchi provenienti da app sconosciute. Installando le app provenienti da questa origine, accetti di essere responsabile degli eventuali danni al tablet o della perdita di dati che potrebbero derivare dall\'utilizzo di queste app."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Il telefono e i dati personali sono più vulnerabili agli attacchi provenienti da app sconosciute. Installando le app provenienti da questa origine, accetti di essere responsabile degli eventuali danni al telefono o della perdita di dati che potrebbero derivare dall\'utilizzo di queste app."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Impostazioni avanzate"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Interrompere il servizio di sistema?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Se interrompi questo servizio, potrebbero verificarsi anomalie in alcune funzioni del tablet fino allo spegnimento e alla riaccensione del tablet."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Se interrompi questo servizio, potrebbero verificarsi anomalie in alcune funzioni del telefono fino allo spegnimento e alla riaccensione del telefono."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Lingue, inserimento e gesti"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Lingue e immissione"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Lingue e immissione"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Supporto input"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> servizi di stampa attivi</item>
       <item quantity="one">1 servizio di stampa attivo</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> processi di stampa</item>
+      <item quantity="one">1 processo di stampa</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Servizi di stampa"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nessun servizio installato"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nessuna stampante trovata"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Dettagli di utilizzo"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Regola consumo alimentazione"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pacchetti inclusi"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"App che consumano la batteria"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Mantenendo il dispositivo attivo"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Attivando il dispositivo in background"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Richiedendo la posizione frequentemente"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> app con comportamenti anomali"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Arrestare l\'app?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Il telefono non può gestire la batteria normalmente perché <xliff:g id="APP">%1$s</xliff:g> lo sta mantenendo attivo.\n\nPer provare a risolvere il problema, puoi forzare l\'arresto dell\'app.\n\nSe il problema continua a verificarsi, potresti dover disinstallare l\'app per migliorare le prestazioni della batteria."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Il tablet non può gestire la batteria normalmente perché <xliff:g id="APP">%1$s</xliff:g> lo sta mantenendo attivo.\n\nPer provare a risolvere il problema, puoi forzare l\'arresto dell\'app.\n\nSe il problema continua a verificarsi, potresti dover disinstallare l\'app per migliorare le prestazioni della batteria."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Il dispositivo non può gestire la batteria normalmente perché <xliff:g id="APP">%1$s</xliff:g> lo sta mantenendo attivo.\n\nPer provare a risolvere il problema, puoi forzare l\'arresto dell\'app.\n\nSe il problema continua a verificarsi, potresti dover disinstallare l\'app per migliorare le prestazioni della batteria."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Arresta l\'app"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Disattivare l\'utilizzo in background?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Il telefono non può gestire la batteria normalmente perché <xliff:g id="APP">%1$s</xliff:g> lo mantiene attivo.\n\nPer risolvere il problema, puoi impedire che l\'app venga eseguita in background."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Il tablet non può gestire la batteria normalmente perché <xliff:g id="APP">%1$s</xliff:g> lo mantiene attivo.\n\nPer risolvere il problema, puoi impedire che l\'app venga eseguita in background."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Il dispositivo non può gestire la batteria normalmente perché <xliff:g id="APP">%1$s</xliff:g> lo mantiene attivo.\n\nPer risolvere il problema, puoi impedire che l\'app venga eseguita in background."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Disattiva"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Disattivare la geolocalizzazione?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Il telefono non può gestire la batteria normalmente perché <xliff:g id="APP">%1$s</xliff:g> continua a chiedere la posizione quando non stai utilizzando l\'app.\n\nPer correggere il problema, puoi disattivare la geolocalizzazione per quest\'app.."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Il tablet non può gestire la batteria normalmente perché <xliff:g id="APP">%1$s</xliff:g> continua a chiedere la posizione quando non stai utilizzando l\'app.\n\nPer correggere il problema, puoi disattivare la geolocalizzazione per quest\'app.."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Il dispositivo non può gestire la batteria normalmente perché <xliff:g id="APP">%1$s</xliff:g> continua a chiedere la posizione quando non stai utilizzando l\'app.\n\nPer correggere il problema, puoi disattivare la geolocalizzazione per quest\'app.."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Disattiva"</string>
     <string name="power_screen" msgid="3023346080675904613">"Schermo"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Torcia"</string>
     <string name="power_camera" msgid="4976286950934622605">"Fotocamera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"App"</string>
     <string name="power_service" msgid="1599661212370831780">"Servizi"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
-    <string name="power_user" msgid="1889728099253018005">"Utente"</string>
+    <string name="power_user" msgid="3706143225319881667">"Altri utenti"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Totale CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU in primo piano"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantieni attivo"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo batteria sovrastimato"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Usato per <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Attivo per <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Uso dello schermo: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilizzato da <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> dell\'utilizzo totale della batteria"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Cambia PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostra notifiche"</string>
     <string name="help_label" msgid="6886837949306318591">"Guida e feedback"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Articoli della guida, supporto via chat e telefono"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Articoli della guida, assistenza telefonica e tramite chat, guida introduttiva"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Account per i contenuti"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID foto"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Minacce estreme"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Mostra %d elemento nascosto</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rete e Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, dispositivo mobile, utilizzo dati, hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"rete mobile"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"utilizzo dei dati"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivi collegati"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Trasmetti, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Trasmetti"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"App e notifiche"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Autorizzazioni, app predefinite"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Utenti e account"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"paga, tocca, pagamenti"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gesto, bordo, lato, bordo attivo, schiaccia, afferra, assisti, assistente, squeezy, premi, ok google, assistente google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gesto, attiva, notifiche, schermo, display, schermo spento, schermo accesso, schiaccia, bordo, disattivato, sospeso, afferra"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gesto, silenzio, posticipa, allarme, chiamata in arrivo, silenzioso, display, blocco schermo, schiaccia, afferra, bordo, interrompi"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configura tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Modifica"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tocca un tag per impostarlo..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Non mostrare le notifiche di lavoro"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Quando il dispositivo è bloccato, come desideri che vengano visualizzate le notifiche del profilo?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notifiche del profilo"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Notifiche"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Notifiche"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notifiche app"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria della notifica"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importanza"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Lascia decidere all\'app"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgente"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Attiva audio"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Non emettere suoni o vibrazioni e non mostrare queste notifiche nella schermata corrente."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Importanza scarsa"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Importanza media"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importanza elevata"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgente"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Assistente notifica"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Accesso alle notifiche"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Accosso bloccato alle notifiche del profilo di lavoro"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Consenti picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Consenti a questa app di creare una finestra picture-in-picture quando l\'app è aperta o dopo essere uscito (ad esempio, per continuare a guardare un video). Questa finestra viene visualizzata sopra le altre app in uso."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Sì"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"No"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accesso Non disturbare"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nessuna delle app installate ha richiesto l\'accesso Non disturbare"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Caricamento app..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Questo profilo di lavoro è gestito da:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Gestito da <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Sperimentale)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Rotazione del dispositivo"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Ruota i contenuti dello schermo"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Rimani in visualizzazione verticale"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Rimani in visualizzazione orizzontale"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Rimani in orientamento corrente"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Avvio sicuro"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continua"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Puoi proteggere ulteriormente il dispositivo attivando la richiesta del PIN prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie. \n\nIn questo modo puoi proteggere i dati su dispositivi persi o rubati. Vuoi richiedere il PIN per avviare il dispositivo?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Puoi proteggere ulteriormente il dispositivo attivando la richiesta della password prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie. \n\nIn questo modo puoi proteggere i dati su dispositivi persi o rubati. Vuoi richiedere la password per avviare il dispositivo?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Oltre a utilizzare la tua impronta digitale per sbloccare il dispositivo, puoi aggiungere ulteriore protezione richiedendo il PIN prima dell\'avvio. Fino all\'avvio, il dispositivo non potrà ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati su dispositivi persi o rubati. Vuoi richiedere il PIN per avviare il dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Oltre a utilizzare la tua impronta digitale per sbloccare il dispositivo, puoi aggiungere ulteriore protezione richiedendo la sequenza prima dell\'avvio. Fino all\'avvio, il dispositivo non potrà ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati su dispositivi persi o rubati. Vuoi richiedere la sequenza per avviare il dispositivo?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Oltre a utilizzare la tua impronta digitale per sbloccare il dispositivo, puoi aggiungere ulteriore protezione richiedendo la password prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati su dispositivi persi o rubati. Vuoi richiedere la password per avviare il dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Oltre a usare la tua impronta digitale per sbloccare il dispositivo, puoi proteggere ulteriormente il dispositivo richiedendo la password prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati memorizzati su dispositivi rubati o persi. Vuoi richiedere la password per avviare il dispositivo?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sì"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Richiedere il PIN?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Avvisi sul livello di carica"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Mostra utilizzo completo del dispositivo"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Mostra utilizzo delle app"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Utilizzo elevato"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> app si comportano in modo anomalo</item>
+      <item quantity="one">L\'app <xliff:g id="APP">%1$s</xliff:g> si comporta in modo anomalo</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Alcune app stanno consumando la batteria</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> sta consumando la batteria</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Senza ottimizzazione"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Senza ottimizzazione"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Uso della batteria ottimizzato"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Mostra sopra altre app"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> di <xliff:g id="COUNT_1">%2$d</xliff:g> app visualizzabili sopra le altre app"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"App con autorizzazione"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Sì"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"No"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Consentita"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Non consentita"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"installa app origini sconosciute"</string>
     <string name="write_settings" msgid="4797457275727195681">"Modifica impostazioni sistema"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"scrittura modifica impostazioni di sistema"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Lo schermo è diventato color ambra. Potrebbe conciliare il sonno."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggerimenti"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+ altri <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> suggerimenti</item>
+      <item quantity="one">1 suggerimento</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> suggerimenti</item>
+      <item quantity="one">+1 suggerimento</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Rimuovi"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura di colore fredda"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizza colori del display più freddi"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Avviso sui dati: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Avviso sui dati: <xliff:g id="ID_1">%1$s</xliff:g>/Limite dati: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciclo di fatturazione"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Il ciclo mensile ha inizio il giorno <xliff:g id="ID_1">%1$s</xliff:g> di ogni mese"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mensile a partire dal giorno <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Il giorno <xliff:g id="ID_1">%1$s</xliff:g> di ogni mese"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Restrizioni di rete"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrizioni</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 app autorizzata a utilizzare dati senza limitazioni quando la funzione Risparmio dati è attiva</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Risparmio dati"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Accesso ai dati senza limitazioni"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Dati senza limitazioni"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"I dati in background sono disattivati"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"On"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Off"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlla notifiche in schermata blocco"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostra o nascondi i contenuti delle notifiche"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Tutte"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Assistenza"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Assistenza e suggerimenti"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Larghezza minima"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nessuna app installata ha richiesto l\'accesso a SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Gli SMS premium potrebbero comportare costi, che verranno aggiunti alle fatture del tuo operatore. Se attivi l\'autorizzazione per un\'app, potrai utilizzarla per inviare SMS premium."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatiche"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuali"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Libera spazio ora"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gesti"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Scorciatoie per i gesti"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gesti rapidi per controllare il telefono"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gesti rapidi per controllare il tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gesti rapidi per controllare il dispositivo"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Apri la fotocamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Per aprire velocemente la fotocamera, premi due volte il tasto di accensione da qualsiasi schermata."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Apri rapidamente la fotocamera"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Premi due volte il tasto accensione per aprire la fotocamera"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Cambia fotocamera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Scatta selfie più rapidamente"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Ruota due volte il telefono per la modalità selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Ruota due volte il tablet per la modalità selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Ruota due volte il dispositivo per la modalità selfie"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tocca due volte il telefono per controllare le notifiche"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tocca due volte il tablet per controllare le notifiche"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tocca due volte il dispositivo per controllare le notifiche"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Per controllare velocemente le notifiche, tocca due volte lo schermo."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Per controllare l\'ora, le icone di notifica e altre informazioni, tocca due volte lo schermo."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Controlla le notifiche con lo schermo spento"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Solleva il telefono per controllare le notifiche"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Solleva il tablet per controllare le notifiche"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Solleva il dispositivo per controllare le notifiche"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Per controllare velocemente le notifiche, solleva il telefono."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Per controllare velocemente le notifiche, solleva il tablet."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Per controllare velocemente le notifiche, solleva il dispositivo."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Per controllare l\'ora, le icone di notifica e altre informazioni, solleva il telefono."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Per controllare l\'ora, le icone di notifica e altre informazioni, solleva il tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Per controllare l\'ora, le icone di notifica e altre informazioni, solleva il dispositivo."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Controlla le notifiche con lo schermo spento"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Usa l\'impronta digitale per le notifiche"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Per controllare le notifiche, scorri verso il basso sul sensore di impronte digitali sul retro del telefono."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Per controllare le notifiche, scorri verso il basso sul sensore di impronte digitali sul retro del tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Per controllare le notifiche, scorri verso il basso sul sensore di impronte digitali sul retro del dispositivo."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Visualizza rapidamente le notifiche"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Scorri verso il basso sul sensore di impronte digitali"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Solleva per aprire la fotocamera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Per aprire la fotocamera in modo automatico, solleva il telefono come per scattare una foto (in orizzontale o in verticale). Funziona quando il telefono è in stand-by o bloccato."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Scatta foto con sospensione attiva o telefono bloccato"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Assistenza gesto"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilità"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Vuoi rimuovere questa app istantanea?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Giochi"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"File audio"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Spazio occupato"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(disinstallato per l\'utente <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(disattivato per l\'utente <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Servizio di compilazione automatica"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"App istantanea"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Disattivare la gestione della memoria?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"App per film e programmi televisivi"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Spazio occupato"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Informazioni sul provisioning operatore"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Attiva provisioning operatore"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Quali entusiasmanti novità ti attendono?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Scopri le 5 funzioni principali"</string>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 282da43..b80b91f 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"טובה"</item>
     <item msgid="8986346415847956850">"מצוינת"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"תמיד"</item>
-    <item msgid="844721238536786870">"רק כאשר המכשיר מחובר"</item>
-    <item msgid="1986753720941888596">"אף פעם"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"תמיד"</item>
-    <item msgid="7433294150916905997">"רק כאשר המכשיר מחובר"</item>
-    <item msgid="1390404486722375028">"לעולם לא"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 הימים האחרונים"</item>
     <item msgid="6600989128423965319">"הגדר מחזור שימוש..."</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index ef2a589..e834a07 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -32,6 +32,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"אתה כעת מפתח!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"אין צורך, אתה כבר מפתח."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"קודם עליך להפעיל את אפשרויות המפתח."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"רשתות ותקשורת אלחוטית"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"חיבורים"</string>
     <string name="header_category_device" msgid="4544026001618307754">"מכשיר"</string>
@@ -43,6 +44,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"‏ניהול התצורה של VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ניהול תצורה של שיחות וידאו"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"‏ניהול תצורה של שיחות Wifi"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"‏ניהול תצורה של נוכחות/EAB מופעל"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"הפעלה של רדיו סלולרי"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"‏הצג פנקס כתובות של SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"הצג מספרי חיוג קבועים"</string>
@@ -108,10 +110,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"סרוק אחר מכשירים"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"שנה את שם המכשיר"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"שנה שם"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"להתנתק?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"‏פעולה זו תסיים את החיבור עם:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"לנתק את המכשיר?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"הטלפון שלך יתנתק מהמכשיר <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"הטאבלט שלך יתנתק מהמכשיר <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"המכשיר שלך יתנתק מהמכשיר <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"אני רוצה להתנתק"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"‏אין לך הרשאה לשנות את הגדרות ה-Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"התאמה של מכשיר חדש"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"‏<xliff:g id="DEVICE_NAME">%1$s</xliff:g> גלוי למכשירים קרובים כאשר הגדרת Bluetooth פתוחה."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"‏כתובת הטלפון לחיבור דרך Bluetooth: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"‏כתובת הטאבלט לחיבור דרך Bluetooth: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"‏כתובת המכשיר לחיבור דרך Bluetooth: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"האם לנתק את <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"שידור"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"להשבית פרופיל?"</string>
@@ -123,7 +132,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"‏בקשת התאמה של Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"בקשת התאמה"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"הקש כדי ליצור התאמה עם <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"הצג קבצים שהתקבלו"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"קבצים שהתקבלו"</string>
     <string name="device_picker" msgid="4978696506172252813">"‏בחר מכשיר Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"‏<xliff:g id="APP_NAME">%1$s</xliff:g> רוצה להפעיל את ה-Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"‏<xliff:g id="APP_NAME">%1$s</xliff:g> רוצה לכבות את ה-Bluetooth"</string>
@@ -159,6 +168,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏%1$s רוצה לגשת להודעות שלך. להעניק גישה ל-%2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"‏בקשת גישה אל כרטיס SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"‏<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> רוצה לגשת אל כרטיס ה-SIM. הענקת גישה אל כרטיס ה-SIM תשבית את קישוריות הנתונים במכשיר לכל משך החיבור. הענק גישה ל-<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"גלוי למכשירים אחרים. מופיע בשם \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"המכשירים שלך"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"התאמה של מכשיר חדש"</string>
     <string name="date_and_time" msgid="9062980487860757694">"תאריך ושעה"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"בחירת אזור זמן"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -333,7 +345,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"חשבונות"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"מיקום"</string>
     <string name="account_settings_title" msgid="626177544686329806">"חשבונות"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"אבטחה ומיקום"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"אבטחה ומיקום"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"הצפנה ופרטי כניסה"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"טלפון מוצפן"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"המכשיר מוצפן"</string>
@@ -360,40 +372,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"פתיחה עם טביעת אצבע"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"שימוש בטביעת האצבע"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"נגיעה בחיישן טביעות האצבע תבטל את נעילת הטלפון, תאשר רכישות או תאפשר כניסה לאפליקציות. יש לשים לב, כל מי שאת טביעות האצבע שלו או שלה הוספת יוכל לבצע את הפעולות האלה.\n\nזהירות: ייתכן ששימוש בטביעת אצבע פחות בטוח מאבטחה באמצעות קו ביטול נעילה או קוד גישה חזקים."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"כדי לאשר רכישות או להיכנס לאפליקציות יש לגעת בחיישן טביעות האצבע. יש לשים לב, כל מי שאת טביעות האצבע שלו או שלה הוספת יוכל לבצע את הפעולות האלה.\n\nזהירות: אי אפשר להשתמש בטביעת האצבע שלך כדי לבטל את הנעילה של מכשיר זה. לקבלת מידע נוסף יש לפנות למנהל המערכת בארגון שלך."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"נגיעה בחיישן טביעות אצבע מבטלת את נעילת הטלפון ומאפשרת אישור רכישות או כניסה לאפליקציות. יש לשים לב, כל מי שאת טביעות האצבע שלו או שלה הוספת יוכל לבצע את הפעולות האלה.\n\nזהירות: ייתכן ששימוש בטביעת אצבע פחות בטוח מאבטחה באמצעות קו ביטול נעילה או קוד גישה חזקים."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"שימוש בטביעת אצבע כדי לבטל את הנעילה של הטלפון או לאשר רכישות.\n\nהערה: לא ניתן להשתמש בטביעת אצבע כדי לבטל את הנעילה של המכשיר הזה. לקבלת מידע נוסף, אפשר לפנות למנהל המערכת של הארגון."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"שימוש בטביעת אצבע כדי לבטל את הנעילה של הטלפון או לאשר רכישות.\n\nהערה: שימוש בטביעת אצבע יכול להיות פחות מאובטח משימוש בקו ביטול נעילה או בקוד גישה."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ביטול"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"המשך"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"דילוג"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"הוסף טביעת אצבע"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"תכונות הגנת המכשיר לא יופעלו. במקרה של אובדן, גנבה או מחיקה, לא תהיה לך אפשרות למנוע מאחרים להשתמש בטאבלט."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"תכונות הגנת המכשיר לא יופעלו. במקרה של אובדן, גנבה או מחיקה, לא תהיה לך אפשרות למנוע מאחרים להשתמש במכשיר."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"תכונות הגנת המכשיר לא יופעלו. במקרה של אובדן, גנבה או מחיקה, לא תהיה לך אפשרות למנוע מאחרים להשתמש בטלפון."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"תכונות הגנת המכשיר לא יופעלו. במקרה של אובדן או גנבה, לא תהיה לך אפשרות למנוע מאחרים להשתמש בטאבלט."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"תכונות הגנת המכשיר לא יופעלו. במקרה של אובדן או גנבה, לא תהיה לך אפשרות למנוע מאחרים להשתמש במכשיר."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"תכונות הגנת המכשיר לא יופעלו. במקרה של אובדן או גנבה, לא תהיה לך אפשרות למנוע מאחרים להשתמש בטלפון."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"הבא"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"תכונות ההגנה על המכשיר לא יופעלו. לא תהיה לך אפשרות למנוע מאנשים אחרים להשתמש בטאבלט אם הוא יאבד, ייגנב או יאופס."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"תכונות ההגנה על המכשיר לא יופעלו. לא תהיה לך אפשרות למנוע מאנשים אחרים להשתמש במכשיר אם הוא יאבד, ייגנב או יאופס."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"תכונות ההגנה על המכשיר לא יופעלו. לא תהיה לך אפשרות למנוע מאנשים אחרים להשתמש בטלפון אם הוא יאבד, ייגנב או יאופס."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"תכונות ההגנה על המכשיר לא יופעלו. לא תהיה לך אפשרות למנוע מאנשים אחרים להשתמש בטאבלט אם הוא יאבד או ייגנב."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"תכונות ההגנה על המכשיר לא יופעלו. לא תהיה לך אפשרות למנוע מאנשים אחרים להשתמש במכשיר אם הוא יאבד או ייגנב."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"תכונות ההגנה על המכשיר לא יופעלו. לא תהיה לך אפשרות למנוע מאנשים אחרים להשתמש בטלפון אם הוא יאבד או ייגנב."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"ברצוני לדלג בכל זאת"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"חזרה"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"איתור החיישן"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"אתר את חיישן טביעת האצבע בגב הטלפון."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"נגיעה בחיישן"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"החיישן נמצא בגב הטלפון. יש להשתמש באצבע המורה."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"איור המציג את המיקום של חיישן טביעת האצבע במכשיר"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"שם"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"אישור"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"מחיקה"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"קדימה, נתחיל"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"נגיעה בחיישן"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"הנח את האצבע על החיישן והרם אותה לאחר שתרגיש רטט"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"המשך"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"הזז מעט את האצבע כדי להוסיף את כל החלקים של טביעת האצבע"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"טביעת האצבע נוספה!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"כשתראה את הסמל הזה, תוכל להשתמש בטביעת האצבע שלך לצורך זיהוי או אישור רכישה."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"גע בחיישן טביעת האצבע כדי להוציא את המכשיר ממצב שינה ולבטל את הנעילה שלו."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"כשהסמל הזה מופיע, פירוש הדבר הוא שאפשר גם לאשר רכישות או להיכנס לאפליקציות."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"להרים ולגעת בחיישן שוב"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"יש להרים את האצבע ולגעת בחיישן בחלקים שונים שלה כדי להוסיף טביעת אצבע מלאה"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"טביעת האצבע שלך נקלטה"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"כשיוצג לך הסמל הזה, משמעות הדבר היא שאפשר להשתמש בטביעת אצבע לצורכי זיהוי או לאישור רכישה."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"האם לדלג על הגדרת טביעת אצבע?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"בחרת להשתמש בטביעת האצבע שלך כאחת מהדרכים שבהן תוכל לבטל את הנעילה בטלפון. אם תדלג על שלב זה עכשיו, תצטרך לבצע את ההגדרה בהמשך. ההגדרה לוקחת רק דקה או שתיים."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"הגדר נעילת מסך"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"סיום"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"אופס. זה לא החיישן הנכון"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"השתמש בחיישן טביעת האצבע במכשיר."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"יש לגעת בחיישן שבגב הטלפון באצבע המורה."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ההרשמה לא הושלמה"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"חלף הזמן הקצוב להרשמה באמצעות טביעת אצבע. נסה שוב."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ההרשמה באמצעות טביעת אצבע נכשלה. נסה שוב או השתמש באצבע אחרת."</string>
@@ -455,6 +465,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"הפעל את תכונות הגנת המכשיר כדי למנוע מאחרים להשתמש במכשיר הזה ללא אישורך. בחר בנעילת המסך שבה תרצה להשתמש."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"הפעל את תכונות הגנת המכשיר כדי למנוע מאחרים להשתמש בטלפון הזה ללא אישורך. בחר בנעילת המסך שבה תרצה להשתמש."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"בחר את שיטת הגיבוי לנעילת המסך"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"אפשרויות נעילת מסך"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"אפשרויות נעילת מסך"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"נעילת מסך"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / מיד לאחר יציאה ממצב שינה"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> לאחר יציאה ממצב שינה"</string>
@@ -525,13 +537,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"שנה את קו ביטול הנעילה"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"שנה קוד גישה לביטול נעילה"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"שנה סיסמת ביטול נעילה"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"נסה שוב. ניסיון <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> מתוך <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"ניסיון אחרון"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"אם תזין קו ביטול נעילה שגוי בפרופיל העבודה בניסיון הזה, פרופיל העבודה שלך והנתונים המשויכים יוסרו מהמכשיר הזה."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"אם תזין קוד גישה שגוי בפרופיל העבודה בניסיון הזה, פרופיל העבודה שלך והנתונים המשויכים יוסרו מהמכשיר הזה."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"אם תזין סיסמה שגויה בפרופיל העבודה בניסיון הזה, פרופיל העבודה שלך והנתונים המשויכים יוסרו מהמכשיר הזה."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"נעשו יותר מדי ניסיונות שגויים. פרופיל העבודה שלך והנתונים המשויכים יוסרו מהמכשיר הזה."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ביטול"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"נסה שוב. ניסיון <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> מתוך <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"הנתונים שלך יימחקו"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"אם תזין קו ביטול נעילה שגוי בניסיון הבא, הנתונים במכשיר יימחקו"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"אם תזין קוד גישה שגוי בניסיון הבא, הנתונים במכשיר יימחקו"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"אם תזין סיסמה שגויה בניסיון הבא, הנתונים במכשיר יימחקו"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"אם תזין קו ביטול נעילה שגוי בניסיון הבא, המשתמש הזה יימחק"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"אם תזין קוד גישה שגוי בניסיון הבא, המשתמש הזה יימחק"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"אם תזין סיסמה שגויה בניסיון הבא, המשתמש הזה יימחק"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"אם תזין קו ביטול נעילה שגוי בניסיון הבא, פרופיל העבודה והנתונים המשויכים אליו יימחקו"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"אם תזין קוד גישה שגוי בניסיון הבא, פרופיל העבודה והנתונים המשויכים אליו יימחקו"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"אם תזין סיסמה שגויה בניסיון הבא, פרופיל העבודה והנתונים המשויכים אליו יימחקו"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"נעשו יותר מדי ניסיונות שגויים. נתוני המכשיר יימחקו."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"נעשו יותר מדי ניסיונות שגויים. המשתמש הזה יימחק."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"נעשו יותר מדי ניסיונות שגויים. פרופיל העבודה והנתונים המשויכים אליו יימחקו."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"סגור"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"צריכה להכיל <xliff:g id="COUNT">%d</xliff:g> תווים לפחות"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"קוד הגישה צריך להיות באורך של <xliff:g id="COUNT">%d</xliff:g> ספרות לפחות"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"המשך"</string>
@@ -648,6 +668,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"‏Bluetooth מתקדם"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"‏כש-Bluetooth פועל, יש קשר למכשירי Bluetooth אחרים."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"‏כדי לשפר את דיוק המיקום, אפליקציות ושירותים של המערכת יכולים עדיין לזהות התקני Bluetooth. ניתן לשנות זאת ב<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>הגדרות הסריקה<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"לא ניתן להתחבר. יש לנסות שוב."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"פרטי מכשיר"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"‏כתובת המכשיר לחיבור דרך Bluetooth: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"לשכוח את ההתקן?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"ההתאמה בין הטלפון שלך להתקן <xliff:g id="DEVICE_NAME">%1$s</xliff:g> תבוטל"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"ההתאמה בין הטאבלט שלך להתקן <xliff:g id="DEVICE_NAME">%1$s</xliff:g> תבוטל"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"ההתאמה בין המכשיר שלך להתקן <xliff:g id="DEVICE_NAME">%1$s</xliff:g> תבוטל"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"שכח התקן"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"התחבר אל…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ינותק מהאודיו של המדיה."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ינותק מהאודיו של הדיבורית."</string>
@@ -800,6 +828,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"ללא אישור"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"ללא אימות"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"לא הוגדר אישור. החיבור שלך לא יהיה פרטי."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"שם הרשת ארוך מדי."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"חובה לציין דומיין."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS זמין"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS זמין)"</string>
@@ -833,7 +862,6 @@
       <item quantity="one">רשת אחת</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"‏Wi-Fi מתקדם"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"‏הגדרת Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"‏כתובת MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"‏כתובת IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"מסכת רשת משנה"</string>
@@ -870,9 +898,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"לשכוח קבוצה זו?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"‏נקודה ניידת לשיתוף אינטרנט ב-Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"‏נקודת Wi‑Fi לשיתוף אינטרנט"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"‏השתמש בחיבור סלולרי כדי לספק רשת Wi‑Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"לא משתף את החיבור לאינטרנט של טאבלט זה דרך נקודה לשיתוף אינטרנט"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"לא משתף את החיבור לאינטרנט של טלפון זה דרך נקודה לשיתוף אינטרנט"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"לא יתבצע שיתוף של חיבור לאינטרנט או של תכנים עם מכשירים אחרים"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"המערכת משתפת את החיבור לאינטרנט של הטאבלט דרך נקודה לשיתוף אינטרנט"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"המערכת משתפת את החיבור לאינטרנט של הטלפון דרך נקודה לשיתוף אינטרנט"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"מתבצע שיתוף תכנים באחת האפליקציות. כדי לשתף חיבור לאינטרנט, יש להשבית את הנקודה לשיתוף אינטרנט ולהפעיל אותה מחדש"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"‏שם הנקודה לשיתוף Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"המערכת מפעילה את <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"אפשר לחבר מכשירים נוספים לנקודה <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"‏סיסמה לנקודה לשיתוף Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"‏תדר AP"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"‏יש לך אפשרות להשתמש בנקודה לשיתוף אינטרנט כדי ליצור רשת Wi‑Fi ולחבר אליה את המכשירים האחרים שלך. נקודות לשיתוף אינטרנט מספקות חיבור לאינטרנט דרך חבילת הגלישה שלך. ייתכן שהשימוש יהיה כרוך בתשלום נוסף על חבילת הגלישה."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"אפשר להשתמש באפליקציות כדי ליצור נקודה לשיתוף אינטרנט ולשתף תכנים בין מכשירים שנמצאים בקרבת מקום."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"מפעיל נקודה לשיתוף אינטרנט…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"מכבה נקודה לשיתוף אינטרנט…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> פעיל"</string>
@@ -919,6 +955,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"‏כשהתקשרות Wi-Fi פועלת, הטלפון יכול לנתב שיחות ברשתות Wi-Fi או ברשת של הספק, בהתאם להעדפה שלך ולאות שחזק יותר. לפני הפעלת תכונה זו, בדוק עם הספק פרטים הקשורים לעמלות ופרטים אחרים."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"עדכן כתובת למקרה חירום"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"‏כתובת שתשמש כמיקום שלך לטובת שירותי החירום, אם תתקשר למוקד החירום באמצעות רשת Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"תצוגה"</string>
@@ -976,6 +1013,8 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"אין תוצאות"</string>
     <string name="display_settings" msgid="7965901687241669598">"תצוגה"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"סיבוב אוטומטי של המסך"</string>
+    <!-- no translation found for color_mode_title (3159275920408338215) -->
+    <skip />
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"שנה כיוון באופן אוטומטי בעת סיבוב הטאבלט"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"שנה כיוון באופן אוטומטי בעת סיבוב הטלפון"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"שנה כיוון באופן אוטומטי בעת סיבוב הטאבלט"</string>
@@ -1003,23 +1042,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"בצע אופטימיזציה של רמת הבהירות בהתאם לאור הזמין. כשתכונה זו מופעלת, עדיין ניתן להתאים את הבהירות באופן זמני."</string>
     <string name="night_display_title" msgid="2626451512200357686">"תאורת לילה"</string>
     <string name="night_display_text" msgid="1837277457033025056">"תאורת הלילה מעניקה למסך גוון ענבר בשעת לילה. כך יהיה לך קל יותר להביט במסך או לקרוא באור מעומעם, ויהיה לך קל יותר להירדם."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"לוח זמנים"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"סטטוס"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"הפעל באופן אוטומטי"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"אף פעם"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"תזמון מותאם אישית"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"מהשקיעה ועד לזריחה"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"לוח זמנים"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"לא יופעל"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"יופעל בשעה שאני אקבע"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"יופעל מהשקיעה עד הזריחה"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"שעת התחלה"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"שעת סיום"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"סטטוס"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"עוצמה"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"כבוי. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"לא יופעל אוטומטית אף פעם."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"יופעל אוטומטית בשעה <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"יופעל אוטומטית בשקיעה."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"פועל. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"לא ייכבה אוטומטית אף פעם."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"ייכבה אוטומטית בשעה <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"ייכבה אוטומטית בזריחה."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"כבוי / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"לא יופעל אוטומטית"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"יופעל אוטומטית בשעה <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"יופעל אוטומטית בשקיעה"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"פועל / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"לא ייכבה אוטומטית"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"ייכבה אוטומטית בשעה <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"ייכבה אוטומטית בזריחה"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"שינה"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"כיבוי מסך"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"לאחר <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> של חוסר פעילות"</string>
@@ -1043,8 +1081,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"הגדרות"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"בהירות אוטומטית"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"הרם כדי להוציא ממצב שינה"</string>
-    <string name="doze_title" msgid="2259176504273878294">"תצוגת אווירה"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"תצוגה סביבתית"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"פועל תמיד"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"הודעות חדשות"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"מתי להציג"</string>
+    <string name="doze_title" msgid="2375510714460456687">"הודעות חדשות"</string>
     <string name="doze_summary" msgid="3846219936142814032">"המסך יתעורר כשמתקבלות הודעות"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"פועל תמיד"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"הצגה של השעה, של סמלי ההודעות ושל פרטים אחרים"</string>
     <string name="title_font_size" msgid="4405544325522105222">"גודל גופן"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"הגדלה או הקטנה של גודל הטקסט"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"‏הגדרות נעילת כרטיס SIM"</string>
@@ -1298,6 +1342,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"‏ה-APN לא יכול להיות ריק."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"‏שדה MCC חייב להכיל 3 ספרות."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"‏שדה MNC חייב להכיל 2 או 3 ספרות."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"‏הספק לא מתיר הוספה של APNs מסוג %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"‏משחזר את הגדרות ברירת המחדל של APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"אפס לברירת המחדל"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"‏איפוס הגדרות ברירת המחדל של APN הושלם."</string>
@@ -1329,6 +1374,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"‏מחק כרטיס SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"‏מחק את כל הנתונים באחסון ה-USB הפנימי, כגון פריטי מוזיקה או תמונות"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"‏מחק את כל הנתונים שבכרטיס ה-SD, כגון מוזיקה או תמונות"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"‏מחק את כרטיסי ה-eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"‏מחיקה של כל כרטיסי ה-eSIM בטלפון. פעולה זו לא תבטל את תוכנית השירות הסלולרי שלך."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"‏מחיקה של כל כרטיסי ה-eSIM בטאבלט. פעולה זו לא תבטל את תוכנית השירות הסלולרי שלך."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"איפוס טאבלט"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"איפוס טלפון"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"האם למחוק את כל המידע האישי שלך והאפליקציות שהורדת? לא ניתן לבטל את הפעולה!"</string>
@@ -1351,26 +1399,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"‏לא ניתן לשתף אינטרנט בין ניידים או להשתמש בנקודה ניידת לשיתוף אינטרנט כשחוסך הנתונים (Data Saver) פועל."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"‏שיתוף אינטרנט דרך USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"‏USB מחובר, סמן כדי לקשור"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"קשור"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"‏לא ניתן לשתף אינטרנט כאשר אחסון USB נמצא בשימוש"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"‏USB אינו מחובר"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"חבר כדי להפעיל"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"‏שגיאה בשיתוף אינטרנט דרך USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"‏שתף בחיבור לאינטרנט של הטלפון דרך USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"‏שתף בחיבור לאינטרנט של הטאבלט דרך USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"‏שיתוף אינטרנט דרך Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"‏משתף את החיבור לאינטרנט של טאבלט זה דרך Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"‏משתף את החיבור לאינטרנט של טלפון זה דרך Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"‏משתף את החיבור לאינטרנט של טאבלט זה עם מכשיר אחד דרך Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"‏משתף את החיבור לאינטרנט של טלפון זה עם מכשיר אחד דרך Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"‏משתף את החיבור לאינטרנט של טאבלט זה עם <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> מכשירים דרך Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"‏משתף את החיבור לאינטרנט של טלפון זה עם <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> מכשירים דרך Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"‏שיתוף החיבור לאינטרנט של הטאבלט דרך Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"‏שיתוף החיבור לאינטרנט של הטלפון דרך Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"‏משתף את החיבור לאינטרנט של <xliff:g id="DEVICE_NAME">%1$d</xliff:g> זה דרך Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"‏לא משתף את החיבור לאינטרנט של טאבלט זה דרך Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"‏לא משתף את החיבור לאינטרנט של טלפון זה דרך Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"אין שיתוף אינטרנט"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"לא ניתן לשתף אינטרנט בין למעלה מ-<xliff:g id="MAXCONNECTION">%1$d</xliff:g> מכשירים."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"קשירת <xliff:g id="DEVICE_NAME">%1$s</xliff:g> תבוטל."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"השתמש בנקודה לשיתוף אינטרנט ובשיתוף אינטרנט בין ניידים כדי לספק חיבור לאינטרנט למכשירים אחרים באמצעות החיבור שלך לחבילת הגלישה."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"אפשר להשתמש בנקודה לשיתוף אינטרנט ובשיתוף אינטרנט בין ניידים כדי לאפשר למכשירים אחרים להתחבר לאינטרנט דרך חבילת הגלישה שלך. ניתן גם להשתמש באפליקציות כדי ליצור נקודה לשיתוף אינטרנט ולשתף תכנים בין מכשירים שנמצאים בקרבת מקום."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"עזרה"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"רשתות סלולריות"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"תכנית לנייד"</string>
@@ -1403,7 +1440,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"מצב מיקום"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"‏שימוש ב-GPS‏, ב-Wi‑Fi‏, ב-Bluetooth או ברשתות סלולריות כדי לקבוע את המיקום"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"‏שימוש ב-Wi‑Fi‏, ב-Bluetooth או ברשתות סלולריות כדי לקבוע את המיקום"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏השתמש ב-GPS לקביעת המיקום"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"‏השתמש ב-GPS ובחיישני המכשיר כדי לקבוע את המיקום"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"סריקה"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"‏סריקת Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"‏ניתן לשפר את דיוק המיקום אם מאפשרים לשירותים ולאפליקציות של המערכת לזהות רשתות Wi‑Fi בכל עת."</string>
@@ -1448,8 +1485,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"‏אין לך חיבור נתונים. כדי להציג מידע זה כעת, עבור אל %s ממחשב כלשהו המחובר לאינטרנט."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"טוען..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"בחר סיסמה"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"כדי להשתמש בטביעת אצבע, הגדר סיסמה"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"הגדרת הקו לביטול נעילה"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"לשימוש בטביעת אצבע, הגדר קו ביטול נעילה"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"בחר את קוד הגישה"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"כאמצעי גיבוי, הגדר קוד גישה"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"אשר את הסיסמה"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"אשר את הקו לביטול נעילה"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"אשר את קוד הגישה"</string>
@@ -1518,6 +1558,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"הגדרות אפליקציה"</string>
     <string name="install_applications" msgid="4872012136210802181">"מקורות לא ידועים"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"אפליקציות ממקורות שונים"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"אפליקציות שפתחת לאחרונה"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"הצגת כל <xliff:g id="COUNT">%1$d</xliff:g> האפליקציות"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"לפני <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"הטאבלט והנתונים האישיים שלך פגיעים יותר להתקפות של אפליקציות לא מוכרות. על ידי התקנת אפליקציות ממקור זה, אתה מסכים לכך שאתה האחראי לכל נזק לטאבלט או לכל אובדן של נתונים שעשויים להיגרם כתוצאה מהשימוש באפליקציות אלה."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"הטלפון והנתונים האישיים שלך פגיעים יותר להתקפות של אפליקציות לא מוכרות. על ידי התקנת אפליקציות ממקור זה, אתה מסכים לכך שאתה האחראי לכל נזק לטלפון או לכל אובדן של נתונים שעשויים להיגרם כתוצאה מהשימוש באפליקציות אלה."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"הגדרות מתקדמות"</string>
@@ -1688,6 +1731,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"להפסיק שירות מערכת?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"אם תפסיק שירות זה, תכונות מסוימות של הטאבלט עלולות להפסיק לפעול כהלכה עד לכיבוי המכשיר והפעלתו מחדש."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"אם תפסיק שירות זה, תכונות מסוימות של הטלפון עלולות להפסיק לפעול כהלכה עד לכיבוי המכשיר והפעלתו מחדש."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"שפות, קלט ותנועות"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"שפות וקלט"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"שפות וקלט"</string>
     <string name="input_assistance" msgid="7577795275222555487">"סיוע בקלט"</string>
@@ -1914,6 +1961,12 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> שירותי הדפסה פועלים</item>
       <item quantity="one">שירות הדפסה אחד פועל</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <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">משימת הדפסה אחת</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"שירותי הדפסה"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"אין שירותים מותקנים"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"לא נמצאו מדפסות"</string>
@@ -1980,6 +2033,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"פרטי שימוש"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"התאמת צריכת סוללה"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"חבילות כלולות"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"אפליקציות שמרוקנות את הסוללה"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"מונע מהמכשיר לעבור למצב שינה"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"מוציא את המכשיר ממצב שינה ברקע"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"מבקש מיקום בתדירות גבוהה"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> אפליקציות פועלות בצורה חריגה"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"לעצור את האפליקציה?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"ניהול השימוש בסוללה של הטלפון לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> מוציאה את הטלפון ממצב שינה.\n\nכדי לנסות לפתור את הבעיה, אפשר לאלץ עצירה של האפליקציה.\n\nאם הבעיה תימשך, ייתכן שיהיה עליך להסיר את ההתקנה של האפליקציה כדי לשפר את הביצועים של הסוללה."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"ניהול השימוש בסוללה של הטאבלט לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> מוציאה את הטאבלט ממצב שינה.\n\nכדי לנסות לפתור את הבעיה, אפשר לאלץ עצירה של האפליקציה.\n\nאם הבעיה תימשך, ייתכן שיהיה עליך להסיר את ההתקנה של האפליקציה כדי לשפר את הביצועים של הסוללה."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"ניהול השימוש בסוללה של המכשיר לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> מוציאה את המכשיר ממצב שינה.\n\nכדי לנסות לפתור את הבעיה, אפשר לאלץ עצירה של האפליקציה.\n\nאם הבעיה תימשך, ייתכן שיהיה עליך להסיר את ההתקנה של האפליקציה כדי לשפר את הביצועים של הסוללה."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"אני רוצה לעצור את האפליקציה"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"להשבית שימוש ברקע?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"ניהול השימוש בסוללה של הטלפון לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> מוציאה את הטלפון ממצב שינה.\n\nכדי לפתור את הבעיה, אפשר להגדיר את הטלפון כך שימנע מהאפליקציה לפעול ברקע."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"ניהול השימוש בסוללה של הטאבלט לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> מוציאה את הטאבלט ממצב שינה.\n\nכדי לפתור את הבעיה, אפשר להגדיר את הטאבלט כך שימנע מהאפליקציה לפעול ברקע."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"ניהול השימוש בסוללה של המכשיר לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> מוציאה את המכשיר ממצב שינה.\n\nכדי לפתור את הבעיה, אפשר להגדיר את המכשיר כך שימנע מהאפליקציה לפעול ברקע."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"השבת"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"להשבית העברה של נתוני מיקום?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"ניהול השימוש בסוללה של הטלפון לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> מבקשת את נתוני המיקום שלך גם כשהיא לא בשימוש.\n\nכדי לפתור את הבעיה, אפשר להשבית העברה של נתוני מיקום לאפליקציה הזו."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"ניהול השימוש בסוללה של הטאבלט לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> מבקשת את נתוני המיקום שלך גם כשהיא לא בשימוש.\n\nכדי לפתור את הבעיה, אפשר להשבית העברה של נתוני מיקום לאפליקציה הזו."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"ניהול השימוש בסוללה של המכשיר לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> מבקשת את נתוני המיקום שלך גם כשהיא לא בשימוש.\n\nכדי לפתור את הבעיה, אפשר להשבית העברה של נתוני מיקום לאפליקציה הזו."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"השבת"</string>
     <string name="power_screen" msgid="3023346080675904613">"מסך"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"פנס"</string>
     <string name="power_camera" msgid="4976286950934622605">"מצלמה"</string>
@@ -1994,7 +2067,7 @@
     <string name="power_apps" msgid="2043554781293951327">"אפליקציות"</string>
     <string name="power_service" msgid="1599661212370831780">"שירותים"</string>
     <string name="power_system" msgid="8290455327965307383">"מערכת"</string>
-    <string name="power_user" msgid="1889728099253018005">"משתמש"</string>
+    <string name="power_user" msgid="3706143225319881667">"משתמשים אחרים"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"‏CPU - סך הכל"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏CPU בחזית"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"שמור במצב פעיל"</string>
@@ -2046,6 +2119,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"חישוב יתר של שימוש בחשמל"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> מיליאמפר לשעה"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"משך השימוש: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"פעילה כבר <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"שימוש במסך במשך <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> בשימוש על ידי <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> מצריכת הסוללה הכוללת"</string>
@@ -2615,7 +2689,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"שנה קוד גישה"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"הצג התראות"</string>
     <string name="help_label" msgid="6886837949306318591">"עזרה ומשוב"</string>
-    <string name="support_summary" msgid="8276116616493882830">"מאמרי עזרה, תמיכה בטלפון ובצ\'אט"</string>
+    <string name="support_summary" msgid="2705726826263742491">"מאמרי עזרה, תמיכה טלפונית ותמיכה בצ\'אט, תחילת העבודה"</string>
     <string name="user_account_title" msgid="1127193807312271167">"חשבון לתוכן"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"זיהוי תמונה"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"איומים קיצוניים"</string>
@@ -2707,9 +2781,12 @@
       <item quantity="one">‏הצג פריט %d מוסתר</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"רשת ואינטרנט"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"‏Wi-Fi, נייד, צריכת נתונים, נקודה לשיתוף אינטרנט, hotspot, הוטספוט"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"סלולרית"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"שימוש בנתונים"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"נקודה לשיתוף אינטרנט"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"מכשירים מחוברים"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"‏Bluetooth,‏ Cast‏, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"‏Bluetooth, העברה"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"אפליקציות והודעות"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"הרשאות ואפליקציות המוגדרות כברירת מחדל"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"משתמשים וחשבונות"</string>
@@ -2762,6 +2839,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"תנועה"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"שלם, הקש, תשלומים"</string>
     <string name="keywords_backup" msgid="470070289135403022">"‏גיבוי, לגבות, backup, back up"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"‏תנועה, אדג\', צד, אקטיב אדג\', כיווץ, תפיסה, סקוויז, אחיזה, עזרה, אסיסט, אסיסטנט, סקוויזי, Ok Google‏, אוקיי גוגל, אסיסטנט של גוגל, גוגל אסיסטנט, gesture, edge, side, active edge, squeeze, grip, assist, assistant, squeezy, squeezie, squeezey, squeezee, ok google, google assistant"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"‏תנועה, מחווה, להעיר, מסך, צג, תצוגה, כיבוי מסך, הפעלת מסך, הדלקת מסך, לחיצה, אדג\', מצב שינה, שינה, אחיזה, תפיסה, gesture, wake, notifications, screen, display, screen off, screen on, squeeze, edge, asleep, sleep, grip"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"‏תנועה, נודניק, שעון מעורר, שיחה נכנסת, שקט, מסך, צג, תצוגה, מסך נעילה, נעילת מסך, כיווץ, אחיזה, תפיסה, אדג\', עצירה, gesture, silence, snooze, alarm, incoming call, quiet, display, lockscreen, squeeze, grip, edge, stop"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏הגדר תג NFC של Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"כתוב"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"הקש על תג כדי לכתוב..."</string>
@@ -2846,7 +2926,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"אל תציג הודעות מהעבודה כלל"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"כיצד אתה רוצה שיוצגו הודעות פרופיל כאשר המכשיר נעול?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"הודעות פרופיל"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"הודעות"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"הודעות"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"הודעות אפליקציה"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"קטגוריית הודעות"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"חשיבות"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"תן לאפליקציה להחליט"</string>
@@ -2861,6 +2942,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"דחופה"</string>
     <string name="allow_sound" msgid="1820188704793497324">"הפעלת צליל"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"אל תשמיע צליל, תפעיל רטט או תציג במהירות הודעות אלו לתצוגה המפורטת במסך הנוכחי."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"חשיבות נמוכה"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"חשיבות בינונית"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"חשיבות גבוהה"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"חשיבות דחופה"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"אסיסטנט ההודעות"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"גישה אל הודעות"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"הגישה להודעות של פרופיל העבודה חסומה"</string>
@@ -2890,8 +2975,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"תמונה בתוך תמונה"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"אפשר תמונה בתוך תמונה"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"אפשר לאפליקציה זו ליצור חלון מסוג תמונה בתוך תמונה בזמן שהאפליקציה פתוחה, או לאחר שאתה יוצא ממנה (למשל, כדי להמשיך לצפות בסרטון). חלון זה מוצג מעל אפליקציות אחרות שאתה משתמש בהן."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"כן"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"לא"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"גישה אל \'נא לא להפריע\'"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"אין אפליקציות מותקנות שביקשו גישה אל \'נא לא להפריע\'"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"טוען אפליקציות..."</string>
@@ -3030,11 +3113,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"פרופיל העבודה הזה מנוהל על ידי:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"מנוהל על ידי <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ניסיוני)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"סיבוב המכשיר"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"תוכן המסך יסתובב"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"תצוגה לאורך בלבד"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"תצוגה לרוחב בלבד"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"הישאר בכיוון המסך הנוכחי"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"הפעלה מאובטחת"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"המשך"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"ניתן להגביר את ההגנה על מכשיר זה על-ידי דרישה להזנת קוד גישה לפני הפעלתו. עד שהמכשיר יופעל, הוא לא יוכל לקבל שיחות, הודעות או התראות, כולל התראות קוליות. \n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו. האם לדרוש קוד גישה כדי להפעיל את המכשיר?"</string>
@@ -3042,7 +3120,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ניתן להגביר את ההגנה על המכשיר על ידי דרישה להזנת סיסמה לפני שהוא מופעל. עד שהמכשיר יופעל, הוא לא יוכל לקבל שיחות, הודעות או התראות, כולל התראות קוליות. \n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו. האם לדרוש סיסמה כדי להפעיל את המכשיר?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"בנוסף לשימוש בטביעת אצבע כדי לבטל את הנעילה של המכשיר, ניתן להגביר את ההגנה עליו על ידי דרישה להזנת קוד גישה לפני שהוא מופעל. עד שהמכשיר יופעל, הוא לא יוכל לקבל שיחות, הודעות או התראות, כולל התראות קוליות.\n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו. האם לדרוש הזנה של קוד גישה כדי להפעיל את המכשיר?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"בנוסף לשימוש בטביעת אצבע כדי לבטל את הנעילה של המכשיר, ניתן להגביר את ההגנה עליו על ידי דרישה לסמן את קו ביטול הנעילה לפני שהוא מופעל. עד שהמכשיר יופעל, הוא לא יוכל לקבל שיחות, הודעות או התראות, כולל התראות קוליות.\n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו. האם לדרוש סימון של קו ביטול הנעילה כדי להפעיל את המכשיר?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"בנוסף לשימוש בטביעת אצבע כדי לבטל את הנעילה של המכשיר, ניתן להגביר את ההגנה על ידי דרישה להזנת סיסמה לפני שהוא מופעל. עד שהמכשיר יופעל, הוא לא יוכל לקבל שיחות, הודעות או התראות, כולל התראות קוליות.\n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו. האם לדרוש הזנת סיסמה כדי להפעיל את המכשיר?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"כדי לשפר את רמת האבטחה של המכשיר בנוסף לביטול הנעילה באמצעות טביעת אצבע, תוכל להגדיר את המכשיר כך שתידרש להזין סיסמה לפני הפעלתו. עד להפעלה של המכשיר, לא ניתן לקבל שיחות, הודעות או התראות.\n\nכך, תוכל להגן על הנתונים אם המכשיר ייגנב או יאבד. לדרוש סיסמה להפעלת המכשיר?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"כן"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"לא"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"לדרוש קוד גישה?"</string>
@@ -3168,6 +3246,19 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"התראות על ניצול סוללה"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"הצג נתונים מלאים על השימוש במכשיר"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"הצג את נתוני השימוש באפליקציה"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"צריכה גבוהה"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="two"><xliff:g id="NUMBER">%2$d</xliff:g> אפליקציות מתנהגות באופן חריג</item>
+      <item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> אפליקציות מתנהגות באופן חריג</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> אפליקציות מתנהגות באופן חריג</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> מתנהגת באופן חריג</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="two">אפליקציות מרוקנות את הסוללה</item>
+      <item quantity="many">אפליקציות מרוקנות את הסוללה</item>
+      <item quantity="other">אפליקציות מרוקנות את הסוללה</item>
+      <item quantity="one">אפליקציה אחת (<xliff:g id="APP">%1$s</xliff:g>) מרוקנת את הסוללה</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"לא בוצעה אופטימיזציה"</string>
     <string name="high_power_on" msgid="6216293998227583810">"לא בוצעה אופטימיזציה"</string>
     <string name="high_power_off" msgid="3393904131961263278">"מבצעת אופטימיזציה לשימוש בסוללה"</string>
@@ -3262,8 +3353,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"תצוגה מעל אפליקציות אחרות"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> מתוך <xliff:g id="COUNT_1">%2$d</xliff:g> אפליקציות מורשות להופיע מעל אפליקציות אחרות"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"אפליקציות עם הרשאה"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"כן"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"לא"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"יש הרשאה"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"אין הרשאה"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"להתקין אפליקציות ממקורות לא מוכרים"</string>
     <string name="write_settings" msgid="4797457275727195681">"שינוי הגדרות המערכת"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"שינוי הגדרות המערכת באמצעות כתיבה"</string>
@@ -3355,6 +3446,19 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"המסך בגוון ענבר. זה עשוי לעזור לך להירדם."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"הצעות"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"עוד <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <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">הצעה אחת</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <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">הצעה אחת נוספת</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"הסר"</string>
     <string name="color_temperature" msgid="2070126836910615605">"טמפרטורת צבעים קרים"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"השתמש בצבעי תצוגה קרירים יותר"</string>
@@ -3373,8 +3477,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"אזהרה לגבי שימוש בנתונים - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"אזהרה לגבי שימוש בנתונים - <xliff:g id="ID_1">%1$s</xliff:g> / מגבלת שימוש בנתונים - <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"מחזור חיובים"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"מחזור חודשי מתחיל ב-<xliff:g id="ID_1">%1$s</xliff:g> בכל חודש"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"חיוב חודשי החל מ-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"כל חודש ב-<xliff:g id="ID_1">%1$s</xliff:g> בחודש"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"הגבלות רשת"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="two"><xliff:g id="COUNT">%1$d</xliff:g> הגבלות</item>
@@ -3398,7 +3501,7 @@
       <item quantity="one">‏מותר להשתמש בנתונים בלתי מוגבלים באפליקציה אחת כשחוסך הנתונים (Data Saver) פועל</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"‏חוסך הנתונים (Data Saver)"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"גישה בלתי מוגבלת לנתונים"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"גישה בלתי מוגבלת לנתונים"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"נתוני הרקע כבויים"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"פועל"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"כבוי"</string>
@@ -3464,8 +3567,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"שליטה בהודעות של מסך הנעילה"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"הצג או הסתר תוכן הודעה"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"הכול"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"תמיכה"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"dp <xliff:g id="ID_1">%d</xliff:g>"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"תמיכה וטיפים"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"הרוחב הקטן ביותר"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"‏אף אפליקציה מותקנת לא ביקשה גישה לפרימיום SMS"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"‏פרימיום SMS עשוי לעלות כסף ויצורף לחשבונות הספק שלך. אם אתה מפעיל הרשאה לאפליקציה, תוכל לשלוח פרימיום SMS באמצעות אפליקציה זו."</string>
@@ -3536,28 +3638,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"באופן אוטומטי"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ידני"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"פינוי שטח אחסון עכשיו"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"תנועות"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"תנועות קיצור"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"תנועות מהירות לשליטה בטלפון"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"תנועות מהירות לשליטה בטאבלט"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"תנועות מהירות לשליטה במכשיר"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"הפעלה מיידית של המצלמה"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"כדי לפתוח את המצלמה במהירות צריך פשוט להקיש פעמיים על לחצן ההפעלה. זה פועל בכל מסך."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"פתיחה מהירה של המצלמה"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"לחיצה כפולה על לחצן ההפעלה תפתח את המצלמה"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"מעבר בין מצלמות"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"צילום מהיר יותר של סלפי"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"סיבוב של הטלפון פעמיים מצד לצד יעביר אותו למצב סלפי"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"סיבוב של הטאבלט פעמיים מצד לצד יעביר אותו למצב סלפי"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"סיבוב של המכשיר פעמיים מצד לצד יעביר אותו למצב סלפי"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"הקשה כפולה לבדיקת הטלפון"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"הקשה כפולה לבדיקת הטאבלט"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"הקשה כפולה לבדיקת המכשיר"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"כדי לבדוק במהירות את ההודעות שלך, הקש פעמיים על המסך."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"כדי לבדוק מה השעה, לבדוק אם יש סמלי הודעות ולראות מידע נוסף, פשוט צריך להקיש פעמיים על המסך."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"בדיקת התראות כשהמסך כבוי"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"הרמה לבדיקת הטלפון"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"הרמה לבדיקת הטאבלט"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"הרמה לבדיקת המכשיר"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"כדי לבדוק הודעות מהירות יש להרים את הטלפון."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"כדי לבדוק הודעות במהירות יש להרים את הטאבלט."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"כדי לבדוק הודעות במהירות יש להרים את המכשיר."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"כדי לבדוק מה השעה, לבדוק אם יש סמלי הודעות ולראות מידע נוסף, פשוט צריך להרים את הטלפון."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"כדי לבדוק מה השעה, לבדוק אם יש סמלי הודעות ולראות מידע נוסף, פשוט צריך להרים את הטאבלט."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"כדי לבדוק מה השעה, לבדוק אם יש סמלי הודעות ולראות מידע נוסף, פשוט צריך להרים את המכשיר."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"בדיקת התראות כשהמסך כבוי"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"החלקה לקריאת הודעות"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"כדי לבדוק הודעות, החלק כלפי מטה בחיישן טביעות האצבע שבחלק האחורי של הטלפון."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"כדי לבדוק הודעות, החלק כלפי מטה בחיישן טביעות האצבע שבחלק האחורי של הטאבלט."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"כדי לבדוק הודעות, החלק כלפי מטה בחיישן טביעות האצבע שבחלק האחורי של המכשיר."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"הצגת התראות במהירות"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"החלקה למטה על חיישן טביעות האצבע"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"הרמה לפתיחת המצלמה"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"כדי לפתוח את המצלמה באופן אוטומטי יש להרים את הטלפון לתנוחת צילום (לרוחב או לאורך). זה עובד כשהטלפון במצב שינה או כשהוא נעול."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"אפשר לצלם כאשר הטלפון נעול או במצב שינה"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"תנועת סיוע"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"רגישות"</string>
@@ -3675,6 +3790,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"האם ברצונך להסיר את אפליקציית האינסטנט הזאת?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"משחקים"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"קובצי אודיו"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"שטח אחסון בשימוש"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ההתקנה הוסרה אצל <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"‏(WebView מושבתת אצל <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"שירות מילוי אוטומטי"</string>
@@ -3688,5 +3804,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"אפליקציה אינסטנט"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"האם לכבות את מנהל האחסון?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"אפליקציות סרטים וטלוויזיה"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"שטח אחסון בשימוש"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"פרטי ניהול תצורה של ספק סלולרי"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"הפעל ניהול תצורה של ספק סלולרי"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"מה חדש ומעניין?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"אנחנו מזמינים אותך לנסות את חמש התכונות המובילות"</string>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index f1437c6..9076344 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"強"</item>
     <item msgid="8986346415847956850">"非常に強い"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"常に接続"</item>
-    <item msgid="844721238536786870">"電源接続時にのみ接続"</item>
-    <item msgid="1986753720941888596">"接続しない"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"常に使用"</item>
-    <item msgid="7433294150916905997">"電源接続時にのみ接続"</item>
-    <item msgid="1390404486722375028">"使用しない"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"過去30日間"</item>
     <item msgid="6600989128423965319">"使用サイクルを設定..."</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 32d8a1d..dc84bec 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"これでデベロッパーになりました！"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"開発者向けオプションが既に有効です。"</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"まず開発者向けオプションを有効にしてください。"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"無線とネットワーク"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"接続"</string>
     <string name="header_category_device" msgid="4544026001618307754">"端末"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE プロビジョニング"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ビデオ ハングアウト対応"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi 通話対応"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB / プレゼンス プロビジョニング有効"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"モバイル無線電力"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM のアドレス帳を表示"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"発信番号制限を表示"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"端末をスキャン"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"この端末の名前を変更"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"名前を変更"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"切断しますか？"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"この操作を行うと、次のデバイスとの接続が切断されます:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"端末の接続を解除しますか？"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"このスマートフォンと <xliff:g id="DEVICE_NAME">%1$s</xliff:g> との接続を解除します。"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"このタブレットと <xliff:g id="DEVICE_NAME">%1$s</xliff:g> との接続を解除します。"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"この端末と <xliff:g id="DEVICE_NAME">%1$s</xliff:g> との接続を解除します。"</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"接続を解除"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Bluetooth設定を変更する権限がありません。"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"新しいデバイスとペア設定"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Bluetooth設定を開いている間は、<xliff:g id="DEVICE_NAME">%1$s</xliff:g>は付近のデバイスに表示されています。"</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"スマートフォンの Bluetooth アドレス: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"タブレットの Bluetooth アドレス: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"端末の Bluetooth アドレス: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>を切断しますか？"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ブロードキャスト"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"プロファイルを無効にしますか？"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetoothペア設定リクエスト"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"ペア設定リクエスト"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」とペア設定するにはタップしてください。"</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"受信済みファイルを表示"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"受信済みファイル"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetoothデバイスの選択"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」が Bluetooth を ON にしようとしています"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」が Bluetooth を OFF にしようとしています"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$sがメッセージにアクセスしようとしています。%2$sにアクセスを許可しますか？"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIMアクセスリクエスト"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>がSIMカードにアクセスしようとしています。SIMカードへのアクセスを許可すると、接続を処理している間、端末上のデータ接続は無効になります。<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>にアクセスを許可します"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"他の端末には「<xliff:g id="DEVICE_NAME">^1</xliff:g>」として表示されます"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"端末"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"新しいデバイスとペア設定"</string>
     <string name="date_and_time" msgid="9062980487860757694">"日付と時刻"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"タイムゾーンの選択"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"アカウント"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"位置情報"</string>
     <string name="account_settings_title" msgid="626177544686329806">"アカウント"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"セキュリティと現在地情報"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"セキュリティと現在地情報"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"暗号化と認証情報"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"スマートフォンの暗号化"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"端末の暗号化"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"指紋によるロック解除"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"指紋の使用"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"指紋認証センサーに触れるだけで、スマートフォンのロック解除、購入の許可、アプリへのログインを行うことができます。こうした操作は、登録したどの指紋でも行えるため、誰の指紋を登録するかについては十分にご注意ください\n\n注: 指紋は複雑なパターンや PIN よりも安全面で劣る可能性があります。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"指紋認証センサーにタップするだけで、購入の承認やアプリへのログインを行えます。こうした操作は、登録したどの指紋でも行えるため、誰の指紋を登録するかについては十分にご注意ください。\n\n注: 指紋を使ってこの端末のロックを解除することはできません。詳しくは、組織の管理者にお問い合わせください。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"指紋認証センサーに触れるだけで、スマートフォンのロック解除、購入の許可、アプリへのログインを行うことができます。こうした操作は、登録したどの指紋でも行えるため、誰の指紋を登録するかについては十分にご注意ください。\n\n注: 指紋は複雑なパターンや PIN よりも安全面で劣る可能性があります。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"指紋を使って、スマートフォンのロック解除や購入の承認を行います。\n\n注: 指紋を使ってこの端末のロックを解除することはできません。詳しくは、組織の管理者にお問い合わせください。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"指紋を使って、スマートフォンのロック解除や購入の承認を行います。\n\n注: 指紋は複雑なパターンや PIN よりも安全面で劣る場合があります。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"キャンセル"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"次へ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"スキップ"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"指紋を追加"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"端末保護機能が有効になりません。このタブレットの紛失、盗難、データ消去時に、他人に使用されるのを阻止することはできません。"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"端末保護機能が有効になりません。この端末の紛失、盗難、データ消去時に、他人に使用されるのを阻止することはできません。"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"端末保護機能が有効になりません。このスマートフォンの紛失、盗難、データ消去時に、他人に使用されるのを阻止することはできません。"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"端末保護機能が有効になりません。このタブレットの紛失や盗難時に、他人に使用されるのを阻止することはできません。"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"端末保護機能が有効になりません。この端末の紛失や盗難時に、他人に使用されるのを阻止することはできません。"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"端末保護機能が有効になりません。このスマートフォンの紛失や盗難時に、他人に使用されるのを阻止することはできません。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"次へ"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"端末保護機能は ON になりません。このタブレットの紛失、盗難、リセット時に、他人に使用されるのを阻止することはできません。"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"端末保護機能は ON になりません。この端末の紛失、盗難、リセット時に、他人に使用されるのを阻止することはできません。"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"端末保護機能は ON になりません。このスマートフォンの紛失、盗難、リセット時に、他人に使用されるのを阻止することはできません。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"端末保護機能は ON になりません。このタブレットの紛失や盗難時に、他人に使用されるのを阻止することはできません。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"端末保護機能は ON になりません。この端末の紛失や盗難時に、他人に使用されるのを阻止することはできません。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"端末保護機能は ON になりません。このスマートフォンの紛失や盗難時に、他人に使用されるのを阻止することはできません。"</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"スキップ"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"戻る"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"センサー位置の確認"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"端末の背面にある指紋認証センサーを探します。"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"センサーに触れる"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"スマートフォンの背面にあります。人差し指を使用します。"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"端末の指紋認証センサーの位置を示した図"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"名前"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"削除"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"登録の開始"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"センサーに触れる"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"指をセンサーに当て、振動したら離します。"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"もう一度触れてください"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"指を少しずつ動かして、指紋全体を登録します。"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"指紋の登録完了"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"このアイコンが表示されているときは、本人確認や購入の承認に指紋認証を使用できます。"</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"指紋認証センサーに触れるだけで端末を復帰させてロックを解除できます。"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"このアイコンが表示されている場合は、購入の許可やアプリへのログインも行えます。"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"指を離してからもう一度触れる"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"指を離したままにして、あらゆる角度から指紋を登録します"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"指紋の登録完了"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"このアイコンが表示されているときは、本人確認や購入の承認に指紋認証を使用します。"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"指紋の設定をスキップしますか？"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"スマートフォンのロック解除方法として指紋を選択しています。スキップした場合は、後でセットアップする必要があります。セットアップの所要時間は1分程度です。"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"画面ロックを設定"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"完了"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"これはセンサーではありません"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"端末の指紋認証センサーを使用してください。"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"スマートフォン背面のセンサーに人差し指で触れます。"</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"登録を完了できませんでした"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"指紋の登録がタイムアウトになりました。もう一度お試しください。"</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"指紋を登録できませんでした。もう一度試すか、別の指を使用してください。"</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"この端末が他人に無断で使用されるのを防ぐには、端末保護機能を有効にします。利用する画面ロックを選択してください。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"このスマートフォンが他人に無断で使用されるのを防ぐには、端末保護機能を有効にします。利用する画面ロックを選択してください。"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"予備の画面ロック方式を選択してください"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"画面ロックの方法"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"画面ロックの種類"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"画面ロック"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / スリープ直後"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / スリープから <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g>"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ロック解除パターンの変更"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ロック解除PINの変更"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ロック解除パスワードの変更"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"もう一度お試しください。入力回数: <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>/<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"残り 1 回"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"仕事用パターンをあと 1 回間違って入力すると、仕事用プロファイルと関連データはこの端末から削除されます。"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"仕事用 PIN をあと 1 回間違って入力すると、仕事用プロファイルと関連データはこの端末から削除されます。"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"仕事用パスワードをあと 1 回間違って入力すると、仕事用プロファイルと関連データはこの端末から削除されます。"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"入力回数が上限を超えました。仕事用プロファイルと関連データはこの端末から削除されます。"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"閉じる"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"もう一度お試しください。入力回数: <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>/<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> 回"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"データが削除されます"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"パターンをあと 1 回間違えると、この端末のデータが削除されます"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"PIN をあと 1 回間違えると、この端末のデータが削除されます"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"パスワードをあと 1 回間違えると、この端末のデータが削除されます"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"パターンをあと 1 回間違えると、このユーザーが削除されます"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"PIN をあと 1 回間違えると、このユーザーが削除されます"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"パスワードをあと 1 回間違えると、このユーザーが削除されます"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"パターンをあと 1 回間違えると、仕事用プロファイルと関連データが削除されます"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"PIN をあと 1 回間違えると、仕事用プロファイルと関連データが削除されます"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"パスワードをあと 1 回間違えると、仕事用プロファイルと関連データが削除されます"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"間違えた回数が上限を超えました。この端末のデータが削除されます。"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"間違えた回数が上限を超えました。このユーザーが削除されます。"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"間違えた回数が上限を超えました。この仕事用プロファイルと関連データが削除されます。"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"閉じる"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"<xliff:g id="COUNT">%d</xliff:g> 文字以上必要です"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN は <xliff:g id="COUNT">%d</xliff:g> 桁以上必要です"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"次へ"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth詳細設定"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"BluetoothをONにすると、お使いの端末は近くにある他のBluetoothデバイスと通信できます。"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"位置情報の精度を向上させるため、BluetoothがOFFの場合でもシステムのアプリやサービスはBluetoothデバイスを検出できます。この設定は、<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>スキャンの設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>で変更できます。"</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"接続できませんでした。もう一度お試しください。"</string>
+    <string name="device_details_title" msgid="6576953269221085300">"端末の詳細"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"端末の Bluetooth アドレス: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"このデバイスとのペアを解除しますか？"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"このスマートフォンと <xliff:g id="DEVICE_NAME">%1$s</xliff:g> とのペア設定を解除します"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"このタブレットと <xliff:g id="DEVICE_NAME">%1$s</xliff:g> とのペア設定を解除します"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"この端末と <xliff:g id="DEVICE_NAME">%1$s</xliff:g> とのペア設定を解除します"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"このデバイスとのペアを解除"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"接続先..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>はメディアの音声から切断されます。"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>はハンズフリー音声デバイスから切断されます。"</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"指定しない"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"検証しない"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"証明書が指定されていません。この接続ではプライバシーが保護されません。"</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"ネットワーク名が長すぎます。"</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"ドメインを指定する必要があります。"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS利用可"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" （WPS利用可）"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">ネットワーク: 1 件</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi詳細設定"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wi‑Fi の設定"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MACアドレス"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IPアドレス"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"サブネット マスク"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"このグループを削除しますか？"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ポータブルWi-Fiアクセスポイント"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fiアクセスポイント"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"モバイル接続で Wi‑Fi ネットワークを提供"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"このタブレットのインターネット接続をアクセス ポイント経由で共有しない"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"このスマートフォンのインターネット接続をアクセス ポイント経由で共有しない"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"インターネット接続やコンテンツを他の端末と共有しません"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"このタブレットのインターネット接続をアクセス ポイント経由で共有"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"このスマートフォンのインターネット接続をアクセス ポイント経由で共有"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"アプリがコンテンツを共有しています。インターネット接続を共有するには、アクセス ポイントをオフにしてから再度オンにします"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi 名"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> を ON にしています..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"他の端末が <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> に接続できます"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi パスワード"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP 帯域幅"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"アクセス ポイントを使って他の端末との Wi‑Fi ネットワークを作成します。アクセス ポイントはモバイルデータ接続によるインターネット接続を提供します。モバイルデータ通信料が追加で発生する可能性があります。"</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"アプリを使ってアクセス ポイントを作成し、コンテンツを近くの端末と共有できます。"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"アクセスポイントをONにしています…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"アクセスポイントをOFFにしています…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> はアクティブです"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi発信をONにすると、ユーザーの設定と信号の強度に応じて、スマートフォンからWi-Fiネットワークか携帯通信会社ネットワークのいずれかを経由して通話をルーティングできるようになります。この機能をONにする場合は、事前に料金などの条件について携帯通信会社にご確認ください。"</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"緊急対応の住所の更新"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Wi-Fi を使用して 110 に電話した場合に、緊急サービスが現在地として使用する住所"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"表示"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"一致する結果はありません"</string>
     <string name="display_settings" msgid="7965901687241669598">"ディスプレイ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"画面の自動回転"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"鮮明な色"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"画面の向きに合わせて縦横表示を切り替える"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"画面の向きに合わせて縦横表示を切り替える"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"画面の向きに合わせて縦横表示を切り替える"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"周囲に合わせて明るさを最適化します。この機能が ON の場合でも、一時的に明るさを調整できます。"</string>
     <string name="night_display_title" msgid="2626451512200357686">"読書灯"</string>
     <string name="night_display_text" msgid="1837277457033025056">"読書灯を利用すると画面が黄味がかった色になります。薄明かりの下でも画面を見やすくなり、寝付きを良くする効果も期待できます。"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"スケジュール"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"ステータス"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"自動的に ON"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"設定しない"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"手動で設定"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"日の入りから日の出まで"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"スケジュール"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"使用しない"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"指定した日時に ON"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"日の入りから日の出まで ON"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"開始時間"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"終了時間"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"ステータス"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"輝度"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"OFF: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"自動で ON にしない"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"自動的に ON: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"自動的に ON: 日の入り"</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"ON: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"自動で OFF にしない"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"自動的に OFF: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"自動的に OFF: 日の出"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"OFF / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"自動で ON にしない"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"自動的に ON: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"自動的に ON: 日の入り"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"ON / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"自動で OFF にしない"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"自動的に OFF: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"自動的に OFF: 日の出"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"スリープ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"画面がOFFになったとき"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"操作が行われない状態で<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>経過後"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"設定"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"明るさを自動調整"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"指を離してスリープ状態から復帰"</string>
-    <string name="doze_title" msgid="2259176504273878294">"アンビエント表示"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"常に画面表示"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"常に ON"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"新しい通知"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"表示するタイミング"</string>
+    <string name="doze_title" msgid="2375510714460456687">"新しい通知"</string>
     <string name="doze_summary" msgid="3846219936142814032">"通知を受信したときにスリープ状態から復帰"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"常に ON"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"時刻、通知アイコンなどの情報を表示します"</string>
     <string name="title_font_size" msgid="4405544325522105222">"フォントサイズ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"テキストのサイズを変更します"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIMカードロック設定"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APNは必ず指定してください。"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC欄は3桁で指定してください。"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC欄は2桁か3桁で指定してください。"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"携帯通信会社により、タイプ %s の APN の追加は許可されていません。"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"デフォルトのAPN設定を復元しています。"</string>
     <string name="menu_restore" msgid="8260067415075573273">"初期設定にリセット"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN設定をリセットしました。"</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SDカード内データを消去"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"内部USBストレージ内の全データ（音楽、画像など）を消去します"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SDカード内の全データ（音楽、画像など）を消去します"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM を消去"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"スマートフォン上の eSIM をすべて消去します。この操作でモバイル サービス プランがキャンセルされることはありません。"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"タブレット上の eSIM をすべて消去します。この操作でモバイル サービス プランがキャンセルされることはありません。"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"タブレットをリセット"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"モバイル端末をリセット"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"個人情報とダウンロードしたアプリをすべて削除しますか？この操作は元に戻せません。"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"データセーバーが ON のときは、テザリングやポータブル アクセス ポイントを使用できません"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USBテザリング"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB接続済み、テザリングするには選択"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"テザリングしました"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USBストレージの使用中はテザリングできません"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USBが接続されていません"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"USBを接続してください"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USBテザリングエラー"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"スマートフォンのインターネット接続を USB 経由で共有する"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"タブレットのインターネット接続を USB 経由で共有する"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetoothテザリング"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"このタブレットのインターネット接続を Bluetooth で共有"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"このスマートフォンのインターネット接続を Bluetooth で共有"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"このタブレットのインターネット接続を 1 台の端末と Bluetooth で共有"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"この端末のインターネット接続を 1 台の端末と Bluetooth で共有"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"このタブレットのインターネット接続を <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> 台の端末と Bluetooth で共有"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"このスマートフォンのインターネット接続を <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> 台の端末と Bluetooth で共有"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"タブレットのインターネット接続を Bluetooth で共有"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"スマートフォンのインターネット接続を Bluetooth で共有"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"この <xliff:g id="DEVICE_NAME">%1$d</xliff:g> のインターネット接続を Bluetooth で共有"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"このタブレットのインターネット接続を Bluetooth で共有しない"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"このスマートフォンのインターネット接続を Bluetooth で共有しない"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"テザリングしていません"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"テザリングできるデバイスは<xliff:g id="MAXCONNECTION">%1$d</xliff:g>個までです。"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>のテザリングを解除します。"</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"アクセス ポイントとテザリングを使用して、モバイルデータ通信により他の端末にインターネット接続を提供します。"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"アクセス ポイントとテザリングを使用して、モバイルデータ通信により他の端末にインターネット接続を提供します。アプリを使ってアクセス ポイントを作成し、コンテンツを近くの端末と共有することもできます。"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ヘルプ"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"モバイル ネットワーク"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"モバイルプラン"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"位置情報モード"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"GPS、Wi‑Fi、Bluetooth、モバイル ネットワークで現在地を特定します"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Wi‑Fi、Bluetooth、モバイル ネットワークで現在地を特定します"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS で現在地を特定します"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"GPS と端末のセンサーを使って現在地を特定します"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"スキャン"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fiのスキャン"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"位置情報の精度を向上させるため、システムのアプリやサービスがいつでもWi‑Fiネットワークを検出できるようにします"</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"データ接続されていません。この情報を表示するにはインターネットに接続されているパソコンから%sにアクセスしてください。"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"読み込み中..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"パスワードを選択"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"指紋認証にはパスワードが必要です"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"パターンの選択"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"指紋認証にはパターンが必要です"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PINを選択"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"指紋認証には PIN が必要です"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"パスワードを確認"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"パターンの確認"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PINの確認"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"アプリの設定"</string>
     <string name="install_applications" msgid="4872012136210802181">"提供元不明のアプリ"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"アプリの提供元をすべて許可する"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"最近開いたアプリ"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"<xliff:g id="COUNT">%1$d</xliff:g> 個のアプリをすべて表示"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g>前"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"不明なアプリをインストールするとタブレットや個人データが攻撃を受ける可能性が高くなります。この提供元からアプリをインストールすることにより、アプリの使用により生じる可能性があるタブレットへの損害やデータの損失について、ユーザーご自身が単独で責任を負うことに同意するものとします。"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"不明なアプリをインストールするとスマートフォンや個人データが攻撃を受ける可能性が高くなります。この提供元からアプリをインストールすることにより、アプリの使用により生じる可能性があるスマートフォンへの損害やデータの損失について、ユーザーご自身が単独で責任を負うことに同意するものとします。"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"詳細設定"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"システムサービスを停止しますか？"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"このサービスを停止すると、電源を一旦OFFにして再度ONにするまで、タブレットの一部の機能が正常に動作しなくなる場合があります。"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"このサービスを停止すると、電源を一旦OFFにして再度ONにするまで、モバイル端末の一部の機能が正常に動作しなくなる場合があります。"</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"言語、入力とジェスチャー"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"言語と入力"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"言語と入力"</string>
     <string name="input_assistance" msgid="7577795275222555487">"入力アシスタント"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> 件の印刷サービスが ON です</item>
       <item quantity="one">1 件の印刷サービスが ON です</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> 件の印刷ジョブ</item>
+      <item quantity="one">1 件の印刷ジョブ</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"印刷サービス"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"インストールされているサービスはありません"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"プリンタが見つかりません"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"使用状況の詳細"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"消費電力の調整"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"含まれているパッケージ"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"電池を消費しているアプリ"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"端末をスリープモードにしないようにしています"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"バックグラウンドで端末をスリープ状態から復帰させています"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"位置情報を頻繁にリクエストしています"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> 個のアプリの動作に問題があります"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"アプリを停止しますか？"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"<xliff:g id="APP">%1$s</xliff:g> がスマートフォンをスリープモードにしないようにしているため、スマートフォンが電池を正常に管理できません。\n\nこの問題を解決するには、アプリを強制停止してみてください。\n\n問題が解決しない場合、電池消費を改善するにはこのアプリのアンインストールが必要となる可能性があります。"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"<xliff:g id="APP">%1$s</xliff:g> がタブレットをスリープモードにしないようにしているため、タブレットが電池を正常に管理できません。\n\nこの問題を解決するには、アプリを強制停止してみてください。\n\n問題が解決しない場合、電池消費を改善するにはこのアプリのアンインストールが必要となる可能性があります。"</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"<xliff:g id="APP">%1$s</xliff:g> が端末をスリープモードにしないようにしているため、端末が電池を正常に管理できません。\n\nこの問題を解決するには、アプリを強制停止してみてください。\n\n問題が解決しない場合、電池消費を改善するにはこのアプリのアンインストールが必要となる可能性があります。"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"アプリを停止する"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"バックグラウンドでの使用を OFF にしますか？"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"<xliff:g id="APP">%1$s</xliff:g> がこのスマートフォンをスリープ状態から復帰させているため、スマートフォンが電池を正常に管理できません。\n\nこの問題を解決するために、スマートフォンでこのアプリのバックグラウンドでの実行を阻止できます。"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"<xliff:g id="APP">%1$s</xliff:g> がこのタブレットをスリープ状態から復帰させているため、タブレットが電池を正常に管理できません。\n\nこの問題を解決するために、タブレットでこのアプリのバックグラウンドでの実行を阻止できます。"</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"<xliff:g id="APP">%1$s</xliff:g> が端末をスリープ状態から復帰させているため、端末が電池を正常に管理できません。\n\nこの問題を解決するために、端末でこのアプリのバックグラウンドでの実行を阻止できます。"</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"OFF にする"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"位置情報を OFF にしますか？"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"<xliff:g id="APP">%1$s</xliff:g> を使用していないときにこのアプリが位置情報のリクエストを繰り返しているため、スマートフォンが電池を正常に管理できません。\n\nこの問題を解決するには、このアプリでの位置情報の利用を OFF にします。"</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"<xliff:g id="APP">%1$s</xliff:g> を使用していないときにこのアプリが位置情報のリクエストを繰り返しているため、タブレットが電池を正常に管理できません。\n\nこの問題を解決するには、このアプリでの位置情報の利用を OFF にします。"</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"<xliff:g id="APP">%1$s</xliff:g> を使用していないときにこのアプリが位置情報のリクエストを繰り返しているため、端末が電池を正常に管理できません。\n\nこの問題を解決するには、このアプリでの位置情報の利用を OFF にします。"</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"OFF にする"</string>
     <string name="power_screen" msgid="3023346080675904613">"画面"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"ライト"</string>
     <string name="power_camera" msgid="4976286950934622605">"カメラ"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"アプリ"</string>
     <string name="power_service" msgid="1599661212370831780">"サービス"</string>
     <string name="power_system" msgid="8290455327965307383">"システム"</string>
-    <string name="power_user" msgid="1889728099253018005">"ユーザー"</string>
+    <string name="power_user" msgid="3706143225319881667">"その他のユーザー"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU合計"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPUフォアグラウンド"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"スリープモードにしない"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"過剰算出された消費電力"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>、使用"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"連続稼働時間: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"画面の使用: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g>: <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"電池使用量全体の <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2567,7 +2638,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PINを変更"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"通知を表示"</string>
     <string name="help_label" msgid="6886837949306318591">"ヘルプとフィードバック"</string>
-    <string name="support_summary" msgid="8276116616493882830">"ヘルプ記事、電話サポート、チャット サポート"</string>
+    <string name="support_summary" msgid="2705726826263742491">"ヘルプ記事、電話とチャット、使ってみる"</string>
     <string name="user_account_title" msgid="1127193807312271167">"コンテンツのアカウント"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"画像ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"極めて重大な脅威"</string>
@@ -2657,9 +2728,12 @@
       <item quantity="one">%d 件の非表示のアイテムを表示</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ネットワークとインターネット"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi、モバイル、データ使用量、アクセス ポイント"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"モバイル"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"データ使用量"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"アクセス ポイント"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"接続済みの端末"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth、キャスト、NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth、キャスト"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"アプリと通知"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"権限、デフォルト アプリ"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"ユーザーとアカウント"</string>
@@ -2712,6 +2786,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"操作"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"支払い, タップ, ペイメント"</string>
     <string name="keywords_backup" msgid="470070289135403022">"バックアップ, バック アップ"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"ジェスチャー, 側面, 側, アクティブな側面, 握る操作, つかむ, アシスト, アシスタント, スクイジー, スクイズィー, スクイーズィー, スクイージー, OK Google, Google アシスタント"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"ジェスチャー, 復帰, 通知, 画面, 表示, 画面を OFF, 画面を ON, 握る操作, 側面, スリープ時, スリープ, つかむ"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"ジェスチャー, マナーモード, スヌーズ, アラーム, 着信, 無音, 表示, ロック画面, 握る操作, つかむ, 側面, 停止"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFCタグのセットアップ"</string>
     <string name="write_tag" msgid="8571858602896222537">"書き込む"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"書き込むにはタグをタップしてください..."</string>
@@ -2794,7 +2871,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"仕事用通知をすべて表示しない"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"端末がロックされている場合、プロファイル通知をどのように表示しますか？"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"プロファイル通知"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"通知"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"通知"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"アプリの通知"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"通知のカテゴリ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"重要度"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"アプリに判断させる"</string>
@@ -2809,6 +2887,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"緊急"</string>
     <string name="allow_sound" msgid="1820188704793497324">"音の許可"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"音やバイブレーションで知らせず、現在の画面に通知を数秒間表示することもしません。"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"重要度: 低"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"重要度: 中"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"重要度: 高"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"重要度: 緊急"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"通知アシスタント"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"通知へのアクセス"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"仕事用プロファイルの通知へのアクセスがブロックされています"</string>
@@ -2836,8 +2918,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"PIP"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"PIP を許可"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"このアプリを開いているとき、またはアプリを離れた後に、動画の再生を続けるなどの目的で PIP ウィンドウを表示できるようにします。このウィンドウは、使用中の他のアプリの上に重ねて表示されます。"</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"許可する"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"許可しない"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"マナーモードへのアクセス"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"マナーモードへのアクセスをリクエストしたインストール済みアプリはありません"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"アプリを読み込んでいます..."</string>
@@ -2968,11 +3048,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"この仕事用プロファイルを管理するアプリ:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>によって管理されています"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"（試験運用）"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"端末の回転"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"画面のコンテンツを回転させる"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"縦向きのままにする"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"横向きのままにする"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"現在の向きを維持する"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"起動時の保護"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"次へ"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"端末のロック解除に指紋を使うだけでなく、起動時に PIN を入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。この端末の起動に PIN を必要としますか？"</string>
@@ -2980,7 +3055,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"この端末の起動時にパスワードを入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。この端末の起動にパスワードを必要としますか？"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"端末のロック解除に指紋を使うだけでなく、起動時に PIN を入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。この端末の起動に PIN を必要としますか？"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"端末のロック解除に指紋を使うだけでなく、起動時にパターンを入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。この端末の起動にパターンを必要としますか？"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"端末のロック解除に指紋を使うだけでなく、起動時にパスワードを入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。この端末の起動にパスワードを必要としますか？"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"端末のロック解除に指紋を使うだけでなく、起動時にパスワードを入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。この端末の起動にパスワードを必要としますか？"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"はい"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"いいえ"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PINが必要ですか？"</string>
@@ -3098,6 +3173,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"使用状況に関する通知"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"フル充電以降の端末の電池使用状況を表示"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"アプリの使用状況を表示"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"使用が多いアイテム"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> 個のアプリが正常に動作していません</item>
+      <item quantity="one">「<xliff:g id="APP">%1$s</xliff:g>」が正常に動作していません</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">複数のアプリが電池を消費しています</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> が電池を消費しています</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"最適化していないアプリ"</string>
     <string name="high_power_on" msgid="6216293998227583810">"最適化していないアプリ"</string>
     <string name="high_power_off" msgid="3393904131961263278">"電池の使用を最適化"</string>
@@ -3190,8 +3274,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"他のアプリの上に重ねて表示"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"他のアプリの上に重ねて表示できるアプリの数: <xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g> 個"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"権限のあるアプリ"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"可"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"不可"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"許可"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"不許可"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"インストール アプリ 不明 提供元"</string>
     <string name="write_settings" msgid="4797457275727195681">"システム設定の変更"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"書き込み 変更 システム設定"</string>
@@ -3281,6 +3365,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"画面が黄味がかった色になります。寝付きを良くする効果も期待できます。"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"候補"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"他 <xliff:g id="ID_1">%1$d</xliff:g> 件"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"他 <xliff:g id="ID_1">%1$d</xliff:g> 件"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> 件の候補</item>
+      <item quantity="one">1 件の候補</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">他 <xliff:g id="COUNT">%1$d</xliff:g> 件の候補</item>
+      <item quantity="one">他 1 件の候補</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"削除"</string>
     <string name="color_temperature" msgid="2070126836910615605">"寒色の色温度"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"寒色の表示色を使用します"</string>
@@ -3299,8 +3392,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> データ警告"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> データ警告 / <xliff:g id="ID_2">%2$s</xliff:g> データ上限"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"請求期間"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"月単位の請求期間の開始日は、毎月 <xliff:g id="ID_1">%1$s</xliff:g> 日です"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"<xliff:g id="ID_1">%1$s</xliff:g> 日から月単位で請求"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"毎月 <xliff:g id="ID_1">%1$s</xliff:g> 日"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"ネットワーク制限"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> 個の制限</item>
@@ -3320,7 +3412,7 @@
       <item quantity="one">データセーバーが ON のときのデータ無制限使用を 1 個のアプリに許可しました</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"データセーバー"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"データへの無制限アクセス"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"データ無制限アクセス"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"バックグラウンド データは無効になっています"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"ON"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"OFF"</string>
@@ -3384,8 +3476,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"ロック画面の通知を管理"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"通知内容の表示と非表示を切り替える"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"すべて"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"サポート"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"サポートとヒント"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"最小幅"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"プレミアム SMS へのアクセスをリクエストしたインストール済みアプリはありません"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"プレミアム SMS で料金が発生した場合は、携帯通信会社の請求に加算されます。アプリで権限を有効にすると、そのアプリを使用してプレミアム SMS を送信できるようになります。"</string>
@@ -3450,28 +3541,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"自動"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"手動"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"今すぐ空き容量を増やす"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"操作"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"操作のショートカット"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"簡単な操作でスマートフォンを管理できます"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"簡単な操作でタブレットを管理できます"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"簡単な操作で端末を管理できます"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"カメラの起動"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"カメラをすばやく起動するには、電源ボタンを 2 回押します。どの画面からでも操作できます。"</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"カメラをすばやく起動"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"電源ボタンを 2 回押してカメラを起動"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"カメラの切り替え"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"自撮り写真をすばやく撮影する"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"2 回ひねる動作でスマートフォンを自撮り写真モードに変更"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"2 回ひねる動作でタブレットを自撮り写真モードに変更"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"2 回ひねる動作で端末を自撮り写真モードに変更"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"端末の画面をダブルタップして通知をチェック"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"タブレットの画面をダブルタップして通知をチェック"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"端末の画面をダブルタップして通知をチェック"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"通知をすばやく確認するには、画面をダブルタップします。"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"時刻、通知アイコンなどの情報を確認するには、画面をダブルタップします。"</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"画面が OFF のときも通知を確認します"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"端末を持ち上げて通知をチェック"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"タブレットを持ち上げて通知をチェック"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"端末を持ち上げて通知をチェック"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"通知をすばやく確認するには、スマートフォンを持ち上げます。"</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"通知をすばやく確認するには、タブレットを持ち上げます。"</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"通知をすばやく確認するには、端末を持ち上げます。"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"時刻、通知アイコンなどの情報を確認するには、スマートフォンを持ち上げます。"</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"時刻、通知アイコンなどの情報を確認するには、タブレットを持ち上げます。"</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"時刻、通知アイコンなどの情報を確認するには、端末を持ち上げます。"</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"画面が OFF のときも通知を確認します"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"指紋センサーをスワイプして通知を表示"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"通知を確認するには、スマートフォンの背面にある指紋認証センサーを下にスワイプします。"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"通知を確認するには、タブレットの背面にある指紋認証センサーを下にスワイプします。"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"通知を確認するには、端末の背面にある指紋認証センサーを下にスワイプします。"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"通知をすばやく確認する"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"指紋認証センサーを下にスワイプ"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"撮影位置で構えたときにカメラを起動"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"カメラを自動的に起動するには、スマートフォンを撮影位置（横向きまたは縦向き）で構えます。スマートフォンがスリープ状態またはロック状態でも機能します。"</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"スリープまたはロック状態でもカメラを起動する"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"アシスト操作"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"感度"</string>
@@ -3575,6 +3679,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"この Instant App を削除してもよろしいですか？"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"ゲーム"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"音声ファイル"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"使用済み容量"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"（<xliff:g id="USER">%s</xliff:g> からアンインストール）"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"（<xliff:g id="USER">%s</xliff:g> では無効）"</string>
     <string name="autofill_app" msgid="7338387238377914374">"自動入力サービス"</string>
@@ -3588,5 +3693,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Instant App"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"ストレージ マネージャを OFF にしますか？"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"ムービー＆ TV アプリ"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"使用済み容量"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"携帯通信会社のプロビジョニング情報"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"携帯通信会社のプロビジョニングをトリガー"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"注目の新機能"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"主な 5 つの特長をチェック"</string>
 </resources>
diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml
index 13e21c2..1cc501a 100644
--- a/res/values-ka/arrays.xml
+++ b/res/values-ka/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"კარგი"</item>
     <item msgid="8986346415847956850">"შესანიშნავი"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"ყოველთვის"</item>
-    <item msgid="844721238536786870">"მხოლოდ ქსელიდან კვების მიღების დროს"</item>
-    <item msgid="1986753720941888596">"არასოდეს"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"ყოველთვის"</item>
-    <item msgid="7433294150916905997">"მხოლოდ მაშინ, როცა მიერთებულია"</item>
-    <item msgid="1390404486722375028">"არასოდეს"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"ბოლო 30 დღე"</item>
     <item msgid="6600989128423965319">"გამოყენების ციკლის დაყენება..."</item>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index a674ec8..bed497f 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ახლა დეველოპერი ხართ!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"არ არის საჭირო, თქვენ უკვე დეველოპერი ხართ."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"გთხოვთ, ჯერ ჩართოთ დეველოპერთა პარამეტრები."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"უსადენო კავშირი და ქსელები"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"კავშირები"</string>
     <string name="header_category_device" msgid="4544026001618307754">"მოწყობილობა"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE უზრუნველყოფილია"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ვიდეოზარი უზრუნველყოფილია"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi დარეკვა უზრუნველყოფილია"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presence უზრუნველყოფილია"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"მობილური რადიოკავშირის ელკვება"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM-ის მისამართების წიგნის ნახვა"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ფიქსირებული დარეკილი ნომრების ნახვა"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"მოწყობილობების ძიება"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"ამ მოწყობილობის გადარქმევა"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"გადარქმევა"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"გავწყვიტო კავშირი?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ეს დაასრულებს თქვენს კავშირს :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"გსურთ მოწყობილობის დაკავშირების გაწყვეტა?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"თქვენი ტელეფონი გაწყვეტს კავშირს <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"თქვენი ტაბლეტი გაწყვეტს კავშირს <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"თქვენი მოწყობილობა გაწყვეტს კავშირს <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"კავშირის გაწყვეტა"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"თქვენ არ გაქვთ Bluetooth-ის პარამეტრების შეცვლის ნებართვა."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"ახალი მოწყობილობის დაწყვილება"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ჩანს ახლომდებარე მოწყობილობებზე, როდესაც Bluetooth პარამეტრები გახსნილია."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"ტელეფონის Bluetooth-მისამართი: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"ტაბლეტის Bluetooth-მისამართი: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"მოწყობილობის Bluetooth-მისამართი: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"გაწყდეს კავშირი <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"მაუწყებლობა"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"გავაუქმოთ პროფილი?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth დაწყვილების მოთხოვნა"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"დაწყვილების თხოვნა"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"შეეხეთ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან დასაწყვილებლად."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"მიღებული ფაილების ნახვა"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"მიღებული ფაილები"</string>
     <string name="device_picker" msgid="4978696506172252813">"აირჩიეთ Bluetooth მოწყობილობა"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ს სურს, ჩართოს Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ს სურს, გამორთოს Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s-ს უნდა თქვენს შეტყობინებებზე წვდომა. მისცემთ %2$s-ს წვდომას?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM-ზე წვდომის მოთხოვნა"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>-ს სურს თქვენს SIM ბარათზე წვდომა. SIM ბარათზე წვდომის დაშვება კავშირის განმავლობაში გათიშავს მონაცემთა გადაცემას მოწყობილობაზე. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>-ისთვის წვდომის მიცემა"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"სხვა მოწყობილობებისთვის ჩანს, როგორც <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"თქვენი მოწყობილობები"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ახალი მოწყობილობის დაწყვილება"</string>
     <string name="date_and_time" msgid="9062980487860757694">"თარიღი და დრო"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"დროის ზონის არჩევა"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ანგარიშები"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"მდებარეობა"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ანგარიშები"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"უსაფრთხოება და მდებარეობა"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"უსაფრთხოება და მდებარეობა"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"დაშიფვრა და ავტორიზაციის მონაცემები"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ტელეფონი დაშიფრულია"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"მოწყობილობა დაშიფრულია"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"თითის ანაბეჭდით განბლოკვა"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"თითის ანაბეჭდის გამოყენება"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"თქვენი ტელეფონის განსაბლოკად, შენაძენების ავტორიზაციისთვის ან აპებში შესასვლელად, უბრალოდ შეეხეთ თითის ანაბეჭდის სენსორს. ყურადღება მიაქციეთ იმას, თუ ვის თითის ანაბეჭდებს დაამატებთ, რადგან ამ მოქმედებების შესრულება ერთ დამატებულ ანაბეჭდსაც კი შეუძლია.\n\nშენიშვნა: თითის ანაბეჭდის გამოყენება შეიძლება ძლიერ ნიმუშზე ან PIN-კოდზე ნაკლებად საიმედო იყოს."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"შენაძენების ავტორიზაციისთვის ან აპებში შესასვლელად, უბრალოდ შეეხეთ თითის ანაბეჭდის სენსორს. ყურადღება მიაქციეთ იმას, თუ ვის თითის ანაბეჭდებს დაამატებთ, რადგან ამ მოქმედებების შესრულება ერთ დამატებულ ანაბეჭდსაც კი შეუძლია.\n\nგაითვალისწინეთ: ამ მოწყობილობის განსაბლოკად თითის ანაბეჭდს ვერ გამოიყენებთ. დამატებითი ინფორმაციისთვის, დაუკავშირდით თქვენი ორგანიზაციის ადმინისტრატორს."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"თქვენი ტელეფონის განსაბლოკად, შენაძენების ავტორიზაციისთვის ან აპებში შესასვლელად, უბრალოდ შეეხეთ თითის ანაბეჭდის სენსორს. ყურადღება მიაქციეთ იმას, თუ ვის თითის ანაბეჭდებს დაამატებთ, რადგან ამ მოქმედებების შესრულება ერთ დამატებულ ანაბეჭდსაც კი შეუძლია.\n\nშენიშვნა: თითის ანაბეჭდის გამოყენება შეიძლება ძლიერ ნიმუშზე ან PIN-კოდზე ნაკლებად საიმედო იყოს."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"გამოიყენეთ თქვენი თითის ანაბეჭდი ტელეფონის განსაბლოკად ან შენაძენების დასადასტურებლად.\n\nგაითვალისწინეთ: თითის ანაბეჭდს ამ მოწყობილობის განსაბლოკად ვერ გამოიყენებთ. დამატებითი ინფორმაციისთვის დაუკავშირდით თქვენი ორგანიზაციის ადმინისტრატორს."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"გამოიყენეთ თქვენი თითის ანაბეჭდი ტელეფონის განსაბლოკად ან შენაძენების დასადასტურებლად.\n\nგაითვალისწინეთ: თითის ანაბეჭდი შესაძლოა ნაკლებად უსაფრთხო იყოს, ვიდრე მაღალი სიძლიერის მქონე განმბლოკავი ნიმუში ან PIN-კოდი."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"გაუქმება"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"გაგრძელება"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"გამოტოვება"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"ანაბეჭდის დამატება"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"მოწყობილობის დაცვის ფუნქციები არ გააქტიურდება. ტაბლეტის დაკარგვის, მოპარვის ან მისი მონაცემების ამოშლის შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"მოწყობილობის დაცვის ფუნქციები არ გააქტიურდება. მოწყობილობის დაკარგვის, მოპარვის ან მისი მონაცემების ამოშლის შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"მოწყობილობის დაცვის ფუნქციები არ გააქტიურდება. ტელეფონის დაკარგვის, მოპარვის ან მისი მონაცემების ამოშლის შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"მოწყობილობის დაცვის ფუნქციები არ გააქტიურდება. ტაბლეტის დაკარგვის ან მოპარვის შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"მოწყობილობის დაცვის ფუნქციები არ გააქტიურდება. მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"მოწყობილობის დაცვის ფუნქციები არ გააქტიურდება. ტელეფონის დაკარგვის ან მოპარვის შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"შემდეგი"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"მოწყობილობის დაცვის ფუნქციები არ ჩაირთვება. ამ ტაბლეტის დაკარგვის, მოპარვის ან მისი ქარხნული პარამეტრების დაბრუნების შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"მოწყობილობის დაცვის ფუნქციები არ ჩაირთვება. ამ მოწყობილობის დაკარგვის, მოპარვის ან მისი ქარხნული პარამეტრების დაბრუნების შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"მოწყობილობის დაცვის ფუნქციები არ ჩაირთვება. ამ ტელეფონის დაკარგვის, მოპარვის ან მისი ქარხნული პარამეტრების დაბრუნების შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"მოწყობილობის დაცვის ფუნქციები არ ჩაირთვება. ამ ტაბლეტის დაკარგვის ან მოპარვის შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"მოწყობილობის დაცვის ფუნქციები არ ჩაირთვება. ამ მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"მოწყობილობის დაცვის ფუნქციები არ ჩაირთვება. ამ ტელეფონის დაკარგვის ან მოპარვის შემთხვევაში, თქვენ ვერ შეძლებთ ხელი შეუშალოთ სხვას მის გამოყენებაში."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"მაინც გამოტოვება"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"დაბრუნება"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"სენსორის პოვნა"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"იპოვეთ თქვენი ტელეფონის უკანა ნაწილზე მდებარე თითის ანაბეჭდების სენსორი."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"შეეხეთ სენსორს"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"ის თქვენი ტელეფონის უკანა მხარეს მდებარეობს. მისაგნებად, გამოიყენეთ საჩვენებელი თითი."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ილუსტრაცია მოწყობილობისა და თითის ანაბეჭდის სენსორის ადგილმდებარეობით"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"სახელი"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"კარგი"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"წაშლა"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"დავიწყოთ"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"შეეხეთ სენსორს"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"დაადეთ თითი სენსორს და ვიბრაციის შეგრძნების შემდეგ აიღეთ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"გააგრძელეთ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"თქვენი თითის ანაბეჭდის სხვადასხვა ნაწილის დასამატებლად თითი ოდნავ გადააადგილეთ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"ანაბეჭდი დამატებულია!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"როდესად ამ ხატულას დაინახავთ, იდენტიფიცირების ან თქვენი შესყიდვის ავტორიზებისათვის შეგიძლიათ გამოიყენოთ თქვენი თითის ანაბეჭდი."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"უბრალოდ, შეეხეთ თითის ანაბეჭდის სენსორს თქვენი მოწყობილობის გამოსაღვიძებლად და განსაბლოკად."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"როცა ამ ხატულას დაინახავთ, შენაძენების ავტორიზაცია ან აპებში შესვლაც შეგეძლებათ."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"აიღეთ თითი, შემდეგ კი ხელახლა შეეხეთ"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"რამდენჯერმე აიღეთ და ისევ შეახეთ თითი სენსორს, რათა თქვენი თითის ანაბეჭდის ყველა ნაწილის დამატება შეძლოთ"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"თითის ანაბეჭდი დამატებულია"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"როდესად ამ ხატულას დაინახავთ, იდენტიფიცირების ან თქვენი შესყიდვის დადასტურებისთვის შეგიძლიათ გამოიყენოთ თქვენი თითის ანაბეჭდი."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"გსურთ თითის ანაბეჭდის დაყენ. გამოტოვება?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"თქვენ აირჩიეთ თქვენი თითის ანაბეჭდის გამოყენება თქვენი ტელეფონის განბლოკვის ერთ-ერთ მეთოდად. თუ ამას ახლა გამოტოვებთ, მისი დაყენება მოგვიანებით მოგიწევთ. დაყენებას მხოლოდ ერთი წუთი სჭირდება."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ეკრანის დაბლოკვის დაყენება"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"შესრულდა"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ეს სენსორი არ არის"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"გამოიყენეთ ანაბეჭდის სენსორი მოწყობილობაზე"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"შეეხეთ თქვენი ტელეფონის უკანა მხარეს მდებარე სენსორს. ამისთვის გამოიყენეთ საჩვენებელი თითი."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"რეგისტრაცია არ დასრულდა"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"თითის ანაბეჭდის რეგისტრაციის დროის ლიმიტი ამოიწურა. ცადეთ ისევ."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"თითის ანაბეჭდის რეგისტრაცია ვერ მოხერხდა. ცადეთ ისევ ან გამოიყენეთ სხვა თითი."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"გაააქტიურეთ მოწყობილობის დაცვის ფუნქციები, რათა თქვენი ნებართვის გარეშე ეს მოწყობილობა ვერავინ გამოიყენოს. აირჩიეთ ეკრანის დაბლოკვის სასურველი ხერხი."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"გაააქტიურეთ მოწყობილობის დაცვის ფუნქციები, რათა თქვენი ნებართვის გარეშე ეს ტელეფონი ვერავინ გამოიყენოს. აირჩიეთ ეკრანის დაბლოკვის სასურველი ხერხი."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"აირჩიეთ თქვენი სარეზერვო ეკრანის დაბლოკვის მეთოდი"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"ეკრანის დაბლოკვის ვარიანტები"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"ეკრანის დაბლოკვის ვარიანტები"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ეკრანის დაბლოკვა"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / ძილის შემდეგ დაუყოვნებლივ"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> ძილის შემდეგ"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"გასაღების ცვლილება"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"განბლოკვის PIN-ის შეცვლა"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"განბლოკვის პაროლის შეცვლა"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"ცადეთ ხელახლა. მცდელობა <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> / <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>-დან."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"ბოლო მცდელობა"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"ამ მცდელობისას სამსახურის ნიმუშის არასწორად შეყვანის შემთხვევაში, თქვენი სამსახურის პროფილი და დაკავშირებული მონაცემები ამოიშლება ამ მოწყობილობიდან."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"ამ მცდელობისას სამსახურის PIN-კოდის არასწორად შეყვანის შემთხვევაში, თქვენი სამსახურის პროფილი და დაკავშირებული მონაცემები ამოიშლება ამ მოწყობილობიდან."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"ამ მცდელობისას სამსახურის პაროლის არასწორად შეყვანის შემთხვევაში, თქვენი სამსახურის პროფილი და დაკავშირებული მონაცემები ამოიშლება ამ მოწყობილობიდან."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"დაფიქსირდა მეტისმეტად ბევრი არასწორი მცდელობა. თქვენი სამსახურის პროფილი და დაკავშირებული მონაცემები ამოიშლება ამ მოწყობილობიდან."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"დახურვა"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"ცადეთ ხელახლა. მცდელობა <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> / <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>-დან."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"თქვენი მონაცემები წაიშლება"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"შემდეგი მცდელობისას განმბლოკავი ნიმუშის არასწორად შეყვანის შემთხვევაში, ამ მოწყობილობის მონაცემები წაიშლება"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"შემდეგი მცდელობისას PIN-კოდის არასწორად შეყვანის შემთხვევაში, ამ მოწყობილობის მონაცემები წაიშლება"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"შემდეგი მცდელობისას პაროლის არასწორად შეყვანის შემთხვევაში, ამ მოწყობილობის მონაცემები წაიშლება"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"შემდეგი მცდელობისას განმბლოკავი ნიმუშის არასწორად შეყვანის შემთხვევაში, ეს მომხმარებელი წაიშლება"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"შემდეგი მცდელობისას PIN-კოდის არასწორად შეყვანის შემთხვევაში, ეს მომხმარებელი წაიშლება"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"შემდეგი მცდელობისას პაროლის არასწორად შეყვანის შემთხვევაში, ეს მომხმარებელი წაიშლება"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"შემდეგი მცდელობისას განმბლოკავი ნიმუშის არასწორად შეყვანის შემთხვევაში, თქვენი სამსახურის პროფილი და მისი მონაცემები წაიშლება"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"შემდეგი მცდელობისას PIN-კოდის არასწორად შეყვანის შემთხვევაში, თქვენი სამსახურის პროფილი და მისი მონაცემები წაიშლება"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"შემდეგი მცდელობისას პაროლის არასწორად შეყვანის შემთხვევაში, თქვენი სამსახურის პროფილი და მისი მონაცემები წაიშლება"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"დაფიქსირდა ზედმეტად ბევრი არასწორი მცდელობა. შედეგად, ამ მოწყობილობის მონაცემები წაიშლება."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"დაფიქსირდა ზედმეტად ბევრი არასწორი მცდელობა. შედეგად, ეს მომხმარებელი წაიშლება."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"დაფიქსირდა ზედმეტად ბევრი არასწორი მცდელობა. შედეგად, სამსახურის ეს პროფილი და მისი მონაცემები წაიშლება."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"დახურვა"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"უნდა შეიცავდეს მინიმუმ <xliff:g id="COUNT">%d</xliff:g> სიმბოლოს"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN-კოდი უნდა შედგებოდეს მინიმუმ <xliff:g id="COUNT">%d</xliff:g> ციფრისგან"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"გაგრძელება"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth, დამატებითი"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"როდესაც Bluetooth ჩართულია, თქვენს მოწყობილობას ახლომდებარე Bluetooth მოწყობილობებთან კომუნიკაცია შეუძლია."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"მდებარეობის სიზუსტის გასაუმჯობესებლად სისტემის აპები და სერვისები კვლავ შეძლებს Bluetooth მოწყობილობების აღმოჩენას. ამის შეცვლა <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>სკანირების პარამეტრებში<xliff:g id="LINK_END_1">LINK_END</xliff:g> შეგიძლიათ."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"დაკავშირება ვერ მოხერხდა. ცადეთ ხელახლა."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"მოწყობილობის დეტალები"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"მოწყობილობის Bluetooth მისამართი: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"გსურთ მოწყობილობის დავიწყება?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"თქვენი ტელეფონი აღარ იქნება დაწყვილებული <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"თქვენი ტაბლეტი აღარ იქნება დაწყვილებული <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"თქვენი მოწყობილობა აღარ იქნება დაწყვილებული <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"მოწყობილობის დავიწყება"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"დაუკავშირდი…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> გაითიშება მედია აუდიოსგან."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> გაითიშება უხელო რეჟიმის აუდიოდან."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"არ მსურს მიწოდება"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"არ მსურს დადასტურება"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"სერტიფიკატი მითითებული არ არის. კავშირი არ იქნება კონფიდენციალური."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"ქსელის სახელი მეტისმეტად გრძელია."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"მიუთითეთ დომენი."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"ხელმისაწვდომია WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ხელმისაწვდომია)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 ქსელი</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"გაუმჯობესებული Wi‑Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wi‑Fi-ს კონფიგურაცია"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC მისამართი"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP მისამართი"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"ქვექსელის ნიღაბი"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"გსურთ, ამ ჯგუფის დავიწყება?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"პორტატული Wi‑Fi-ს უსადენო ქსელი"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi უსადენო ქსელი"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"მობილური კავშირის გამოყენება Wi‑Fi ქსელის უზრუნველყოფისთვის"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"ამ ტაბლეტის ინტერნეტ-კავშირი უსადენო ქსელით არ ზიარდება"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"ამ ტელეფონის ინტერნეტ-კავშირი უსადენო ქსელით არ ზიარდება"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"არ მოხდეს ინტერნეტის ან კონტენტის სხვა მოწყობილობებთან გაზიარება"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ამ ტაბლეტის ინტერნეტ-კავშირი უსადენო ქსელით ზიარდება"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ამ ტელეფონის ინტერნეტ-კავშირი უსადენო ქსელით ზიარდება"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"აპი კონტენტს აზიარებს. ინტერნეტ-კავშირის გასაზიარებლად, ჯერ გამორთეთ, შემდეგ კი ხელახლა ჩართეთ უსადენო ქსელი"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi-ს სახელი"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"მიმდინარეობს <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-ის ჩართვა…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"სხვა მოწყობილობებს შეუძლია <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-თან დაკავშირება"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-ს პაროლი"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"გამოიყენეთ უსადენო ქსელი თქვენი სხვა მოწყობილობებისთვის Wi‑Fi ქსელის შესაქმნელად. უსადენო ქსელი ინტერნეტზე წვდომას უზრუნველყოფს თქვენი მობილური ინტერნეტ-კავშირის მეშვეობით. შედეგად, შესაძლოა დაგეკისროთ მობილური ინტერნეტის შესაბამისი გადასახადები."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"აპებს შეუძლიათ უსადენო ქსელის შექმნა, რათა გაუზიარონ კონტენტი ახლომდებარე მოწყობილობებს."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"უსადენო ქსელი ჩართვა…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"hotspot-ია გამორთვა…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> აქტიურია"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"როდესაც Wi-Fi ზარი ჩართულია, თქვენს ტელეფონს შეუძლია გადაამისამართოს ზარი Wi-Fi ან თქვენს ოპერატორ ქსელზე, თქვენი პრეფერენციებისა და სიგნალის სიძლიერის მიხედვით. ამ ფუნქციის ჩართვამდე, დააზუსტეთ თქვენს ოპერატორთან შესაძლო თანხები და სხვა დეტალები."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"საგანგებო ვითარებისას საკონტაქტო მისამართის განახლება"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"მისამართი, რომელსაც 911-ზე Wi-Fi-ს მეშვეობით დარეკვისას, საგანგებო სამსახურები თქვენი მდებარეობის დასადგენად გამოიყენებს."</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ეკრანი"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"შედეგები არ არის"</string>
     <string name="display_settings" msgid="7965901687241669598">"ეკრანი"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ავტოროტაციის ეკრანი"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"მკვეთრი ფერები"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ტაბლეტის გადატრიალებისას ეკრანის ორიენტაციის ავტომატური შეცვლა"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ტელეფონის გადატრიალებისას ეკრანის ორიენტაციის ავტომატური შეცვლა"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"ავტომატურად შეიცვალოს ეკრანის ორიენტაცია ტაბლეტის გადატრიალებისას"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"სიკაშკაშის მორგება არსებულ სინათლეზე. სიკაშკაშის დროებით დარეგულირებას მოგვიანებით მაინც შეძლებთ."</string>
     <string name="night_display_title" msgid="2626451512200357686">"ღამის განათება"</string>
     <string name="night_display_text" msgid="1837277457033025056">"ღამის განათება თქვენს ეკრანს ღამის პერიოდში ქარვისფერ ელფერს მიანიჭებს. მკრთალი სინათლე გაგიმარტივებთ ეკრანზე კითხვას ან ყურებას და უფრო სწრაფად დაძინებაში დაგეხმარებათ."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"განრიგი"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"სტატუსი"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"ავტომატურად ჩართვა"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"არასოდეს"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"მორგებული განრიგი"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"მზის ჩასვლიდან ამოსვლამდე"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"განრიგი"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"არცერთი"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"ჩაირთვება თქვენზე მორგებულ დროს"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"ჩაირთვება მზის ჩასვლიდან ამოსვლამდე"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"დაწყების დრო"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"დასრულების დრო"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"სტატუსი"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"ინტენსივობა"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"გამორთული. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"არასოდეს ჩაირთოს ავტომატურად."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"ავტომატურად ჩაირთვება <xliff:g id="ID_1">%1$s</xliff:g>-ზე."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"ავტომატურად ჩაირთვება მზის ჩასვლისას."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"ჩართული. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"არასოდეს გამოირთვება ავტომატურად."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"ავტომატურად გამოირთვება <xliff:g id="ID_1">%1$s</xliff:g>-ზე."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"ავტომატურად გამოირთვება მზის ამოსვლისას."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"გამორთულია / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"არასოდეს ჩაირთოს ავტომატურად"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"ავტომატურად ჩაირთვება <xliff:g id="ID_1">%1$s</xliff:g>-ზე"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"ავტომატურად ჩაირთვება მზის ჩასვლისას"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"ჩართულია / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"არასოდეს გამოირთვება ავტომატურად"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"ავტომატურად გამოირთვება <xliff:g id="ID_1">%1$s</xliff:g>-ზე"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"ავტომატურად გამოირთვება მზის ამოსვლისას"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"ძილი"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"ეკრანი გამოირთვება"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> განმავლობაში უმოქმედობის შემდეგ"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"პარამეტრები"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ავტომატური სიკაშკაშე"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"გაღვიძება აწევისას"</string>
-    <string name="doze_title" msgid="2259176504273878294">"გარემოს ეკრანი"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"ემბიენტური ეკრანი"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"ყოველთვის ჩართული"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ახალი შეტყობინებები"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ჩვენების წესები"</string>
+    <string name="doze_title" msgid="2375510714460456687">"ახალი შეტყობინებები"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ეკრანის გამოღვიძება შეტყობინებების მიღებისას"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"ყოველთვის ჩართული"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"დროის, შეტყობინებათა ხატულების და სხვა ინფორმაციის ჩვენება"</string>
     <string name="title_font_size" msgid="4405544325522105222">"შრიფტის ზომა"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ტექსტის გადიდება ან დაპატარავება"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM ბარათის დაბლოკვის პარამეტრები"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN არ უნდა იყოს ცარიელი."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC ველი უნდა შეიცავდეს 3 ციფრს."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC ველი უნდა შეიცავდეს ორ ან სამ ციფრს."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"ეს ოპერატორი კრძალავს %s ტიპის APN-ებს."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"ნაგულისხმევი APN პარამეტრების აღდგენა."</string>
     <string name="menu_restore" msgid="8260067415075573273">"საწყის პარამეტრებზე ჩამოყრა"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ნაგულისხმევი APN პარამეტრების  აღდგენა დასრულებულია"</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD ბარათის წაშლა"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"შიდა USB მეხსიერებიდან ყველა მონაცემების წაშლა, როგორიცაა მუსიკა ან ფოტოები"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"წაიშალოს SD ბარათის ყველა მონაცემი, როგორიცაა მუსიკა და ფოტოები"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM-ების ამოშლა"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"ტელეფონზე არსებული ყველა eSIMs ამოიშლება, თუმცა ეს არ გააუქმებს თქვენს მოქმედ მობილურ სერვისს."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"ტაბლეტზე არსებული ყველა eSIMs ამოიშლება, თუმცა ეს არ გააუქმებს თქვენს მოქმედ მობილურ სერვისს."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ტაბლეტის მონაცემების ჩამოყრა"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ტელეფონის საწყისი მდგომარეობის აღდგენა"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"გსურთ მთელი თქვენი პირადი ინფორმაციისა და ჩამოტვირთული აპების წაშლა? ამ მოქმედების გაუქმება შეუძლებელია!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ტეტერინგის ან პორტატული უსადენო ქსელის გამოყენება ვერ მოხერხდება, როცა მონაცემთა დამზოგველი ჩართულია"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB მოდემი"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB დაკავშირებულია, მონიშნეთ მოდემის რეჟიმში გადასასვლელად"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"მიერთებული"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"როცა USB მეხსიერება დაკავებულია, უსადენო ქსელის გავრცელების რეჟიმში მუშაობა შეუძლებელია"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB არ არის დაკავშირებული"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"შეაერთეთ ჩასართავად"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB მოდემის შეცდომა"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"ტელეფონის ინტერნეტ-კავშირის USB-ის მეშვეობით გაზიარება"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"ტაბლეტის ინტერნეტ-კავშირის USB-ის მეშვეობით გაზიარება"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-მოდემი"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"ამ ტაბლეტის ინტერნეტ-კავშირი Bluetooth-ით ზიარდება"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"ამ ტელეფონის ინტერნეტ-კავშირი Bluetooth-ით ზიარდება"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"ამ ტაბლეტის ინტერნეტ-კავშირი Bluetooth-ით 1 მოწყობილობასთან ზიარდება"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"ამ ტელეფონის ინტერნეტ-კავშირი Bluetooth-ით 1 მოწყობილობასთან ზიარდება"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"ამ ტაბლეტის ინტერნეტ-კავშირი Bluetooth-ით <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> მოწყობილობასთან ზიარდება"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"ამ ტელეფონის ინტერნეტ-კავშირი Bluetooth-ით <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> მოწყობილობასთან ზიარდება"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"ტაბლეტის ინტერნეტ-კავშირის Bluetooth-ით გაზიარება"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"ტელეფონის ინტერნეტ-კავშირის Bluetooth-ით გაზიარება"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"ეს <xliff:g id="DEVICE_NAME">%1$d</xliff:g> ინტერნეტ-კავშირს Bluetooth-ით აზიარებს"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"ამ ტაბლეტის ინტერნეტ-კავშირი Bluetooth-ით არ ზიარდება"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"ამ ტელეფონის ინტერნეტ-კავშირი Bluetooth-ით არ ზიარდება"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"მოდემის რეჟიმი არ არის"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"შეუძლებელია <xliff:g id="MAXCONNECTION">%1$d</xliff:g>-ზე მეტ მოწყობილობაზე მოედმის მიერთება."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან კავშირი გაწყდება."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"უსადენო ქსელი და ტეტერინგი მობილური ინტერნეტის სხვა მოწყობილობებთან გაზიარების საშუალებას მოგცემთ."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"უსადენო ქსელი და ტეტერინგი მობილური ინტერნეტის სხვა მოწყობილობებთან გაზიარების საშუალებას მოგცემთ. აპებს ასევე შეუძლიათ უსადენო ქსელის შექმნა, რათა გაუზიარონ კონტენტი ახლომდებარე მოწყობილობებს."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"დახმარება"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"მობილური ქსელი"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"მობილური სატარიფო გეგმა"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"მდებარეობის რეჟიმი"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"მდებარეობის განსაზღვრისათვის გამოიყენეთ GPS, Wi‑Fi, Bluetooth ან მობილური ქსელები"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"მდებარეობის განსაზღვრისათვის გამოიყენეთ Wi‑Fi, Bluetooth ან მობილური ქსელები"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ადგილმდებარეობის განსაზღვრისათვის, გამოიყენეთ GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"მდებარეობის განსაზღვრისთვის GPS-ისა და მოწყობილობის სენსორების გამოყენება"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"სკანირება"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi სკანირება"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"გააუმჯობესეთ მდებარეობა ნებისმიერ დროს სისტემის აპებისა და სერვისებისთვის Wi‑Fi ქსელების აღმოჩენის უფლების მიცემით."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"თქვენ არ გაქვთ ინტერნეტ კავშირი. ამ ინფორმაციის სანახავად ახლავე, გადადით %s-ზე ინტერნეტში ჩართული ნებისმიერი კომპიუტერიდან."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"იტვირთება…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"აირჩიეთ პაროლი"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"თითის ანაბეჭდის გამოსაყენებლად დააყენეთ პაროლი"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"აირჩიეთ გრაფიკული გასაღები"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"თითის ანაბეჭდის გამოსაყენებლად დააყენეთ ნიმუში"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"თქვენი PIN-ის არჩევა"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"თითის ანაბეჭდის გამოსაყენებლად დააყენეთ PIN-კოდი"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"დაადასტურეთ პაროლი"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"დაადასტურეთ ნიმუში"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"დაადასტურეთ PIN-კოდი"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"აპების პარამეტრები"</string>
     <string name="install_applications" msgid="4872012136210802181">"უცნობი წყაროები"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"აპის ყველა წყაროს დაშვება"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"ახლახან გახსნილი აპები"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"<xliff:g id="COUNT">%1$d</xliff:g>-ვე აპის ნახვა"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g>-ის წინ"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"თქვენი ტაბლეტი და პირადი მონაცემები უცნობი აპების შემოტევების წინაშე მეტად დაუცველია. აპების ამ წყაროდან ინსტალაციის შემთხვევაში, თქვენ თანახმა ხართ, პასუხისმგებელი იყოთ ამ აპების გამოყენების შედეგად ტაბლეტისთვის მიყენებულ ზიანსა და მონაცემების დაკარგვაზე."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"თქვენი ტელეფონი და პირადი მონაცემები უცნობი აპების შემოტევების წინაშე მეტად დაუცველია. აპების ამ წყაროდან ინსტალაციის შემთხვევაში, თქვენ თანახმა ხართ, პასუხისმგებელი იყოთ ამ აპების გამოყენების შედეგად ტელეფონისთვის მიყენებულ ზიანსა და მონაცემების დაკარგვაზე."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"დამატებითი პარამეტრები"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"გსურთ, სისტემის სერვისის შეწყვეტა?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"თუ გამორთავთ ამ სერვისს, თქვენი ტაბლეტის ზოგიერთი ფუნქცია აღარ იმუშავებს გამართულად ვიდრე არ გამორთავთ და ჩართავთ ხელახლა."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"სერვისის გაჩერების შემთხვევაში, ტელეფონის მომდევნო სრულ გადატვირთვამდე შესაძლოა ზოგმა ფუნქციამ შეცდომებით იმუშაოს."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"ენები, შეყვანა და ჟესტები"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"ენები და შეყვანა"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ენები და შეყვანა"</string>
     <string name="input_assistance" msgid="7577795275222555487">"შეყვანის დამხმარე საშუალებები"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other">ჩართულია ბეჭდვის <xliff:g id="COUNT">%1$d</xliff:g> სერვისი</item>
       <item quantity="one">ჩართულია ბეჭდვის 1 სერვისი</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other">ბეჭდვის <xliff:g id="COUNT">%1$d</xliff:g> დავალება</item>
+      <item quantity="one">ბეჭდვის 1 დავალება</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"ბეჭდვის სერვისები"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"სერვისები დაყენებული არ არის"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"პრინტერები ვერ მოიძებნა"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"გამოყენების დეტალები"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"ენერგიის მოხმარების მორგება"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"შესული პაკეტები"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ბატარეის მხარჯავი აპები"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"მოწყობილობას გამოღვიძებულ რეჟიმში ტოვებს"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"მოწყობილობის გამოღვიძება ფონურ რეჟიმში"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ხშირად ითხოვს მდებარეობას"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> აპი არასათანადოდ მუშაობს"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"გსურთ აპის შეჩერება?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"თქვენი ტელეფონი სათანადოდ ვერ მართავს ბატარეას, რადგან <xliff:g id="APP">%1$s</xliff:g> მას გამოღვიძებულ რეჟიმში ტოვებს.\n\nამის მოსაგვარებლად, შეგიძლიათ აპის ძალით შეჩერება.\n\nპრობლემის განმეორების შემთხვევაში, ბატარეის წარმადობის გასაუმჯობესებლად, შესაძლოა აპის დეინსტალაცია დაგჭირდეთ."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"თქვენი ტაბლეტი სათანადოდ ვერ მართავს ბატარეას, რადგან <xliff:g id="APP">%1$s</xliff:g> მას გამოღვიძებულ რეჟიმში ტოვებს.\n\nამის მოსაგვარებლად, შეგიძლიათ აპის ძალით შეჩერება.\n\nპრობლემის განმეორების შემთხვევაში, ბატარეის წარმადობის გასაუმჯობესებლად, შესაძლოა აპის დეინსტალაცია დაგჭირდეთ."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"თქვენი მოწყობილობა სათანადოდ ვერ მართავს ბატარეას, რადგან <xliff:g id="APP">%1$s</xliff:g> მას გამოღვიძებულ რეჟიმში ტოვებს.\n\nამის მოსაგვარებლად, შეგიძლიათ აპის ძალით შეჩერება.\n\nპრობლემის განმეორების შემთხვევაში, ბატარეის წარმადობის გასაუმჯობესებლად, შესაძლოა აპის დეინსტალაცია დაგჭირდეთ."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"აპის შეჩერება"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"გსურთ ფონზე მოხმარების გამორთვა?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"თქვენი ტელეფონი ბატარეას სათანადოდ ვერ მართავს, რადგან <xliff:g id="APP">%1$s</xliff:g> მას გამუდმებით აღვიძებს.\n\nამ პრობლემის მოსაგვარებლად, თქვენს ტელეფონს შეუძლია ამ აპის ფონურ რეჟიმში გაშვება აღკვეთოს."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"თქვენი ტაბლეტი ბატარეას სათანადოდ ვერ მართავს, რადგან <xliff:g id="APP">%1$s</xliff:g> მას გამუდმებით აღვიძებს.\n\nამ პრობლემის მოსაგვარებლად, თქვენს ტაბლეტს შეუძლია ამ აპის ფონურ რეჟიმში გაშვება აღკვეთოს."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"თქვენი მოწყობილობა ბატარეას სათანადოდ ვერ მართავს, რადგან <xliff:g id="APP">%1$s</xliff:g> მას გამუდმებით აღვიძებს.\n\nამ პრობლემის მოსაგვარებლად, თქვენს მოწყობილობას შეუძლია ამ აპის ფონურ რეჟიმში გაშვება აღკვეთოს."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"გამორთვა"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"გსურთ მდებარეობის გამორთვა?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"თქვენი ტელეფონი ბატარეას სათანადოდ ვერ მართავს, რადგან <xliff:g id="APP">%1$s</xliff:g> გამუდმებით ითხოვს თქვენს მდებარეობას მაშინ, როცა აპს არ იყენებთ.\n\nამის მოსაგვარებლად, შეგიძლიათ ამ აპისთვის მდებარეობაზე წვდომის გამორთვა."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"თქვენი ტაბლეტი ბატარეას სათანადოდ ვერ მართავს, რადგან <xliff:g id="APP">%1$s</xliff:g> გამუდმებით ითხოვს თქვენს მდებარეობას მაშინ, როცა აპს არ იყენებთ.\n\nამის მოსაგვარებლად, შეგიძლიათ ამ აპისთვის მდებარეობაზე წვდომის გამორთვა."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"თქვენი მოწყობილობა ბატარეას სათანადოდ ვერ მართავს, რადგან <xliff:g id="APP">%1$s</xliff:g> გამუდმებით ითხოვს თქვენს მდებარეობას მაშინ, როცა აპს არ იყენებთ.\n\nამის მოსაგვარებლად, შეგიძლიათ ამ აპისთვის მდებარეობაზე წვდომის გამორთვა."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"გამორთვა"</string>
     <string name="power_screen" msgid="3023346080675904613">"ეკრანი"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"ფანარი"</string>
     <string name="power_camera" msgid="4976286950934622605">"კამერა"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"აპები"</string>
     <string name="power_service" msgid="1599661212370831780">"სერვისები"</string>
     <string name="power_system" msgid="8290455327965307383">"სისტემა"</string>
-    <string name="power_user" msgid="1889728099253018005">"მომხმარებელი"</string>
+    <string name="power_user" msgid="3706143225319881667">"სხვა მომხმარებლები"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"სულ ცენრალურ პროცესორში"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU აქტიური რეჟიმი"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"დარჩეს აქტიური"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ზედმეტად ჩათვლილი ელკვების გამოყენება"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"გამოიყენება <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"აქტივობის დრო: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"ეკრანის მოხმარება: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g>-ს იყენებს <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"ბატარეის საერთო მოხმარების <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN-ის შეცვლა"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"შეტყობინებების ჩვენება"</string>
     <string name="help_label" msgid="6886837949306318591">"დახმარება/უკუკავშირი"</string>
-    <string name="support_summary" msgid="8276116616493882830">"დამხმარე სტატიები, მხარდაჭერა ტელეფონით და ჩეთით"</string>
+    <string name="support_summary" msgid="2705726826263742491">"დამხმარე სტატიები, მხარდაჭერა ტელეფონით და ჩეთით, დაწყება"</string>
     <string name="user_account_title" msgid="1127193807312271167">"ანგარიში კონტენტისთვის"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ფოტოს ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"უკიდურესი საფრთხეები"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">%d დამალული ერთეულის ჩვენება</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ქსელი და ინტერნეტი"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, მობილური ინტერნეტი, მონაცემთა მოხმარება, უსადენო ქსელი"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"მობილური"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"მონაცემთა მოხმარება"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"უსადენო ქსელი"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"დაკავშირებული მოწყობილობები"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"აპები და შეტყობინებები"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ნებართვები, ნაგულისხმევი აპები"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"მომხმარებლები და ანგარიშები"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"ჟესტი"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"გადახდა, შეხება, გადახდები"</string>
     <string name="keywords_backup" msgid="470070289135403022">"სარეზერვო ასლი, სარეზერვო ასლის შექმნა"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"ჟესტი, კიდე, გვერდი, აქტიური კიდე, მოჭერა, ჩავლება, დახმარება, ასისტენტი, squeezy, squeezie, squeezey, squeezee, Ok Google, Google ასისტენტი"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"ჟესტი, გაღვიძება, შეტყობინებები, ეკრანი, ჩვენება, ეკრანი გამორთულია, ეკრანი ჩართულია, მოჭერა, კიდე, ძილის რეჟიმში, დაძინება, ჩავლება"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"ჟესტი, დადუმება, ჩაჩუმება, მაღვიძარა, შემომავალი ზარი, ჩუმი, ჩვენება, დაბლოკილი ეკრანი, მოჭერა, ჩავლება, კიდე, შეწყვეტა"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC თეგის დაყენება"</string>
     <string name="write_tag" msgid="8571858602896222537">"ჩაწერა"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"შეეხეთ თეგს დასაწერად..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"საერთოდ არ მსურს სამსახურის შეტყობინებების ნახვა"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"აირჩიეთ ჩაკეტილ მოწყობილობაზე პროფილის შეტყობინებების ჩვენების რეჟიმი."</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"პროფილის შეტყობინებები"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"შეტყობინებები"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"შეტყობინებები"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"აპის შეტყობინებები"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"შეტყობინების კატეგორია"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"მნიშვნელობის დონე"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"არჩევანის აპისთვის მინდობა"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"სასწრაფო"</string>
     <string name="allow_sound" msgid="1820188704793497324">"ხმის გამოყენების დაშვება"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"შეტყობინებებისთვის ხმისა თუ ვიბრაციის გათიშვა და მიმდინარე ეკრანზე ანთების აკრძალვა."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"დაბალი პრიორიტეტი"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"საშუალო პრიორიტეტი"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"მაღალი პრიორიტეტი"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"გადაუდებელი"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"შეტყობინებათა ასისტენტი"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"შეტყობინებებზე წვდომა"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"სამსახურის პროფილის შეტყობინებებზე წვდომა დაბლოკილია"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"გამოსახულება გამოსახულებაში"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"„გამოსახულება გამოსახულებაში“ რეჟიმის დაშვება"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"საშუალებას მისცემს ამ აპს, შექმნას „გამოსახულება გამოსახულებაში“ ტიპის ფანჯარა, როცა ის გახსნილია, ან აპიდან გასვლისას (მაგალითად, ვიდეოს ყურების გასაგრძელებლად). ეს ფანჯარა თქვენ მიერ გამოყენებული აპების ზემოდან გამოჩნდება."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"დიახ"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"არა"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"„არ შემაწუხოთ“ წვდომა"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"დაუინსტალირებელმა აპებმა მოითხოვა „არ შემაწუხოთ“ წვდომა"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"აპები იტვირთება..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ამ სამუშაო პროფილს მართავს:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"მმართველი: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ექსპერიმენტული)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"მოწყობილობის შეტრიალება"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"ქონთენთის ეკრანზე შებრუნება"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"პორტრეტის ხედზე დარჩენა"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ლანდშაფტის ხედზე დარჩენა"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ამჟამინდელ ორიენტაციაზე დარჩენა"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"უსაფრთხო დაწყება"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"გაგრძელება"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"ამ მოწყობილობის დაცვის გაძლიერება შეგიძლიათ მის გასაშვებად PIN-კოდის შეყვანის მოთხოვნის გააქტიურებით. მოწყობილობის გაშვებამდე ის ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები). \n\nეს მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში მონაცემების დაცვას ემსახურება. გსურთ თქვენი მოწყობილობის გასაშვებად PIN-კოდის შეყვანის მოთხოვნის გააქტიურება?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ამ მოწყობილობის დაცვის გაძლიერება შეგიძლიათ მის გასაშვებად პაროლის შეყვანის მოთხოვნის გააქტიურებით. მოწყობილობის გაშვებამდე ის ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები). \n\nეს მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში მონაცემების დაცვას ემსახურება. გსურთ თქვენი მოწყობილობის გასაშვებად პაროლის შეყვანის მოთხოვნის გააქტიურება?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"განსაბლოკად თითის ანაბეჭდის გამოყენებასთან ერთად, ამ მოწყობილობის დაცვის გაძლიერება შეგიძლიათ მის გასაშვებად PIN-კოდის შეყვანის მოთხოვნის გააქტიურებით. მოწყობილობის გაშვებამდე ის ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები).\n\nეს მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში მონაცემების დაცვას ემსახურება. გსურთ თქვენი მოწყობილობის გასაშვებად PIN-კოდის შეყვანის მოთხოვნის გააქტიურება?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"განსაბლოკად თითის ანაბეჭდის გამოყენებასთან ერთად, ამ მოწყობილობის დაცვის გაძლიერება შეგიძლიათ მის გასაშვებად ნიმუშის დახატვის მოთხოვნის გააქტიურებით. მოწყობილობის გაშვებამდე ის ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები).\n\nეს მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში მონაცემების დაცვას ემსახურება. გსურთ თქვენი მოწყობილობის გასაშვებად ნიმუშის დახატვის მოთხოვნის გააქტიურება?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"განსაბლოკად თითის ანაბეჭდის გამოყენებასთან ერთად, ამ მოწყობილობის დაცვის გაძლიერება შეგიძლიათ მის გასაშვებად პაროლის შეყვანის მოთხოვნის გააქტიურებით. მოწყობილობის გაშვებამდე ის ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები).\n\nეს მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში მონაცემების დაცვას ემსახურება. გსურთ თქვენი მოწყობილობის გასაშვებად პაროლის შეყვანის მოთხოვნის გააქტიურება?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"განსაბლოკად თითის ანაბეჭდის გამოყენებასთან ერთად, ამ მოწყობილობის დაცვის გაძლიერება შეგიძლიათ მის გასაშვებად პაროლის შეყვანის მოთხოვნის გააქტიურებით. მოწყობილობის გაშვებამდე ის ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები).\n\nეს მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში მონაცემების დაცვას ემსახურება. გსურთ თქვენი მოწყობილობის გასაშვებად პაროლის შეყვანის მოთხოვნის გააქტიურება?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"დიახ"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"არა"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"მოთხოვნილი იქნეს PIN?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"მოხმარების გაფრთხილებები"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"მოწყობილობის მოხმარების სრულად ჩვენება"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"აპების მოხმარების ჩვენება"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"მაღალი მოხმარება"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> აპი არასათანადოდ მუშაობს</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> არასათანადოდ მუშაობს</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">ბატარეის მხარჯავი აპი</item>
+      <item quantity="one">ბატარეის მხარჯავი <xliff:g id="APP">%1$s</xliff:g> აპი</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"არ არის ოპტიმიზებული"</string>
     <string name="high_power_on" msgid="6216293998227583810">"არ არის ოპტიმიზებული"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ხდება ბატარეის გამოყენების ოპტიმიზაცია"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"სხვა აპების ზემოდან გამოჩენა"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"სხვა აპების ზემოდან გამოჩენა <xliff:g id="COUNT_1">%2$d</xliff:g>-დან <xliff:g id="COUNT_0">%1$d</xliff:g> აპს შეუძლია"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"ნებართვის მქონე აპები"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"კი"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"არა"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"დაშვებულია"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"არ არის დაშვებული"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"ინსტალაცია აპები უცნობი წყაროები"</string>
     <string name="write_settings" msgid="4797457275727195681">"სისტემის პარამეტრების შეცვლა"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"სისტემის პარამეტრების შეცვლის დაწერა"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"ეკრანს ახლა ქარვისფერი ელფერი აქვს. ეს დაძინებაში დაგეხმარებათ."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"შემოთავაზებები"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> სხვა"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> შემოთავაზება</item>
+      <item quantity="one">1 შემოთავაზება</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> შემოთავაზება</item>
+      <item quantity="one">+1 შემოთავაზება</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"ამოშლა"</string>
     <string name="color_temperature" msgid="2070126836910615605">"ცივი ფერები"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ეკრანზე ცივი ფერების გამოყენება"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"გაფრთხილება, როცა გამოყენებულია <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"გაფრთხილება, როცა გამოყენებულია: <xliff:g id="ID_1">%1$s</xliff:g>/მონაცემთა ლიმიტი: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"ბილინგის ციკლი"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"ყოველთვიური ციკლი იწყება ყოველი თვის <xliff:g id="ID_1">%1$s</xliff:g> რიცხვიდან"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"ყოველთვიური, <xliff:g id="ID_1">%1$s</xliff:g> რიცხვიდან"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"ყოველთვიურად, <xliff:g id="ID_1">%1$s</xliff:g> რიცხვში"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"ქსელის შეზღუდვები"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> შეზღუდვა</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 აპს მონაცემთა შეუზღუდავად გამოყენების უფლება აქვს, როცა მონაცემთა დამზოგველი ჩართულია</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"მონაცემთა დამზოგველი"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"მონაცემებზე შეუზღ.წვდომა"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"მონაცემებზე შეუზღუდავი წვდომით"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"ფონური მონაცემები გამორთულია"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"ჩართული"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"გამორთული"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"მართეთ შეტყობინებები ჩაკეტილ ეკრანზე"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"შეტყობინების კონტენტის ჩვენება ან დამალვა"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"ყველა"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"მხარდაჭერა"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"მხარდაჭერა და მინიშნებები"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"უმცირესი სიგანე"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"პრემიუმ SMS შეტყობინებების გაგზავნაზე წვდომა არცერთ ინსტალირებულ აპს არ მოუთხოვია"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"პრემიუმ SMS შეტყობინებებისთვის შეიძლება დამატებითი საფასურის გადახდა მოგიწიოთ. აპისთვის ამ ნებართვის მიცემის შემთხვევაში, თქვენ მისი მეშვეობით პრემიუმ SMS შეტყობინებების გაგზავნას შეძლებთ."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ავტომატური"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"მექანიკური"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"მეხსიერების გამოთავისუფლება"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"ჟესტები"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"ჟესტის მალსახმობები"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"ჟესტები თქვენი ტელეფონის სამართავად"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"ჟესტები თქვენი ტაბლეტის სამართავად"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"ჟესტები თქვენი მოწყობილობის სამართავად"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"კამერაზე გადასვლა"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"კამერის სწრაფად გასახსნელად, დააჭირეთ ელკვების ღილაკს ორჯერ. მუშაობს ნებისმიერი ეკრანიდან."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"კამერის სწრაფად გახსნა"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"კამერის ჩასართავად, ორჯერ დააჭირეთ ჩართვის ღილაკს"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"კამერის გადართვა"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"სელფების უფრო სწრაფად გადაღება"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"სელფის რეჟიმის ჩასართავად, ორმაგად მოატრიალეთ ტელეფონი"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"სელფის რეჟიმის ჩასართავად, ორმაგად მოატრიალეთ ტაბლეტი"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"სელფის რეჟიმის ჩასართავად, ორმაგად მოატრიალეთ მოწყობილობა"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"ტელეფონის შესამოწმებლად, შეეხეთ ორმაგად"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ტაბლეტის შესამოწმებლად, შეეხეთ ორმაგად"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"მოწყობილობის შესამოწმებლად, შეეხეთ ორმაგად"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"შეტყობინებების სწრაფად შესამოწმებლად, შეეხეთ ორმაგად ეკრანს."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"დროის, შეტყობინების ხატულებისა და სხვა ინფორმაციის სანახავად, ორმაგად შეეხეთ ეკრანს."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"შეტყობინებების შემოწმება, როცა ეკრანი გამორთულია"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ასწიეთ ტელეფონის შესამოწმებლად"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ასწიეთ ტაბლეტის შესამოწმებლად"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"ასწიეთ მოწყობილობის შესამოწმებლად"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"შეტყობინებების სწრაფად შესამოწმებლად, აიღეთ ხელში თქვენი ტელეფონი."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"შეტყობინებების სწრაფად შესამოწმებლად, აიღეთ ხელში თქვენი ტაბლეტი."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"შეტყობინებების სწრაფად შესამოწმებლად, აიღეთ ხელში თქვენი მოწყობილობა."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"დროის, შეტყობინების ხატულებისა და სხვა ინფორმაციის სანახავად, აიღეთ ტელეფონი."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"დროის, შეტყობინების ხატულებისა და სხვა ინფორმაციის სანახავად, აიღეთ ტაბლეტი."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"დროის, შეტყობინების ხატულებისა და სხვა ინფორმაციის სანახავად, აიღეთ მოწყობილობა."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"შეტყობინებების შემოწმება, როცა ეკრანი გამორთულია"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"თითის ანაბეჭდით გადაფურცვლა შეტყობინებების შესამოწმებლად"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"თქვენი შეტყობინებების შესამოწმებლად, ჩამოუსვით თითი თითის ანაბეჭდის სენსორს, რომელიც თქვენი ტელეფონის უკანა ნაწილზე მდებარეობს."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"თქვენი შეტყობინებების შესამოწმებლად, ჩამოუსვით თითი თითის ანაბეჭდის სენსორს, რომელიც თქვენი ტაბლეტის უკანა ნაწილზე მდებარეობს."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"თქვენი შეტყობინებების შესამოწმებლად, ჩამოუსვით თითი თითის ანაბეჭდის სენსორს, რომელიც თქვენი მოწყობილობის უკანა ნაწილზე მდებარეობს."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"შეტყობინებების სწრაფად ნახვა"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"ჩამოუსვით თითი ანაბეჭდის სენსორს"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"აწიეთ კამერის გასახსნელად"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"კამერა გაიხსნება ავტომატურად, როცა ტელეფონს აწევთ და ფოტოს გადაღების მდგომარეობაში მოათავსებთ (პეიზაჟის ან პორტრეტის რეჟიმში). მუშაობს, როცა ტელეფონი ძილის რეჟიმშია ან მისი ეკრანი ჩაკეტილია."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"გადაიღეთ ფოტოები, როცა ტელეფონი ძილის რეჟიმშია ან დაბლოკილია"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"დახმარების ჟესტი"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"მგრძნობიარობა"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"გსურთ ამ მყისიერი აპის ამოშლა?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"თამაშები"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"აუდიო ფაილები"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"გამოყენებული მეხსიერება"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(დეინსტალირებულია მომხმარებლისთვის: <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(გათიშულია მომხმარებლისთვის: <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"ავტომატური შევსების სერვისი"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"მყისიერი აპი"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"გსურთ მეხსიერების მენეჯერის გამორთვა?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"ფილმების და ტელევიზიის აპები"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"გამოყენებული მეხსიერება"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"ოპერატორის უზრუნველყოფის ინფორმაცია"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ოპერატორის უზრუნველყოფის გაშვება"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"რა არის ახალი და გამორჩეული?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"გაეცანით ყველაზე პოპულარულ 5 ფუნქციას"</string>
 </resources>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index 62df25e..d75b606 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Жақсы"</item>
     <item msgid="8986346415847956850">"Өте жақсы"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Әрқашан"</item>
-    <item msgid="844721238536786870">"Жалғанып тұрғанда"</item>
-    <item msgid="1986753720941888596">"Ешқашан"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Үнемі"</item>
-    <item msgid="7433294150916905997">"Жалғанып тұрғанда ғана"</item>
-    <item msgid="1390404486722375028">"Ешқашан"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Соңғы 30 күн"</item>
     <item msgid="6600989128423965319">"Пайдалану циклын орнату…"</item>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 7c7539f..57e6e83 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Қазір сіз дамытушысыз!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Қажет емес, сіз қазір әзірлеушісіз."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Алдымен әзірлеуші опцияларын қосыңыз."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Сымсыз желілер"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Байланыстар"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Құрылғы"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE қамтамасыз ету"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Бейне қоңырау шалу қарастырылған"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi арқылы қоңырау шалу қарастырылған"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presence қосулы"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Радиосигнал күші"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM мекенжай кітапшасын қарау"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Бекітілген теру нөмірлерін қарау"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Құрылғыларды скандау"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Осы құрылғының атауын өзгерту"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Атауын өзгерту"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ажыратылсын ба?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Бұл келесі құрылғымен байланысты үзеді:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Құрылғы ажыратылсын ба?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Бұл телефон <xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысынан ажыратылды."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Бұл планшет <xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысынан ажыратылды."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Бұл құрылғы <xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысынан ажыратылды."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Ажырату"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Сізде Bluetooth параметрлерін өзгерту рұқсаты жоқ."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Жаңа құрылғыны жұптау"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth параметрлері ашық болғанда маңайдағы құрылғыларға көрінеді."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Телефонның Bluetooth мекенжайы: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Планшеттің Bluetooth мекенжайы: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Құрылғының Bluetooth мекенжайы: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ажырату керек пе?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Хабар тарату"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Профайл істен шығарылсын ба?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth жұптасу өтініші"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Жұптау өтініші"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысымен жұптастыру үшін түртіңіз."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Алынған файлдарды көрсету"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Алынған файлдар"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth құрылғысын таңдау"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасы Bluetooth қызметін өшіруді сұрайды"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасы Bluetooth қызметін өшіруді сұрайды"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s хабарларыңызға кіруді қалайды. %2$s кірсін бе?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM картасына кіру сұрауы"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> сіздің SIM картаңызға кіруге рұқсат сұрайды. Ондай рұқсатты берсеңіз, байланыс барысында дерек тасымалы өшіріледі. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> құрылғысына рұқсат беру"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Басқа құрылғыларға <xliff:g id="DEVICE_NAME">^1</xliff:g> болып көрінеді"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Құрылғыларыңыз"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Жаңа құрылғыны жұптау"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Күн және уақыт"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Уақыт аймағын таңдау"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Есептік жазбалар"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Орын"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Есептік жазбалар"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Қауіпсіздік және орын"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрлау және тіркелу деректері"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Телефон шифрланған"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Құрылғы шифрланған"</string>
@@ -354,40 +367,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Саусақ ізімен құлыпты ашу"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Саусақ ізін пайдалану"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Телефон құлпын ашу, сатып алуларды авторизациялау немесе қолданбаларға кіру үшін саусақ ізін оқу сканерін түртсеңіз болды. Басқа саусақ іздерін қосқанда сақ болыңыз. Олар осы әрекеттердің кез келгенін орындай алады.\n\nЕскертпе: саусақ ізінің қауіпсіздігі күшті өрнектен немесе PIN кодынан азырақ болуы мүмкін."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Сатып алу әрекеттерін авторизациялау немесе қолданбаларға кіру үшін саусақ ізін оқу сканерін түртсеңіз болды. Басқа саусақ іздерін қосқанда сақ болыңыз. Бір рет қосылса болғаны, олар осы әрекеттердің кез келгенін орындай алады.\n\nЕскертпе: бұл құрылғының құлпын ашу үшін саусақ ізін пайдалана алмайсыз. Қосымша ақпарат алу үшін ұйым әкімшісіне хабарласыңыз."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Телефон құлпын ашу, сатып алғандарды авторизациялау немесе қолданбаларға кіру үшін жай ғана саусақ ізін оқу сканерін түртіңіз. Басқа саусақ іздерін қосарда сақ болыңыз. Өйткені бір саусақ ізі қосылған болса да, оның иесі бұл әрекеттердің барлығын орындай алады.\n\nЕскертпе: саусақ ізінің қауіпсіздік деңгейі күрделі өрнектен немесе PIN кодынан төмен болуы мүмкін."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Саусақ ізімен телефон құлпын ашыңыз не сатып алған нәрсені мақұлдаңыз.\n\nЕскертпе: бұл құрылғының құлпын саусақ ізімен ашу мүмкін емес. Қосымша ақпарат алу үшін ұйым әкімшісіне хабарласыңыз."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Саусақ ізімен телефон құлпын ашыңыз не сатып алған нәрсені мақұлдаңыз.\n\nЕскертпе: қауіпсіздік тұрғысынан саусақ ізі күрделі үлгіге не PIN кодына қарағанда әлсіздеу болуы мүмкін."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Бас тарту"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Жалғастыру"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Өткізіп жіберу"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Саусақ ізін қосу"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Құрылғыны қорғау мүмкіндіктері белсендірілмейді. Планшет жоғалса, ұрланса немесе деректері өшірілсе, оны басқалардың пайдалануынан сақтау мүмкін болмайды."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Құрылғыны қорғау мүмкіндіктері белсендірілмейді. Жоғалса, ұрланса немесе деректері өшірілсе, осы құрылғыны басқалардың пайдалануын болдырмау мүмкін болмайды."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Құрылғыны қорғау мүмкіндіктері іске қосылмайды. Жоғалса, ұрланса немесе деректері өшірілсе, бұл телефонды басқалардың пайдалануынан қорғай алмайсыз."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Құрылғыны қорғау мүмкіндіктері белсендірілмейді. Жоғалса немесе ұрланса, басқалардың осы планшетті пайдалануын болдырмау мүмкін болмайды."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Құрылғыны қорғау мүмкіндіктері белсендірілмейді. Жоғалса немесе ұрланса, басқалардың осы құрылғыны пайдалануын болдырмау мүмкін болмайды."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Құрылғыны қорғау мүмкіндіктері іске қосылмайды. Жоғалса, ұрланса немесе деректері өшірілсе, бұл телефонды басқалардың пайдалануынан қорғай алмайсыз."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Келесі"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Құрылғыны қорғау функциялары қосылмайды. Планшет жоғалса, ұрланса не бастапқы күйіне қайтарылса, оны басқалардың пайдалануына тыйым сала алмайсыз."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Құрылғыны қорғау функциялары қосылмайды. Құрылғы жоғалса, ұрланса не бастапқы күйіне қайтарылса, оны басқалардың пайдалануына тыйым сала алмайсыз."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Құрылғыны қорғау функциялары қосылмайды. Телефон жоғалса, ұрланса не бастапқы күйіне қайтарылса, оны басқалардың пайдалануына тыйым сала алмайсыз."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Құрылғыны қорғау функциялары қосылмайды. Планшет жоғалса не ұрланса, оны басқалардың пайдалануына тыйым сала алмайсыз."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Құрылғыны қорғау функциялары қосылмайды. Құрылғы жоғалса не ұрланса, оны басқалардың пайдалануына тыйым сала алмайсыз."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Құрылғыны қорғау функциялары қосылмайды. Телефон жоғалса не ұрланса, оны басқалардың пайдалануына тыйым сала алмайсыз."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Бәрібір өткізіп жіберу"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Оралу"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Сенсорды табу"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Телефонның артқы жағындағы саусақ ізін оқитын сенсорды табыңыз."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Датчикті түрту"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Ол телефонның артында. Сұқ саусағыңызды пайдаланыңыз."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Құрылғы мен саусақ таңбасы сенсорының орны бар сурет"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Аты"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Жарайды"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Жою"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Бастайық"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Датчикті түрту"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Саусақты сенсорға қойып, дірілді сезгеннен кейін көтеріңіз"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Тағы бір рет түртіңіз"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Саусақ ізінің әр түрлі бөліктерінің барлығын қосу үшін саусақты азғантай жылжытыңыз"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Саусақ ізі қосылды!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Осы белгішені көргенде идентификациялау немесе сатып алуды авторизациялау үшін саусақ ізін пайдалануға болады."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Құрылғыны ояту және құлпын ашу үшін жай саусақ ізі сенсорын түртіңіз."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Осы белгішені көрген кезде сатып алуларды авторизациялауға немесе қолданбаларға кіруге болады."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Саусағыңызды алып, қайта түртіңіз"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Саусақ ізінің түрлі бөліктерін енгізу үшін саусағыңызды көтеріп тұрыңыз"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Саусақ ізі енгізілді"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Бұл белгіше шыққан кезде, саусақ ізімен жеке басыңызды растаңыз не сатып алған нәрсені мақұлдаңыз."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Саусақ ізін орнатуды өткізіп жіберу керек пе?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Саусақ ізін пайдалануды телефон құлпын ашудың бір жолы ретінде таңдадыңыз. Қазір өткізіп жіберсеңіз, мұны кейінірек орнату керек. Орнату бір минутқа жақын уақыт алады."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Экран құлпын орнату"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Дайын"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Бұл сенсор емес"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Құрылғының саусақ таңбасы сенсорын пайдаланыңыз."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Телефонның артындағы датчикті сұқ саусақпен түртіңіз."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Тіркеу аяқталмады"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Саусақ ізін тіркеу уақытының шегіне жеттіңіз. Әрекетті қайталаңыз."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Саусақ ізін тіркеу нәтиже бермеді. Әрекетті қайталаңыз немесе басқа саусақты пайдаланыңыз."</string>
@@ -449,6 +460,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Құрылғыны қорғау мүмкіндіктерін белсендіру арқылы басқалардың осы құрылғыны рұқсатыңызсыз пайдалануын болдырмаңыз. Пайдаланғыңыз келетін экран бекітпесін таңдаңыз."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Құрылғыны қорғау мүмкіндіктерін белсендіру арқылы басқалардың осы телефонды рұқсатыңызсыз пайдалануын болдырмаңыз. Пайдаланғыңыз келетін экран бекітпесін таңдаңыз."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Сақтық көшірме экранын құлыптау әдісін таңдаңыз"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Экран құлпы опциялары"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Экран құлпы опциялары"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Экран құлпы"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / ұйқыдан кейін бірден"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / ұйқыдан кейін <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g>"</string>
@@ -519,13 +532,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Бекітпе ашу кескінін өзгерту"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Бекітпесін ашу PIN кодын өзгерту"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Бекітпе кілтсөзін өзгерту"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Әрекетті қайталаңыз. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>-мүмкіндік, барлығы — <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Соңғы мүмкіндік"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Осы жолы жұмыс өрнегін дұрыс енгізбесеңіз, жұмыс профиліңіз және байланысты деректер осы құрылғыдан жойылады."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Осы жолы жұмыс PIN кодын дұрыс енгізбесеңіз, жұмыс профиліңіз және байланысты деректер осы құрылғыдан жойылады."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Осы жолы жұмыс құпия сөзін дұрыс енгізбесеңіз, жұмыс профиліңіз және байланысты деректер осы құрылғыдан жойылады."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Басқа мүмкіндігіңіз жоқ. Жұмыс профиліңіз және байланысты деректер осы құрылғыдан жойылады."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Жабу"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Әрекетті қайталаңыз. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> мүмкіндік, барлығы – <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Деректеріңіз жойылады"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Келесі әрекет кезінде қате өрнек енгізсеңіз, бұл құрылғылардың деректері жойылады"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Келесі әрекет кезінде қате PIN кодын енгізсеңіз, бұл құрылғылардың деректері жойылады"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Келесі әрекет кезінде қате құпия сөз енгізсеңіз, бұл құрылғылардың деректері жойылады"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Келесі әрекет кезінде қате өрнек енгізсеңіз, бұл пайдаланушы жойылады"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Келесі әрекет кезінде қате PIN кодын енгізсеңіз, бұл пайдаланушы жойылады"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Келесі әрекет кезінде қате құпия сөз енгізсеңіз, бұл пайдаланушы жойылады"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Келесі әрекет кезінде қате өрнек енгізсеңіз, жұмыс профиліңіз бен оның деректері жойылады"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Келесі әрекет кезінде қате PIN кодын енгізсеңіз, жұмыс профиліңіз бен оның деректері жойылады"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Келесі әрекет кезінде қате құпия сөз енгізсеңіз, жұмыс профиліңіз бен оның деректері жойылады"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Тым көп қате әрекет жасалды. Бұл құрылғылардың деректері жойылады."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Тым көп қате әрекет жасалды. Бұл пайдаланушы жойылады."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Тым көп қате әрекет жасалды. Бұл жұмыс профилі мен оның деректері жойылады."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Бас тарту"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Кемінде <xliff:g id="COUNT">%d</xliff:g> таңба болуы керек"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN коды кемінде <xliff:g id="COUNT">%d</xliff:g> таңбадан тұруы керек"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Жалғастыру"</string>
@@ -626,6 +647,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Жетілдірілген Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth қосып, маңайдағы құрылғылармен байланысуға болады."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Орынды анықтау дәлдігін жақсарту үшін жүйелік қолданбалар мен қызметтер әлі де Bluetooth құрылғыларын анықтай алады. Мұны <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>іздеу параметрлерінде<xliff:g id="LINK_END_1">LINK_END</xliff:g> өзгертуге болады."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Қосылмады. Әрекетті қайталаңыз."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Құрылғы мәліметтері"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Құрылғының Bluetooth мекенжайы: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Құрылғы ұмытылсын ба?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Телефон <xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысымен байланыстан ажыратылады"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Планшет <xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысымен байланыстан ажыратылады"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Құрылғы <xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысымен байланыстан ажыратылады"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Құрылғыны ұмыту"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"…қосылу"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> медиа аудиосынан ажыратылады."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> қолсыз қолданылатын аудиодан ажыратылады."</string>
@@ -778,6 +807,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Қамтамасыз етпеу"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Тексермеу"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Сертификат көрсетілмеген. Байланыс жеке болмайды."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Желі атауы тым ұзын."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Доменді көрсету керек."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS қол жетімді"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS қол жетімді)"</string>
@@ -809,7 +839,6 @@
       <item quantity="one">1 желі</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Жетілдірілген Wi‑Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wi-Fi желісін конфигурациялау"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC мекенжайы"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP мекенжайы"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Қосалқы желі маскасы"</string>
@@ -846,9 +875,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Бұл топ ұмытылсын ба?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Жиналмалы Wi‑Fi хотспот"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi хотспоты"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Wi‑Fi желісіне қосылу мүмкіндігін беру үшін мобильдік байланысты пайдалану"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Планшеттің интернет байланысы хотспот арқылы бөлісілмейді"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Телефонның интернет байланысы хотспот арқылы бөлісілмейді"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Басқа құрылғылармен интернет не мазмұн бөлісіліп жатқан жоқ"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Планшеттің интернет байланысы хотспот арқылы бөлісілуде"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Телефонның интернет байланысы хотспот арқылы бөлісілуде"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Қолданба мазмұнды бөлісуде. Интернет байланысын бөлісу үшін хотспотты өшіріп, қайта қосыңыз"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi хотспотының атауы"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> қосылуда…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Басқа құрылғылар <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> хотспотына қосыла алады"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi құпия сөзі"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP диапазоны"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Басқа құрылғыларға Wi‑Fi желісін жасау үшін хотспотты пайдаланыңыз. Хотспот мобильдік деректер байланысы арқылы интернетпен қамтамасыз етеді. Қосымша мобильдік деректер ақысы алынуы мүмкін."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Қолданбалар мазмұнды маңайдағы құрылғылармен бөлісу үшін хоспот жасай алады."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Хотспот қосылуда…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Хотспот өшірілуде…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> қосулы"</string>
@@ -895,6 +932,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi қоңырау шалу қосулы кезде қалауыңызға және қайсы сигнал күштілігіне байланысты телефоныңыз қоңырауларды Wi-Fi желілері не жабдықтаушы желісі арқылы бағыттауы мүмкін. Бұл мүмкіндікті қосудан бұрын жабдықтаушыңыздың қатысты алымдары мен басқа мәліметтерді тексеріңіз."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Төтенше жағдайда пайдаланылатын мекенжайды жаңарту"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"WiFi көмегімен 911 нөміріне қоңырау шалсаңыз, төтенше жағдай қызметтері орныңыз ретінде пайдаланатын мекенжай"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
@@ -952,6 +990,8 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Нәтижелер жоқ"</string>
     <string name="display_settings" msgid="7965901687241669598">"Дисплей"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Экранды автоматты бұру"</string>
+    <!-- no translation found for color_mode_title (3159275920408338215) -->
+    <skip />
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Планшетті айналдырғанда бағытын автоматты түрде ауыстыру"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Телефонды бұрғанда бағытын автоматты түрде бұру"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Планшетті айналдырғанда бағытын автоматты түрде ауыстыру"</string>
@@ -979,23 +1019,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Қолжетімді жарықтандыруға сәйкес жарық деңгейін оңтайландырыңыз. Бұл функция қосулы кезде, жарық деңгейін уақытша реттей аласыз."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Түнгі жарық"</string>
     <string name="night_display_text" msgid="1837277457033025056">"\"Night Light\" функциясы экраныңызға ашық сары реңк береді. Бұл қараңғыда экранға қарауды жеңілдетеді әрі жылдам ұйықтауға да көмектесуі мүмкін."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Уақыт кестесі"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Күй"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Автоматты түрде қосу"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Ешқашан"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Арнаулы кесте"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Күн батқаннан күн шыққанға дейін"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Уақыт кестесі"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ешқашан"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Арнаулы уақытта қосылады"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Күн батқаннан күн шыққанға дейін қосулы"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Басталу уақыты"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Аяқталу уақыты"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Күйі"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Қарқын"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Өшірулі. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Автоматты қосылмайды."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Автоматты қосылады: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Күн батқанда автоматты түрде қосылады."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Қосулы. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Ешқашан автоматты өшпейді."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Автоматты өшеді: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Күн шыққанда автоматты өшеді."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Өшірулі / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Автоматты қосылмайды"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Автоматты қосылады: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Күн батқанда, автоматты түрде қосылады"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Қосулы / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Автоматты өшпейді"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Автоматты өшеді: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Күн шыққанда, автоматты өшеді"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Ұйқы"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Экран өшеді"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Әрекетсіз <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> тұрған соң"</string>
@@ -1019,8 +1058,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Параметрлер"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Aвтоматтық жарықтық"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ояту үшін көтеру"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Айналаны көрсету"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Айналаны көрсету"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Әрқашан қосулы"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Жаңа хабарландырулар"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Көрсетілетін уақыты"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Жаңа хабарландырулар"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Хабарландырулар келгенде, экранды ұйқы режимінен шығару"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Әрқашан қосулы"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Уақытын, хабарландыру белгішелерін және басқа ақпаратты көрсету"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Шрифт өлшемі"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Мәтінді үлкейтеді немесе кішірейтеді"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM картасын бекіту параметрлері"</string>
@@ -1272,6 +1317,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN (Apple хабар жіберу қызметі )бос болмауы тиіс."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC өрісінде 3 цифр болуы тиіс."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC өрісінде 2 немесе 3 цифр тұруы тиіс."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Оператор %s түріндегі APN қосуға рұқсат бермейді."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Бастапқы APN параметрлерін қалпына келтіру."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Бастапқы параметрлеріне қайтару"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Бастапқы қол жетімділік нүктесі атауының параметрлерін қайта орнату аяқталды."</string>
@@ -1301,6 +1347,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD картасын өшіру"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ішкі USB жадындағы музыка немесе фотолар сияқты барлық деректерді өшіру"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD картадағы музыка және фотосуреттер сияқты барлық деректерді өшіру"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIMs картасын өшіру"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Телефондағы барлық eSIM карталарындағы деректерді өшіріңіз. Мұның нәтижесінде мобильдік қызмет жоспарынан бас тартылмайды."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Планшеттегі барлық eSIM карталарындағы деректерді өшіріңіз. Мұның нәтижесінде мобильдік қызмет жоспарынан бас тартылмайды."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Планшетті қайта реттеу"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Телефонды қайта реттеу"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Барлық жеке ақпаратыңыз бен жүктелген қолданбаларыңыз өшірілсін бе? Бұл әрекетті кері қайтару мүмкін емес!"</string>
@@ -1323,26 +1372,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Data Saver функциясы қосулы кезде, тетерингті немесе тасымалы хот-спотты пайдалану мүмкін емес"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB модем режимі"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB жалғанған, қосылу үшін құсбелгі қойыңыз"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Тетеринг арқылы жалғанған"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USB жады қолданыста болғанда тетер мүмкін емес"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB жалғанбаған"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Қосу үшін қосылу"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB жалғау қатесі"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Телефонның интернет байланысын USB арқылы бөлісу"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Планшеттің интернет байланысын USB арқылы бөлісу"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth тетеринг"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Планшет интернет байланысын Bluetooth арқылы бөлісуде"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Телефон интернет байланысын Bluetooth арқылы бөлісуде"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Планшеттің интернет байланысын 1 құрылғы Bluetooth арқылы пайдалануда"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Телефонның интернет байланысын 1 құрылғы Bluetooth арқылы пайдалануда"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Планшеттің интернет байланысын <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> құрылғы Bluetooth арқылы пайдалануда"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Телефонның интернет байланысын <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> құрылғы Bluetooth арқылы пайдалануда"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Планшеттің интернет байланысын Bluetooth арқылы бөлісу"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Телефонның интернет байланысын Bluetooth арқылы бөлісу"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g> интернет байланысын Bluetooth арқылы бөлісуде"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Планшеттің интернет байланысы Bluetooth арқылы бөлісілмейді"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Телефонның интернет байланысы Bluetooth арқылы бөлісілмейді"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Тетеринг жалғанбаған"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> көп құрылғыға тетеринг жалғау мүмкін емес."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысы тетеринг арқылы ажыратылады."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Мобильдік деректер байланысы арқылы басқа құрылғыларды интернетке қосу үшін хотспот және тетеринг функцияларын пайдалану."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Мобильдік деректер байланысы арқылы басқа құрылғыларды интернетке қосу үшін хотспот және тетеринг функцияларын пайдаланыңыз. Қолданбалар да маңайдағы құрылғылармен мазмұнды бөлісу үшін хоспот жасай алады."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Көмек"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Мобильдік желі"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Ұялы жоспар"</string>
@@ -1375,7 +1413,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Орын режимі"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Орынды анықтау үшін GPS, Wi‑Fi, Bluetooth немесе мобильдік желілерді пайдалану"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Орынды анықтау үшін Wi‑Fi, Bluetooth немесе мобильдік желілерді пайдалану"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Орынды анықтау үшін GPS пайдалану"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Орынды анықтау үшін GPS және құрылғы датчиктерін пайдалану"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Тексеруде"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi іздеу"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Орын дәлірек анықталуы үшін жүйелік қолданбаларға және қызметтерге Wi‑Fi желілерін толассыз іздеп отыруға рұқсат етіңіз."</string>
@@ -1420,8 +1458,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Сіздің дерекқор байланысыңыз жоқ. Бұл ақпаратты қазір көру үшін, интернетке қосылған кез келген компьютерден %s тармағына кіріңіз."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Жүктелуде..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Құпия сөзді таңдау"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Саусақ ізін пайдалану үшін құпия сөз орнатыңыз"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Өрнек салу"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Саусақ ізін пайдалану үшін өрнекті орнатыңыз"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN таңдау"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Саусақ ізін пайдалану үшін PIN кодын пайдаланыңыз"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Құпия сөзді растаңыз"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Өрнекті растаңыз"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN кодын растаңыз"</string>
@@ -1490,6 +1531,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Қолданбалар параметрлері"</string>
     <string name="install_applications" msgid="4872012136210802181">"Белгісіз дереккөздер"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Барлық қолд. көз-не рұқсат ету"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Жақында ашылған қолданбалар"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Барлық <xliff:g id="COUNT">%1$d</xliff:g> қолданбаны көру"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> бұрын"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Планшет және жеке деректер белгісіз қолданбалар шабуылына ұшырауы мүмкін. Бұл қолданбаларды пайдалану нәтижесінде телефонға келетін залалға немесе деректердің жоғалуына өзіңіз ғана жауапты боласыз."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Телефон және жеке деректер белгісіз қолданбалар шабуылына ұшырауы мүмкін. Бұл қолданбаларды пайдалану нәтижесінде телефонға келетін залалға немесе деректердің жоғалуына өзіңіз ғана жауапты боласыз."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Қосымша параметрлер"</string>
@@ -1658,6 +1702,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Жүйе қызметі тоқтатылсын ба?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Бұл қызметті тоқтатсаңыз, оны қайта қосуға дейін планшеттің кейбір фукциялары дұрыс жұмыс істемейді."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Бұл қызметті тоқтатсаңыз телефонның кейбір функциялары телефонды өшіріп, қайта қосқанша дұрыс жұмыс істемеуі мүмкін."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Тіл, енгізу және қимылдар"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Тілдер және енгізу"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Тілдер және енгізу"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Мәтін енгізуге көмектесетін параметрлер"</string>
@@ -1872,6 +1920,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> басып шығару қызметі қосулы</item>
       <item quantity="one">1 басып шығару қызметі қосулы</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> басып шығару тапсырмасы</item>
+      <item quantity="one">1 басып шығару тапсырмасы</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Басу қызметтері"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Ешқандай қызметтер орнатылмаған"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Ешқандай принтерлер табылмады"</string>
@@ -1938,6 +1990,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Қолдану деректері"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Қуат қолданысын бейімдеу"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Қамтылған орамдар"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Батареяны пайдаланып жатқан қолданбалар"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Құрылғыны қосулы ұстау"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Құрылғыны фондық режимде ояту"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Орналасу орны ақпаратын жиі сұрауда"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> қолданба оғаш әрекет етуде"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Қолданба тоқтатылсын ба?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Телефон пайдаланылмайтын кезде де, <xliff:g id="APP">%1$s</xliff:g> орналасқан орын мәліметін сұрайтындықтан, құрылғы батареяны басқара алмайды.\n\nБұл мәселені шешу үшін қолданбаны қолмен тоқтатуға болады.\n\nМұндай жағдай қайталана берсе, батарея жұмысын жақсарту үшін қолданбаны жою қажет болуы мүмкін."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Планшет пайдаланылмайтын кезде де, <xliff:g id="APP">%1$s</xliff:g> орналасқан орын мәліметін сұрайтындықтан, құрылғы батареяны басқара алмайды.\n\nБұл мәселені шешу үшін қолданбаны қолмен тоқтатуға болады.\n\nМұндай жағдай қайталана берсе, батарея жұмысын жақсарту үшін қолданбаны жою қажет болуы мүмкін."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Қолданба пайдаланылмайтын кезде де, <xliff:g id="APP">%1$s</xliff:g> орналасқан орын мәліметін сұрайтындықтан, құрылғы батареяны басқара алмайды.\n\nБұл мәселені шешу үшін қолданбаны қолмен тоқтатуға болады.\n\nМұндай жағдай қайталана берсе, батарея жұмысын жақсарту үшін қолданбаны жою қажет болуы мүмкін."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Қолданбаны тоқтату"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Фондық режимде пайдалану өшірілсін бе?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"<xliff:g id="APP">%1$s</xliff:g> телефонды қосулы ұстайтындықтан, телефоныңыз батареяны қалыпты басқара алмайды.\n\nМәселені шешу үшін құрылғы бұл қолданбаның фонда іске қосылуына тыйым сала алады."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"<xliff:g id="APP">%1$s</xliff:g> телефонды қосулы ұстайтындықтан, планшетіңіз батареяны қалыпты басқара алмайды.\n\nМәселені шешу үшін құрылғы бұл қолданбаның фонда іске қосылуына тыйым сала алады."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"<xliff:g id="APP">%1$s</xliff:g> телефонды қосулы ұстайтындықтан, құрылғыңыз батареяны қалыпты басқара алмайды.\n\nМәселені шешу үшін құрылғы бұл қолданбаның фонда іске қосылуына тыйым сала алады."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Өшіру"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Орналасу орны функциясы өшірілсін бе?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Қолданба пайдаланылмайтын кезде де, <xliff:g id="APP">%1$s</xliff:g> орналасқан орын мәліметін сұрайтындықтан, телефон батареяны қалыпты басқара алмайды.\n\nБұл мәселені шешу үшін осы қолданба үшін орналасу орны функциясын өшіріп қойыңыз."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Қолданба пайдаланылмайтын кезде де, <xliff:g id="APP">%1$s</xliff:g> орналасқан орын мәліметін сұрайтындықтан, планшет батареяны қалыпты басқара алмайды.\n\nБұл мәселені шешу үшін осы қолданба үшін орналасу орны функциясын өшіріп қойыңыз."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Қолданба пайдаланылмайтын кезде де, <xliff:g id="APP">%1$s</xliff:g> орналасқан орын мәліметін сұрайтындықтан, құрылғы батареяны қалыпты басқара алмайды.\n\nБұл мәселені шешу үшін осы қолданба үшін орналасу орны функциясын өшіріп қойыңыз."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Өшіру"</string>
     <string name="power_screen" msgid="3023346080675904613">"Экран"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Қалта шам"</string>
     <string name="power_camera" msgid="4976286950934622605">"Камера"</string>
@@ -1952,7 +2024,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Қолданбалар"</string>
     <string name="power_service" msgid="1599661212370831780">"Қызметтер"</string>
     <string name="power_system" msgid="8290455327965307383">"Жүйе"</string>
-    <string name="power_user" msgid="1889728099253018005">"Пайдаланушы"</string>
+    <string name="power_user" msgid="3706143225319881667">"Басқа пайдаланушылар"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Барлық CPU (орталық өңдеу бірлігі)"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU (орталық процессор) алғы шебі"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ұйқы бермеу"</string>
@@ -2004,6 +2076,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Мөлшерінен жоғары есептелген қуатты қолдану"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> Ампер/сағ"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Пайдаланылу уақыты: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"<xliff:g id="TIME">^1</xliff:g> бойы қосулы"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Экранның тұтынуы: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g>-н пайдаланды"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Жалпы батарея зарядының <xliff:g id="PERCENT">%1$s</xliff:g>-ы"</string>
@@ -2563,7 +2636,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN кодты өзгерту"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Хабарларды көрсету"</string>
     <string name="help_label" msgid="6886837949306318591">"Анықтама/пікір"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Анықтама мақалалары, телефон және чат қолдауы"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Анықтама мақалалары, телефон және чат, жұмысты бастау"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Мазмұнға арналған есептік жазба"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Фотосуретті ЖА"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Үлкен қауіптер"</string>
@@ -2653,9 +2726,12 @@
       <item quantity="one">%d жасырын элементті көрсету</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Желі және интернет"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, мобильдік, деректер трафигі, хотспот"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобильдік желі"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"деректерді пайдалану"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"хотспот"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Қосылған құрылғылар"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Қолданбалар мен хабарландырулар"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Рұқсаттар, әдепкі қолданбалар"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Пайдаланушылар мен есептік жазбалар"</string>
@@ -2708,6 +2784,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"қимыл"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"төлеу, түрту, төлемдер"</string>
     <string name="keywords_backup" msgid="470070289135403022">"сақтық көшірме, сақтық көшірме жасау"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"қимыл, жиек, жаны, белсенді жиек, қысу, қармау, көмектесу, Assistant, сығылмалы, squeezie, squeezey, squeezee, Ok Google, Google Assistant"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"қимыл, ояту, хабарландырулар, экран, дисплей, экранды өшіру, экранды қосу, қысу, жиек, ұйқыда, ұйқы, қармау"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"қимыл, үнсіздік, кідірту, дабыл, келген қоңырау, тыныш, көрсету, құлып экраны, қысу, қармау, жиек, тоқтату"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC белгісін реттеу"</string>
     <string name="write_tag" msgid="8571858602896222537">"Жазу"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Жазу үшін белгіні түртіңіз…"</string>
@@ -2790,7 +2869,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Хабарландыруларды мүлде көрсетпеу"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Құрылғы бекітілген болса, профиль хабарландырулары қалай көрсетілуі керек?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Профиль хабарландырулары"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Хабарландырулар"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Хабарландырулар"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Қолданба хабар-лары"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Хабарландыру санаты"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Маңыздылық"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Қолданба өзі шешеді"</string>
@@ -2805,6 +2885,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Шұғыл"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Дыбысқа рұқсат ету"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Дыбыс шығармау, дірілдетпеу немесе осы хабарландыруларды ағымдағы экрандағы көріністе көрсетпеу."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Төмен маңыздылық"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Орташа маңыздылық"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Жоғары маңыздылық"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Шұғыл маңыздылық"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Хабарландыру көмекшісі"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Хабарландыруға кіру мүмкіндігі"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Жұмыс профилінің хабарландыруларына кіру бөгелген"</string>
@@ -2832,8 +2916,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Сурет ішіндегі сурет"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"\"Сурет ішіндегі сурет\" режиміне рұқсат беру"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Қолданба ашық болғанда не одан шыққанда (мысалы, бейнені көре беру үшін), бұл қолданбаға сурет ішіндегі сурет терезесін ашуға мүмкіндік береді. Бұл терезе пайдаланылып жатқан басқа қолданбалардың үстінен шығады."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Иә"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Жоқ"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Мазаламау режиміне кіру"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Орнатылған қолданбалардың ешбірі Мазаламау режиміне кіруге рұқсат сұрамады"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Қолданбаларды жүктеу…"</string>
@@ -2964,11 +3046,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Бұл жұмыс профилін басқаратын:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> арқылы басқарылады"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Эксперименттік)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Құрылғыны айналдыру"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Экран мазмұнын бұру"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Портреттік көріністе қалу"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Пейзаждық көріністе қалу"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ағымдағы бағдарда қалу"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Қорғалған іске қосу"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Жалғастыру"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Құрылғыны іске қосардың алдында PIN кодын талап ету арқылы оның қауіпсіздігін күшейтуге болады. Ол іске қосылмайынша, қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде дабылдарды қабылдай алмайды. \n\nБұл жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі. Құрылғыны іске қосу үшін PIN кодын талап ету керек пе?"</string>
@@ -2976,7 +3053,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Бұл құрылғыны іске қосу алдында құпиясөз талап ету арқылы оның қауіпсіздігін күшейтуге болады. Ол іске қосылмайынша, қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде дабылдарды қабылдай алмайды. \n\nБұл жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі. Құрылғыны іске қосу үшін құпиясөз сұрау керек пе?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Құрылғы құлпын ашу үшін саусақ ізін пайдаланумен бірге, іске қосардың алдында PIN кодын талап ету арқылы оның қауіпсіздігін күшейтуге болады. Ол іске қосылмайынша, қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде дабылдарды қабылдай алмайды.\n\nБұл жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі. Құрылғыны іске қосу үшін PIN кодын талап ету керек пе?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Құрылғы құлпын ашу үшін саусақ ізін пайдаланумен бірге, іске қосардың алдында өрнекті енгізуді талап ету арқылы оның қауіпсіздігін күшейтуге болады. Ол іске қосылмайынша, қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде дабылдарды қабылдай алмайды.\n\nБұл жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі. Құрылғыны іске қосу үшін өрнекті талап ету керек пе?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Құрылғы құлпын ашу үшін саусақ ізін пайдаланумен бірге, іске қосардың алдында өрнек енгізуді талап ету арқылы оның қауіпсіздігін күшейтуге болады. Ол іске қосылмайынша, қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде дабылдарды қабылдай алмайды.\n\nБұл жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі. Құрылғыны іске қосу үшін құпиясөз талап ету керек пе?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Құрылғы құлпын ашу үшін саусақ ізін пайдаланумен бірге, іске қосардың алдында құпия сөз талап ету арқылы оны қорғай аласыз. Құрылғы іске қосылмайынша, қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде дабылдарды қабылдай алмайды.\n\nБұл жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі. Құрылғыны іске қосу үшін құпия сөз талап ету керек пе?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Иә"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Жоқ"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN коды қажет пе?"</string>
@@ -3094,6 +3171,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Пайдаланушы ескертулері"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Толық құрылғы тұтынуы"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Қолданбаны пайдалануды көрсету"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Көп пайдалану"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> қолданба дұрыс жұмыс істемей тұр</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> қолданбасы дұрыс жұмыс істемей тұр</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Батареяны пайдаланып жатқан қолданбалар</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> батареяны пайдалануда</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Оңтайландырылмаған"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Оңтайландырылмаған"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Батареяны пайдалануды оңтайландыру"</string>
@@ -3186,8 +3272,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Басқа қолданбалардың үстінен көрсету"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> қолданбаның <xliff:g id="COUNT_0">%1$d</xliff:g>-на(не) басқа қолданбалардың үстінен шығуға рұқсат берілген"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Рұқсаты бар қолданбалар"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Иә"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Жоқ"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Рұқсат етілген"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Рұқсат етілмеген"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"қолданбаларлы орнату белгісіз дереккөздер"</string>
     <string name="write_settings" msgid="4797457275727195681">"Жүйелік параметрлерді өзгерту"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"жүйелік параметрлерді жазу өзгерту"</string>
@@ -3277,6 +3363,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Экранға ашық сары реңк берілді. Бұл жылдам ұйықтап кетуіңізге көмектеседі."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Ұсыныстар"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"тағы +<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ұсыныс</item>
+      <item quantity="one">1 ұсыныс</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> ұсыныс</item>
+      <item quantity="one">+1 ұсыныс</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Жою"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Суық түс температурасы"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Суығырақ дисплей түстерін пайдалану"</string>
@@ -3295,8 +3390,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> Деректер туралы ескерту"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> Деректер туралы ескерту / <xliff:g id="ID_2">%2$s</xliff:g> Деректер шегі"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Есепшот ұсыну мерзімі"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Ай сайынғы бастапқы мерзім әр айдың <xliff:g id="ID_1">%1$s</xliff:g> күнінде басталады"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Ай сайынғы бастапқы <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Ай сайын <xliff:g id="ID_1">%1$s</xliff:g> күні"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Желілік шектеулер"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> шектеу</item>
@@ -3316,7 +3410,7 @@
       <item quantity="one">Трафикті үнемдеу функциясы қосулы кезде, 1 қолданбаға деректерді шексіз пайдалануға рұқсат етілген</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Трафикті үнемдеу"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Деректерді шексіз пайдалану"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Шектелмейтін деректер"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Фондық дерек өшірілген"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Қосулы"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Өшірулі"</string>
@@ -3380,8 +3474,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Құлыпталған экран хабарландыруларын бақылау"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Хабарландыру мазмұнын көрсету немесе жасыру"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Барлығы"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Қолдау"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> нүкте/дюйм"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Қолдау және кеңестер"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ең кішкентай ен"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Орнатылған қолданбалардың ешбірі Premium SMS мүмкіндігін пайдалануға рұқсат сұрамады."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS мүмкіндігі үшін оператор тарифтеріне сәйкес ақы алынуы мүмкін. Егер қолданбаға рұқсат берсеңіз, сол қолданба арқылы премиум SMS жібере аласыз.Premium SMS мүмкіндігі үшін ақша алынуы мүмкін және операторыңыз арқылы жасалған төлем бойынша қосылады. Егер қолданбаға рұқсат берсеңіз, сол қолданба арқылы премиум SMS жібере аласыз."</string>
@@ -3446,28 +3539,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Aвтоматты"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Қолмен"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Орынды қазір босату"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Қимылдар"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Қимыл таңбашалары"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Телефоныңызды басқаруға арналған жылдам қимылдар"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Планшетті басқаруға арналған жылдам қимылдар"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Құрылғыны басқаруға арналған жылдам қимылдар"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Камераға өту"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Камераны жылдам ашу үшін қуат түймесін екі рет басыңыз. Кез келген экраннан жұмыс істейді."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Камераны жылдам ашу"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Камераны ашу үшін қуат түймесін екі рет басыңыз"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Камераны аудару"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Жылдам селфи түсу"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Селфи режимі үшін телефонды екі рет айналдырыңыз"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Селфи режимі үшін планшетті екі рет айналдырыңыз"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Селфи режимі үшін құрылғыны екі рет айналдырыңыз"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Телефонды тексеру үшін екі рет түртіңіз"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Планшетті тексеру үшін екі рет түртіңіз"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Құрылғыны тексеру үшін екі рет түртіңіз"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Хабарландыруларды жылдам тексеру үшін экранды екі рет түртіңіз."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Уақытты, хабарландыру белгішелерін және басқа ақпаратты тексеру үшін экранды екі рет түртіңіз."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Экран өшірулі кезде хабарландыруларды тексеру"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Телефонды тексеру үшін оны көтеріңіз"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Планшетті тексеру үшін оны көтеріңіз"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Құрылғыны тексеру үшін оны көтеріңіз"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Хабарландыруларды жылдам тексеру үшін телефонды қолыңызға алыңыз."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Хабарландыруларды жылдам тексеру үшін планшетті қолыңызға алыңыз."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Хабарландыруларды жылдам тексеру үшін құрылғыны қолыңызға алыңыз."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Уақытты, хабарландыру белгішелерін және басқа ақпаратты тексеру үшін телефонды көтеріңіз."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Уақытты, хабарландыру белгішелерін және басқа ақпаратты тексеру үшін планшетті көтеріңіз."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Уақытты, хабарландыру белгішелерін және басқа ақпаратты тексеру үшін құрылғыны көтеріңіз."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Экран өшірулі кезде хабарландыруларды тексеру"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Саусақпен сипап өтіп, хабарландыруларды қараңыз"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Хабарландыруларды көру үшін телефонның артындағы саусақ ізін оқу сканерін саусақпен төмен қарай сипап өтіңіз."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Хабарландыруларды көру үшін планшеттің артындағы саусақ ізін оқу сканерін саусақпен төмен қарай сипап өтіңіз."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Хабарландыруларды көру үшін құрылғының артындағы саусақ ізін оқу сканерін саусақпен төмен қарай сипап өтіңіз."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Хабарландыруларды жылдам көру"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Саусақ ізін оқу сканерінде саусақты төмен сырғыту"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Камераны ашу үшін көтеріңіз"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Камера автоматты түрде ашылуы үшін, телефоныңызды фотоға түсіретін қалыпқа (альбомдық немесе портреттік) көтеріңіз. Телефоныңыз күту режимінде болса да немесе құлыпталса да жұмыс істейді."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Телефон күту режимінде не құлып болған кезде суретке түсіру"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Көмекші қимыл"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Сезгіштік"</string>
@@ -3571,6 +3677,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Бұл лездік қолданбаны өшіргіңіз келе ме?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Ойындар"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудиофайлдар"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Пайдаланылған орын"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> деген пайдаланушы үшін жойылған)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> деген пайдаланушы үшін өшірілген)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Автотолтыру қызметі"</string>
@@ -3584,5 +3691,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Лездік қолданба"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Жад менеджері өшірілсін бе?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Фильм және телебағдарлама қолданбалары"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Пайдаланылған орын"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Операторды инициализациялау туралы ақпарат"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Операторды инциализациялауды іске қосу"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Қандай қызық жаңа мүмкіндік бар?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Үздік 5 функцияны қараңыз"</string>
 </resources>
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index 26ea3dd..dcdd510 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"ខ្លាំង"</item>
     <item msgid="8986346415847956850">"ខ្លាំងណាស់"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"ជា​និច្ច"</item>
-    <item msgid="844721238536786870">"តែ​ពេល​ដោតប៉ុណ្ណោះ"</item>
-    <item msgid="1986753720941888596">"កុំ"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"ជា​និច្ច"</item>
-    <item msgid="7433294150916905997">"តែ​ពេល​ដោត"</item>
-    <item msgid="1390404486722375028">"កុំ"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 ថ្ងៃ​មុន"</item>
     <item msgid="6600989128423965319">"កំណត់រង្វង់ប្រើប្រាស់..."</item>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index eb0102a..9fb3170 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ឥឡូវ​អ្នក​ក្លាយ​ជា​អ្នក​អភិវឌ្ឍ​ហើយ!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"មិន​ចាំបាច់​ទេ អ្នក​ជា​អ្នក​អភិវឌ្ឍ​រួច​ហើយ។"</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"សូមបើកជម្រើសសម្រាប់អ្នកអភិវឌ្ឍន៍ជាមុនសិន។"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"ឥត​ខ្សែ &amp; បណ្ដាញ​"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"ការ​តភ្ជាប់"</string>
     <string name="header_category_device" msgid="4544026001618307754">"ឧបករណ៍"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"បានផ្តល់ VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"បានផ្តល់នូវការហៅជាវីដេអូ"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"បានផ្តល់នូវការហៅតាមរយៈ Wifi"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"បាន​ផ្តល់ជូន EAB/Presence"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"ថាមពលវិទ្យុចល័ត"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"មើលសៀវភៅអាសយដ្ឋានក្នុងស៊ីមកាត"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"មើល​លេខ​ហៅ​ថេរ"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"វិភាគ​រក​ឧបករណ៍"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"ប្ដូរ​ឈ្មោះ​ឧបករណ៍​នេះ"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"ប្ដូរ​ឈ្មោះ"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ផ្ដាច់?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"វា​នឹង​បញ្ចប់​ការ​តភ្ជាប់​​ជា​មួយ៖&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"ផ្ដាច់​ឧបករណ៍?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"ទូរសព្ទ​របស់អ្នក​នឹង​ផ្តាច់ចេញពី <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ។"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"ថេប្លេតរបស់អ្នក​នឹង​ផ្តាច់ចេញពី <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ។"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"ឧបករណ៍របស់អ្នក​នឹង​ផ្តាច់ចេញពី <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ។"</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"ផ្ដាច់"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"អ្នក​មិន​មាន​សិទ្ធិ​ ដើម្បី​​ប្ដូរ​ការ​កំណត់​ប៊្លូធូស​ទេ។"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"ផ្គូផ្គង​ឧបករណ៍ថ្មី"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> អាចមើលឃើញដោយឧបករណ៍នៅក្បែរនោះ នៅពេលដែលបើកការកំណត់ប្ល៊ូធូស។"</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"អាសយដ្ឋាន​ប៊្លូធូស​របស់ទូរសព្ទ៖ <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"អាសយដ្ឋាន​ប៊្លូធូស​របស់ថេប្លេត៖ <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"អាសយដ្ឋាន​ប៊្លូធូស​របស់ឧបករណ៍៖ <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"ផ្ដាច់ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ការ​ផ្សាយ"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"បិទ​ប្រវត្តិរូប?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"ស្នើ​ផ្គូផ្គង​ប៊្លូធូស"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"សំណើ​ផ្គូផ្គង"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"ប៉ះដើម្បីផ្គូផ្គងជាមួយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ។"</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"បង្ហាញ​ឯកសារ​បាន​ទទួល"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"ឯកសារ​ដែល​បានទទួល"</string>
     <string name="device_picker" msgid="4978696506172252813">"ជ្រើស​ឧបករណ៍​ប៊្លូ​ធូ​ស"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ចង់បើកប៊្លូធូស"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ចង់បិទប៊្លូធូស"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ចង់​ចូល​ដំណើរការ​សារ​របស់​អ្នក។ សូម​ផ្ដល់​ការ​ចូល​ដំណើរការ​ទៅ​កាន់​%2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"សំណើចូលដំណើរការស៊ីម"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ចង់ចូលដំណើរការស៊ីមកាតរបស់អ្នក។ ការផ្តល់ការអនុញ្ញាតចូលដំណើរការស៊ីមកាតនឹងបិទដំណើរការតភ្ជាប់ទិន្នន័យនៅលើឧបករណ៍របស់អ្នកក្នុងអំឡុងពេលធ្វើការតភ្ជាប់។ អនុញ្ញាតឲ្យចូលដំណើរការ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"អាច​មើល​ឃើញ​ជា <xliff:g id="DEVICE_NAME">^1</xliff:g> ចំពោះ​ឧបករណ៍ផ្សេង"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ឧបករណ៍របស់អ្នក"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ផ្គូផ្គង​ឧបករណ៍ថ្មី"</string>
     <string name="date_and_time" msgid="9062980487860757694">"កាលបរិច្ឆេទ និង ម៉ោង"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ជ្រើស​តំបន់​ពេល​វេលា"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"គណនី"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ទី​តាំង​"</string>
     <string name="account_settings_title" msgid="626177544686329806">"គណនី"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"សុវត្ថិភាព និងទីកន្លែង"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"សុវត្ថិភាព &amp; ទីតាំង"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ការ​អ៊ិនគ្រីប និងលិខិត​សម្គាល់"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"បានអ៊ិនគ្រីបទូរសព្ទ"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"ឧបករណ៍​ត្រូវបានអ៊ិនគ្រីប"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"ដោះសោដោយប្រើស្នាមម្រាមដៃ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"ប្រើស្នាមម្រាមដៃរបស់អ្នក"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"គ្រាន់តែប៉ះលើឧបករណ៍ចាប់ស្នាមម្រាមដៃប៉ុណ្ណោះដើម្បីដោះសោទូរស័ព្ទរបស់អ្នក អនុញ្ញាតលើការទិញ ឬចូលកម្មវិធី។ សូមប្រុងប្រយ័ត្នចំពោះស្នាមម្រាមដៃដែលអ្នកបន្ថែម។ ទោះបីជាបន្ថែមស្នាមម្រាមដៃតែមួយក៏ដោយ ក៏វាអាចធ្វើសកម្មភាពទាំងអស់នេះបានដែរ។\n\nចំណាំ៖ ស្នាមម្រាមដៃរបស់អ្នកមិនសូវមានសុវត្ថិភាពដូចការប្រើលំនាំ ឬកូដ PIN ដែលខ្លាំងនោះទេ។"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"គ្រាន់តែប៉ះលើឧបករណ៍សម្គាល់ស្នាមម្រាមដៃប៉ុណ្ណោះ ដើម្បីអនុញ្ញាត​ការទិញ ឬចូលកម្មវិធី។ សូមប្រុងប្រយ័ត្នចំពោះស្នាមម្រាមដៃរបស់​បុគ្គល​ដែលអ្នកបន្ថែម។ ទោះបីជាអ្នកបន្ថែមស្នាមម្រាមដៃតែមួយក៏ដោយ ក៏វាអាចធ្វើសកម្មភាពទាំងអស់នេះបានដែរ។\n\nចំណាំ៖ អ្នកមិនអាចប្រើស្នាមម្រាមដៃរបស់អ្នក ដើម្បីដោះសោឧបករណ៍នេះឡើយ។ សម្រាប់ព័ត៌មានបន្ថែម សូមទាក់ទងរដ្ឋបាល​ក្នុង​អង្គភាពរបស់អ្នក។"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"គ្រាន់តែប៉ះលើឧបករណ៍ចាប់ស្នាមម្រាមដៃប៉ុណ្ណោះដើម្បីដោះសោទូរស័ព្ទរបស់អ្នក អនុញ្ញាតលើការទិញ ឬចូលកម្មវិធី។ សូមប្រុងប្រយ័ត្នចំពោះស្នាមម្រាមដៃដែលអ្នកបន្ថែម។ ទោះបីជាបន្ថែមស្នាមម្រាមដៃតែមួយក៏ដោយ ក៏វាអាចធ្វើសកម្មភាពទាំងអស់នេះបានដែរ។\n\nចំណាំ៖ ស្នាមម្រាមដៃរបស់អ្នកមិនសូវមានសុវត្ថិភាពដូចការប្រើលំនាំ ឬកូដ PIN រឹងមាំនោះទេ។"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"ប្រើម្រាមដៃរបស់អ្នកដើម្បីដោះសោទូរសព្ទរបស់អ្នក ឬយល់ព្រមលើការទិញ។\n\nចំណាំ៖ អ្នកមិនអាចប្រើស្នាមម្រាមដៃរបស់អ្នក ដើម្បីដោះសោឧបករណ៍នេះឡើយ។ សម្រាប់ព័ត៌មានបន្ថែម សូមទាក់ទងអ្នកគ្រប់គ្រង​របស់​ស្ថាប័នអ្នក។"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"ប្រើម្រាមដៃរបស់អ្នកដើម្បីដោះសោទូរសព្ទរបស់អ្នក ឬយល់ព្រមលើការទិញ។\n\nចំណាំ៖ ស្នាមម្រាមដៃរបស់អ្នកអាចមិនសូវមានសុវត្ថិភាពដូចការប្រើលំនាំ ឬកូដ PIN ដែលរឹងមាំនោះទេ។"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"បោះបង់"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"បន្ត"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"រំលង"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"បញ្ចូល​ស្នាមម្រាមដៃ"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"លក្ខណៈពិសេសេការពារឧបករណ៍នឹងមិនត្រូវធ្វើឲ្យសកម្មទេ។ អ្នកនឹងមិនអាចបង្ការអ្នកផ្សេងពីការប្រើថេប្លេតនេះឡើយ ប្រសិនបើវាបាត់បង់ ត្រូវបានគេលួច ឬលុបចោល។"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"លក្ខណៈពិសេសេការពារឧបករណ៍នឹងមិនត្រូវធ្វើឲ្យសកម្មទេ។ អ្នកនឹងមិនអាចបង្ការអ្នកផ្សេងពីការប្រើឧបករណ៍នេះឡើយ ប្រសិនបើវាបាត់បង់ ត្រូវបានគេលួច ឬលុបចោល។"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"លក្ខណៈពិសេសការពារឧបករណ៍នឹងមិនត្រូវបានធ្វើឲ្យដំណើរការទេ។ អ្នកនឹងមិនអាចរារាំងអ្នកដទៃពីការប្រើទូរសព្ទនេះបានឡើយ ប្រសិនបើវាបាត់បង់ ត្រូវបានគេលួច ឬលុបចោល។"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"លក្ខណៈពិសេសការពារឧបករណ៍នឹងមិនត្រូវបានធ្វើឲ្យសកម្មទេ។ អ្នកនឹងមិនអាចរារាំងអ្នកដទៃក្នុងការប្រើថេប្លេតនេះនៅពេលវាបាត់បង់ ឬត្រូវបានគេលួចនោះទេ។"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"លក្ខណៈពិសេសការពារឧបករណ៍នឹងមិនត្រូវបានធ្វើឲ្យសកម្មទេ។ អ្នកនឹងមិនអាចរារាំងអ្នកដទៃពីការប្រើឧបករណ៍នេះនៅពេលវាបាត់បង់ ឬត្រូវបានគេលួចនោះទេ។"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"លក្ខណៈពិសេសការពារឧបករណ៍នឹងមិនត្រូវបានធ្វើឲ្យសកម្មទេ។ អ្នកនឹងមិនអាចរារាំងអ្នកដទៃពីការប្រើទូរស័ព្ទនេះនៅពេលវាបាត់បង់ ឬត្រូវបានគេលួចនោះទេ។"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"បន្ទាប់"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"មុខងារការពារឧបករណ៍នឹងមិនត្រូវបានបើកទេ។ អ្នកនឹងមិនអាច​រារាំង​អ្នកផ្សេង​មិនឲ្យប្រើប្រាស់ថេប្លេតនេះបានទេ ប្រសិនបើវាបាត់ ត្រូវបានគេលួច ឬកំណត់ឡើងវិញ។"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"មុខងារការពារឧបករណ៍នឹងមិនត្រូវបានបើកទេ។ អ្នកនឹងមិនអាច​រារាំង​អ្នកផ្សេង​មិនឲ្យប្រើប្រាស់ឧបករណ៍នេះបានទេ ប្រសិនបើវាបាត់ ត្រូវបានគេលួច ឬកំណត់ឡើងវិញ។"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"មុខងារការពារឧបករណ៍នឹងមិនត្រូវបានបើកទេ។ អ្នកនឹងមិនអាច​រារាំង​អ្នកផ្សេង​មិនឲ្យប្រើប្រាស់ទូរសព្ទនេះបានទេ ប្រសិនបើវាបាត់ ត្រូវបានគេលួច ឬកំណត់ឡើងវិញ។"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"មុខងារការពារឧបករណ៍នឹងមិនត្រូវបានបើកទេ។ អ្នកនឹងមិនអាច​រារាំង​អ្នកផ្សេង​មិនឲ្យប្រើប្រាស់ថេប្លេតនេះបានទេ ប្រសិនបើវាបាត់ ឬត្រូវបានគេលួច។"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"មុខងារការពារឧបករណ៍នឹងមិនត្រូវបានបើកទេ។ អ្នកនឹងមិនអាច​រារាំង​អ្នកផ្សេង​មិនឲ្យប្រើប្រាស់ឧបករណ៍នេះបានទេ ប្រសិនបើវាបាត់ ឬត្រូវបានគេលួច។"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"មុខងារការពារឧបករណ៍នឹងមិនត្រូវបានបើកទេ។ អ្នកនឹងមិនអាច​រារាំង​អ្នកផ្សេង​មិនឲ្យប្រើប្រាស់ទូរសព្ទនេះបានទេ ប្រសិនបើវាបាត់ ឬត្រូវបានគេលួច។"</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"រំលងទោះបីយ៉ាងណាក៏ដោយ"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"ថយ​ក្រោយ"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ស្វែងរកឧបករណ៍ចាប់សញ្ញា"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ដាក់ឧបករណ៍ចាប់សញ្ញាស្នាមម្រាមដៃនៅខាងក្រោយទូរស័ព្ទរបស់អ្នក។"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"ប៉ះឧបករណ៍ចាប់ស្នាមម្រាមដៃ"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"វាស្ថិតនៅផ្នែកខាងក្រោយនៃទូរសព្ទរបស់អ្នក។ សូមប្រើម្រាមដៃចង្អុលរបស់អ្នក។"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"រូបភាពបង្ហាញទីតាំងឧបករណ៍ចាប់សញ្ញាស្នាមម្រាមដៃ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"ឈ្មោះ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"យល់ព្រម"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"លុប"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"តោះចាប់ផ្តើម!"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"ប៉ះឧបករណ៍ចាប់ស្នាមម្រាមដៃ"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ដាក់ម្រាមដៃរបស់អ្នកនៅលើឧបករណ៍ចាប់សញ្ញា ហើយលើកវាឡើងបន្ទាប់ពីអ្នកមានអារម្មណ៍ថាវាញ័រហើយ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"បន្តធ្វើ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"ផ្លាស់ទីម្រាមដៃរបស់អ្នកបន្តិចដើម្បីបន្ថែមផ្នែកផ្សេងទៀតទាំងអស់នៃម្រាមដៃរបស់អ្នក"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"បានបញ្ចូល​ស្នាមម្រាមដៃ​រួចហើយ!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"នៅពេលដែលអ្នកឃើញរូបតំណាងនេះ អ្នកអាចប្រើស្នាមម្រាមដៃដើម្បីសម្គាល់​អត្តសញ្ញាណ ឬដើម្បីអនុញ្ញាតការទិញ។"</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"គ្រាន់តែប៉ះឧបករណ៍ចាប់ស្នាមម្រាមដៃដើម្បីដាស់ និងដោះសោឧបករណ៍របស់អ្នក។"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"នៅពេលដែលអ្នកឃើញរូបតំណាងនេះ អ្នកក៏អាចផ្តល់សិទ្ធិក្នុងការទិញ ឬចូលកម្មវិធីផងដែរ។"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"លើកឡើង បន្ទាប់មកប៉ះម្តងទៀត"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"បន្តលើកម្រាមដៃរបស់អ្នកឡើង ដើម្បីបញ្ចូលផ្នែកផ្សេងទៀតនៃម្រាមដៃរបស់អ្នក"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"បានបញ្ចូល​ស្នាមម្រាមដៃ​រួចហើយ"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"នៅពេលដែលអ្នកឃើញរូបតំណាងនេះ សូមប្រើស្នាមម្រាមដៃរបស់អ្នកសម្រាប់ការកំណត់អត្តសញ្ញាណ ឬយល់ព្រមលើការទិញ។"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"រំលងការដំឡើងស្នាមម្រាមដៃឬទេ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"អ្នកបានជ្រើសរើសប្រើស្នាមម្រាមដៃរបស់អ្នកជាវិធីមួយក្នុងការដោះសោទូរស័ព្ទរបស់អ្នក។ ប្រសិនបើអ្នករំលងឥឡូវនេះ អ្នកត្រូវដំឡើងវានៅពេលក្រោយ។ ការដំឡើងចំណាយពេលបន្តិចប៉ុណ្ណោះ។"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"កំណត់ការចាក់សោអេក្រង់"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"រួចរាល់"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"អូ នោះមិនមែនជាឧបករណ៍ចាប់សញ្ញាទេ"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"ប្រើឧបករណ៍ចាប់សញ្ញាម្រាមដៃនៅលើឧបករណ៍របស់អ្នក។"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"ប៉ះឧបករណ៍ចាប់ស្នាមម្រាមដៃនៅផ្នែកខាងក្រោយនៃទូរសព្ទរបស់អ្នក។ សូមប្រើម្រាមដៃចង្អុលរបស់អ្នក។"</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ការចុះឈ្មោះមិនបានបញ្ចប់នោះទេ"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"រយៈពេលបញ្ចូលស្នាមម្រាមដៃបានអស់ពេលហើយ សូមព្យាយាមម្តងទៀត។"</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ការបញ្ចូលស្នាមម្រាមដៃមិនដំណើរការទេ សូមព្យាយាមម្តងទៀត ឬប្រើម្រាមដៃផ្សេងពីនេះ។"</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ទប់ស្កាត់អ្នកផ្សេងពីការប្រើឧបករណ៍នេះដោយគ្មានការអនុញ្ញាតពីអ្នកដោយធ្វើឲ្យលក្ខណៈពិសេសការពារឧបករណ៍សកម្ម។ សូមជ្រើសការចាក់សោអេក្រង់ដែលអ្នកចង់ប្រើ។"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ទប់ស្កាត់អ្នកផ្សេងពីការប្រើទូរស័ព្ទនេះដោយគ្មានការអនុញ្ញាតពីអ្នកដោយធ្វើឲ្យលក្ខណៈពិសេសការពារឧបករណ៍សកម្ម។ សូមជ្រើសការចាក់សោអេក្រង់ដែលអ្នកចង់ប្រើ។"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"ជ្រើសរើសវិធីចាក់សោអេក្រង់បម្រុងទុក"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"ជម្រើស​ចាក់សោអេក្រង់"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"ជម្រើស​ចាក់សោអេក្រង់"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ចាក់សោ​អេក្រង់"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / ភ្លាមៗ​បន្ទាប់ពីគេង"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> បន្ទាប់ពីគេង"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ប្ដូរ​លំនាំ​ដោះ​សោ"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ប្ដូរ​កូដ​ PIN ដោះ​សោ"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ប្ដូរ​ពាក្យសម្ងាត់​ដោះ​សោ"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"ព្យាយាមម្តងទៀត ការព្យាយាម <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ដងនៃ <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> ដង"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"ការព្យាយាមចុងក្រោយ"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"ប្រសិនបើអ្នកបញ្ចូលលំនាំការងារមិនបានត្រឹមត្រូវសម្រាប់ការព្យាយាមលើកនេះទេ នោះប្រវត្តិរូបការងាររបស់អ្នក និងទិន្នន័យដែលពាក់ព័ន្ធនឹងត្រូវបានយកចេញពីឧបករណ៍នេះ។"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"ប្រសិនបើអ្នកបញ្ចូលកូដ PIN ការងារមិនបានត្រឹមត្រូវសម្រាប់ការព្យាយាមលើកនេះទេ នោះប្រវត្តិរូបការងាររបស់អ្នក និងទិន្នន័យដែលពាក់ព័ន្ធនឹងត្រូវបានយកចេញពីឧបករណ៍នេះ។"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"ប្រសិនបើអ្នកបញ្ចូលពាក្យសម្ងាត់ការងារមិនបានត្រឹមត្រូវសម្រាប់ការព្យាយាមលើកនេះទេ នោះប្រវត្តិរូបការងាររបស់អ្នក និងទិន្នន័យដែលពាក់ព័ន្ធនឹងត្រូវបានយកចេញពីឧបករណ៍នេះ។"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"មានការព្យាយាមមិនត្រឹមត្រូវច្រើនដងពេកហើយ។ ប្រវត្តិរូបការងាររបស់អ្នក និងទិន្នន័យដែលពាក់ព័ន្ធនឹងត្រូវបានយកចេញពីឧបករណ៍នេះ។"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"បដិសេធ"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"សូម​ព្យាយាមម្តងទៀត។ ការព្យាយាម <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ដងនៃ <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> ដង។"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"ទិន្នន័យរបស់អ្នកនឹងត្រូវបានលុប"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"ប្រសិនបើអ្នកបញ្ចូលលំនាំមិនត្រឹមត្រូវនៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ ទិន្នន័យឧបករណ៍នេះនឹងត្រូវបានលុប"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"ប្រសិនបើអ្នកបញ្ចូលកូដ PIN មិនត្រឹមត្រូវនៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ ទិន្នន័យឧបករណ៍នេះនឹងត្រូវបានលុប"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"ប្រសិនបើអ្នកបញ្ចូលពាក្យសម្ងាត់មិនត្រឹមត្រូវនៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ ទិន្នន័យឧបករណ៍នេះនឹងត្រូវបានលុប"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"ប្រសិនបើអ្នកបញ្ចូលលំនាំមិនត្រឹមត្រូវនៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ អ្នកប្រើប្រាស់នេះនឹងត្រូវបានលុប"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"ប្រសិនបើអ្នកបញ្ចូលកូដ PIN មិនត្រឹមត្រូវ​នៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ អ្នកប្រើប្រាស់នេះនឹងត្រូវបានលុប"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"ប្រសិនបើអ្នកបញ្ចូលពាក្យសម្ងាត់មិនត្រឹមត្រូវនៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ អ្នកប្រើប្រាស់នេះនឹងត្រូវបានលុប"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"ប្រសិនបើអ្នកបញ្ចូលលំនាំមិនត្រឹមត្រូវនៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ កម្រងព័ត៌មានការងាររបស់អ្នក និងទិន្នន័យរបស់វានឹងត្រូវបានលុប"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"ប្រសិនបើអ្នកបញ្ចូលកូដ PIN មិនត្រឹមត្រូវនៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ កម្រងព័ត៌មានការងាររបស់អ្នក និងទិន្នន័យរបស់វានឹងត្រូវបានលុប"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"ប្រសិនបើអ្នកបញ្ចូលពាក្យសម្ងាត់មិនត្រឹមត្រូវនៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ កម្រងព័ត៌មានការងាររបស់អ្នក និងទិន្នន័យរបស់វានឹងត្រូវបានលុប"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"ដោយសារមានការព្យាយាមដោះសោមិនត្រឹមត្រូវច្រើនដងពេក ទិន្នន័យឧបករណ៍នេះនឹងត្រូវបានលុប។"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"ដោយសារមានការព្យាយាមដោះសោមិនត្រឹមត្រូវច្រើនដងពេក អ្នកប្រើប្រាស់នេះនឹងត្រូវបានលុប។"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"ដោយសារមានការព្យាយាមដោះសោមិនត្រឹមត្រូវច្រើនដងពេក កម្រងព័ត៌មានការងារនេះ និងទិន្នន័យរបស់វានឹងត្រូវបានលុប។"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"បដិសេធ"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"ត្រូវ​​មាន​យ៉ាង​ហោច​ណាស់ <xliff:g id="COUNT">%d</xliff:g> តួ"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"កូដ PIN ​ត្រូវ​មាន​លេខ​យ៉ាង​ហោច​ណាស់ <xliff:g id="COUNT">%d</xliff:g> ខ្ទង់"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"បន្ត"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"ប៊្លូធូស​កម្រិត​ខ្ពស់"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"នៅពេលបើកប៊្លូធូស ឧបករណ៍របស់អ្នកអាចទាក់ទងជាមួយឧបករណ៍ប៊្លូធូសនៅជិត​ផ្សេងទៀតបាន។"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"ដើម្បីបង្កើនភាពត្រឹមត្រូវរបស់ទីតាំង កម្មវិធី និងសេវាកម្មប្រព័ន្ធនៅតែអាចស្វែងរកឧបករណ៍ប៊្លូធូសបានដដែល។ អ្នកអាចប្តូរវានៅក្នុង <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ការកំណត់ការស្កេន<xliff:g id="LINK_END_1">LINK_END</xliff:g>។"</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"មិនអាចភ្ជាប់បានទេ។ សូមព្យាយាមម្តងទៀត។"</string>
+    <string name="device_details_title" msgid="6576953269221085300">"ព័ត៌មានលម្អិត​អំពី​ឧបករណ៍"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"អាសយដ្ឋាន​ប៊្លូធូស​របស់ឧបករណ៍៖ <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"បំភ្លេច​ឧបករណ៍?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"ទូរសព្ទ​របស់អ្នក​នឹង​ឈប់​ផ្គូផ្គង​ជាមួយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ទៀតហើយ"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"ថេប្លេត​របស់អ្នក​នឹង​ឈប់​ផ្គូផ្គង​ជាមួយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ទៀតហើយ"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"ឧបករណ៍​របស់អ្នក​នឹង​ឈប់​ផ្គូផ្គង​ជាមួយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ទៀតហើយ"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"បំភ្លេច​ឧបករណ៍"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"តភ្ជាប់​ជា​មួយ…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> នឹង​ត្រូវ​បាន​ផ្ដាច់​ពី​សំឡេង​មេឌៀ។"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> នឹង​ត្រូវ​បាន​ផ្ដាច់​ពី​អូឌីយ៉ូ​កាស។"</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"កុំផ្តល់"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"កុំបញ្ជាក់សុពលភាព"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"មិនមានវិញ្ញាបនបត្រដែលបានបញ្ជាក់ទេ។ ការតភ្ជាប់របស់អ្នកនឹងមិនមានលក្ខណៈឯកជនទេ។"</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"ឈ្មោះ​បណ្តាញ​វែងពេក​ហើយ។"</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"ត្រូវតែបញ្ជាក់ដែន"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS អាច​ប្រើ​បាន"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (មាន WPS)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">បណ្តាញ 1</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"វ៉ាយហ្វាយ​កម្រិត​ខ្ពស់"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"កំណត់រចនាសម្ព័ន្ធ Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"អាសយដ្ឋាន MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"អាសយដ្ឋាន IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"របាំងបណ្តាញរង"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"បំភ្លេច​ក្រុម​នេះ?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Wi-Fi ហតស្ប៉ត​ចល័ត"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"ហតស្ប៉ត​វ៉ាយហ្វាយ"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"ប្រើការតភ្ជាប់ទិន្នន័យចល័តដើម្បីផ្ដល់បណ្ដាញ Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"មិនកំពុងចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ថេប្លេតនេះតាមរយៈហតស្ប៉តទេ"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"មិនកំពុងចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ទូរសព្ទនេះតាមរយៈហតស្ប៉តទេ"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"មិនកំពុងចែករំលែកអ៊ីនធឺណិត ឬមាតិកាជាមួយឧបករណ៍ផ្សេងទៀតទេ"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"កំពុងចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ថេប្លេតនេះតាមរយៈហតស្ប៉ត"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"កំពុងចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ទូរសព្ទនេះតាមរយៈហតស្ប៉ត"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"កម្មវិធីកំពុងចែករំលែកមាតិកា។ ដើម្បីចែករំលែកការតភ្ជាប់អ៊ីនធឺណិត សូមបិទហតស្ប៉ត បន្ទាប់មកបើកវាវិញ"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"ឈ្មោះ Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"កំពុងបើក <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"ឧបករណ៍​ផ្សេងទៀត​អាចភ្ជាប់​ជាមួយ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"ពាក្យសម្ងាត់ Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ប្រើហតស្ប៉តដើម្បីបង្កើតបណ្តាញ Wi‑Fi សម្រាប់ឧបករណ៍ផ្សេងទៀតរបស់អ្នក។ ហតស្ប៉តផ្តល់ជូនអ៊ីនធឺណិតដោយប្រើការ​តភ្ជាប់​ទិន្នន័យ​ចល័តរបស់អ្នក។ អាចនឹងគិតប្រាក់លើទិន្នន័យទូរសព្ទចល័តបន្ថែម។"</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"កម្មវិធីអាចបង្កើតហតស្ប៉ត ដើម្បីចែករំលែកមាតិកាជាមួយឧបករណ៍ដែលនៅជិត។"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"កំពុង​បើក​ហតស្ពត..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"កំពុង​បិទ​ហតស្ពត..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ដំណើរការ"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"នៅពេលការហៅតាម Wi-Fi បានបើក ទូរស័ព្ទរបស់អ្នកអាចធ្វើការហៅចេញតាមរយៈបណ្តាញ Wi-Fi ឬបណ្តាញរបស់ក្រុមហ៊ុនរបស់អ្នក ដោយផ្អែកលើចំណូលចិត្តរបស់អ្នក និងថាតើ signal ណាមួយខ្លាំងជាង។ មុនពេលបើកលក្ខណៈពិសេសនេះ សូមត្រួតពិនិត្យជាមួយក្រុមហ៊ុនរបស់អ្នកពាក់ព័ន្ធនឹងតម្លៃ និងព័ត៌មានលម្អិតផ្សេងទៀត។"</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"អាប់ដេតអាសយដ្ឋានសង្គ្រោះបន្ទាន់"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"ប្រសិនបើអ្នកធ្វើការហៅទៅ 911 ដោយប្រើ WiFi នោះអាសយដ្ឋានដែលប្រើដោយសេវាកម្មសង្គ្រោះបន្ទាន់នឹងយកធ្វើជាទីតាំងរបស់អ្នក"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"បង្ហាញ"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"មិនមានលទ្ធផលទេ"</string>
     <string name="display_settings" msgid="7965901687241669598">"បង្ហាញ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"បង្វិល​អេក្រង់​ស្វ័យប្រវត្តិ"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"ពណ៌ស្រស់"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ប្ដូរ​ទិស​ស្វ័យ​ប្រវត្តិ​ពេល​បង្វិល​កុំព្យូទ័រ​បន្ទះ"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ប្ដូរ​ទិស​ស្វ័យ​ប្រវត្តិ​ពេល​បង្វិល​ទូរស័ព្ទ"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"ប្ដូរ​ទិស​ស្វ័យប្រវត្តិ​ពេល​បង្វិល​កុំព្យូទ័រ​បន្ទះ"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"ធ្វើ​ឲ្យ​កម្រិត​ពន្លឺ​ប្រសើរ​នៅពេល​មានពន្លឺធម្មជាតិ។ នៅពេលដែលមុខងារនេះបើក អ្នក​ក៏​នៅ​តែ​អាច​កែសម្រួល​ពន្លឺ​ជាបណ្តោះអាសន្ន​បាន​ដដែល។"</string>
     <string name="night_display_title" msgid="2626451512200357686">"ពន្លឺពេលយប់"</string>
     <string name="night_display_text" msgid="1837277457033025056">"ពន្លឺពេលយប់ធ្វើឲ្យអេក្រង់របស់អ្នកមានពណ៌លឿងទុំព្រឿងៗ។ វាធ្វើឲ្យមានភាពងាយស្រួលជាងមុនក្នុងការមើលអេក្រង់របស់អ្នក ឬអាននៅកន្លែងដែលមានពន្លឺតិច ហើយវាអាចជួយឲ្យអ្នកឆាប់គេងលក់។"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"កាលវិភាគ"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"ស្ថានភាព"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"បើកដោយស្វ័យប្រវត្តិ"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"កុំ"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"កាលវិភាគផ្ទាល់ខ្លួន"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"ពីថ្ងៃលិចទៅថ្ងៃរះ"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"កាលវិភាគ"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"គ្មាន"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"បើកតាមពេលវេលាកំណត់ផ្ទាល់ខ្លួន"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"បើកចាប់ពីពេលថ្ងៃលិចរហូតដល់ពេលថ្ងៃរះ"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"ម៉ោងចាប់ផ្ដើម"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"ម៉ោងបញ្ចប់"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"ស្ថានភាព"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"អាំងតង់ស៊ីតេ"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"បិទ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"នឹងមិនបើកដោយស្វ័យប្រវត្តិនោះទេ។"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"នឹងបើកដោយស្វ័យប្រវត្តិនៅម៉ោង <xliff:g id="ID_1">%1$s</xliff:g>។"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"នឹងបើកដោយស្វ័យប្រវត្តិនៅពេលថ្ងៃលិច។"</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"បើក។ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"នឹងមិនបិទដោយស្វ័យប្រវត្តិទេ។"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"នឹងបិទដោយស្វ័យប្រវត្តិនៅម៉ោង <xliff:g id="ID_1">%1$s</xliff:g>។"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"នឹងបិទដោយស្វ័យប្រវត្តិពេលថ្ងៃរះ។"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"បិទ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"នឹងមិនបើកដោយស្វ័យប្រវត្តិនោះទេ"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"នឹងបើកដោយស្វ័យប្រវត្តិនៅម៉ោង <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"នឹងបើកដោយស្វ័យប្រវត្តិនៅពេលថ្ងៃលិច"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"បើក / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"នឹងមិនបិទដោយស្វ័យប្រវត្តិទេ"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"នឹងបិទដោយស្វ័យប្រវត្តិនៅម៉ោង <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"នឹងបិទដោយស្វ័យប្រវត្តិពេលថ្ងៃរះ"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"ដេក"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"អេក្រង់​បិទ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"បន្ទាប់​ពី​អសកម្ម <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"ការ​កំណត់"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ពន្លឺ​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"លើក​ដៃ​ដើម្បី​ឲ្យ​ភ្ញាក់"</string>
-    <string name="doze_title" msgid="2259176504273878294">"មុខងារដាស់អេក្រង់"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"មុខងារអេក្រង់សម្ងំ"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"បើក​ជា​និច្ច"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ការជូនដំណឹងថ្មីៗ"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ពេលដែលត្រូវ​បង្ហាញ"</string>
+    <string name="doze_title" msgid="2375510714460456687">"ការជូនដំណឹងថ្មីៗ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ដាស់អេក្រង់នៅពេលដែលអ្នកទទួលបានការជូនដំណឹង"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"បើក​ជា​និច្ច"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"បង្ហាញ​ម៉ោង រូបតំណាងការជូនដំណឹង និងព័ត៌មានផ្សេងទៀត"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ទំហំពុម្ពអក្សរ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ធ្វើឲ្យអក្សរធំជាងមុន ឬតូចជាងមុន"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"កំណត់​ការ​ចាក់សោ​ស៊ីម​កាត"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN មិន​អាច​ទទេ។"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"វាល MCC ត្រូវ​តែ​មាន​ ៣ តួ។"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"វាល MNC ត្រូវ​តែ​មាន​ពីរ ឬ​បី​តួលេខ។"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"ក្រុមហ៊ុនបម្រើសេវាទូរសព្ទមិនអនុញ្ញាតឲ្យបញ្ចូល APN ប្រភេទ %s ទេ។"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"ស្ដារ​ការ​កំណត់ APN លំនាំដើម​ឡើងវិញ។"</string>
     <string name="menu_restore" msgid="8260067415075573273">"កំណត់​ទៅ​លំនាំដើម​ឡើងវិញ"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"បាន​បញ្ចប់​ការ​កំណត់​នៃ​ការកំណត់​ APN លំនាំដើម។"</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"លុប​កាត​​អេសឌី"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"លុប​ទិន្នន័យ​ទាំងអស់​លើ​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី​ខាង​ក្នុង ដូច​ជា​តន្ត្រី ឬ​​រូបថត"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"លុប​ទិន្នន័យ​ទាំងអស់​លើ​កាត​អេសឌី ដូច​ជា​តន្ត្រី ឬ​រូបថត"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"លុប eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"លុប eSIM ទាំងអស់នៅលើទូរសព្ទនេះ។ វានឹងមិនលុបគម្រោងសេវាកម្មទិន្នន័យចល័តរបស់អ្នកទេ។"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"លុប eSIM ទាំងអស់នៅលើថេប្លេតនេះ។ វានឹងមិនលុបគម្រោងសេវាកម្មទិន្នន័យចល័តរបស់អ្នកទេ។"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"កំណត់​កុំព្យូទ័រ​បន្ទះ​ឡើងវិញ"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"កំណត់​ទូរស័ព្ទ​ឡើងវិញ"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"លុបព័ត៌មានផ្ទាល់ខ្លួន និងកម្មវិធីដែលបានទាញយករបស់អ្នកទាំងអស់? អ្នកមិនអាចធ្វើសកម្មភាពនេះវិញបានទេ!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"មិនអាចភ្ជាប់ ឬប្រើហតស្ពតចល័តបានទេ នៅពេលបើកកម្មវិធីសន្សំសំចៃទិន្នន័យ"</string>
     <string name="usb_title" msgid="7483344855356312510">"យូអេសប៊ី"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"ការ​ភ្ជាប់​តាម USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"បាន​តភ្ជាប់​តាម USB ពិនិត្យ​ដើម្បី​ភ្ជាប់"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"បា​ន​ភ្ជាប់"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"មិន​អាច​ភ្ជាប់​ពេល​​កំពុង​ប្រើ​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"មិន​បាន​តភ្ជាប់​តាម​យូអេសប៊ី"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"ភ្ជាប់​ដើម្បី​បើក"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"កំហុស​ការ​ភ្ជាប់​យូអេសប៊ី"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"ចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ទូរសព្ទតាមរយៈ USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"ចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ថេប្លេតតាមរយៈ USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ការ​ភ្ជាប់​ប៊្លូធូស"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"កំពុងចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ថេប្លេតនេះតាមរយៈប៊្លូធូស"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"កំពុងចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ទូរសព្ទនេះតាមរយៈប៊្លូធូស"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"កំពុងចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ថេប្លេតនេះជាមួយឧបករណ៍ 1 តាមរយៈប៊្លូធូស"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"កំពុងចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ទូរសព្ទនេះជាមួយឧបករណ៍ 1 តាមរយៈប៊្លូធូស"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"កំពុងចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ថេប្លេតនេះជាមួយឧបករណ៍ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> តាមរយៈប៊្លូធូស"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"កំពុងចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ទូរសព្ទនេះជាមួយឧបករណ៍ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> តាមរយៈប៊្លូធូស"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"ចែក​រំលែក​ការ​តភ្ជាប់​អ៊ីនធឺណិត​របស់ថេប្លេត​តាមរយៈប៊្លូធូស"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"ចែក​រំលែក​ការ​តភ្ជាប់​អ៊ីនធឺណិត​របស់ទូរសព្ទ​តាមរយៈប៊្លូធូស"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"កំពុងចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ <xliff:g id="DEVICE_NAME">%1$d</xliff:g> នេះតាមរយៈប្ល៊ូធូស"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"មិនកំពុងចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ថេប្លេតនេះតាមរយៈប៊្លូធូសទេ"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"មិនកំពុងចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ទូរសព្ទនេះតាមរយៈប៊្លូធូសទេ"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"មិន​បាន​ភ្ជាប់"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"មិន​អាច​ភ្ជាប់​ទៅ​ឧបករណ៍​ច្រើន​ជាង <xliff:g id="MAXCONNECTION">%1$d</xliff:g> ។"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> នឹង​ត្រូវ​បាន​ផ្ដាច់។"</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"ប្រើហតស្ប៉ត និងការភ្ជាប់ ដើម្បីផ្តល់ជូនអ៊ីនធឺណិតដល់ឧបករណ៍ផ្សេងទៀតតាមរយៈការតភ្ជាប់ទិន្នន័យទូរសព្ទចល័តរបស់អ្នក។"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"ប្រើហតស្ប៉ត និងការភ្ជាប់ ដើម្បីផ្តល់ជូនអ៊ីនធឺណិតដល់ឧបករណ៍ផ្សេងទៀតតាមរយៈការតភ្ជាប់ទិន្នន័យទចល័តរបស់អ្នក។ កម្មវិធីអាចបង្កើតហតស្ប៉ត ដើម្បីចែករំលែកមាតិកាជាមួយឧបករណ៍ដែលនៅជិត។"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ជំនួយ"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"បណ្ដាញទូរសព្ទចល័ត"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"ផែនការ​ទិន្នន័យ​ចល័ត"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"របៀបកំណត់​ទីតាំង"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"ប្រើ GPS, Wi‑Fi, ប៊្លូធូស ឬបណ្តាញទូរសព្ទ​ចល័តដើម្បី​កំណត់​ទីតាំង"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"ប្រើ Wi‑Fi, ប៊្លូធូស ឬបណ្តាញទូរសព្ទចល័ត​ដើម្បីកំណត់​ទីតាំង"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ប្រើ GPS ដើម្បីកំណត់ទីតាំងរបស់អ្នក"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"ប្រើ GPS និង​ឧបករណ៍ចាប់សញ្ញារបស់ឧបករណ៍ ដើម្បីកំណត់ទីតាំង"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"ការស្កេន"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"ការស្កេន Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ធ្វើឲ្យការចាប់​ទីតាំងប្រសើរឡើងដោយអនុញ្ញាតឲ្យកម្មវិធី និងសេវាកម្មប្រព័ន្ធចាប់យក​បណ្តាញ Wi-Fi បានគ្រប់ពេល។"</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"អ្នក​មិន​មាន​ការ​តភ្ជាប់​ទិន្នន័យ។ ដើម្បី​មើល​ព័ត៌មាន​នេះ​ឥឡូវ ចូល​ទៅ %s ពី​កុំព្យូទ័រ​ដែល​បាន​ភ្ជាប់​អ៊ីនធឺណិត​ណា​មួយ។"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"កំពុង​ផ្ទុក..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"ជ្រើសរើស​ពាក្យ​សម្ងាត់​របស់​អ្នក"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ដើម្បី​ប្រើប្រាស់​ស្នាម​ម្រាមដៃ សូម​កំណត់​ពាក្យសម្ងាត់"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"ជ្រើស​លំនាំ​របស់​អ្នក"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ដើម្បី​ប្រើប្រាស់​ស្នាម​ម្រាមដៃ សូម​កំណត់​លំនាំ"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"ជ្រើសរើស​​​កូដ PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ដើម្បី​ប្រើប្រាស់​ស្នាម​ម្រាមដៃ សូម​កំណត់​កូដ PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"បញ្ជក់​ពាក្យ​សម្ងាត់​របស់​អ្នក"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"បញ្ជាក់​លំនាំដើម​របស់​អ្នក"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"បញ្ជាក់​កូដ PIN របស់​អ្នក"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"ការ​កំណត់​កម្មវិធី"</string>
     <string name="install_applications" msgid="4872012136210802181">"មិនស្គាល់ប្រភព"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"អនុញ្ញាតប្រភពកម្មវិធីទាំងអស់"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"កម្មវិធីដែលទើបបើកថ្មីៗ"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"មើលកម្មវិធី​ទាំង <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> មុន"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ថេប្លេត និងទិន្នន័យផ្ទាល់ខ្លួនរបស់អ្នកងាយនឹងរងគ្រោះពីការវាយប្រហារពីកម្មវិធីដែលមិនស្គាល់។ ប្រសិនបើដំឡើងកម្មវិធីពីប្រភពនេះ មានន័យថាអ្នកទទួលខុសត្រូវលើការខូចខាតណាមួយចំពោះទូរសព្ទ ឬការបាត់បង់ទិន្នន័យ ដែលអាចបណ្តាលមកពីការប្រើប្រាស់កម្មវិធីទាំងនោះ។"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"ទូរសព្ទ និងទិន្នន័យផ្ទាល់ខ្លួនរបស់អ្នកងាយនឹងរងគ្រោះពីការវាយប្រហារពីកម្មវិធីដែលមិនស្គាល់។ ប្រសិនបើដំឡើងកម្មវិធីពីប្រភពនេះ មានន័យថាអ្នកនឹងទទួលខុសត្រូវលើការខូចខាតណាមួយចំពោះទូរសព្ទ ឬការបាត់បង់ទិន្នន័យរបស់អ្នក ដែលអាចបណ្តាលមកពីការប្រើប្រាស់កម្មវិធីទាំងនោះ។"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"ការ​កំណត់​កម្រិត​ខ្ពស់"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"បញ្ឈប់​សេវាកម្ម​ប្រព័ន្ធ?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"បើ​អ្នក​បញ្ឈប់​សេវាកម្ម​នេះ លក្ខណៈ​មួយ​ចំនួន​នៃ​កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក​អាច​មិន​ដំណើរការ​ត្រឹមត្រូវ លុះ​ត្រា​តែ​អ្នក​បិទ ហើយ​បើក​វា​ឡើងវិញ។"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"បើ​អ្នក​បញ្ឈប់​សេវាកម្ម​នេះ លក្ខណៈ​មួយ​ចំនួន​នៃ​ទូរស័ព្ទ​របស់​អ្នក​អាច​លែង​ដំណើរការ​តាម​ត្រឹមត្រូវ លុះ​ត្រា​តែ​អ្នក​បិទ ហើយ​បើក​វា​ឡើងវិញ។"</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"ភាសា ការបញ្ចូល និងកាយវិការ"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"ភាសា និងធាតុចូល"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ភាសា និងធាតុចូល"</string>
     <string name="input_assistance" msgid="7577795275222555487">"ជំនួយ​ក្នុងការ​បញ្ចូល"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other">សេវាកម្មបោះពុម្ព <xliff:g id="COUNT">%1$d</xliff:g> បានបើកហើយ</item>
       <item quantity="one">សេវាកម្មបោះពុម្ព 1 បានបើកហើយ</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other">ការងារ​បោះពុម្ព <xliff:g id="COUNT">%1$d</xliff:g></item>
+      <item quantity="one">ការងារ​បោះពុម្ព 1</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"សេវាកម្ម​បោះពុម្ព"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"គ្មាន​សេវាកម្ម​បាន​ដំឡើង"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"រក​មិន​ឃើញ​ម៉ាស៊ីន​បោះពុម្ព"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"ព័ត៌មាន​លម្អិត​នៃការ​ប្រើ"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"កែ​ការ​ប្រើ​ថាមពល"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"កញ្ចប់​រួម​បញ្ចូល"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"កម្មវិធី​កំពុង​ប្រើ​ថាមពល​ថ្ម"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"កំពុងធ្វើឲ្យឧបករណ៍នៅបន្តភ្ញាក់"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"កំពុងដាស់ឧបករណ៍​នៅ​ផ្ទៃខាងក្រោយ"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"កំពុង​ស្នើ​ទីកន្លែង​ច្រើនដងហើយ"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"កម្មវិធី <xliff:g id="NUMBER">%1$d</xliff:g> កំពុងដំណើរការខុសធម្មតា"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"បញ្ឈប់កម្មវិធី?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"ទូរសព្ទ​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានជាធម្មតាទេ ពីព្រោះ <xliff:g id="APP">%1$s</xliff:g> កំពុង​បន្ត​ធ្វើ​ឲ្យ​ទូរសព្ទ​របស់អ្នក​ភ្ញាក់។\n\nដើម្បី​ព្យាយាម​ដោះស្រាយបញ្ហានេះ អ្នក​អាច​បង្ខំឲ្យ​កម្មវិធី​នេះ​ឈប់បាន។\n\nប្រសិនបើ​បញ្ហា​នេះ​បន្ត​កើត​ឡើង អ្នក​អាច​នឹង​ត្រូវ​លុប​កម្មវិធីនេះ ដើម្បី​ធ្វើ​ឲ្យ​ដំណើរការថ្ម​មានភាពប្រសើរឡើង។"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"ថេប្លេត​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានជាធម្មតាទេ ពីព្រោះ <xliff:g id="APP">%1$s</xliff:g> កំពុង​បន្ត​ធ្វើ​ឲ្យ​ថេប្លេត​របស់អ្នក​ភ្ញាក់។\n\nដើម្បី​ព្យាយាម​ដោះស្រាយបញ្ហានេះ អ្នក​អាច​បង្ខំឲ្យ​កម្មវិធី​នេះ​ឈប់បាន។\n\nប្រសិនបើ​បញ្ហា​នេះ​បន្ត​កើត​ឡើង អ្នក​អាច​នឹង​ត្រូវ​លុប​កម្មវិធីនេះ ដើម្បី​ធ្វើ​ឲ្យ​ដំណើរការថ្ម​មានភាពប្រសើរឡើង។"</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"ឧបករណ៍​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានជាធម្មតាទេ ពីព្រោះ <xliff:g id="APP">%1$s</xliff:g> កំពុង​បន្ត​ធ្វើ​ឲ្យ​ឧបករណ៍​របស់អ្នក​ភ្ញាក់។\n\nដើម្បី​ព្យាយាម​ដោះស្រាយបញ្ហានេះ អ្នក​អាច​បង្ខំឲ្យ​កម្មវិធី​នេះ​ឈប់បាន។\n\nប្រសិនបើ​បញ្ហា​នេះ​បន្ត​កើត​ឡើង អ្នក​អាច​នឹង​ត្រូវ​លុប​កម្មវិធីនេះ ដើម្បី​ធ្វើ​ឲ្យ​ដំណើរការថ្ម​មានភាពប្រសើរឡើង។"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"បញ្ឈប់កម្មវិធី"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"បិទ​ការប្រើ​ប្រាស់​នៅ​ផ្ទៃ​ខាងក្រោយ?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"ទូរសព្ទ​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានជាធម្មតាទេ ពីព្រោះ <xliff:g id="APP">%1$s</xliff:g> បន្តដាស់ទូរសព្ទ​របស់អ្នក​។\n\nដើម្បី​ដោះ​ស្រាយបញ្ហានេះ ទូរសព្ទ​របស់អ្នកអាច​ រារាំង​កម្មវិធី​នេះ​មិន​ឲ្យដំណើរការនៅ​ផ្ទៃខាងក្រោយ​បាន។"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"ថេប្លេត​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានជាធម្មតាទេ ពីព្រោះ <xliff:g id="APP">%1$s</xliff:g> បន្តដាស់ថេប្លេត​របស់អ្នក។\n\nដើម្បី​ដោះ​ស្រាយបញ្ហានេះ ថេប្លេត​របស់អ្នកអាច​ រារាំង​កម្មវិធី​នេះ​មិន​ឲ្យដំណើរការនៅ​ផ្ទៃខាងក្រោយ​បាន។"</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"ឧបករណ៍​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានជាធម្មតាទេ ពីព្រោះ <xliff:g id="APP">%1$s</xliff:g> បន្តដាស់ឧបករណ៍​របស់អ្នក​។\n\nដើម្បី​ដោះ​ស្រាយបញ្ហានេះ ឧបករណ៍​របស់អ្នកអាច​ រារាំង​កម្មវិធី​នេះ​មិន​ឲ្យដំណើរការនៅ​ផ្ទៃខាងក្រោយ​បាន។"</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"បិទ"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"បិទទីកន្លែង?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"ទូរសព្ទ​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានជាធម្មតាទេ ពីព្រោះ <xliff:g id="APP">%1$s</xliff:g> បន្ត​ស្នើ​សុំ​ទីតាំងរបស់អ្នក​ នៅពេលដែល​អ្នក​មិន​កំពុង​ប្រើ​កម្មវិធី​នេះ។\n\nដើម្បី​ដោះស្រាយ​បញ្ហា​នេះ អ្នក​អាច​បិទ​ទីកន្លែង​សម្រាប់​កម្មវិធីនេះ។"</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"ថេប្លេត​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានជាធម្មតាទេ ពីព្រោះ <xliff:g id="APP">%1$s</xliff:g> បន្ត​ស្នើ​សុំ​ទីតាំង​ នៅពេលដែល​អ្នក​មិន​កំពុង​ប្រើ​កម្មវិធី​នេះ។\n\nដើម្បី​ដោះស្រាយ​បញ្ហា​នេះ អ្នក​អាច​បិទ​ទីកន្លែង​សម្រាប់​កម្មវិធីនេះ។"</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"ឧបករណ៍​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានជាធម្មតាទេ ពីព្រោះ <xliff:g id="APP">%1$s</xliff:g> បន្ត​ស្នើ​សុំ​ទីតាំងរបស់អ្នក​ នៅពេលដែល​អ្នក​មិន​កំពុង​ប្រើ​កម្មវិធី​នេះ។\n\nដើម្បី​ដោះស្រាយ​បញ្ហា​នេះ អ្នក​អាច​បិទ​ទីកន្លែង​សម្រាប់​កម្មវិធីនេះ។"</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"បិទ"</string>
     <string name="power_screen" msgid="3023346080675904613">"អេក្រង់"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"ពិល"</string>
     <string name="power_camera" msgid="4976286950934622605">"កាមេរ៉ា"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"កម្មវិធី"</string>
     <string name="power_service" msgid="1599661212370831780">"សេវាកម្ម"</string>
     <string name="power_system" msgid="8290455327965307383">"ប្រព័ន្ធ"</string>
-    <string name="power_user" msgid="1889728099253018005">"អ្នក​ប្រើប្រាស់"</string>
+    <string name="power_user" msgid="3706143225319881667">"អ្នក​ប្រើ​ប្រាស់ផ្សេងទៀត"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU សរុប"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ផ្ទៃ​ខាង​មុខ CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"មិន​ដេក"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ការ​ប្រើ​ប្រាស់​ថាមពល​លើស​"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"បានប្រើ​អស់​រយៈពេល <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"ដំណើរការរយៈពេល <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"ការប្រើប្រាស់អេក្រង់មានរយៈពេល <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> ប្រើប្រាស់ដោយ <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> នៃ​ថ្ម​ទាំងអស់"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"ប្ដូរ​កូដ PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"បង្ហាញ​ការ​ជូន​ដំណឹង"</string>
     <string name="help_label" msgid="6886837949306318591">"ជំនួយ &amp; មតិស្ថាបនា"</string>
-    <string name="support_summary" msgid="8276116616493882830">"អត្ថបទ​ជំនួយ ជំនួយ​សម្រាប់​ការ​ហៅទូរសព្ទ និង​ការជជែក"</string>
+    <string name="support_summary" msgid="2705726826263742491">"អត្ថបទជំនួយ ទូរសព្ទ និងការជជែក ការចាប់ផ្តើម"</string>
     <string name="user_account_title" msgid="1127193807312271167">"គណនី​សម្រាប់​មាតិកា"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"លេខ​សម្គាល់​រូបថត"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"ការ​គំរាមកំហែង​ខ្លាំង​បំផុត"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">បង្ហាញធាតុ %d ដែលបានលាក់</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"បណ្តាញ និងអ៊ីនធឺណិត"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi ឧបករណ៍​ចល័ត ការ​ប្រើ​ប្រាស់ទិន្នន័យ ហតស្ប៉ត"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ឧបករណ៍​ចល័ត"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ការប្រើទិន្នន័យ"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ហតស្ប៉ត"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ឧបករណ៍ដែលបានភ្ជាប់"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"ប៊្លូធូស ការបញ្ជូន NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"ប៊្លូធូស ការបញ្ជូន"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"កម្មវិធី និងការជូនដំណឹង"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ការ​អនុញ្ញាត កម្មវិធី​លំនាំដើម"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"អ្នកប្រើប្រាស់ និងគណនី"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"កាយវិការ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"បង់​ប្រាក់, ចុច, ការ​បង់​ប្រាក់"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ការបម្រុងទុក បម្រុងទុក"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"កាយវិការ ជ្រុង ខាង ជ្រុងសកម្ម ច្របាច់ ក្តាប់ ជំនួយ ជំនួយការ ការច្របាច់ ការច្របាច់ ការច្របាច់ ការច្របាច់ ok google, google ជំនួយការ"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"កាយវិការ ដាស់ ការជូនដំណឹង អេក្រង់ ការបង្ហាញ អេក្រង់បិទ អេក្រង់បើក ច្របាច់ ជ្រុង ដេកលក់ ដេក ក្តាប់"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"កាយវិការ ស្ងាត់ ឈប់មួយស្របក់ រោទ៍ ការហៅចូល ស្ងាត់ អេក្រង់ អេក្រង់ចាក់សោ ច្របាច់ ក្តាប់ ជ្រុង ឈប់"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"រៀបចំ​ស្លាក​អិនអេហ្វ​ស៊ី​វ៉ាយហ្វាយ"</string>
     <string name="write_tag" msgid="8571858602896222537">"សរសេរ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ប៉ះ​ស្លាក​ដើម្បី​សរសេរ..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"កុំបង្ហាញការជូនដំណឹងការងារឲ្យសោះ"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"នៅពេលដែលឧបករណ៍របស់អ្នកជាប់សោ តើអ្នកចង់ឲ្យការជូនដំណឹងប្រវត្តិរូបបង្ហាញដោយរបៀបណា?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"ការជូនដំណឹងប្រវត្តិរូប"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"ការជូនដំណឹង"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"ការ​ជូនដំណឹង"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"ការ​ជូន​ដំណឹង​កម្មវិធី"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"ប្រភេទ​នៃ​ការជូនដំណឹង"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"សារៈសំខាន់"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"ទុក​ឲ្យ​កម្មវិធី​នេះ​សម្រេច"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"បន្ទាន់"</string>
     <string name="allow_sound" msgid="1820188704793497324">"អនុញ្ញាត​សំឡេង"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"កុំបន្លឺសំឡេង ញ័រ ឬលោតបង្ហាញការជូនដំណឹងទាំងនេះទៅក្នុងការបង្ហាញនៃអេក្រង់បច្ចុប្បន្ន។"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"មិនសូវសំខាន់"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"សំខាន់កម្រិតមធ្យម"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"សំខាន់ខ្លាំង"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"សំខាន់ជាបន្ទាន់"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"ជំនួយការជូនដំណឹង"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"ចូល​ដំណើរការ​ការ​ជូន​ដំណឹង"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"ការ​ចូលប្រើប្រាស់​កម្រង​ព័ត៌មាន​ការងារ​ត្រូវ​បានទប់ស្កាត់"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"រូបភាព​ក្នុង​រូបភាព"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"អនុញ្ញាតសម្រាប់មុខងាររូបភាពក្នុងរូបភាព"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"អនុញ្ញាតឲ្យកម្មវិធីនេះបង្កើតវិនដូរូបភាពក្នុងរូបភាព ខណៈពេលដែលកម្មវិធីកំពុងបើក ឬបន្ទាប់ពីអ្នកចាកចេញពីវា (ឧទាហរណ៍ ដើម្បីបន្តមើលវីដេអូ)។ វិនដូនេះបង្ហាញនៅលើកម្មវិធីផ្សេងទៀតដែលអ្នកកំពុង​ប្រើប្រាស់។"</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"បាទ/ចាស"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"ទេ"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ចូលដំណើរការមុខងារកុំរំខាន"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"គ្មានកម្មវិធីបានដំឡើងណាមួយបានស្នើការចូលដំណើរការមុខងារកុំរំខានទេ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"កំពុង​ផ្ទុក​កម្មវិធី..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ប្រវត្តិរូបការងារនេះត្រូវបានគ្រប់គ្រងដោយ៖"</string>
     <string name="managing_admin" msgid="8843802210377459055">"គ្រប់គ្រងដោយ <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ពិសោធន៍​)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"ការ​បង្វិល​ឧបករណ៍"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"បង្វិល​មាតិកា​អេក្រង់"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"ស្ថិតនៅ​ក្នុង​ទិដ្ឋភាព​បញ្ឈរ"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ស្ថិតនៅ​​ក្នុង​ទិដ្ឋភាព​ទេសភាព"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ស្ថិត​នៅ​ក្នុង​​ទិស​ដៅ​​បច្ចុប្បន្ន"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"សុវត្ថិភាពពេលចាប់ផ្តើម"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"បន្ត"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"អ្នក​អាច​ការពារឧបករណ៍នេះ​បន្ថែម ដោយ​កំណត់​ឲ្យ​ប្រើ​កូដ PIN មុន​ពេល​ដែល​វា​ចាប់ផ្តើម។ ប្រសិនបើ​ឧបករណ៍​មិនទាន់​ចាប់ផ្ដើមទេ វា​មិន​អាច​ទទួល​ការ​​ហៅទូរសព្ទ សារ ឬ​ការ​ជូនដំណឹងក៏ដូចជា ម៉ោងរោទ៍​បានទេ។ \n\nវាជួយការពារទិន្នន័យនៅលើឧបករណ៍​ដែល​បាត់ ឬ​ត្រូវគេលួច។ កំណត់​ឲ្យ​ប្រើកូដ PIN ដើម្បីចាប់ផ្តើមឧបករណ៍របស់អ្នក?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"អ្នកអាច​ការពារឧបករណ៍​នេះ​បន្ថែម ដោយតម្រូវឲ្យប្រើពាក្យសម្ងាត់របស់អ្នកមុនពេលដែលវាចាប់ផ្តើម។ ប្រសិនបើ​ឧបករណ៍​មិនទាន់​ចាប់ផ្ដើមទេ វា​មិន​អាច​ទទួល​ការ​​ហៅទូរសព្ទ សារ ឬ​ការ​ជូនដំណឹងក៏ដូចជា ម៉ោងរោទ៍​បានទេ។ \n\nវាជួយការពារទិន្នន័យនៅលើឧបករណ៍​ដែល​បាត់ ឬ​ត្រូវគេលួច។ តម្រូវ​ឲ្យ​ប្រើ​ពាក្យសម្ងាត់​ដើម្បីចាប់ផ្តើមឧបករណ៍របស់អ្នក?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"ក្រៅពីប្រើម្រាមដៃរបស់អ្នកដើម្បីដោះសោឧបករណ៍របស់អ្នក អ្នក​អាច​ការពារឧបករណ៍នេះ​បន្ថែម ដោយ​កំណត់​ឲ្យ​ប្រើកូដ PIN មុន​ពេល​ដែល​វា​ចាប់ផ្តើម។ ប្រសិនបើ​ឧបករណ៍​មិនទាន់​ចាប់ផ្ដើមទេ វា​មិន​អាច​ទទួល​ការ​​ហៅទូរសព្ទ សារ ឬ​ការ​ជូនដំណឹង ក៏ដូចជា ម៉ោងរោទ៍​បានទេ។\n\nវាជួយការពារទិន្នន័យនៅលើឧបករណ៍​ដែល​បាត់ ឬ​ត្រូវគេលួច។ កំណត់​ឲ្យ​ប្រើកូដ PIN ដើម្បីចាប់ផ្តើមឧបករណ៍របស់អ្នក?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"ក្រៅពីប្រើម្រាមដៃរបស់អ្នកដើម្បីដោះសោឧបករណ៍របស់អ្នក អ្នក​អាច​ការពារឧបករណ៍នេះ​បន្ថែម ដោយ​កំណត់​ឲ្យ​ប្រើ​លំនាំ​មុន​ពេល​ដែល​វា​ចាប់ផ្តើម។ ប្រសិនបើ​ឧបករណ៍​មិនទាន់​ចាប់ផ្ដើមទេ វា​មិន​អាច​ទទួល​ការ​​ហៅទូរសព្ទ សារ ឬ​ការ​ជូនដំណឹងក៏ដូចជា ម៉ោងរោទ៍​បានទេ។\n\nវាជួយការពារទិន្នន័យនៅលើឧបករណ៍​ដែល​បាត់ ឬ​ត្រូវគេលួច។ កំណត់​ឲ្យ​មាន​ប្រើលំនាំ​ដើម្បីចាប់ផ្តើមឧបករណ៍របស់អ្នក?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"ក្រៅពីប្រើម្រាមដៃរបស់អ្នកដើម្បីដោះសោឧបករណ៍របស់អ្នក អ្នក​អាច​ការពារឧបករណ៍នេះ​បន្ថែម ដោយ​កំណត់​ឲ្យ​ប្រើ​ពាក្យ​សម្ងាត់​មុន​ពេល​ដែល​វា​ចាប់ផ្តើម។ ប្រសិនបើ​ឧបករណ៍​មិនទាន់​ចាប់ផ្ដើមទេ វា​មិន​អាច​ទទួល​ការ​​ហៅទូរសព្ទ សារ ឬ​ការ​ជូនដំណឹងក៏ដូចជា ម៉ោងរោទ៍​បានទេ។ \n\nវា​ជួយ​ការពារ​ទិន្នន័យ​នៅ​ពេល​ឧបករណ៍​បាត់ ឬ​ត្រូវគេ​លួច។ កំណត់​ឲ្យ​ប្រើ​ពាក្យសម្ងាត់​ដើម្បីចាប់ផ្តើមឧបករណ៍របស់អ្នក&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"ក្រៅពី​ប្រើម្រាមដៃ​របស់អ្នក​ដើម្បី​ដោះសោឧបករណ៍​របស់​អ្នក អ្នក​អាច​បន្ថែម​ការ​ការពារលើ​ឧបករណ៍នេះ ដោយ​កំណត់​ឲ្យ​ប្រើ​ពាក្យ​សម្ងាត់​មុន​ពេល​ដែល​វា​ចាប់ផ្តើម។ ប្រសិនបើ​ឧបករណ៍​មិនទាន់​ចាប់ផ្ដើមទេ វា​មិន​អាច​ទទួល​ការ​​ហៅទូរសព្ទ សារ ឬ​ការ​ជូនដំណឹងក៏ដូចជាម៉ោងរោទ៍​បានទេ។\n\nវា​ជួយ​ការពារ​ទិន្នន័យ​នៅ​លើ​ឧបករណ៍​ដែលបាត់ ឬ​ត្រូវគេ​លួច។ កំណត់​ឲ្យ​ប្រើ​ពាក្យសម្ងាត់​ដើម្បី​ចាប់ផ្តើម​ឧបករណ៍​របស់អ្នក?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"បាទ/ចាស"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"ទេ"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"ទាមទារ​កូដ PIN?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"ការ​ដាស់តឿន​លើ​ការ​ប្រើប្រាស់"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"បង្ហាញការប្រើប្រាស់ឧបករណ៍ពេញលេញ"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"បង្ហាញការប្រើប្រាស់កម្មវិធី"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"ការប្រើប្រាស់កម្រិតខ្ពស់"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> កំពុងដំណើរការខុសពីធម្មតា</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> កំពុងដំណើរការខុសពីធម្មតា</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">កម្មវិធី​កំពុង​ប្រើ​ថាមពល​ថ្ម</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> កំពុងប្រើថាមពលថ្ម</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"មិនបានបង្កើនប្រសិទ្ធភាព"</string>
     <string name="high_power_on" msgid="6216293998227583810">"មិនបានសម្រួលឲ្យមានប្រសិទ្ធភាពទេ"</string>
     <string name="high_power_off" msgid="3393904131961263278">"បង្កើនប្រសិទ្ធភាពប្រើប្រាស់ថ្ម"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"បង្ហាញនៅលើកម្មវិធីផ្សេងទៀត"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"កម្មវិធី <xliff:g id="COUNT_0">%1$d</xliff:g> ក្នុងចំណោម <xliff:g id="COUNT_1">%2$d</xliff:g> ត្រូវបានអនុញ្ញាតឲ្យបង្ហាញនៅលើកម្មវិធីផ្សេងទៀត"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"កម្មវិធីដែលមានសិទ្ធិអនុញ្ញាត"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"បាទ/ចាស"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"ទេ"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"បាន​អនុញ្ញាត"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"មិន​អនុញ្ញាត​ទេ"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"ដំឡើងកម្មវិធីពីប្រភពដែលមិនស្គាល់"</string>
     <string name="write_settings" msgid="4797457275727195681">"កែការកំណត់ប្រព័ន្ធ"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"សរសេរការកែការកំណត់ប្រព័ន្ធ"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"អេក្រង់មានពណ៌លឿងទុំព្រឿងៗ វាអាចជួយឲ្យអ្នកឆាប់គេងលក់។"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"ការណែនាំ"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> ទៀត"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other">ការណែនាំ <xliff:g id="COUNT">%1$d</xliff:g></item>
+      <item quantity="one">ការណែនាំ 1</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">ការណែនាំ +<xliff:g id="COUNT">%1$d</xliff:g></item>
+      <item quantity="one">ការណែនាំ +1</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"យកចេញ"</string>
     <string name="color_temperature" msgid="2070126836910615605">"សីតុណ្ហភាពពណ៌ត្រជាក់"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ប្រើពណ៌បង្ហាញត្រជាក់ជាងមុន"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"ការព្រមានពីការប្រើទិន្នន័យ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"ការព្រមានពីការប្រើទិន្នន័យ <xliff:g id="ID_1">%1$s</xliff:g> / ដែនកំណត់ទិន្នន័យ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"វដ្តចេញវិក្កយបត្រ"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"វដ្តប្រចាំខែចាប់ផ្តើមនៅថ្ងៃទី <xliff:g id="ID_1">%1$s</xliff:g> រៀងរាល់ខែ"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"ចាប់ផ្តើមប្រចាំខែនៅថ្ងៃទី <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"ប្រចាំខែនៅថ្ងៃទី <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"ការដាក់កំហិតបណ្ដាញ"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other">ការដាក់កំហិត <xliff:g id="COUNT">%1$d</xliff:g></item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">អនុញ្ញាតឲ្យកម្មវិធី 1 ប្រើទិន្នន័យគ្មានកំណត់ នៅពេលកម្មវិធីសន្សំសំចៃទិន្នន័យបានបើក</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"កម្មវិធីសន្សំសំចៃទិន្នន័យ"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"ការប្រើទិន្នន័យដែលគ្មានការកំហិត"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"ទិន្នន័យ​ដែល​លែង​មាន​ការដាក់​កំហិត"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"ទិន្នន័យផ្ទៃខាងក្រោយបានបិទ"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"បើក"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"បិទ"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"គ្រប់គ្រងការជូនដំណឹងអេក្រង់ចាក់សោ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"បង្ហាញ ឬលាក់មាតិកាជូនដំណឹង"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"ទាំងអស់"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"គាំទ្រ"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"ជំនួយ និងគន្លឹះ"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ទទឹងតូចបំផុត"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"មិនមានកម្មវិធីដែលដំឡើងហើយបានស្នើសុំការចូលដំណើរការសេវាកម្ម SMS ពិសេសទេ"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"សេវាកម្ម SMS ពិសេសអាចនឹងគិតថ្លៃ ហើយបន្ថែមតម្លៃនោះទៅក្នុងវិក្កយបត្រក្រុមហ៊ុនផ្តល់សេវាទូរស័ព្ទរបស់អ្នក។ ប្រសិនបើដំណើរការសិទ្ធិអនុញ្ញាតសម្រាប់កម្មវិធីណាមួយ នោះអ្នកនឹងអាចផ្ញើសេវាកម្ម SMS ពិសេសដោយប្រើកម្មវិធីនោះ។"</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ស្វ័យប្រវត្តិ"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ឯកសារណែនាំ"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"បង្កើនទំហំផ្ទុកឥឡូវនេះ"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"កាយវិការ"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"ផ្លូវកាត់ចលនា"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"ធ្វើកាយវិការរហ័សដើម្បីគ្រប់គ្រងទូរស័ព្ទរបស់អ្នក"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"ធ្វើកាយវិការរហ័សដើម្បីគ្រប់គ្រងថេប្លេតរបស់អ្នក"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"ធ្វើកាយវិការរហ័សដើម្បីគ្រប់គ្រងឧបករណ៍របស់អ្នក"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"លោតទៅកាមេរ៉ា"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"ដើម្បីបើកកាមេរ៉ាឲ្យបានរហ័ស សូមចុចប៊ូតុងថាមពលពីរដង។ ដំណើរការនៅលើអេក្រង់ទាំងអស់។"</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"បើក​កាមេរ៉ា​យ៉ាង​រហ័ស"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"ចុច​ប៊ូតុង​ថាមពល​ពីរដង​ដើម្បី​បើក​កាមេរ៉ា"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ត្រឡប់កាមេរ៉ា"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"ថត​រូបពីមុខកាន់តែរហ័សជាងមុន"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"បង្វិល​ទូរសព្ទ​ពីរដង​សម្រាប់មុខងារ​ថតពីមុខ"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"បង្វិល​ថេប្លេត​ពីរដង​សម្រាប់មុខងារ​ថតពីមុខ"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"បង្វិល​ឧបករណ៍​ពីរដង​សម្រាប់មុខងារ​ថតពីមុខ"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"ប៉ះពីរដងដើម្បីពិនិត្យទូរសព្ទ"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ប៉ះពីរដងដើម្បីពិនិត្យថេប្លេត"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"ប៉ះពីរដងដើម្បីពិនិត្យឧបករណ៍"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"ដើម្បីពិនិត្យមើលការជូនដំណឹងរបស់អ្នកឲ្យបានរហ័ស សូមចុចអេក្រង់របស់អ្នកពីរដង។"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"ដើម្បី​ពិនិត្យមើល​ម៉ោង រូបជូនដំណឹង និង​ព័ត៌មាន​ផ្សេងទៀត សូមចុចអេក្រង់របស់អ្នកពីរដង។"</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"ពិនិត្យមើល​ការជូនដំណឹង​នៅ​ពេល​ដែល​អេក្រង់បិទ"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"លើកដើម្បីពិនិត្យទូរសព្ទ"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"លើកដើម្បីពិនិត្យថេប្លេត"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"លើកដើម្បីពិនិត្យឧបករណ៍"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"ដើម្បីពិនិត្យមើលការជូនដំណឹងរបស់អ្នកឲ្យបានរហ័ស សូមលើកទូរសព្ទរបស់អ្នក។"</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"ដើម្បីពិនិត្យមើលការជូនដំណឹងរបស់អ្នកឲ្យបានរហ័ស សូមលើកថេប្លេតរបស់អ្នក។"</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"ដើម្បីពិនិត្យមើលការជូនដំណឹងរបស់អ្នកឲ្យបានរហ័ស សូមលើកឧបករណ៍របស់អ្នក។"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"ដើម្បី​ពិនិត្យមើល​ម៉ោង រូបជូនដំណឹង និង​ព័ត៌មាន​ផ្សេងទៀត សូមជ្រើសរើស​ទូរសព្ទ​របស់អ្នក។"</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"ដើម្បី​ពិនិត្យមើល​ម៉ោង រូបជូនដំណឹង និង​ព័ត៌មាន​ផ្សេងទៀត សូមជ្រើសរើស​ថេប្លេត​របស់អ្នក។"</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"ដើម្បី​ពិនិត្យមើល​ម៉ោង រូបជូនដំណឹង និង​ព័ត៌មាន​ផ្សេងទៀត សូមជ្រើសរើស​ឧបករណ៍​របស់អ្នក។"</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"ពិនិត្យមើល​ការជូនដំណឹង​នៅ​ពេល​ដែល​អេក្រង់បិទ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"អូស​ស្នាមម្រាមដៃ​សម្រាប់​ការជូនដំណឹង"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"ដើម្បីពិនិត្យមើលការជូនដំណឹងរបស់អ្នក សូមអូសចុះក្រោមនៅលើឧបករណ៍ចាប់ស្នាមម្រាមដៃ ដែលស្ថិតនៅផ្នែកខាងក្រោយទូរសព្ទរបស់អ្នក។"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"ដើម្បីពិនិត្យមើលការជូនដំណឹងរបស់អ្នក សូមអូសចុះក្រោមនៅលើឧបករណ៍ចាប់ស្នាមម្រាមដៃ ដែលស្ថិតនៅផ្នែកខាងក្រោយថេប្លេតរបស់អ្នក។"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"ដើម្បីពិនិត្យមើលការជូនដំណឹងរបស់អ្នក សូមអូសចុះក្រោមនៅលើឧបករណ៍ចាប់ស្នាមម្រាមដៃ ដែលស្ថិតនៅផ្នែកខាងក្រោយឧបករណ៍របស់អ្នក។"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"មើលការជូនដំណឹងយ៉ាងឆាប់រហ័ស"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"អូសចុះក្រោមលើឧបករណ៍ចាប់ស្នាមម្រាមដៃ"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"លើក​ដើម្បី​បើក​កាមេរ៉ា"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"ដើម្បីបើកកាមេរ៉ាដោយស្វ័យប្រវត្តិ សូមលើកទូរសព្ទរបស់អ្នកស្របតាមទិសដៅថតរូប (ផ្ដេក ឬបញ្ឈរ)។ វាដំណើរការទាំងនៅពេលដែលទូរសព្ទរបស់អ្នកដេក ឬជាប់សោ។"</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"ថតរូបនៅពេលទូរសព្ទដេក ឬជាប់សោ"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"ចលនា​បើកកម្មវិធីជំនួយ"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"កម្រិតរំញោច"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"តើ​អ្នកចង់​ដក​កម្មវិធី​ប្រើភ្លាមៗ​នេះចេញ​មែន​ទេ?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"ហ្គេម"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ឯកសារ​សំឡេង"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"ទំហំដែលបានប្រើ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(បានលុប​សម្រាប់​អ្នក​ប្រើ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(បានបិទ​សម្រាប់​អ្នក​ប្រើ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"សេវាកម្មបំពេញដោយស្វ័យប្រវត្តិ"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"កម្មវិធីប្រើភ្លាមៗ"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"បិទកម្មវិធីគ្រប់គ្រងទំហំផ្ទុក?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"កម្មវិធីភាពយន្ត និងកម្មវិធីទូរទស្សន៍"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"ទំហំដែលបានប្រើ"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"ព័ត៌មាន​អំពី​ការ​ផ្តល់​ទិន្នន័យ​របស់​ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ជំរុញ​ការ​ផ្តល់​ទិន្នន័យ​របស់​ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"តើមានអ្វីដែលថ្មី និងគួរឲ្យចាប់អារម្មណ៍?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"សូមពិនិត្យមើលមុខងារពេញនិយមទាំង 5"</string>
 </resources>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index bcd6f00..9b5a56c 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"ಉತ್ತಮ"</item>
     <item msgid="8986346415847956850">"ಉತ್ಕೃಷ್ಟ"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"ಯಾವಾಗಲೂ"</item>
-    <item msgid="844721238536786870">"ಕೇವಲ ಪ್ಲಗ್ ಇನ್ ಮಾಡಿದಾಗ"</item>
-    <item msgid="1986753720941888596">"ಎಂದಿಗೂ ಬೇಡ"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"ಯಾವಾಗಲೂ"</item>
-    <item msgid="7433294150916905997">"ಕೇವಲ ಪ್ಲಗ್ ಇನ್ ಮಾಡಿದಾಗ"</item>
-    <item msgid="1390404486722375028">"ಎಂದಿಗೂ ಇಲ್ಲ"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"ಕಳೆದ 30 ದಿನಗಳು"</item>
     <item msgid="6600989128423965319">"ಬಳಕೆಯ ಆವರ್ತನೆಯನ್ನು ಹೊಂದಿಸಿ..."</item>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 7774625..6c4083a 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ಇದೀಗ ನೀವು ಡೆವಲಪರ್‌!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"ಅಗತ್ಯವಿಲ್ಲ, ನೀವು ಈಗಾಗಲೇ ಡೆವಲಪರ್‌ ಆಗಿರುವಿರಿ."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"ಮೊದಲು ಡೆವಲಪರ್ ಆಯ್ಕೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"ವೈರ್‌ಲೆಸ್ &amp; ನೆಟ್‌ವರ್ಕ್‌ಗಳು"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"ಸಂಪರ್ಕಗಳು"</string>
     <string name="header_category_device" msgid="4544026001618307754">"ಸಾಧನ"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ಪೂರೈಸಲಾಗಿದೆ"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ವೀಡಿಯೊ ಕರೆ ಸೌಲಭ್ಯ ಕಲ್ಪಿಸಲಾಗಿದೆ"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"ವೈಫೈ ಕರೆ ಸೌಲಭ್ಯ ಕಲ್ಪಿಸಲಾಗಿದೆ"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/ಪ್ರಸ್ತುತ ಸಿದ್ಧವಾಗಿದೆ"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"ಮೊಬೈಲ್ ರೇಡಿಯೋ ಪವರ್"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"ಸಿಮ್ ವಿಳಾಸ ಪುಸ್ತಕವನ್ನು ವೀಕ್ಷಿಸಿ"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ಸ್ಥಿರ ಡಯಲಿಂಗ್ ಸಂಖ್ಯೆಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"ಸಾಧನಗಳಿಗಾಗಿ ಸ್ಕ್ಯಾನ್ ಮಾಡು"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"ಈ ಸಾಧನವನ್ನು ಮರುಹೆಸರಿಸು"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"ಮರುಹೆಸರಿಸು"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸುವುದೇ?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ಇದರೊಂದಿಗೆ ನಿಮ್ಮ ಸಂಪರ್ಕವನ್ನು ಇದು ಕೊನೆಗೊಳಿಸುತ್ತದೆ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"ಸಾಧನದ ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸುವುದೇ?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ನಿಂದ ನಿಮ್ಮ ಫೋನ್‌ನ ಸಂಪರ್ಕ ಕಡಿತಗೊಳ್ಳುತ್ತದೆ."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ನಿಂದ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಸಂಪರ್ಕ ಕಡಿತಗೊಳ್ಳುತ್ತದೆ."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ನಿಂದ ನಿಮ್ಮ ಸಾಧನದ ಸಂಪರ್ಕ ಕಡಿತಗೊಳ್ಳುತ್ತದೆ."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಿ"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"ಬ್ಲೂಟೂತ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಲು ನೀವು ಅನುಮತಿ ಹೊಂದಿಲ್ಲ."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"ಹೊಸ ಸಾಧನವನ್ನು ಜೋಡಿಸಿ"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"ಬ್ಲೂಟೂತ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ತೆರೆದಿರುವಾಗ ಸಮೀಪದಲ್ಲಿರುವ ಸಾಧನಗಳಿಗೆ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"ಫೋನ್‌ನ ಬ್ಲೂಟೂತ್ ವಿಳಾಸ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"ಟ್ಯಾಬ್ಲೆಟ್‌ನ ಬ್ಲೂಟೂತ್ ವಿಳಾಸ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"ಸಾಧನದ ಬ್ಲೂಟೂತ್ ವಿಳಾಸ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸುವುದೇ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ಪ್ರಸಾರ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ಪ್ರೊಫೈಲ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದೇ?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"ಬ್ಲೂಟೂತ್‌‌ ಜೋಡಣೆ ವಿನಂತಿ"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"ಜೋಡಣೆ ವಿನಂತಿ"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಜೊತೆಗೆ ಜೋಡಿ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"ಸ್ವೀಕರಿಸಿದ ಫೈಲ್‌ಗಳನ್ನು ತೋರಿಸು"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"ಸ್ವೀಕರಿಸಲಾದ ಫೈಲ್‌ಗಳು"</string>
     <string name="device_picker" msgid="4978696506172252813">"ಬ್ಲೂಟೂತ್ ಸಾಧನ ಆರಿಸಿ"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"ಬ್ಲೂಟೂತ್‌ ಆನ್ ಮಾಡಲು <xliff:g id="APP_NAME">%1$s</xliff:g> ಬಯಸುತ್ತದೆ"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"ಬ್ಲೂಟೂತ್‌ ಆಫ್ ಮಾಡಲು <xliff:g id="APP_NAME">%1$s</xliff:g> ಬಯಸುತ್ತದೆ"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ನಿಮ್ಮ ಸಂದೇಶಗಳನ್ನು ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ. %2$s ಗೆ ಪ್ರವೇಶವನ್ನು ನೀಡುವುದೇ?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"ಸಿಮ್ ಪ್ರವೇಶ ವಿನಂತಿ"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ನಿಮ್ಮ ಸಿಮ್ ಕಾರ್ಡ್ ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ. ಸಿಮ್ ಕಾರ್ಡ್‌ಗೆ ಪ್ರವೇಶವನ್ನು ನೀಡಿದರೆ, ಸಂಪರ್ಕಪಡಿಸುವ ಸಂದರ್ಭದಲ್ಲಿ ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಡೇಟಾ ಸಂಪರ್ಕಪಡಿಸುವಿಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> ಗೆ ಪ್ರವೇಶ ನೀಡಿ"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"ಇತರ ಸಾಧನಗಳಿಗೆ \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' ಎಂದು ಗೋಚರಿಸುತ್ತದೆ"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ನಿಮ್ಮ ಸಾಧನಗಳು"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ಹೊಸ ಸಾಧನವನ್ನು ಜೋಡಿಸಿ"</string>
     <string name="date_and_time" msgid="9062980487860757694">"ದಿನಾಂಕ &amp; ಸಮಯ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ಸಮಯದ ವಲಯವನ್ನು ಆರಿಸಿ"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ಖಾತೆಗಳು"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ಸ್ಥಳ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ಖಾತೆಗಳು"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"ಭದ್ರತೆ ಮತ್ತು ಸ್ಥಳ"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ಎನ್‌ಕ್ರಿಪ್ಶನ್ ಮತ್ತು ರುಜುವಾತುಗಳು"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ಫೋನ್ ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"ಸಾಧನ ಎನ್‌ಕ್ರಿಪ್ಟ್ ಆಗಿದೆ"</string>
@@ -354,40 +367,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"ಬೆರಳಚ್ಚು‌ ಮೂಲಕ ಅನ್‌ಲಾಕ್‌ ಮಾಡಿ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಿ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಕೇವಲ ಬೆರಳಚ್ಚು ಸೆನ್ಸರ್ ಸ್ಪರ್ಶಿಸಿ‌. ನೀವು ಸೇರಿಸುವ ಬೆರಳಚ್ಚು‌ಗಳ ಬಗ್ಗೆ ಜಾಗರೂಕರಾಗಿರಿ. ಒಂದು ಹೆಚ್ಚಿನ ಬೆರಳಚ್ಚು ಸಹ ಇವುಗಳಲ್ಲಿ ಯಾವುದನ್ನಾದರೂ ಮಾಡಬಹುದು.\n\nಗಮನಿಸಿ: ನಿಮ್ಮ ಬೆರಳಚ್ಚು ಬಲವಾದ ಪ್ಯಾಟರ್ನ್ ಅಥವಾ ‌ಪಿನ್‌ಗಿಂತ ಕಡಿಮೆ ಸುರಕ್ಷಿತವಾಗಿರಬಹುದು."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಕೇವಲ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್ ಸ್ಪರ್ಶಿಸಿ. ನೀವು ಸೇರಿಸುವ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳ ಬಗ್ಗೆ ಕಾಳಜಿವಹಿಸಿ. ಒಂದು ಹೆಚ್ಚಿನ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸಹ ಇವುಗಳಲ್ಲಿ ಯಾವುದನ್ನಾದರೂ ಮಾಡಬಹುದು.\n\nಗಮನಿಸಿ: ಈ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನೀವು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ, ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಕೇವಲ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್ ಸ್ಪರ್ಶಿಸಿ‌. ನೀವು ಯಾರ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸೇರಿಸುತ್ತೀರಿ ಎಂಬುದರ ಕುರಿತು ಎಚ್ಚರಿಕೆಯಿಂದಿರಿ. ಒಂದು ಸೇರಿಸಲಾದ ಮುದ್ರಣವು ಸಹ ಇವುಗಳಲ್ಲಿ ಯಾವುದನ್ನಾದರೂ ಪೂರೈಸಬಹುದು.\n\nನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಬಲವಾದ ಪ್ಯಾಟರ್ನ್ ಅಥವಾ ಪಿನ್‌ಗಿಂತಲೂ ಕಡಿಮೆ ಸುರಕ್ಷತೆ ಹೊಂದಿರಬಹುದು."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"ನಿಮ್ಮ ಪರದೆಯನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ಖರೀದಿಗಳನ್ನು ಅನುಮೋದಿಸಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಿ.\n\nಗಮನಿಸಿ: ಈ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ನೀವು ಬಳಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ, ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"ನಿಮ್ಮ ಪರದೆಯನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ಖರೀದಿಗಳನ್ನು ಅನುಮೋದಿಸಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಿ.\n\nಗಮನಿಸಿ: ಬಲವಾದ ಪ್ಯಾಟರ್ನ್ ಅಥವಾ ಪಿನ್‌ಗಿಂತಲೂ ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಕಡಿಮೆ ಸುರಕ್ಷಿತವಾಗಿರಬಹುದು"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ರದ್ದುಮಾಡಿ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ಮುಂದುವರಿಸು"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"ಸ್ಕಿಪ್‌"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"ಬೆರಳಚ್ಚು ಸೇರಿಸಿ"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ. ಈ ಟ್ಯಾಬ್ಲೆಟ್ ಕಳೆದು ಹೋದರೆ, ಕಳವಾದರೆ ಅಥವಾ ಅಳಿಸಿ ಹೋದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ. ಈ ಸಾಧನವು ಕಳೆದು ಹೋದರೆ, ಕಳವಾದರೆ ಅಥವಾ ಅಳಿಸಿ ಹೋದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ. ಈ ಫೋನ್ ಕಳೆದು ಹೋದರೆ, ಕಳವಾದರೆ ಅಥವಾ ಅಳಿಸಿ ಹೋದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿಲ್ಲ. ಈ ಟ್ಯಾಬ್ಲೆಟ್ ಕಳೆದು ಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿಲ್ಲ. ಈ ಸಾಧನವು ಕಳೆದು ಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿಲ್ಲ. ಈ ಫೋನ್ ಕಳೆದು ಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"ಮುಂದೆ"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆನ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಈ ಸಾಧನವು ಕಳೆದು ಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಾಗದೆ ಇರಬಹುದು."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆನ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಈ ಸಾಧನವು ಕಳೆದು ಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಾಗದೆ ಇರಬಹುದು."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆನ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಈ ಫೋನ್‌ ಕಳೆದು ಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಾಗದೆ ಇರಬಹುದು."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆನ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಈ ಟ್ಯಾಬ್ಲೆಟ್‌ ಕಳೆದು ಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಾಗದೆ ಇರಬಹುದು."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆನ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಈ ಸಾಧನವು ಕಳೆದು ಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ಸಾಧ್ಯವಾಗದೆ ಇರಬಹುದು."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆನ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಈ ಫೋನ್‌ ಕಳೆದು ಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ ಇತರರು ಇದನ್ನು ಬಳಸುವುದನ್ನು ನಿಮಗೆ ತಡೆಯಲು ಸಾಧ್ಯವಾಗದೆ ಇರಬಹುದು."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"ಸ್ಕಿಪ್ ಮಾಡು"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"ಹಿಂದಿರುಗು"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ಸೆನ್ಸಾರ್ ಪತ್ತೆಹಚ್ಚಿ"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ಬೆರಳಚ್ಚು ಸೆನ್ಸಾರ್ ಅನ್ನು ನಿಮ್ಮ ಫೋನ್ ಹಿಂಬದಿಯಲ್ಲಿ ಕಂಡುಹಿಡಿಯಿರಿ."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"ಸೆನ್ಸಾರ್ ಸ್ಪರ್ಶಿಸಿ"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"ನಿಮ್ಮ ಫೋನ್‌ನ ಹಿಂಬದಿಯಲ್ಲಿದೆ. ನಿಮ್ಮ ಸೂಚಿಕ ಬೆರಳನ್ನು ಬಳಸಿ."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ಸಾಧನ ಮತ್ತು ಬೆರಳಚ್ಚು ಸೆನ್ಸಾರ್ ಸ್ಥಳದೊಂದಿಗೆ ವಿವರಣೆ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"ಹೆಸರು"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ಸರಿ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ಅಳಿಸಿ"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"ಇದೀಗ ಪ್ರಾರಂಭಿಸೋಣ"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"ಸೆನ್ಸಾರ್ ಸ್ಪರ್ಶಿಸಿ"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ಸೆನ್ಸರ್ ಮೇಲೆ ನಿಮ್ಮ ಬೆರಳಿರಿಸಿ ಮತ್ತು ನಿಮಗೆ ವೈಬ್ರೇಷನ್ ಅನುಭವ ಆದ ನಂತರ ತೆಗೆಯಿರಿ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ಮುಂದುವರಿಸಿ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ನ ಎಲ್ಲಾ ವಿವಿಧ ಭಾಗಗಳನ್ನು ಸೇರಿಸಲು ನಿಮ್ಮ ಬೆರಳನ್ನು ಸ್ವಲ್ಪಮಟ್ಟಿಗೆ ಸರಿಸಿ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"ಬೆರಳಚ್ಚು ಸೇರಿಸಲಾಗಿದೆ!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ನೀವು ಈ ಐಕಾನ್ ವೀಕ್ಷಿಸಿದಾಗ, ನಿಮ್ಮ ಬೆರಳಚ್ಚು ಅನ್ನು ನೀವು ಗುರುತಿಸುವಿಕೆಗೆ ಅಥವಾ ಖರೀದಿಯನ್ನು ಪ್ರಮಾಣೀಕರಿಸಲು ಬಳಸಬಹುದು."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಎಚ್ಚರಗೊಳಿಸಲು ಮತ್ತು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಕೇವಲ ಬೆರಳಚ್ಚು ಸೆನ್ಸಾರ್ ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"ನೀವು ಈ ಐಕಾನ್ ಅನ್ನು ವೀಕ್ಷಿಸಿದಾಗ, ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ಗಳಲ್ಲಿ ಖರೀದಿಗಳಿಗೆ ದೃಢೀಕರಣ ನೀಡಬಹುದು ಅಥವಾ ಸೈನ್‌ ಇನ್‌ ಮಾಡಬಹುದು."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"ಎತ್ತಿರಿ, ನಂತರ ಪುನಃ ಸ್ಪರ್ಶಿಸಿ"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ನ ವಿವಿಧ ಭಾಗಗಳನ್ನು ಸೇರಿಸಲು ನಿಮ್ಮ ಬೆರಳನ್ನು ಎತ್ತುತ್ತಲಿರಿ"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೇರಿಸಲಾಗಿದೆ"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"ನೀವು ಈ ಐಕಾನ್‌ ನೋಡಿದಾಗ, ಗುರುತಿಸಲು ಅಥವಾ ಖರೀದಿಗಳನ್ನು ಅನುಮೋದಿಸಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಿ."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ಬೆರಳಚ್ಚು ಸೆಟಪ್ ಸ್ಕಿಪ್ ಮಾಡುವುದೇ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಒಂದು ಮಾರ್ಗವಾಗಿ ನಿಮ್ಮ ಬೆರಳಚ್ಚು ಅನ್ನು ಬಳಸಲು ನೀವು ಆಯ್ಕೆಮಾಡಿರುವಿರಿ. ನೀವು ಇದೀಗ ಸ್ಕಿಪ್ ಮಾಡಿದರೆ, ನೀವು ಇದನ್ನು ನಂತರ ಹೊಂದಿಸುವ ಅಗತ್ಯವಿರುತ್ತದೆ. ಸೆಟಪ್ ಕೇವಲ ನಿಮಿಷದಷ್ಟು ಸಮಯವನ್ನು ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಹೊಂದಿಸಿ"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"ಮುಗಿದಿದೆ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ಓಹ್, ಅದು ಸೆನ್ಸರ್ ಅಲ್ಲ"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಬೆರಳಚ್ಚು ಸೆನ್ಸರ್ ಬಳಸಿ."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"ನಿಮ್ಮ ಫೋನ್ ಹಿಂಬದಿಯಲ್ಲಿರುವ ಸೆನ್ಸಾರ್ ಸ್ಪರ್ಶಿಸಿ. ನಿಮ್ಮ ಸೂಚಿಕ ಬೆರಳನ್ನು ಬಳಸಿ."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ನೋಂದಣಿ ಪೂರ್ಣಗೊಂಡಿಲ್ಲ"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"ಬೆರಳಚ್ಚು ನೋಂದಣಿ ಸಮಯದ ಮಿತಿಯನ್ನು ಮೀರಿದೆ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ಬೆರಳಚ್ಚು ನೋಂದಣಿ ಕೆಲಸ ಮಾಡುತ್ತಿಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ ಅಥವಾ ಬೇರೊಂದು ಬೆರಳನ್ನು ಬಳಸಿ."</string>
@@ -449,6 +460,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಅನುಮತಿ ಇಲ್ಲದೆ ಇತರರು ಈ ಸಾಧನವನ್ನು ಬಳಸುವುದನ್ನು ತಡೆಯಿರಿ. ನೀವು ಬಳಸಲು ಬಯಸುವ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಅನುಮತಿ ಇಲ್ಲದೆ ಇತರರು ಈ ಫೋನ್ ಬಳಸುವುದನ್ನು ತಡೆಯಿರಿ. ನೀವು ಬಳಸಲು ಬಯಸುವ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"ನಿಮ್ಮ ಬ್ಯಾಕಪ್ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ವಿಧಾನವನ್ನು ಆರಿಸಿಕೊಳ್ಳಿ"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಗಳು"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಗಳು"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ಸ್ಕ್ರೀನ್ ಲಾಕ್"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / ನಿದ್ರಾವಸ್ಥೆಯ ನಂತರ ತಕ್ಷಣವೇ"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"ನಿದ್ರಾವಸ್ಥೆಯ ಬಳಿಕ <xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g>"</string>
@@ -519,13 +532,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ಅನ್‌ಲಾಕ್ ನಮೂನೆಯನ್ನು ಬದಲಾಯಿಸಿ"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ಅನ್‌ಲಾಕ್ ಪಿನ್‌ ಬದಲಾಯಿಸಿ"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ಅನ್‌ಲಾಕ್ ಪಾಸ್‌ವರ್ಡ್‌ ಬದಲಾಯಿಸಿ"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> ನಲ್ಲಿ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ಪ್ರಯತ್ನ."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"ಕೊನೆಯ ಪ್ರಯತ್ನ"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"ನೀವು ಈ ಪ್ರಯತ್ನದಲ್ಲಿ ಕೆಲಸದ ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ತಪ್ಪಾಗಿ ನಮೂದಿಸಿದರೆ, ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಸಂಬಂಧಿಸಿದ ಡೇಟಾವನ್ನು ಈ ಸಾಧನದಿಂದ ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"ನೀವು ಈ ಪ್ರಯತ್ನದಲ್ಲಿ ಕೆಲಸದ ಪಿನ್‌ ಅನ್ನು ತಪ್ಪಾಗಿ ನಮೂದಿಸಿದರೆ, ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಸಂಬಂಧಿಸಿದ ಡೇಟಾವನ್ನು ಈ ಸಾಧನದಿಂದ ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"ನೀವು ಈ ಪ್ರಯತ್ನದಲ್ಲಿ ಕೆಲಸದ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ತಪ್ಪಾಗಿ ನಮೂದಿಸಿದರೆ, ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಸಂಬಂಧಿಸಿದ ಡೇಟಾವನ್ನು ಈ ಸಾಧನದಿಂದ ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"ಹಲವಾರು ತಪ್ಪಾದ ಪ್ರಯತ್ನಗಳು. ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಸಂಬಂಧಿಸಿದ ಡೇಟಾವನ್ನು ಈ ಸಾಧನದಿಂದ ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ವಜಾಗೊಳಿಸಿ"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> ನಲ್ಲಿ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ಪ್ರಯತ್ನ."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"ನಿಮ್ಮ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪ್ಯಾಟರ್ನ್‌ ನಮೂದಿಸಿದರೆ, ಈ ಸಾಧನಗಳ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪಿನ್ ನಮೂದಿಸಿದರೆ, ಈ ಸಾಧನಗಳ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸಿದರೆ, ಈ ಸಾಧನಗಳ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪ್ಯಾಟರ್ನ್‌ ನಮೂದಿಸಿದರೆ, ಈ ಬಳಕೆದಾರರನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪಿನ್ ನಮೂದಿಸಿದರೆ, ಈ ಬಳಕೆದಾರರನ್ನು ಅಳಿಸಲಾಗುವುದು."</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸಿದರೆ, ಈ ಬಳಕೆದಾರರನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪ್ಯಾಟರ್ನ್‌ ನಮೂದಿಸಿದರೆ, ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪಿನ್ ನಮೂದಿಸಿದರೆ, ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸಿದರೆ, ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"ಹಲವಾರು ಬಾರಿ ತಪ್ಪಾಗಿ ಪ್ರಯತ್ನಿಸಿದ್ದೀರಿ. ಈ ಸಾಧನಗಳ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"ಹಲವಾರು ಬಾರಿ ತಪ್ಪಾಗಿ ಪ್ರಯತ್ನಿಸಿದ್ದೀರಿ. ಈ ಬಳಕೆದಾರಾರನ್ನು ಅಳಿಸಲಾಗುವುದು."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"ಹಲವಾರು ಬಾರಿ ತಪ್ಪಾಗಿ ಪ್ರಯತ್ನಿಸಿದ್ದೀರಿ. ಈ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಅದರ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"ವಜಾಗೊಳಿಸಿ"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"ಕನಿಷ್ಠ <xliff:g id="COUNT">%d</xliff:g> ಕ್ಯಾರೆಕ್ಟರ್‌ಗಳನ್ನು ಹೊಂದಿರಬೇಕು"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"ಪಿನ್ ಕನಿಷ್ಠ <xliff:g id="COUNT">%d</xliff:g> ಅಂಕಿಗಳನ್ನು ಹೊಂದಿರಬೇಕು"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ಮುಂದುವರಿಸು"</string>
@@ -626,6 +647,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"ಸುಧಾರಿತ ಬ್ಲೂಟೂತ್‌‌"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ಬ್ಲೂಟೂತ್‌‌ ಆನ್‌ ಮಾಡಿದಾಗ, ನಿಮ್ಮ ಸಾಧನವು ಇತರ ಸಮೀಪದ ಬ್ಲೂಟೂತ್‌‌ ಸಾಧನಗಳ ಜೊತೆಗೆ ಸಂವಹನ ಮಾಡಬಹುದು."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಲು, ಸಿಸ್ಟಂ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳು ಈಗಲೂ ಬ್ಲೂಟೂತ್‌ ಸಾಧನಗಳನ್ನು ಪತ್ತೆ ಮಾಡಬಹುದು. ನೀವು ಇದನ್ನು <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ಸ್ಕ್ಯಾನ್‌ ಮಾಡುವಿಕೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು<xliff:g id="LINK_END_1">LINK_END</xliff:g> ನಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"ಸಾಧನದ ವಿವರಗಳು"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"ಸಾಧನದ ಬ್ಲೂಟೂತ್ ವಿಳಾಸ: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"ಸಾಧನವನ್ನು ಮರೆತಿದ್ದೀರಾ?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಇನ್ನು ಮುಂದೆ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಜೊತೆಗೆ ಜೋಡಿಸಲಾಗುವುದಿಲ್ಲ"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಅನ್ನು ಇನ್ನು ಮುಂದೆ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಜೊತೆಗೆ ಜೋಡಿಸಲಾಗುವುದಿಲ್ಲ"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಇನ್ನು ಮುಂದೆ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಜೊತೆಗೆ ಜೋಡಿಸಲಾಗುವುದಿಲ್ಲ"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"ಸಾಧನವನ್ನು ಮರೆತುಬಿಡಿ"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ಇದಕ್ಕೆ ಸಂಪರ್ಕಪಡಿಸಲಾಗಿದೆ..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"ಮಾಧ್ಯಮ ಆಡಿಯೋದಿಂದ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ರ ಸಂಪರ್ಕವನ್ನು ಕಡಿತಗೊಳಿಸಲಾಗುವುದು."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"ಹ್ಯಾಂಡ್ಸ್‌ಫ್ರೀ ಆಡಿಯೋದಿಂದ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ರ ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತದೆ."</string>
@@ -778,6 +807,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"ಒದಗಿಸಬೇಡಿ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"ಮೌಲ್ಯೀಕರಿಸಬೇಡಿ"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"ಯಾವುದೇ ಪ್ರಮಾಣಪತ್ರ ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ. ನಿಮ್ಮ ಸಂಪರ್ಕವು ಖಾಸಗಿಯಾಗಿರುವುದಿಲ್ಲ."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"ನೆಟ್‌ವರ್ಕ್‌ ಹೆಸರು ತುಂಬಾ ಉದ್ದವಾಗಿದೆ."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"ಡೊಮೇನ್ ನಿರ್ದಿಷ್ಟ ಪಡಿಸಬೇಕು."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ಲಭ್ಯವಿದೆ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ಲಭ್ಯವಿದೆ)"</string>
@@ -809,7 +839,6 @@
       <item quantity="other">%d ನೆಟ್‌ವರ್ಕ್‌ಗಳು</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"ಸುಧಾರಿತ Wi‑Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"ವೈ-ಫೈ ಕಾನ್ಫಿಗರ್‌ ಮಾಡಿ"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC ವಿಳಾಸ"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP ವಿಳಾಸ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"ಸಬ್‌ನೆಟ್‌ ಮಾಸ್ಕ್‌"</string>
@@ -846,9 +875,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ಈ ಗುಂಪನ್ನು ಮರೆಯುವುದೇ?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ಪೋರ್ಟಬಲ್ Wi‑Fi ಹಾಟ್‌ಸ್ಪಾಟ್‌"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi ಹಾಟ್‌ಸ್ಪಾಟ್‌"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ ಒದಗಿಸಲು ಮೊಬೈಲ್ ಸಂಪರ್ಕವನ್ನು ಬಳಸಿ"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"ಈ ಟ್ಯಾಬ್ಲೆಟ್‌ನ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹಾಟ್‌ಸ್ಪಾಟ್ ಮೂಲಕ ಹಂಚಿಕೊಳ್ಳುತ್ತಿಲ್ಲ"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"ಈ ಫೋನ್‌ನ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹಾಟ್‌ಸ್ಪಾಟ್ ಮೂಲಕ ಹಂಚಿಕೊಳ್ಳುತ್ತಿಲ್ಲ"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"ಇತರ ಸಾಧನಗಳೊಂದಿಗೆ ಇಂಟರ್ನೆಟ್ ಅಥವಾ ವಿಷಯವನ್ನು ಹಂಚಿಕೊಳ್ಳುತ್ತಿಲ್ಲ"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ಈ ಟ್ಯಾಬ್ಲೆಟ್‌ನ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹಾಟ್‌ಸ್ಪಾಟ್ ಮೂಲಕ ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ಈ ಫೋನ್‌ನ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹಾಟ್‌ಸ್ಪಾಟ್ ಮೂಲಕ ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ಅಪ್ಲಿಕೇಶನ್‌ ವಿಷಯವನ್ನು ಹಂಚಿಕೊಳ್ಳುತ್ತಿದೆ. ಇಂಟರ್ನೆಟ್‌ ಸಂಪರ್ಕವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು, ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಆಫ್‌ ಮಾಡಿ ನಂತರ ಆನ್‌ ಮಾಡಿ"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"ವೈ-ಫೈ ಹೆಸರು"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ಅನ್ನು ಆನ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"ಇತರೆ ಸಾಧನಗಳು <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕವನ್ನು ಪಡೆದುಕೊಳ್ಳಬಹುದು"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"ವೈ-ಫೈ ಪಾಸ್‌ವರ್ಡ್‌"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP ಬ್ಯಾಂಡ್"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ನಿಮ್ಮ ಇತರ ಸಾಧನಗಳಿಗೆ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ ರಚಿಸಲು ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಬಳಸಿ. ನಿಮ್ಮ ಮೊಬೈಲ್‌ ಡೇಟಾ ಸಂಪರ್ಕವನ್ನು ಬಳಸಿಕೊಂಡು ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಇಂಟರ್ನೆಟ್‌ ಅನ್ನು ಒದಗಿಸುತ್ತದೆ. ಹೆಚ್ಚುವರಿ ಮೊಬೈಲ್‌ ಡೇಟಾ ಶುಲ್ಕಗಳು ಅನ್ವಯವಾಗಬಹುದು."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ಹತ್ತಿರದ ಸಾಧನಗಳೊಂದಿಗೆ ವಿಷಯವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಹಾಟ್‌ಸ್ಪಾಟ್ ಅನ್ನು ಸಹ ರಚಿಸಬಹುದು."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಆನ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಆಫ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ಸಕ್ರಿಯವಾಗಿದೆ"</string>
@@ -895,6 +932,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ ಆನ್‌ ಆದಾಗ, ನಿಮ್ಮ ಫೋನ್‌ ನಿಮ್ಮ ಆದ್ಯತೆ ಮತ್ತು ಯಾವ ಸಿಗ್ನಲ್ ಬಲವಾಗಿದೆ ಎಂಬುದರ ಅನುಗುಣವಾಗಿ, ಕರೆಗಳನ್ನು ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗಳು ಅಥವಾ ನಿಮ್ಮ ವಾಹಕದ ನೆಟ್‌ವರ್ಕ್ ಮೂಲಕ ರವಾನಿಸುತ್ತದೆ. ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಆನ್‌ ಮಾಡವ ಮೊದಲು, ಶುಲ್ಕಗಳು  ಮತ್ತು ಇತರ ವಿವರಗಳಿಗೆ ಸಂಬಂಧಿಸಿದಂತೆ ನಿಮ್ಮ ವಾಹಕವನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"ತುರ್ತು ವಿಳಾಸವನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಿ"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"ವೈ-ಫೈ ಬಳಸಿಕೊಂಡು ನೀವು 911 ಕರೆ ಮಾಡಿದಾಗ ನಿಮ್ಮ ಸ್ಥಳದ ವಿಳಾಸವನ್ನು ತುರ್ತು ಸೇವೆಗಳಿಗೆ ಬಳಸಲಾಗುತ್ತದೆ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ಪ್ರದರ್ಶನ"</string>
@@ -952,6 +990,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"ಯಾವುದೇ ಫಲಿತಾಂಶಗಳಿಲ್ಲ"</string>
     <string name="display_settings" msgid="7965901687241669598">"ಪ್ರದರ್ಶನ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ಪರದೆಯನ್ನು ಸ್ವಯಂ-ತಿರುಗಿಸು"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"ಹೊಳೆಯುವ ಬಣ್ಣಗಳು"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ಟ್ಯಾಬ್ಲೆಟ್‌ ತಿರುಗಿಸುವಾಗ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಓರಿಯಂಟೇಶನ್ ಬದಲಾಯಿಸು"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ಫೋನ್ ಅನ್ನು ತಿರುಗಿಸುವಾಗ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಓರಿಯಂಟೇಶನ್ ಬದಲಾಯಿಸು"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"ಟ್ಯಾಬ್ಲೆಟ್‌ ತಿರುಗಿಸುವಾಗ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಓರಿಯಂಟೇಶನ್ ಬದಲಾಯಿಸು"</string>
@@ -979,23 +1018,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"ಲಭ್ಯವಿರುವ ಬೆಳಕಿಗೆ ಹೊಳಪಿನ ಮಟ್ಟ ಸೂಕ್ತಗೊಳಿಸಿ. ವೈಶಿಷ್ಟ್ಯ ಆನ್ ಇರುವಾಗ ತಾತ್ಕಾಲಿಕವಾಗಿ ಹೊಳಪನ್ನು ಹೊಂದಿಸಬಹುದು."</string>
     <string name="night_display_title" msgid="2626451512200357686">"ನೈಟ್ ಲೈಟ್"</string>
     <string name="night_display_text" msgid="1837277457033025056">"ನೈಟ್ ಲೈಟ್ ನಿಮ್ಮ ಪರದೆಯನ್ನು ಆಂಬರ್ ಬಣ್ಣಕ್ಕೆ ಟಿಂಟ್ ಮಾಡುತ್ತದೆ. ಇದರಿಂದಾಗಿ ಮಂದ ಬೆಳಕಿನಲ್ಲಿಯೂ ನಿಮ್ಮ ಪರದೆಯನ್ನು ನೋಡಲು ಅಥವಾ ಓದಲು ಸುಲಭವಾಗುತ್ತದೆ ಮತ್ತು ಸುಲಭವಾಗಿ ನಿದ್ರಿಸಲು ನಿಮಗೆ ಸಹಾಯ ಮಾಡಬಹುದು."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"ಅವಧಿ"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"ಸ್ಥಿತಿ"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡಿ"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"ಎಂದಿಗೂ ಬೇಡ"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"ಕಸ್ಟಮ್ ವೇಳಾಪಟ್ಟಿ"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"ಸೂರ್ಯಾಸ್ತದಿಂದ ಸೂರ್ಯೋದಯಕ್ಕೆ"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"ಅವಧಿ"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"ಯಾವುದೂ ಅಲ್ಲ"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"ಕಸ್ಟಮ್ ಸಮಯದಲ್ಲಿ ಆನ್ ಮಾಡಿ"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"ಸೂರ್ಯಾಸ್ತದಿಂದ ಸೂರ್ಯೋದಯದವರೆಗೂ ಆನ್‌ ಮಾಡಿರುತ್ತದೆ"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"ಪ್ರಾರಂಭದ ಸಮಯ"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"ಮುಕ್ತಾಯದ ಸಮಯ"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"ಸ್ಥಿತಿ"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"ತೀಕ್ಷ್ಣತೆ"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"ಆಫ್. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"ಎಂದಿಗೂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗುವುದಿಲ್ಲ."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g> ರಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗುತ್ತದೆ."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"ಸೂರ್ಯಾಸ್ತದ ಸಮಯದಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗುತ್ತದೆ."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"ಆನ್. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"ಎಂದಿಗೂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಆಗುವುದಿಲ್ಲ."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g> ರಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಆಗುತ್ತದೆ"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"ಸೂರ್ಯೋದಯದ ಸಮಯದಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಆಗುತ್ತದೆ."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"ಆಫ್ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"ಎಂದಿಗೂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗುವುದಿಲ್ಲ"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g> ರಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗುತ್ತದೆ"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"ಸೂರ್ಯಾಸ್ತದ ಸಮಯದಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗುತ್ತದೆ"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"ಆನ್ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"ಎಂದಿಗೂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಆಗುವುದಿಲ್ಲ"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g> ರಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಆಗುತ್ತದೆ"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"ಸೂರ್ಯೋದಯದ ಸಮಯದಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಫ್ ಆಗುತ್ತದೆ"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"ಸ್ಲೀಪ್‌"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"ಪರದೆ ಆಫ್ ಆಗುತ್ತದೆ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"ನಿಷ್ಕ್ರಿಯತೆಯ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ನಂತರ"</string>
@@ -1019,8 +1057,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ಸ್ವಯಂಚಾಲಿತ ಪ್ರಖರತೆ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ಎಬ್ಬಿಸಲು ಎತ್ತಿರಿ"</string>
-    <string name="doze_title" msgid="2259176504273878294">"ಆವರಿಸಿದ ಪರದೆ"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"ಆಂಬಿಯೆಂಟ್ ಡಿಸ್‌ಪ್ಲೇ"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"ಯಾವಾಗಲೂ ಆನ್"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ಹೊಸ ಅಧಿಸೂಚನೆಗಳು"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ಯಾವಾಗ ತೋರಿಸಬೇಕು"</string>
+    <string name="doze_title" msgid="2375510714460456687">"ಹೊಸ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ಅಧಿಸೂಚನೆಗಳನ್ನು ನೀವು ಸ್ವೀಕರಿಸಿದಾಗ ಪರದೆಯನ್ನು ಎಚ್ಚರಗೊಳಿಸಿ"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"ಯಾವಾಗಲೂ ಆನ್"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"ಸಮಯ, ಅಧಿಸೂಚನೆ ಐಕಾನ್‌ಗಳು ಮತ್ತು ಇತರ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸಿ"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ಫಾಂಟ್ ಗಾತ್ರ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ಪಠ್ಯವನ್ನು ಸಣ್ಣದು ಅಥವಾ ದೊಡ್ಡದು ಮಾಡಿ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"ಸಿಮ್‌ ಕಾರ್ಡ್ ಲಾಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -1272,6 +1316,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN ಖಾಲಿ ಇರುವಂತಿಲ್ಲ."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC ಕ್ಷೇತ್ರವು 3 ಅಂಕಿಗಳಾಗಿರಬೇಕು."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC ಕ್ಷೇತ್ರವು 2 ಅಥವಾ 3 ಅಂಕಿಗಳಾಗಿರಬೇಕು."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"%s ಪ್ರಕಾರದ APN ಗಳನ್ನು ಸೇರಿಸಲು ವಾಹಕ ಅನುಮತಿಸುವುದಿಲ್ಲ."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"ಡಿಫಾಲ್ಟ್ APN ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಸ್ಥಾಪಿಸಲಾಗುತ್ತಿದೆ."</string>
     <string name="menu_restore" msgid="8260067415075573273">"ಡೀಫಾಲ್ಟ್‌ಗೆ  ಮರುಹೊಂದಿಸು"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ಡಿಫಾಲ್ಟ್ APN ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮರುಹೊಂದಿಕೆಯು ಪೂರ್ಣಗೊಂಡಿದೆ."</string>
@@ -1301,6 +1346,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD ಕಾರ್ಡ್‌ ಅಳಿಸಿ"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"ಆಂತರಿಕ USB ಸಂಗ್ರಹಣೆಯಲ್ಲಿರುವ ಸಂಗೀತ ಅಥವಾ ಫೋಟೋಗಳಂಥ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"ಸಂಗೀತ ಫೋಟೋಗಳನ್ನು ಒಳಗೊಂಡಂತೆ SD ಕಾರ್ಡ್‌ನಲ್ಲಿರುವ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIMಗಳನ್ನು ಅಳಿಸಿಹಾಕಿ"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"ಫೋನ್‌ನಲ್ಲಿರುವ ಎಲ್ಲ eSIMಗಳನ್ನು ಅಳಿಸಿಹಾಕಿ. ಇದು ನಿಮ್ಮ ಮೊಬೈಲ್ ಸೇವಾ ಯೋಜನೆಯನ್ನು ರದ್ದುಗೊಳಿಸುವುದಿಲ್ಲ."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"ಟ್ಯಾಬ್ಲೆಟ್‌ನಲ್ಲಿರುವ ಎಲ್ಲ eSIMಗಳನ್ನು ಅಳಿಸಿಹಾಕಿ. ಇದು ನಿಮ್ಮ ಮೊಬೈಲ್ ಸೇವಾ ಯೋಜನೆಯನ್ನು ರದ್ದುಗೊಳಿಸುವುದಿಲ್ಲ."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಮರುಹೊಂದಿಸು"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ಫೋನ್‌ ಮರುಹೊಂದಿಸು"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"ನಿಮ್ಮ ಎಲ್ಲ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ ಮತ್ತು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅಳಿಸಬೇಕೇ? ನೀವು ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ!"</string>
@@ -1323,26 +1371,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ಡೇಟಾ ಉಳಿಸುವಿಕೆಯನ್ನು ಆನ್ ಆಗಿರುವಾಗ ಪೋರ್ಟೆಬಲ್ ಹಾಟ್‌ಸ್ಪಾಟ್‌ಗಳನ್ನು ಟೆಥರ್ ಮಾಡಲಾಗುವುದಿಲ್ಲ ಅಥವಾ ಬಳಸಲಾಗುವುದಿಲ್ಲ"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB ಟೆಥರಿಂಗ್"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB ಸಂಪರ್ಕಗೊಂಡಿದೆ, ಟೆಥರ್ ಮಾಡಲು ಪರಿಶೀಲಿಸಿ"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"ಟೆಥರ್ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USB ಸಂಗ್ರಹಣೆಯು ಬಳಕೆಯಲ್ಲಿರುವಾಗ ಟೆಥರ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB ಅನ್ನು ಸಂಪರ್ಕಗೊಳಿಸಿಲ್ಲ"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"ಆನ್ ಮಾಡಲು ಸಂಪರ್ಕಿಸಿ"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB ಟೆಥರಿಂಗ್ ದೋಷ"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"USB ಮೂಲಕ ಫೋನ್‌ನ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"USB ಮೂಲಕ ಟ್ಯಾಬ್ಲೆಟ್‌ನ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ಬ್ಲೂಟೂತ್‌‌ ಟೆಥರಿಂಗ್‌"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"ಟ್ಯಾಬ್ಲೆಟ್ ಇಂಟರ್ನೆಟ್ ಬ್ಲೂಟೂತ್‌ನಲ್ಲಿ ಹಂಚಲಾಗುತ್ತಿದೆ"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"ಫೋನ್‌ ಇಂಟರ್ನೆಟ್ ಬ್ಲೂಟೂತ್‌ನಲ್ಲಿ ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"ಟ್ಯಾಬ್ಲೆಟ್ ಇಂಟರ್ನೆಟ್ ಬ್ಲೂಟೂತ್ ಮೂಲಕ 1 ಸಾಧನಕ್ಕೆ ಹಂಚಲಾಗುತ್ತಿದೆ"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"ಫೋನ್ ಇಂಟರ್ನೆಟ್ ಬ್ಲೂಟೂತ್ ಮೂಲಕ 1 ಸಾಧನಕ್ಕೆ ಹಂಚಲಾಗುತ್ತಿದೆ"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"ಟ್ಯಾಬ್ಲೆಟ್ ಇಂಟರ್ನೆಟ್ ಬ್ಲೂಟೂತ್ ಮೂಲಕ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ಸಾಧನಗಳಿಗೆ ಹಂಚಲಾಗುತ್ತಿದೆ"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"ಫೋನ್ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕ ಬ್ಲೂಟೂತ್ ಮೂಲಕ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ಸಾಧನಗಳಿಗೆ ಹಂಚಲಾಗುತ್ತಿದೆ"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"ಟ್ಯಾಬ್ಲೆಟ್‌ನ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಹಂಚಿಕೊಳ್ಳಿ"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"ಫೋನ್‌ನ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಹಂಚಿಕೊಳ್ಳಿ"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g>ನ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕ ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಹಂಚಲಾಗುತ್ತಿದೆ"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"ಟ್ಯಾಬ್ಲೆಟ್ ಇಂಟರ್ನೆಟ್ - ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಹಂಚುತ್ತಿಲ್ಲ"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"ಫೋನ್ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕ ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಹಂಚುತ್ತಿಲ್ಲ"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"ಟೆಥರ್ ಮಾಡಲಾಗಲಿಲ್ಲ"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> ಗಿಂತ ಹೆಚ್ಚಿನ ಸಾಧನಗಳಿಗೆ ಟೆಥರ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಅನ್ನು ಅನ್‌ಟೆಥರ್ ಮಾಡಲಾಗುತ್ತದೆ."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"ನಿಮ್ಮ ಮೊಬೈಲ್ ಡೇಟಾ ಸಂಪರ್ಕದ ಮೂಲಕ ಇತರ ಸಾಧನಗಳಿಗೆ ಇಂಟರ್ನೆಟ್ ಒದಗಿಸಲು ಹಾಟ್‌ಸ್ಪಾಟ್ ಮತ್ತು ಟೆಥರಿಂಗ್ ಬಳಸಿ."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"ನಿಮ್ಮ ಮೊಬೈಲ್ ಡೇಟಾ ಸಂಪರ್ಕದ ಮೂಲಕ ಇತರ ಸಾಧನಗಳಿಗೆ ಇಂಟರ್ನೆಟ್ ಒದಗಿಸಲು ಹಾಟ್‌ಸ್ಪಾಟ್ ಮತ್ತು ಟೆಥರಿಂಗ್ ಬಳಸಿ. ಹತ್ತಿರದ ಸಾಧನಗಳೊಂದಿಗೆ ವಿಷಯವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಹಾಟ್‌ಸ್ಪಾಟ್ ಅನ್ನು ಸಹ ರಚಿಸಬಹುದು."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ಸಹಾಯ"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"ಮೊಬೈಲ್‌ ನೆಟ್‌ವರ್ಕ್‌"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"ಮೊಬೈಲ್ ಯೋಜನೆ"</string>
@@ -1375,7 +1412,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"ಸ್ಥಳ ಮೋಡ್"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು GPS, ವೈ-ಫೈ, ಬ್ಲೂಟೂತ್ ಅಥವಾ ಮತ್ತು ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ​​ಬಳಸಿ"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು ವೈ-ಫೈ, ಬ್ಲೂಟೂತ್ ಅಥವಾ ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ​​ಬಳಸಿ"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು GPS ಬಳಸಿ"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು, GPS ಹಾಗೂ ಸಾಧನದ ಸೆನ್ಸರ್‌ಗಳನ್ನು ಬಳಸಿ"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"ಸ್ಕ್ಯಾನ್ ಮಾಡುವಿಕೆ"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"ವೈ-ಫೈ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ವೈ-ಫೈ  ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಪತ್ತೆಹಚ್ಚಲು ಸಿಸ್ಟಂ ಸೇವೆಗಳು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಅನುಮತಿಸುವುದರ ಮೂಲಕ ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಿ."</string>
@@ -1420,8 +1457,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"ನೀವು ಡೇಟಾ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿಲ್ಲ. ಇದೀಗ ಈ ಮಾಹಿತಿಯನ್ನು ವೀಕ್ಷಿಸಲು, ಇಂಟರ್ನೆಟ್‌ಗೆ ಸಂಪರ್ಕಪಡಿಸಿದ ಯಾವುದೇ ಕಂಪ್ಯೂಟರ್‌ನಿಂದ %s ಗೆ ಹೋಗಿ."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ಲೋಡ್ ಆಗುತ್ತಿದೆ..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್‌ ಆರಿಸಿಕೊಳ್ಳಿ"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಬಳಸಲು, ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಿ"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"ಪ್ಯಾಟರ್ನ್ ಆಯ್ಕೆ ಮಾಡಿ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ಬೆರಳಚ್ಚು ಬಳಸಲು, ಪ್ಯಾಟರ್ನ್ ಹೊಂದಿಸಿ"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"ನಿಮ್ಮ ಪಿನ್‌ ಅನ್ನು ಆರಿಸಿ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ಬೆರಳಚ್ಚು ಬಳಸಲು, ಪಿನ್ ಹೊಂದಿಸಿ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್‌ ದೃಢೀಕರಿಸಿ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ದೃಢೀಕರಿಸಿ"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"ನಿಮ್ಮ ಪಿನ್‌ ಅನ್ನು ದೃಢೀಕರಿಸಿ"</string>
@@ -1490,6 +1530,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"ಅಪ್ಲಿಕೇಶನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="install_applications" msgid="4872012136210802181">"ಅಪರಿಚಿತ ಮೂಲಗಳು"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್ ಮೂಲಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"ಇತ್ತೀಚೆಗಷ್ಟೇ ತೆರೆಯಲಾಗಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"ಎಲ್ಲಾ <xliff:g id="COUNT">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> ನಿಮಿಷಗಳ ಹಿಂದೆ"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಹಾಗೂ ವೈಯಕ್ತಿಕ ಡೇಟಾ, ಅಪರಿಚಿತ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ದಾಳಿಗೆ ತುತ್ತಾಗುವ ಸಾಧ್ಯತೆ ಹೆಚ್ಚಾಗಿದೆ. ಈ ಮೂಲದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸುವ ಮೂಲಕ, ನಿಮ್ಮ ಫೋನ್‌ಗೆ ಯಾವುದೇ ಹಾನಿ ಉಂಟಾದರೆ ಅಥವಾ ಅವುಗಳ ಬಳಕೆಯಿಂದ ಡೇಟಾ ನಷ್ಟವಾದರೆ, ಅದಕ್ಕೆ ನೀವೇ ಜವಾಬ್ದಾರರು ಎನ್ನುವುದನ್ನು ಒಪ್ಪಿಕೊಳ್ಳುತ್ತೀರಿ."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"ನಿಮ್ಮ ಫೋನ್ ಹಾಗೂ ವೈಯಕ್ತಿಕ ಡೇಟಾ, ಅಪರಿಚಿತ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ದಾಳಿಗೆ ತುತ್ತಾಗುವ ಸಾಧ್ಯತೆ ಹೆಚ್ಚಾಗಿದೆ. ಈ ಮೂಲದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸುವ ಮೂಲಕ, ನಿಮ್ಮ ಫೋನ್‌ಗೆ ಯಾವುದೇ ಹಾನಿ ಉಂಟಾದರೆ ಅಥವಾ ಅವುಗಳ ಬಳಕೆಯಿಂದ ಡೇಟಾ ನಷ್ಟವಾದರೆ, ಅದಕ್ಕೆ ನೀವೇ ಜವಾಬ್ದಾರರು ಎನ್ನುವುದನ್ನು ಒಪ್ಪಿಕೊಳ್ಳುತ್ತೀರಿ."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"ಸುಧಾರಿತ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -1658,6 +1701,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"ಸಿಸ್ಟಂ ಸೇವೆಗಳನ್ನು ನಿಲ್ಲಿಸಬೇಕೇ?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"ನೀವು ಈ ಸೇವೆಯನ್ನು ನಿಲ್ಲಿಸಿದರೆ, ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಅನ್ನು ಆಫ್‌ ಮಾಡಿ ಹಾಗೂ ನಂತರ ಮತ್ತೆ ಆನ್‌ ಮಾಡುವವರೆಗೆ ಅದರ ಕೆಲವು ವೈಶಿಷ್ಟ್ಯಗಳು ಸದ್ಯಕ್ಕೆ ಕಾರ್ಯ ನಿರ್ವಹಿಸುವುದನ್ನು ನಿಲ್ಲಿಸಬಹುದು."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"ನೀವು ಈ ಸೇವೆಯನ್ನು ನಿಲ್ಲಿಸಿದರೆ, ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಆಫ್‌ ಮಾಡಿ ಹಾಗೂ ನಂತರ ಮತ್ತೆ ಆನ್‌ ಮಾಡುವವರೆಗೆ ಅದರ ಕೆಲವು ವೈಶಿಷ್ಟ್ಯಗಳು ಸದ್ಯಕ್ಕೆ ಕಾರ್ಯ ನಿರ್ವಹಿಸುವುದನ್ನು ನಿಲ್ಲಿಸಬಹುದು."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"ಭಾಷೆಗಳು, ಇನ್‌ಪುಟ್ ಮತ್ತು ಗೆಸ್ಚರ್‌ಗಳು"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"ಭಾಷೆಗಳು ಮತ್ತು ಇನ್‌ಪುಟ್"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ಭಾಷೆಗಳು ಮತ್ತು ಇನ್‌ಪುಟ್"</string>
     <string name="input_assistance" msgid="7577795275222555487">"ಇನ್‌ಪುಟ್ ಸಹಾಯ"</string>
@@ -1872,6 +1919,10 @@
       <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="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <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="print_settings_title" msgid="3685449667822217816">"ಮುದ್ರಣ ಸೇವೆಗಳು"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"ಯಾವುದೇ ಸೇವೆಗಳನ್ನು ಸ್ಥಾಪಿಸಿಲ್ಲ"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"ಯಾವುದೇ ಮುದ್ರಕಗಳು ಕಂಡುಬಂದಿಲ್ಲ"</string>
@@ -1938,6 +1989,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"ಬಳಕೆಯ ವಿವರಗಳು"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"ವಿದ್ಯುತ್ ಬಳಕೆಯನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"ಒಳಗೊಂಡ ಪ್ಯಾಕೇಜ್‌ಗಳು"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ಬ್ಯಾಟರಿಯನ್ನು ಕ್ಷೀಣಿಸುತ್ತಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"ಸಾಧನವನ್ನು ಎಚ್ಚರದಲ್ಲಿ ಇರಿಸಲಾಗಿದೆ"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ಸಾಧನವನ್ನು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿದೆ"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ಆಗಾಗ್ಗೆ ಸ್ಥಳವನ್ನು ವಿನಂತಿಸಲಾಗುತ್ತಿದೆ"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"ಅನುಚಿತವಾಗಿ ವರ್ತಿಸುತ್ತಿರುವ <xliff:g id="NUMBER">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"ಅಪ್ಲಿಕೇಶನ್‌ ನಿಲ್ಲಿಸಬೇಕೇ?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"<xliff:g id="APP">%1$s</xliff:g> ನಿಮ್ಮ ಫೋನ್‌ ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಫೋನ್‌ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಒತ್ತಾಯವಾಗಿ ನಿಲ್ಲಿಸಬಹುದು. \n\n ಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"<xliff:g id="APP">%1$s</xliff:g> ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಒತ್ತಾಯವಾಗಿ ನಿಲ್ಲಿಸಬಹುದು. \n\n ಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"<xliff:g id="APP">%1$s</xliff:g> ನಿಮ್ಮ ಸಾಧನವನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಸಾಧನವು ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಒತ್ತಾಯವಾಗಿ ನಿಲ್ಲಿಸಬಹುದು. \n\n ಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"ಅಪ್ಲಿಕೇಶನ್‌ ನಿಲ್ಲಿಸಿ"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"ಹಿನ್ನೆಲೆ ಬಳಕೆಯನ್ನು ಆಫ್ ಮಾಡಬೇಕೇ?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"<xliff:g id="APP">%1$s</xliff:g> ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಫೋನ್‌ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯ ಬಗ್ಗೆ ತಿಳಿಸಲು, ನಿಮ್ಮ ಫೋನ್‌ ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಕೆಲಸ ಮಾಡುವುದನ್ನು ತಡೆಯಬಹುದು."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"<xliff:g id="APP">%1$s</xliff:g> ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯ ಬಗ್ಗೆ ತಿಳಿಸಲು, ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಕೆಲಸ ಮಾಡುವುದನ್ನು ತಡೆಯಬಹುದು."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"<xliff:g id="APP">%1$s</xliff:g> ನಿಮ್ಮ ಸಾಧನವನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಸಾಧನವು ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\n ಈ ಸಮಸ್ಯೆಯ ಬಗ್ಗೆ ತಿಳಿಸಲು, ನಿಮ್ಮ ಸಾಧನವು ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಕೆಲಸ ಮಾಡುವುದನ್ನು ತಡೆಯಬಹುದು."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"ಆಫ್ ಮಾಡಿ"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"ಸ್ಥಳವನ್ನು ಆಫ್ ಮಾಡಬೇಕೇ?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಬಳಸದೇ ಇರುವಾಗ <xliff:g id="APP">%1$s</xliff:g> ನಿಮ್ಮ ಸ್ಥಳದ ಕೋರಿಕೆಯು ಚಾಲನೆಯಲ್ಲಿರುವ ಕಾರಣದಿಂದ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಫೋನ್‌ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಈ ಅಪ್ಲಿಕೇಶನ್‌ನ ಸ್ಥಳವನ್ನು ಆಫ್‌ ಮಾಡಬಹುದು."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಬಳಸದೇ ಇರುವಾಗ <xliff:g id="APP">%1$s</xliff:g> ನಿಮ್ಮ ಸ್ಥಳದ ಕೋರಿಕೆಯು ಚಾಲನೆಯಲ್ಲಿರುವ ಕಾರಣದಿಂದ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಈ ಅಪ್ಲಿಕೇಶನ್‌ನ ಸ್ಥಳವನ್ನು ಆಫ್‌ ಮಾಡಬಹುದು."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಬಳಸದೇ ಇರುವಾಗ <xliff:g id="APP">%1$s</xliff:g> ನಿಮ್ಮ ಸ್ಥಳದ ಕೋರಿಕೆಯು ಚಾಲನೆಯಲ್ಲಿರುವ ಕಾರಣದಿಂದ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಸಾಧನ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಈ ಅಪ್ಲಿಕೇಶನ್‌ನ ಸ್ಥಳವನ್ನು ಆಫ್‌ ಮಾಡಬಹುದು."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"ಆಫ್ ಮಾಡಿ"</string>
     <string name="power_screen" msgid="3023346080675904613">"ಪರದೆ"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"ಫ್ಲಾಶ್‌ಲೈಟ್‌"</string>
     <string name="power_camera" msgid="4976286950934622605">"ಕ್ಯಾಮರಾ"</string>
@@ -1952,7 +2023,7 @@
     <string name="power_apps" msgid="2043554781293951327">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="power_service" msgid="1599661212370831780">"ಸೇವೆಗಳು"</string>
     <string name="power_system" msgid="8290455327965307383">"ಸಿಸ್ಟಂ"</string>
-    <string name="power_user" msgid="1889728099253018005">"ಬಳಕೆದಾರ"</string>
+    <string name="power_user" msgid="3706143225319881667">"ಇತರ ಬಳಕೆದಾರರು"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU ಮೊತ್ತ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ಮುನ್ನೆಲೆ"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ಎಚ್ಚರವಾಗಿಡಿ"</string>
@@ -2004,6 +2075,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ಅಧಿಕ ಗಣನೆಯ ಪವರ್ ಬಳಕೆ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> ಕಾಲ ಬಳಸಲಾಗಿದೆ"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"<xliff:g id="TIME">^1</xliff:g> ಗಾಗಿ ಸಕ್ರಿಯ"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"ಸ್ಕ್ರೀನ್ ಬಳಕೆ <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ಬಳಸುತ್ತಿರುವುದು <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"ಒಟ್ಟು ಬ್ಯಾಟರಿಯ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2563,7 +2635,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"ಪಿನ್‌ ಬದಲಾಯಿಸಿ"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸು"</string>
     <string name="help_label" msgid="6886837949306318591">"ಸಹಾಯ,ಪ್ರತಿಕ್ರಿಯೆ"</string>
-    <string name="support_summary" msgid="8276116616493882830">"ಸಹಾಯ ಲೇಖನಗಳು, ಫೋನ್ ಮತ್ತು ಚಾಟ್‌ ಬೆಂಬಲ"</string>
+    <string name="support_summary" msgid="2705726826263742491">"ಸಹಾಯ ಲೇಖನಗಳು, ಫೋನ್ ಮತ್ತು ಚಾಟ್‌ ಪ್ರಾರಂಭಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="user_account_title" msgid="1127193807312271167">"ವಿಷಯಕ್ಕಾಗಿ ಖಾತೆ"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ಫೋಟೋ ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"ತೀವ್ರ ಬೆದರಿಕೆಗಳು"</string>
@@ -2653,9 +2725,12 @@
       <item quantity="other">%d ಮರೆಮಾಡಲಾದ ಐಟಂಗಳನ್ನು ತೋರಿಸಿ</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ನೆಟ್‌ವರ್ಕ್ ಮತ್ತು ಇಂಟರ್ನೆಟ್"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"ವೈಫೈ, ಮೊಬೈಲ್, ಡೇಟಾ ಬಳಕೆ, ಹಾಟ್‌ಸ್ಪಾಟ್"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ಮೊಬೈಲ್‌‌"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ಡೇಟಾ ಬಳಕೆ"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ಹಾಟ್‌ಸ್ಪಾಟ್"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ಸಂಪರ್ಕಗೊಂಡಿರುವ ಸಾಧನಗಳು"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"ಬ್ಲೂಟೂತ್, ಬಿತ್ತರಿಸುವಿಕೆ, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"ಬ್ಲೂಟೂತ್, ಬಿತ್ತರಿಸುವಿಕೆ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ಆಪ್‌ಗಳು ಮತ್ತು ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ಅನುಮತಿಗಳು, ಡಿಫಾಲ್ಟ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"ಬಳಕೆದಾರರು ಮತ್ತು ಖಾತೆಗಳು"</string>
@@ -2708,6 +2783,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"ಗೆಸ್ಚರ್"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ಪಾವತಿಸಿ, ಟ್ಯಾಪ್ ಮಾಡಿ, ಪಾವತಿಗಳು"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ಬ್ಯಾಕಪ್, ಬ್ಯಾಕ್ ಅಪ್"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"ಗೆಸ್ಚರ್, ಅಂಚು, ಭಾಗ, ಸಕ್ರಿಯ ಅಂಚು, ಸ್ಕ್ವೀಜ್‌‌, ಹಿಡಿತ, ಸಹಾಯ, ಸಹಾಯಕ ಪುಟ, ಸ್ಕ್ವೀಜಿ, ಸ್ಕ್ವೀಜಿ, ಸ್ಕ್ವೀಜಿ, ಸ್ಕ್ವೀಜಿ, Ok Google, Google ಸಹಾಯಕ ಪುಟಗಳು"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"ಗೆಸ್ಚರ್, ಎಚ್ಚರಿಸಿ, ಅಧಿಸೂಚನೆಗಳು, ಪರದೆ, ಡಿಸ್‌ಪ್ಲೇ, ಪರದೆ ಆಫ್, ಪರದೆ ಆನ್‌, ಸ್ಕ್ವೀಜ್‌, ಅಂಚು, ಮಲಗಿರುವ, ನಿದ್ರೆ, ಹಿಡಿತ"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"ಗೆಸ್ಚರ್, ನಿಶ್ಯಬ್ದ, ಸ್ನೂಜ್, ಅಲಾರಮ್, ಒಳಬರುವ ಕರೆ, ಮೌನ, ಡಿಸ್‌ಪ್ಲೇ, ಪರದೆ ಲಾಕ್, ಸ್ಕ್ವೀಜ್‌‌, ಹಿಡಿತ, ಅಂಚು, ನಿಲ್ಲಿಸಿ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ವೈ-ಫೈ NFC ಟ್ಯಾಗ್‌ ಹೊಂದಿಸಿ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ಬರೆಯಿರಿ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ಬರೆಯಲು ಟ್ಯಾಗ್‌ ಅನ್ನು ಟ್ಯಾಪ್‌ ಮಾಡಿ..."</string>
@@ -2790,7 +2868,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"ಕೆಲಸದ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಬೇಡ"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"ನಿಮ್ಮ ಸಾಧನವು ಲಾಕ್‌ ಆಗಿರುವಾಗ, ನೀವು ಪ್ರೊಫೈಲ್‌ ಅಧಿಸೂಚನೆಗಳನ್ನು ಹೇಗೆ ತೋರಿಸಲು ಬಯಸುವಿರಿ?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"ಪ್ರೊಫೈಲ್‌ ಅಧಿಸೂಚನೆಗಳು"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"ಅಧಿಸೂಚನೆಗಳು"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"ಅಧಿಸೂಚನೆಗಳು"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"ಅಪ್ಲಿಕೇಶನ್‌ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"ಅಧಿಸೂಚನೆ ವರ್ಗ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"ಪ್ರಾಮುಖ್ಯತೆ"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"ಅಪ್ಲಿಕೇಶನ್‌ ನಿರ್ಧರಿಸಲು ಬಿಡಿ"</string>
@@ -2805,6 +2884,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"ತುರ್ತು"</string>
     <string name="allow_sound" msgid="1820188704793497324">"ಧ್ವನಿಗೆ ಅನುಮತಿ ನೀಡಿ"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"ಪ್ರಸ್ತುತ ಪರದೆಯಲ್ಲಿ ಈ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಲು ಧ್ವನಿ, ವೈಬ್ರೇಷನ್ ಅಥವಾ ಇಣುಕು ನೋಟ ಮಾಡಬೇಡ."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"ಕಡಿಮೆ ಪ್ರಾಮುಖ್ಯತೆ"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"ಮಧ್ಯಮ ಪ್ರಾಮುಖ್ಯತೆ"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"ಉನ್ನತ ಪ್ರಾಮುಖ್ಯತೆ"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"ತುರ್ತು ಪ್ರಾಮುಖ್ಯತೆ"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"ಅಧಿಸೂಚನೆ ಸಹಾಯಕ"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"ಅಧಿಸೂಚನೆ ಪ್ರವೇಶ"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್‌ ಅಧಿಸೂಚನೆಗಳಿಗೆ ಪ್ರವೇಶವನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
@@ -2832,8 +2915,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ಚಿತ್ರದಲ್ಲಿ ಚಿತ್ರ"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"ಚಿತ್ರದಲ್ಲಿ ಚಿತ್ರಕ್ಕೆ ಅನುಮತಿಸಿ"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"ನೀವು ಈ ಅಪ್ಲಿಕೇಶನ್ ತೊರೆದ ಬಳಿಕ (ಉದಾಹರಣೆಗೆ, ವೀಡಿಯೊ ನೋಡಲು), ಅಪ್ಲಿಕೇಶನ್ ತೆರೆದೇ ಇರುವಾಗ ಚಿತ್ರದಲ್ಲಿ ಚಿತ್ರ ವಿಂಡೋ ರಚಿಸಲು ಈ ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿ ನೀಡಿ. ನೀವು ಬಳಸುವ ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಮೇಲೆ ಈ ವಿಂಡೋ ಡಿಸ್‌ಪ್ಲೇ ಆಗುತ್ತದೆ."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"ಹೌದು"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"ಇಲ್ಲ"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪ್ರವೇಶ"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ಸ್ಥಾಪಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಯಾವುದೇ ಅಡಚಣೆ ಮಾಡಬೇಡಿಗೆ ಪ್ರವೇಶ ವಿನಂತಿಸಿಲ್ಲ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
@@ -2964,11 +3045,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ಈ ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ ಅನ್ನು ಇವರು ನಿರ್ವಹಿಸುತ್ತಿದ್ದಾರೆ:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> ಮೂಲಕ ನಿರ್ವಹಿಸಲಾಗಿದೆ"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ಪ್ರಾಯೋಗಿಕ)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"ಸಾಧನ ತಿರುಗಿಸುವಿಕೆ"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"ಪರದೆಯಲ್ಲಿನ ವಿಷಯ ತಿರುಗಿಸು"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"ಪೋಟ್ರೇಟ್‌‌ ವೀಕ್ಷಣೆಯಲ್ಲಿರು"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ಲ್ಯಾಂಡ್‌ಸ್ಕೇಪ್ ವೀಕ್ಷಣೆಯಲ್ಲಿ ಉಳಿಯಿರಿ"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ಪ್ರಸ್ತುತ ಓರಿಯಂಟೇಶನ್‌ನಲ್ಲಿ ಉಳಿಯಿರಿ"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"ಸುರಕ್ಷಿತ ಆರಂಭ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ಮುಂದುವರಿಸು"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"ನಿಮ್ಮ ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು, ನಿಮ್ಮ ಪಿನ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಸುರಕ್ಷೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ, ನೀವು ಅಲಾರ್ಮ್‌ಗಳೂ ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನದಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ಪಿನ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವುದೇ?"</string>
@@ -2976,7 +3052,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ಈ ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ ಈ ಸಾಧನಕ್ಕೆ ಹೆಚ್ಚಿನ ಸಂರಕ್ಷಣೆ ನೀಡಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭವಾಗುವವರೆಗೆ ನೀವು ಅಲಾರ್ಮ್‌ಗಳು ಸೇರಿದಂತೆ ಕರೆಗಳನ್ನು, ಸಂದೇಶಗಳನ್ನು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ಸಹಾಯ ಮಾಡುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು, ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವುದೇ?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಬಳಸುವುದು ಮಾತ್ರವಲ್ಲದೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಿನ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ ಈ ಸಾಧನಕ್ಕೆ ಹೆಚ್ಚಿನ ಸುರಕ್ಷೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ, ನೀವು ಅಲಾರ್ಮ್‌ಗಳೂ ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ಪಿನ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಗೊಳಿಸುವುದೇ?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಬಳಸುವುದರ ಜೊತೆಗೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ವಿನ್ಯಾಸ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಸುರಕ್ಷೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರ್ಮ್‌ಗಳೂ ಸೇರಿದಂತೆ ಯಾವುದೇ ಕರೆಗಳು, ಸಂದೇಶಗಳು, ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ವಿನ್ಯಾಸ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವುದೇ?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಬಳಸುವುದು ಮಾತ್ರವಲ್ಲದೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಸುರಕ್ಷೆ ಒದಗಿಸಬಹುದು. ಸಾಧನವು ಪ್ರಾರಂಭವಾಗುವವರೆಗೆ ನೀವು ಅಲಾರ್ಮ್‌ಗಳು ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸುವಾಗ, ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸಿ&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಬಳಸುವುದರ ಜೊತೆಗೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಸುರಕ್ಷೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರ್ಮ್‌ಗಳೂ ಸೇರಿದಂತೆ ಯಾವುದೇ ಕರೆಗಳು, ಸಂದೇಶಗಳು, ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವುದೇ?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"ಹೌದು"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"ಇಲ್ಲ"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN ಅಗತ್ಯವಿದೆಯೇ?"</string>
@@ -3094,6 +3170,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"ಬಳಕೆ ಎಚ್ಚರಿಕೆಗಳು"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"ಸಾಧನದ ಸಂಪೂರ್ಣ ಬಳಕೆಯನ್ನು ತೋರಿಸಿ"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"ಅಪ್ಲಿಕೇಶನ್ ಬಳಕೆಯನ್ನು ತೋರಿಸಿ"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"ಅಧಿಕ ಬಳಕೆ"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಸಹಜವಾಗಿ ವರ್ತಿಸುತ್ತಿವೆ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಸಹಜವಾಗಿ ವರ್ತಿಸುತ್ತಿವೆ</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">ಬ್ಯಾಟರಿ ಕ್ಷೀಣಿಸುವಿಕೆಗೆ ಕಾರಣವಾಗಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು</item>
+      <item quantity="other">ಬ್ಯಾಟರಿ ಕ್ಷೀಣಿಸುವಿಕೆಗೆ ಕಾರಣವಾಗಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
@@ -3186,8 +3271,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"ಇತರ ಅಪ್ಲಿಕೇಶನ್ ಮೇಲೆ ಡಿಸ್‌ಪ್ಲೇ"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> ರಲ್ಲಿ <xliff:g id="COUNT_0">%1$d</xliff:g> ಅಪ್ಲಿಗಳಿಗೆ ಇತರ ಅಪ್ಲಿಗಳ ಮೇಲೆ ಪ್ರದರ್ಶಿಸಲು ಅನುಮತಿಯಿದೆ"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"ಅನುಮತಿಯೊಂದಿಗೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"ಹೌದು"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"ಇಲ್ಲ"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"ಅನುಮತಿಸಲಾಗಿದೆ"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"ಅಪರಿಚಿತ ಮೂಲದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಸ್ಥಾಪನೆ"</string>
     <string name="write_settings" msgid="4797457275727195681">"ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್‍ಗಳನ್ನು ಮಾರ್ಪಡಿಸಿ"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"ಸಿಸ್ಟಂ‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮಾರ್ಪಡಿಸಿ ಬರೆಯಿರಿ"</string>
@@ -3277,6 +3362,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"ಪರದೆಯನ್ನು ಆಂಬರ್ ಬಣ್ಣದಿಂದ ಟಿಂಟ್ ಮಾಡಲಾಗಿದೆ. ಇದು ನಿಮಗೆ ನಿದ್ರಿಸಲು ಸಹಾಯ ಮಾಡಬಹುದು."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"ಸಲಹೆಗಳು"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> ಹೆಚ್ಚು"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <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="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <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="suggestion_remove" msgid="904627293892092439">"ತೆಗೆದುಹಾಕಿ"</string>
     <string name="color_temperature" msgid="2070126836910615605">"ತಂಪು ಬಣ್ಣದ ತಾಪಮಾನ"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ತಂಪಾದ ಪ್ರದರ್ಶನ ಬಣ್ಣಗಳನ್ನು ಬಳಸಿ"</string>
@@ -3295,8 +3389,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> ಡೇಟಾ ಎಚ್ಚರಿಕೆ"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> ಡೇಟಾ ಎಚ್ಚರಿಕೆ / <xliff:g id="ID_2">%2$s</xliff:g> ಡೇಟಾ ಮಿತಿ"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"ಬಿಲ್ಲಿಂಗ್ ಸೈಕಲ್‌‌"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"ಪ್ರತಿ ತಿಂಗಳ <xliff:g id="ID_1">%1$s</xliff:g> ರಂದು ಮಾಸಿಕ ಸೈಕಲ್ ಆರಂಭವಾಗುತ್ತದೆ"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"<xliff:g id="ID_1">%1$s</xliff:g> ರಿಂದ ಮಾಸಿಕ ಆರಂಭ"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"ಮಾಸಿಕವಾಗಿ <xliff:g id="ID_1">%1$s</xliff:g> ರಂದು"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"ನೆಟ್‌ವರ್ಕ್ ನಿರ್ಬಂಧಗಳು"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> ನಿರ್ಬಂಧಗಳು</item>
@@ -3316,7 +3409,7 @@
       <item quantity="other">ಡೇಟಾ ಉಳಿಸುವಿಕೆಯು ಆನ್ ಆಗಿರುವಾಗ ಅನಿರ್ಬಂಧಿಸಿದ ಡೇಟಾವನ್ನು ಬಳಸಲು <xliff:g id="COUNT">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಅನುಮತಿಸಲಾಗಿದೆ</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"ಡೇಟಾ ಸೇವರ್"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"ಅನಿರ್ಬಂಧಿಸಿದ ಡೇಟಾ ಪ್ರವೇಶ"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"ಅನಿಯಂತ್ರಿತ ಡೇಟಾ"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"ಹಿನ್ನೆಲೆ ಡೇಟಾವನ್ನು ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"ಆನ್"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"ಆಫ್"</string>
@@ -3380,8 +3473,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"ಲಾಕ್‌ ಪರದೆಯ ಅಧಿಸೂಚನೆಗಳನ್ನು ನಿಯಂತ್ರಿಸಿ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"ಅಧಿಸೂಚನೆಯ ವಿಷಯವನ್ನು ತೋರಿಸು ಅಥವಾ ಮರೆಮಾಡು"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"ಎಲ್ಲಾ"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"ಬೆಂಬಲ"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"ಬೆಂಬಲ ಮತ್ತು ಸಲಹೆಗಳು"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ಚಿಕ್ಕದಾದ ಅಗಲ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ಯಾವುದೇ ಸ್ಥಾಪಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಪ್ರೀಮಿಯಂ SMS ಪ್ರವೇಶವನ್ನು ವಿನಂತಿಸಿಲ್ಲ"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ಪ್ರೀಮಿಯಂ SMS ನಿಮ್ಮ ವೆಚ್ಚಗಳಿಗೆ ಕಾರಣವಾಗಬಹುದು ಮತ್ತು ಇದನ್ನು ನಿಮ್ಮ ವಾಹಕ ಬಿಲ್‌ಗಳಿಗೆ ಸೇರಿಸಲಾಗುತ್ತದೆ. ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಯನ್ನು ಸಕ್ರೀಯಗೊಳಿಸಿದರೆ, ನೀವು ಆ ಅಪ್ಲಿಕೇಶನ್‌ ಬಳಸಿಕೊಂಡು ಪ್ರೀಮಿಯಂ SMS ಕಳುಹಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ."</string>
@@ -3446,28 +3538,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ಸ್ವಯಂಚಾಲಿತ"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ಹಸ್ತಚಾಲಿತ"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"ಈಗ ಸ್ಥಳಾವಕಾಶವನ್ನು ಮುಕ್ತಗೊಳಿಸಿ"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"ಗೆಸ್ಚರ್‌ಗಳು"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"ಗೆಸ್ಚರ್ ಶಾರ್ಟ್‌ಕಟ್‌ಗಳು"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"ನಿಮ್ಮ ಫೋನ್ ನಿಯಂತ್ರಿಸಲು ತ್ವರಿತ ಸನ್ನೆಗಳು"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ನಿಯಂತ್ರಿಸಲು ತ್ವರಿತ ಗೆಸ್ಚರ್‌ಗಳು"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ನಿಯಂತ್ರಿಸಲು ತ್ವರಿತ ಗೆಸ್ಚರ್‌ಗಳು"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"ಕ್ಯಾಮರಾಗೆ ಹೋಗಿ"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"ಕ್ಯಾಮರಾವನ್ನು ತ್ವರಿತವಾಗಿ ತೆರೆಯಲು, ಎರಡು ಬಾರಿ ಪವರ್ ಬಟನ್ ಒತ್ತಿ. ಯಾವುದೇ ಪರದೆಯಿಂದ ಕೆಲಸ ಮಾಡುತ್ತದೆ."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"ತ್ವರಿತವಾಗಿ ಕ್ಯಾಮರಾ ತೆರೆಯಿರಿ"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"ಕ್ಯಾಮರಾ ತೆರೆಯಲು ಪವರ್ ಬಟನ್ ಅನ್ನು ಎರಡು ಬಾರಿ ಒತ್ತಿ"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ಫ್ಲಿಪ್ ಕ್ಯಾಮರಾ"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"ವೇಗವಾಗಿ ಸೆಲ್ಫೀ‌ಗಳನ್ನು ತೆಗೆಯಿರಿ"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"ಸೆಲ್ಫೀ ಮೋಡ್‌ಗಾಗಿ ಫೋನ್‌ ಅನ್ನು ಎರಡು ಬಾರಿ ತಿರುಗಿಸಿ"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"ಸೆಲ್ಫೀ ಮೋಡ್‌ಗಾಗಿ ಟ್ಯಾಬ್ಲೆಟ್‌ ಅನ್ನು ಎರಡು ಬಾರಿ ತಿರುಗಿಸಿ"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"ಸೆಲ್ಫೀ ಮೋಡ್‌ಗಾಗಿ ಸಾಧನವನ್ನು ಎರಡು ಬಾರಿ ತಿರುಗಿಸಿ"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"ಫೋನ್ ಅನ್ನು ಪರಿಶೀಲಿಸಲು ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ಟ್ಯಾಬ್ಲೆಟ್ ಪರಿಶೀಲಿಸಲು ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"ಸಾಧನವನ್ನು ಪರಿಶೀಲಿಸಲು ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳನ್ನು ತ್ವರಿತವಾಗಿ ಪರೀಕ್ಷಿಸಲು, ನಿಮ್ಮ ಪರದೆಯ ಮೇಲೆ ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"ಸಮಯ, ಅಧಿಸೂಚನೆ ಐಕಾನ್‌ಗಳು ಮತ್ತು ಇತರೆ ಮಾಹಿತಿಗಳನ್ನು ಪರಿಶೀಲಿಸಲು ನಿಮ್ಮ ಪರದೆಯ ಮೇಲೆ ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"ಪರದೆ ಆಫ್ ಆಗಿರುವಾಗ ಅಧಿಸೂಚನೆಗಳನ್ನು ಪರಿಶೀಲಿಸಿ"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ಫೋನ್‌ ಪರಿಶೀಲಿಸಲು ಕೈಗೆತ್ತಿಕೊಳ್ಳಿ"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ಟ್ಯಾಬ್ಲೆಟ್ ಪರಿಶೀಲಿಸಲು ಎತ್ತಿರಿ"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"ಸಾಧನ ಪರಿಶೀಲಿಸಲು ಕೈಗೆತ್ತಿಕೊಳ್ಳಿ"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳನ್ನು ತ್ವರಿತವಾಗಿ ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಫೋನ್ ತೆಗೆದುಕೊಳ್ಳಿ."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳನ್ನು ತ್ವರಿತವಾಗಿ ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ತೆಗೆದುಕೊಳ್ಳಿ."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"ತ್ವರಿತವಾಗಿ ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳನ್ನು ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಸಾಧನವನ್ನು ತೆಗೆದುಕೊಳ್ಳಿ."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"ಸಮಯ, ಅಧಿಸೂಚನೆ ಐಕಾನ್‌ಗಳು ಮತ್ತು ಇತರೆ ಮಾಹಿತಿಗಳನ್ನು ಪರಿಶೀಲಿಸಲು ನಿಮ್ಮ ಫೋನ್‌ ತೆಗೆದುಕೊಳ್ಳಿ."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"ಸಮಯ, ಅಧಿಸೂಚನೆ ಐಕಾನ್‌ಗಳು ಮತ್ತು ಇತರೆ ಮಾಹಿತಿಗಳನ್ನು ಪರಿಶೀಲಿಸಲು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ತೆಗೆದುಕೊಳ್ಳಿ."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"ಸಮಯ, ಅಧಿಸೂಚನೆ ಐಕಾನ್‌ಗಳು ಮತ್ತು ಇತರ ಮಾಹಿತಿಯನ್ನು ಪರಿಶೀಲಿಸಲು ನಿಮ್ಮ ಸಾಧನವನ್ನು ತೆಗೆದುಕೊಳ್ಳಿ."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"ಪರದೆ ಆಫ್ ಆಗಿರುವಾಗ ಅಧಿಸೂಚನೆಗಳನ್ನು ಪರಿಶೀಲಿಸಿ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"ಅಧಿಸೂಚನೆಗೆ ಬೆರಳಚ್ಚು ಬಳಸಿ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಫೋನ್ ಹಿಂಭಾಗದಲ್ಲಿನ ಬೆರಳಚ್ಚು ಸೆನ್ಸರ್‌ನಲ್ಲಿ ಕೆಳಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳನ್ನು ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಹಿಂಬದಿಯಲ್ಲಿನ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್‌ನಲ್ಲಿ ಕೆಳಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಸಾಧನದ ಹಿಂಭಾಗದಲ್ಲಿನ ಬೆರಳಚ್ಚು ಸೆನ್ಸರ್‌ನಲ್ಲಿ ಕೆಳಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"ತ್ವರಿತವಾಗಿ ಅಧಿಸೂಚನೆಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್‌ನ ಕೆಳಗೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"ಕ್ಯಾಮರಾವನ್ನು ತೆರೆಯಲು ಎತ್ತಿಹಿಡಿಯಿರಿ"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಕ್ಯಾಮರಾ ತೆರೆಯಲು, ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಫೋಟೋ ತೆಗೆಯುವ ರೀತಿಯಲ್ಲಿ ಮೇಲಕ್ಕೆ ಎತ್ತಿರಿ (ಲ್ಯಾಂಡ್‌ಸ್ಕೇಪ್ ಅಥವಾ ಪೋಟ್ರೇಟ್). ನಿಮ್ಮ ಫೋನ್ ಸ್ಲೀಪ್ ಅಥವಾ ಲಾಕ್ ಆಗಿದ್ದಾಗ ಕೆಲಸ ಮಾಡುತ್ತದೆ."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"ಫೋನ್ ಸ್ಲೀಪ್ ಮೋಡ್‌ನಲ್ಲಿರುವಾಗ ಅಥವಾ ಲಾಕ್ ಆಗಿದ್ದಾಗ ಫೋಟೋಗಳನ್ನು ತೆಗೆಯಿರಿ"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"ನೆರವು ಗೆಸ್ಚರ್"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"ಸೂಕ್ಷ್ಮತೆ"</string>
@@ -3571,6 +3676,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"ಈ ತತ್‌ಕ್ಷಣ ಅಪ್ಲಿಕೇಶನ್ ತೆಗೆದುಹಾಕಲು ಬಯಸುವಿರಾ?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"ಗೇಮ್‌ಗಳು"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ಆಡಿಯೋ ಫೈಲ್‌ಗಳು"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"ಬಳಸಿರುವ ಸ್ಥಳ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> ಬಳಕೆದಾರರಿಗೆ ಅಸ್ಥಾಪಿಸಲಾಗಿದೆ)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> ಬಳಕೆದಾರರಿಗೆ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"ಸ್ವಯಂತುಂಬುವಿಕೆ ಸೇವೆ"</string>
@@ -3584,5 +3690,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"ತತ್‌ಕ್ಷಣದ ಅಪ್ಲಿಕೇಶನ್"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"ಸಂಗ್ರಹಣೆ ನಿರ್ವಾಹಕವನ್ನು ಆಫ್ ಮಾಡುವುದೇ?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"ಚಲನಚಿತ್ರ ಮತ್ತು ಟಿವಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"ಬಳಸಿರುವ ಸ್ಥಳ"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"ವಾಹಕ ಪೂರೈಕೆಯ ಮಾಹಿತಿ"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ಟ್ರಿಗ್ಗರ್ ವಾಹಕ ಪೂರೈಕೆ"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"ಆಕರ್ಷಕವಾಗಿ ಮತ್ತು ಹೊಸದಾಗಿ ಏನಿದೆ?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ಟಾಪ್ 5 ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಪರಿಶೀಲಿಸಿ"</string>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 52d8d59..f59cdf7 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"좋음"</item>
     <item msgid="8986346415847956850">"우수함"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"항상"</item>
-    <item msgid="844721238536786870">"충전 중인 경우에만"</item>
-    <item msgid="1986753720941888596">"안함"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"항상"</item>
-    <item msgid="7433294150916905997">"충전 중인 경우에만"</item>
-    <item msgid="1390404486722375028">"안함"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"최근 30일"</item>
     <item msgid="6600989128423965319">"사용 주기 설정..."</item>
@@ -303,7 +293,7 @@
     <item msgid="7222837656938871633">"SIP 사용"</item>
     <item msgid="6108267038969274380">"발신 전화 처리"</item>
     <item msgid="4823402479973873358">"지문"</item>
-    <item msgid="5895843015407713543">"신체 센서"</item>
+    <item msgid="5895843015407713543">"인체 감지 센서"</item>
     <item msgid="1436446526955010826">"셀 브로드캐스트 읽기"</item>
     <item msgid="884172201575690484">"가상 위치"</item>
     <item msgid="3591971310048485247">"저장용량 읽기"</item>
@@ -370,7 +360,7 @@
     <item msgid="864565065016166003">"SIP 사용"</item>
     <item msgid="1958009349883195116">"발신 전화 처리"</item>
     <item msgid="8526563410140613458">"지문"</item>
-    <item msgid="7864822459293570891">"신체 센서"</item>
+    <item msgid="7864822459293570891">"인체 감지 센서"</item>
     <item msgid="6798698496904810960">"셀 브로드캐스트 읽기"</item>
     <item msgid="5242052845700875820">"가상 위치"</item>
     <item msgid="1246296877820358565">"저장용량 읽기"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8cf4fc3..3f5e4f4 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"개발자가 되셨습니다."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"이미 개발자입니다."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"먼저 개발자 옵션을 사용 설정하세요."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"무선 및 네트워크"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"연결"</string>
     <string name="header_category_device" msgid="4544026001618307754">"기기"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE 프로비저닝됨"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"화상 통화 프로비저닝됨"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi 통화 프로비저닝됨"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/상태 프로비저닝됨"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"모바일 무선 전력"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM 주소록 보기"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"발신 허용 번호 보기"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"장치 검색"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"기기 이름 변경"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"이름 바꾸기"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"연결을 해제하시겠습니까?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;와(과) 연결이 끊어집니다.&lt;br&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"기기 연결을 해제하겠습니까?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>에서 휴대전화가 연결 해제됩니다."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>에서 태블릿이 연결 해제됩니다."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>에서 기기가 연결 해제됩니다."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"연결 해제"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"블루투스 설정을 변경할 권한이 없습니다."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"새 기기와 페어링"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"블루투스 설정이 열려 있는 동안 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>이(가) 주변의 기기에 표시됩니다."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"휴대전화 블루투스 주소: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"태블릿 블루투스 주소: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"기기 블루투스 주소: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>을(를) 연결 해제하시겠습니까?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"브로드캐스팅"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"프로필을 사용 중지하시겠습니까?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"블루투스 페어링 요청"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"페어링 요청"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>에 페어링하려면 탭하세요."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"받은 파일 보기"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"받은 파일"</string>
     <string name="device_picker" msgid="4978696506172252813">"블루투스 기기 선택"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g>에서 블루투스를 사용 설정하려고 합니다."</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g>에서 블루투스를 사용 중지하려고 합니다."</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s이(가) 메시지에 액세스하려고 합니다. %2$s에 액세스 권한을 제공하시겠습니까?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM 액세스 요청"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>이(가) SIM 카드에 액세스하려고 합니다. SIM 카드에 대한 액세스를 허용하면 연결되어 있는 동안 기기의 데이터 연결이 비활성화됩니다. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>에 액세스 권한을 부여하세요."</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"다른 기기에 \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'(으)로 표시"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"내 기기"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"새 기기와 페어링"</string>
     <string name="date_and_time" msgid="9062980487860757694">"날짜 및 시간"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"시간대 선택"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"계정"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"위치"</string>
     <string name="account_settings_title" msgid="626177544686329806">"계정"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"보안 및 위치 정보"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"보안 및 위치"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"암호화 및 사용자 인증 정보"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"휴대전화 암호화됨"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"기기가 암호화됨"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"지문으로 잠금 해제"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"지문 사용"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"지문 센서를 터치하기만 하면 휴대전화를 잠금 해제하거나 구매를 승인하거나 앱에 로그인할 수 있습니다. 휴대전화에 지문이 추가된 사용자 누구나 이러한 작업을 수행할 수 있으므로 누구의 지문을 추가할지 신중하게 선택하세요.\n\n참고: 지문은 강력한 패턴 또는 PIN보다 보안이 취약합니다."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"지문 센서를 터치하여 구매를 승인하거나 앱에 로그인하세요. 지문을 추가할 때 주의하시기 바랍니다. 지문이 추가된 사용자 누구나 다음 작업을 모두 수행할 수 있습니다.\n\n참고: 지문으로 기기를 잠금 해제할 수 없습니다. 자세한 내용은 조직의 관리자에게 문의하세요."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"지문 센서를 터치하기만 하면 휴대전화를 잠금 해제하거나 구매를 승인하거나 앱에 로그인할 수 있습니다. 휴대전화에 지문이 추가된 사용자 누구나 이러한 작업을 수행할 수 있으므로 누구의 지문을 추가할지 신중하게 선택하세요.\n\n참고: 지문은 강력한 패턴 또는 PIN보다 보안이 취약합니다."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"지문을 사용하여 휴대전화를 잠금 해제하거나 구매를 승인하세요.\n\n참고: 이 기기는 지문을 사용하여 잠금 해제할 수 없습니다. 자세한 내용은 조직의 관리자에게 문의하세요."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"지문을 사용하여 휴대전화를 잠금 해제하거나 구매를 승인하세요.\n\n참고: 지문은 안전한 패턴 또는 PIN보다 보안 수준이 낮을 수 있습니다."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"취소"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"계속"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"건너뛰기"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"지문 추가"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"기기 보호 기능이 활성화되지 않습니다. 태블릿이 분실, 도난되거나 데이터가 삭제된 경우 다른 사람이 이 태블릿을 사용하는 것을 방지할 수 없습니다."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"기기 보호 기능이 활성화되지 않습니다. 기기가 분실, 도난되거나 데이터가 삭제되는 경우 다른 사람이 이 기기를 사용하는 것을 방지할 수 없습니다."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"기기 보호 기능이 활성화되지 않습니다. 스마트폰이 분실, 도난되거나 데이터가 삭제되는 경우 다른 사람이 이 스마트폰을 사용하는 것을 방지할 수 없습니다."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"기기 보호 기능이 활성화되지 않습니다. 태블릿을 분실하거나 도난당했을 때 다른 사람이 이 태블릿을 사용하는 것을 방지할 수 없습니다."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"기기 보호 기능이 활성화되지 않습니다. 기기를 분실하거나 도난당했을 때 다른 사람이 이 기기를 사용하는 것을 방지할 수 없습니다."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"기기 보호 기능이 활성화되지 않습니다. 스마트폰을 분실하거나 도난당했을 때 다른 사람이 이 스마트폰을 사용하는 것을 방지할 수 없습니다."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"다음"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"기기 보호 기능이 사용 설정되지 않습니다. 분실, 도난 또는 재설정되었을 때 다른 사람이 이 태블릿을 사용하는 것을 방지할 수 없습니다."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"기기 보호 기능이 사용 설정되지 않습니다. 분실, 도난 또는 재설정되었을 때 다른 사람이 이 기기를 사용하는 것을 방지할 수 없습니다."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"기기 보호 기능이 사용 설정되지 않습니다. 분실, 도난 또는 재설정되었을 때 다른 사람이 이 휴대전화를 사용하는 것을 방지할 수 없습니다."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"기기 보호 기능이 사용 설정되지 않습니다. 분실하거나 도난당했을 때 다른 사람이 이 태블릿을 사용하는 것을 방지할 수 없습니다."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"기기 보호 기능이 사용 설정되지 않습니다. 분실하거나 도난당했을 때 다른 사람이 이 기기를 사용하는 것을 방지할 수 없습니다."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"기기 보호 기능이 사용 설정되지 않습니다. 분실하거나 도난당했을 때 다른 사람이 이 휴대전화를 사용하는 것을 방지할 수 없습니다."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"건너뛰기"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"뒤로 이동"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"센서 찾기"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"휴대전화 뒷면에 있는 지문 센서를 찾으세요."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"센서 터치"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"휴대전화 뒷면에 있습니다. 검지를 사용하세요."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"기기와 지문 센서 위치가 포함된 그림"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"이름"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"확인"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"삭제"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"시작"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"센서 터치"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"센서에 손가락을 올리고 진동이 느껴지면 떼세요."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"계속"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"손가락을 살짝 움직여 지문의 다른 부분도 전부 추가하세요."</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"지문이 추가되었습니다."</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"이 아이콘이 표시되면 지문을 사용하여 사용자 본인임을 증명하거나 구매를 승인할 수 있습니다."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"기기의 대기 모드 및 잠금을 해제하려면 지문 센서를 터치하기만 하면 됩니다."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"이 아이콘이 표시되는 경우 구매를 승인하거나 앱에 로그인할 수도 있습니다."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"손가락을 들어 올린 후 다시 터치"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"손가락을 들어 지문의 다른 부분을 추가하세요."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"지문 추가됨"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"이 아이콘이 표시되면 지문을 사용하여 사용자 본인임을 인증하거나 구매를 승인하세요."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"지문 설정을 건너뛰시겠습니까?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"지문으로 휴대전화를 잠금 해제하도록 설정했습니다. 지금 건너뛰면 나중에 설정해야 하며 설정에는 약 1분 정도 소요됩니다."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"화면 잠금 설정"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"완료"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"죄송합니다. 센서가 아닙니다."</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"기기에서 지문 센서를 사용합니다."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"휴대전화 뒷면에 있는 센서를 터치하세요. 검지를 사용하세요."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"등록이 완료되지 않았습니다."</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"지문 파일 등록 제한 시간에 도달했습니다. 다시 시도하세요."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"지문 파일 등록이 되지 않았습니다. 다시 시도하거나 다른 손가락을 사용하세요."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"기기 보호 기능을 활성화하여 다른 사람이 내 허가 없이 이 기기를 사용하는 것을 방지합니다. 사용하려는 화면 잠금을 선택하세요."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"기기 보호 기능을 활성화하여 다른 사람이 내 허가 없이 이 스마트폰을 사용하는 것을 방지합니다. 사용하려는 화면 잠금을 선택하세요."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"백업 화면 잠금 방식 선택"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"화면 잠금 옵션"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"화면 잠금 옵션"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"화면 잠금"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/절전 모드 전환 후 즉시"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/절전 모드 전환 <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> 후"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"잠금해제 패턴 변경"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"잠금해제 PIN 변경"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"잠금해제 비밀번호 변경"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"다시 시도하세요. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>회 중 <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>번째 시도입니다."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"마지막 시도"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"이번 시도에서 잘못된 직장 패턴을 입력하는 경우 직장 프로필과 관련 데이터가 이 기기에서 삭제됩니다."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"이번 시도에서 잘못된 직장 PIN을 입력하는 경우 직장 프로필과 관련 데이터가 이 기기에서 삭제됩니다."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"이번 시도에서 잘못된 직장 비밀번호를 입력하는 경우 직장 프로필과 관련 데이터가 이 기기에서 삭제됩니다."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"잘못된 시도 횟수가 너무 많습니다. 직장 프로필과 관련 데이터가 이 기기에서 삭제됩니다."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"닫기"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"다시 시도하세요. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>회 중 <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>번째 시도입니다."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"데이터가 삭제됨"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"다음번 시도에서 잘못된 패턴을 입력하면 이 기기의 데이터가 삭제됩니다."</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"다음번 시도에서 잘못된 PIN을 입력하면 이 기기의 데이터가 삭제됩니다."</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"다음번 시도에서 잘못된 비밀번호를 입력하면 이 기기의 데이터가 삭제됩니다."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"다음번 시도에서 잘못된 패턴을 입력하면 이 사용자가 삭제됩니다."</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"다음번 시도에서 잘못된 PIN을 입력하면 이 사용자가 삭제됩니다."</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"다음번 시도에서 잘못된 비밀번호를 입력하면 이 사용자가 삭제됩니다."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"다음번 시도에서 잘못된 패턴을 입력하면 직장 프로필 및 관련 데이터가 삭제됩니다."</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"다음번 시도에서 잘못된 PIN을 입력하면 직장 프로필 및 관련 데이터가 삭제됩니다."</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"다음번 시도에서 잘못된 비밀번호를 입력하면 직장 프로필 및 관련 데이터가 삭제됩니다."</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"잘못된 시도 횟수가 너무 많습니다. 이 기기의 데이터는 삭제됩니다."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"잘못된 시도 횟수가 너무 많습니다. 이 사용자는 삭제됩니다."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"잘못된 시도 횟수가 너무 많습니다. 이 직장 프로필 및 관련 데이터는 삭제됩니다."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"닫기"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"<xliff:g id="COUNT">%d</xliff:g>자 이상이어야 합니다."</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN은 <xliff:g id="COUNT">%d</xliff:g>자 이상이어야 합니다."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"계속"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"고급 블루투스"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"기기에서 블루투스가 켜져 있으면 주변의 다른 블루투스 기기와 통신할 수 있습니다."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"위치 정확도 개선을 위해 시스템 앱과 서비스에서 블루투스 기기를 계속 감지할 수 있습니다. <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>검색 설정<xliff:g id="LINK_END_1">LINK_END</xliff:g>에서 설정을 변경할 수 있습니다."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"연결할 수 없습니다. 다시 시도해 주세요."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"기기 세부정보"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"기기 블루투스 주소: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"기기를 지우시겠습니까?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"휴대전화가 더 이상 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>과(와) 페어링되지 않습니다."</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"태블릿이 더 이상 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>과(와) 페어링되지 않습니다."</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"기기가 더 이상 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>과(와) 페어링되지 않습니다."</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"기기 지우기"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"연결..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 미디어 오디오의 연결이 끊어집니다."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 핸즈프리 오디오의 연결이 끊어집니다."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"제공하지 않음"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"확인하지 않음"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"지정한 인증서가 없습니다. 비공개로 연결되지 않습니다."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"네트워크 이름이 너무 깁니다."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"도메인을 지정해야 합니다."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS 사용 가능"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS 사용 가능)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">네트워크 1개</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"고급 Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wi‑Fi 설정"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC 주소"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP 주소"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"서브넷 마스크"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"이 그룹을 삭제할까요?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"휴대용 Wi-Fi 핫스팟"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi 핫스팟"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"모바일 연결로 Wi‑Fi 네트워크 제공"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"태블릿의 인터넷 연결을 핫스팟을 통해 공유하고 있지 않음"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"휴대전화의 인터넷 연결을 핫스팟을 통해 공유하고 있지 않음"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"다른 기기와 인터넷 또는 콘텐츠를 공유하지 않음"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"핫스팟을 통해 태블릿의 인터넷 연결 공유 중"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"핫스팟을 통해 휴대전화의 인터넷 연결 공유 중"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"앱에서 콘텐츠를 공유하지 않습니다. 인터넷 연결을 공유하려면 핫스팟을 껐다가 켜세요."</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi 이름"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> 켜는 중..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"다른 기기에서 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>에 연결할 수 있습니다."</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi 비밀번호"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP 대역"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"핫스팟을 사용하여 다른 기기에서 사용할 수 있는 Wi‑Fi 네트워크를 만드세요. 핫스팟은 내 모바일 데이터 연결을 사용하여 인터넷을 제공합니다. 추가 모바일 데이터 요금이 부과될 수 있습니다."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"앱에서 핫스팟을 만들어 주변 기기와 콘텐츠를 공유할 수 있습니다."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"핫스팟 켜는 중…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"핫스팟 끄는 중…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g>이(가) 활성화됨"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi 통화가 켜져 있으면 휴대전화에서 환경설정과 신호 강도에 따라 Wi-Fi 네트워크나 데이터 네트워크를 통해 통화를 연결할 수 있습니다. 이 기능을 사용하기 전에 이동통신사에 문의하여 요금과 기타 세부정보를 알아보세요."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"긴급 주소 업데이트"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Wi-Fi를 통해 119에 전화를 걸 때 응급 서비스에서 내 위치로 사용한 주소"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"디스플레이"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"검색결과 없음"</string>
     <string name="display_settings" msgid="7965901687241669598">"디스플레이"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"자동 화면 회전"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"선명한 색상"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"태블릿 회전 시 자동으로 방향 바꾸기"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"휴대전화 회전 시 자동으로 방향 바꾸기"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"태블릿 회전 시 자동으로 방향 바꾸기"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"주변의 밝기에 맞춰 밝기 수준을 최적화합니다. 이 기능이 사용 설정되어 있는 동안에도 밝기를 일시 조정할 수 있습니다."</string>
     <string name="night_display_title" msgid="2626451512200357686">"야간 조명"</string>
     <string name="night_display_text" msgid="1837277457033025056">"야간 조명을 사용하면 밤에 화면이 황색광으로 표시되어 희미한 빛에서도 편안하게 읽을 수 있으며 수면 방해 효과가 줄어듭니다."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"예약"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"상태"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"자동으로 사용 설정"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"안함"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"맞춤 일정"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"화면 밝기 자동 설정"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"예약"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"없음"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"맞춤 시간에 켜짐"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"일몰부터 일출까지 사용"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"시작 시간"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"종료 시간"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"상태"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"강도"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"끔 - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"자동으로 켜지 않음"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g>에 자동으로 켬"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"어두워지면 자동으로 켬"</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"켬 - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"자동으로 끄지 않음"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g>에 자동으로 끔"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"밝아지면 자동으로 끔"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"끔/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"자동으로 켜지 않음"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g>에 자동으로 켜짐"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"일몰에 자동으로 켜짐"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"켬/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"자동으로 끄지 않음"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g>에 자동으로 꺼짐"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"일출에 자동으로 꺼짐"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"절전 모드"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"화면이 꺼짐"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 이상 동작이 없을 때"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"설정"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"자동 밝기"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"기기를 들어 대기 모드 해제"</string>
-    <string name="doze_title" msgid="2259176504273878294">"절전 모드 자동 해제"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"절전 모드 자동 해제"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"항상 사용"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"새로운 알림"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"표시 시점"</string>
+    <string name="doze_title" msgid="2375510714460456687">"새로운 알림"</string>
     <string name="doze_summary" msgid="3846219936142814032">"알림을 수신하면 절전 모드를 해제합니다."</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"항상 사용"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"시간, 알림 아이콘 등의 정보 표시"</string>
     <string name="title_font_size" msgid="4405544325522105222">"글꼴 크기"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"텍스트를 확대 또는 축소"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 카드 잠금 설정"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN을 비워둘 수 없습니다."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC는 3자리 숫자여야 합니다."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC는 2~3자리 숫자여야 합니다."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"이동통신사에서 %s 유형의 APN을 추가하도록 허용하지 않습니다."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"기본 APN 설정 복원 중"</string>
     <string name="menu_restore" msgid="8260067415075573273">"초기화"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"기본 APN 설정을 초기화했습니다."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD 카드 지우기"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"내부 USB 저장소에 있는 모든 데이터(예: 음악 또는 사진)를 지웁니다."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD 카드에 있는 모든 데이터(예: 음악 또는 사진)를 지웁니다."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"e-SIM 삭제"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"휴대전화에서 모든 eSIM을 삭제합니다. 삭제하더라도 휴대기기 서비스 요금제를 계속 사용할 수 있습니다."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"태블릿에서 모든 eSIM을 삭제합니다. 삭제하더라도 휴대기기 서비스 요금제를 계속 사용할 수 있습니다."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"태블릿 초기화"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"휴대전화 초기화"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"모든 개인정보와 다운로드한 앱을 삭제하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"데이터 절약 모드가 켜져 있으면 테더링하거나 휴대용 핫스팟을 사용할 수 없습니다."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB 테더링"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB 연결됨, 테더링하려면 선택"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"테더링됨"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USB 저장소가 사용 중인 경우 테더링할 수 없습니다."</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB가 연결되어 있지 않음"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"USB를 연결하여 사용하세요."</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB 테더링 오류"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"USB를 통해 휴대전화의 인터넷 연결 공유"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"USB를 통해 태블릿의 인터넷 연결 공유"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"블루투스 테더링"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"태블릿의 인터넷 연결을 블루투스를 통해 공유 중"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"휴대전화의 인터넷 연결을 블루투스를 통해 공유 중"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"태블릿의 인터넷 연결을 블루투스를 통해 기기 1대와 공유 중"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"휴대전화의 인터넷 연결을 블루투스를 통해 기기 1대와 공유 중"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"태블릿의 인터넷 연결을 블루투스를 통해 기기 <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>대와 공유 중"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"휴대전화의 인터넷 연결을 블루투스를 통해 기기 <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>대와 공유 중"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"블루투스를 통해 태블릿의 인터넷 연결 공유"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"블루투스를 통해 휴대전화의 인터넷 연결 공유"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g>의 인터넷 연결을 블루투스를 통해 공유 중"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"태블릿의 인터넷 연결을 블루투스를 통해 공유하고 있지 않음"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"휴대전화의 인터넷 연결을 블루투스를 통해 공유하고 있지 않음"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"테더링되지 않음"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g>개의 기기까지만 테더링 사용 가능"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 기기의 테더링이 끊깁니다."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"핫스팟 및 테더링을 사용하여 다른 기기에서 내 모바일 데이터 연결을 통해 인터넷을 사용할 수 있도록 합니다."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"핫스팟 및 테더링을 사용하여 다른 기기에서 내 모바일 데이터 연결을 통해 인터넷을 사용할 수 있도록 합니다. 앱에서도 핫스팟을 만들어 주변 기기와 콘텐츠를 공유할 수 있습니다."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"고객센터"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"모바일 네트워크"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"모바일 요금제"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"위치 모드"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"GPS, Wi‑Fi, 블루투스 또는 모바일 네트워크를 사용하여 위치를 찾습니다."</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Wi‑Fi, 블루투스 또는 모바일 네트워크를 사용하여 위치를 찾습니다."</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS를 사용하여 위치를 찾습니다."</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"GPS 및 기기 센서를 사용하여 위치를 파악합니다."</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"검색"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi 검색"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"시스템 앱과 서비스가 Wi‑Fi 네트워크를 항상 감지하도록 허용하여 위치 정확도를 개선합니다."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"데이터 서비스에 연결되어 있지 않습니다. 지금 정보를 보려면 인터넷에 연결된 컴퓨터에서 %s(으)로 이동하세요."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"로드 중..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"비밀번호 선택"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"비밀번호를 설정하여 지문 사용"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"패턴 선택"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"패턴을 설정하여 지문 사용"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN 선택"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN을 설정하여 지문 사용"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"비밀번호 확인"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"패턴 확인"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN 확인"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"앱 설정"</string>
     <string name="install_applications" msgid="4872012136210802181">"알 수 없는 소스"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"모든 앱 소스 허용"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"최근 실행한 앱"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"앱 <xliff:g id="COUNT">%1$d</xliff:g>개 모두 보기"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> 전"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"태블릿과 개인 데이터는 알 수 없는 앱의 공격에 더욱 취약합니다. 이 소스에서 가져온 앱을 설치하면 앱 사용으로 인해 발생할 수 있는 태블릿의 손상 및 데이터 손실에 책임을 진다는 데 동의하게 됩니다."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"휴대전화와 개인 데이터는 알 수 없는 앱의 공격에 더욱 취약합니다. 이 소스에서 가져온 앱을 설치하면 앱 사용으로 인해 발생할 수 있는 휴대전화의 손상 및 데이터 손실에 책임을 진다는 데 동의하게 됩니다."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"고급 설정"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"시스템 서비스를 중지하시겠습니까?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"이 서비스를 중지하면 태블릿의 일부 기능이 올바르게 작동되지 않을 수 있으며 전원을 껐다 켜야 합니다."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"이 서비스를 중지하면 휴대전화의 일부 기능이 올바르게 작동되지 않을 수 있으며 전원을 껐다 켜야 합니다."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"언어, 입력 및 동작"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"언어 및 입력"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"언어 및 입력"</string>
     <string name="input_assistance" msgid="7577795275222555487">"입력 지원"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other">인쇄 서비스 <xliff:g id="COUNT">%1$d</xliff:g>개 사용</item>
       <item quantity="one">인쇄 서비스 1개 사용</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other">인쇄 작업 <xliff:g id="COUNT">%1$d</xliff:g>개</item>
+      <item quantity="one">인쇄 작업 1개</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"프린트 서비스"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"설치된 서비스 없음"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"프린터 없음"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"사용 세부정보"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"전원 사용 조절"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"포함된 패키지"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"앱에서 배터리가 많이 소모됨"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"기기 화면을 켜진 상태로 유지"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"백그라운드에서 기기를 작동시킴"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"너무 잦은 위치정보 요청"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"앱 <xliff:g id="NUMBER">%1$d</xliff:g>개에서 오류 발생"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"앱을 종료하시겠습니까?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"<xliff:g id="APP">%1$s</xliff:g>에서 계속 휴대전화를 작동 상태로 유지하고 있어 휴대전화에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 앱을 강제 종료하세요.\n\n문제가 계속 발생하면 앱을 제거하여 배터리 성능을 개선해야 할 수 있습니다."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"<xliff:g id="APP">%1$s</xliff:g>에서 계속 태블릿을 작동 상태로 유지하고 있어 태블릿에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 앱을 강제 종료하세요.\n\n문제가 계속 발생하면 앱을 제거하여 배터리 성능을 개선해야 할 수 있습니다."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"<xliff:g id="APP">%1$s</xliff:g>에서 계속 기기를 작동 상태로 유지하고 있어 기기에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 앱을 강제 종료하세요.\n\n문제가 계속 발생하면 앱을 제거하여 배터리 성능을 개선해야 할 수 있습니다."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"앱 종료"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"백그라운드 사용을 중지하시겠습니까?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"<xliff:g id="APP">%1$s</xliff:g>에서 휴대전화를 계속 작동시키고 있어 휴대전화에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 휴대전화에서 앱이 백그라운드에서 실행되지 않도록 설정할 수 있습니다."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"<xliff:g id="APP">%1$s</xliff:g>에서 태블릿을 계속 작동시키고 있어 태블릿에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 태블릿에서 앱이 백그라운드에서 실행되지 않도록 설정할 수 있습니다."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"<xliff:g id="APP">%1$s</xliff:g>에서 기기를 계속 작동시키고 있어 기기에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 기기에서 앱이 백그라운드에서 실행되지 않도록 설정할 수 있습니다."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"사용 중지"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"위치를 사용 중지하시겠습니까?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"앱을 사용하지 않을 때도 <xliff:g id="APP">%1$s</xliff:g>에서 계속 위치를 요청하여 휴대전화에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 이 앱에서 위치 사용을 중지하세요."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"앱을 사용하지 않을 때도 <xliff:g id="APP">%1$s</xliff:g>에서 계속 위치를 요청하여 태블릿에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 이 앱에서 위치 사용을 중지하세요."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"앱을 사용하지 않을 때도 <xliff:g id="APP">%1$s</xliff:g>에서 계속 위치를 요청하여 기기에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 이 앱에서 위치 사용을 중지하세요."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"사용 중지"</string>
     <string name="power_screen" msgid="3023346080675904613">"화면"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"손전등"</string>
     <string name="power_camera" msgid="4976286950934622605">"카메라"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"앱"</string>
     <string name="power_service" msgid="1599661212370831780">"서비스"</string>
     <string name="power_system" msgid="8290455327965307383">"시스템"</string>
-    <string name="power_user" msgid="1889728099253018005">"사용자"</string>
+    <string name="power_user" msgid="3706143225319881667">"다른 사용자"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"총 CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 포그라운드"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"켜진 상태로 유지"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"전력 사용량 과다 산정됨"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> 사용됨"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"<xliff:g id="TIME">^1</xliff:g> 동안 사용 중"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"화면 사용 시간: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>에서 <xliff:g id="PERCENT">%1$s</xliff:g> 사용"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"전체 배터리 사용량의 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN 변경"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"알림 표시"</string>
     <string name="help_label" msgid="6886837949306318591">"고객센터"</string>
-    <string name="support_summary" msgid="8276116616493882830">"도움말, 전화 및 채팅 지원"</string>
+    <string name="support_summary" msgid="2705726826263742491">"도움말, 전화 &amp; 채팅, 시작하기"</string>
     <string name="user_account_title" msgid="1127193807312271167">"콘텐츠용 계정"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"사진 ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"극단적 위협"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">%d개의 숨겨진 항목 표시</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"네트워크 및 인터넷"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, 모바일, 데이터 사용량, 핫스팟"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"모바일"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"데이터 사용"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"핫스팟"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"연결된 기기"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"블루투스, 전송, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"블루투스, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"앱 및 알림"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"권한, 기본 앱"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"사용자 및 계정"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"동작"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"결제, 탭, 결제"</string>
     <string name="keywords_backup" msgid="470070289135403022">"백업, 백 업"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"동작, edge, 측면, 활성 edge, 쥐기, 잡기, 어시스트, 어시스턴트, squeezy, squeezie, squeezey, squeezee, ok google, google 어시스턴트"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"동작, 깨우기, 알림, 화면, 디스플레이, 화면 끄기, 화면 켜기, 쥐기, edge, 대기 상태, 절전 모드, 잡기"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"동작, 소리 끄기, 일시 중지, 알람, 수신 전화, 무음, 디스플레이, 잠금 화면, 쥐기, 잡기, edge, 중지"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC 태그 설정"</string>
     <string name="write_tag" msgid="8571858602896222537">"쓰기"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"태그를 탭하여 작성하세요..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"직장 알림 표시 안함"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"기기가 잠겨 있을 때 프로필 알림 표시 방법을 선택하세요."</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"프로필 알림"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"알림"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"알림"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"앱 알림"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"알림 카테고리"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"중요도"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"앱에서 결정"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"긴급"</string>
     <string name="allow_sound" msgid="1820188704793497324">"소리 허용"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"현재 화면에서 소리, 진동, 알림 표시를 허용하지 않습니다."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"중요도 낮음"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"중요도 보통"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"중요도 높음"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"중요도 긴급"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"알림 어시스턴트"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"알림 액세스"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"직장 프로필 알림에 액세스하지 못하도록 차단됨"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"PIP 모드"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"PIP 모드 허용"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"앱이 열려 있을 때나 사용자가 앱에서 나갔을 때(예: 동영상 시청을 계속하기 위해) 이 앱에서 PIP 창을 표시하도록 허용합니다. 이 창은 사용 중인 다른 앱 위에 표시됩니다."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"예"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"아니요"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"알림 일시중지 액세스"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"설치된 앱 중에서 알림 일시중지 액세스를 요청한 앱이 없습니다."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"앱 로드 중..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"다음에서 이 직장 프로필을 관리합니다."</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>에서 관리"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(베타)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"기기 회전"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"화면 콘텐츠 회전"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"세로 보기 유지"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"가로 보기 유지"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"현재 방향 유지"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"안전한 시작"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"계속"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"기기가 시작되기 전에 PIN을 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다. \n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 PIN을 입력하도록 설정하시겠습니까?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"기기가 시작되기 전에 비밀번호를 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다. \n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 비밀번호를 입력하도록 설정하시겠습니까?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"지문을 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 PIN을 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 PIN을 입력하도록 설정하시겠습니까?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"지문을 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 패턴을 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 패턴을 입력하도록 설정하시겠습니까?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"지문을 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 비밀번호를 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 비밀번호를 입력하도록 설정하시겠습니까?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"지문을 사용하여 기기를 잠금 해제하는 방법에 더해 기기가 시작되기 전에 비밀번호를 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지, 알림(예: 알람)을 받을 수 없습니다.\n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 비밀번호를 입력하도록 설정하시겠습니까?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"예"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"아니요"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN이 필요한가요?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"배터리 사용량 알림"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"전체 기기 사용 정보 표시"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"앱 사용 정보 표시"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"사용량이 높은 항목"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other">앱 <xliff:g id="NUMBER">%2$d</xliff:g>개가 비정상적으로 작동하고 있음</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> 앱이 비정상적으로 작동하고 있음</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">앱에서 배터리 많이 소모 중</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g>에서 배터리 많이 소모 중</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"최적화되지 않음"</string>
     <string name="high_power_on" msgid="6216293998227583810">"최적화되지 않음"</string>
     <string name="high_power_off" msgid="3393904131961263278">"배터리 최적화 사용"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"다른 앱 위에 표시"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g>개 앱 중 다른 앱 위에 표시하도록 허용된 앱 <xliff:g id="COUNT_0">%1$d</xliff:g>개"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"권한을 가진 앱"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"예"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"아니요"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"허용됨"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"허용되지 않음"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"알 수 없는 소스에서 가져온 앱 설치"</string>
     <string name="write_settings" msgid="4797457275727195681">"시스템 설정 수정"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"시스템 설정 수정 쓰기"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"화면에 황색광이 적용됩니다. 이렇게 하면 수면 방해 효과가 줄어듭니다."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"추천"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"그 외 <xliff:g id="ID_1">%1$d</xliff:g>개"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other">제안사항 <xliff:g id="COUNT">%1$d</xliff:g>개</item>
+      <item quantity="one">제안사항 1개</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">그 외 제안사항 <xliff:g id="COUNT">%1$d</xliff:g>개</item>
+      <item quantity="one">그 외 제안사항 1개</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"삭제"</string>
     <string name="color_temperature" msgid="2070126836910615605">"차가운 색상 온도"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"더 차가운 디스플레이 색상 사용"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> 데이터 경고"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> 데이터 경고 / <xliff:g id="ID_2">%2$s</xliff:g> 데이터 한도"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"결제 주기"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"월간 주기가 매월 <xliff:g id="ID_1">%1$s</xliff:g>일에 시작"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"매월 <xliff:g id="ID_1">%1$s</xliff:g>일에 시작"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"매월 <xliff:g id="ID_1">%1$s</xliff:g>일"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"네트워크 제한"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other">제한 <xliff:g id="COUNT">%1$d</xliff:g>개</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">데이터 절약 모드가 켜져 있을 때 1개의 앱이 무제한 데이터를 사용할 수 있도록 허용됨</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"데이터 절약 모드"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"무제한 데이터 액세스"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"무제한 데이터"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"백그라운드 데이터 사용 중지됨"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"사용"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"사용 안함"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"잠금 화면 알림 제어"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"알림 내용 표시 또는 숨기기"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"전체"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"지원"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g>dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"지원 &amp; 도움말"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"최소 폭"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"설치된 앱 중에서 프리미엄 SMS 액세스를 요청한 앱이 없습니다."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"프리미엄 SMS는 요금이 부과될 수 있으며 이는 이동통신사 요금에 추가됩니다. 앱에 권한을 부여하면 해당 앱을 사용하여 프리미엄 SMS를 사용할 수 있게 됩니다."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"자동"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"수동"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"지금 여유 공간 확보"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"동작"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"동작 바로가기"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"빠른 동작으로 휴대전화 제어"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"빠른 동작으로 태블릿 제어"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"빠른 동작으로 기기 제어"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"카메라로 이동"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"카메라를 빨리 열려면 전원 버튼을 두 번 누릅니다. 어느 화면에서나 작동합니다."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"빠르게 카메라 열기"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"전원 버튼을 두 번 눌러 카메라를 엽니다."</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"카메라 전환"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"셀카 더 빨리 찍기"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"휴대전화를 두 번 돌려 셀카 모드를 실행합니다."</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"태블릿을 두 번 돌려 셀카 모드를 실행합니다."</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"기기를 두 번 돌려 셀카 모드를 실행합니다."</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"두 번 탭하여 스마트폰 확인"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"두 번 탭하여 태블릿 확인"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"두 번 탭하여 기기 확인"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"알림을 빠르게 확인하려면 화면을 두 번 탭하세요."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"시간, 알림 아이콘, 기타 정보를 확인하려면 화면을 두 번 탭하세요."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"화면이 꺼져 있을 때도 알림을 확인할 수 있습니다."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"들어서 스마트폰 확인"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"들어서 태블릿 확인"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"들어서 기기 확인"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"알림을 빠르게 확인하려면 휴대전화를 들어 올리세요."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"알림을 빠르게 확인하려면 태블릿을 들어 올리세요."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"알림을 빠르게 확인하려면 기기를 들어 올리세요."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"시간, 알림 아이콘 등의 정보를 확인하려면 휴대전화를 들어 올리세요."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"시간, 알림 아이콘 등의 정보를 확인하려면 태블릿을 들어 올리세요."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"시간, 알림 아이콘 등의 정보를 확인하려면 기기를 들어 올리세요."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"화면이 꺼져 있을 때도 알림을 확인할 수 있습니다."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"지문을 스와이프하여 알림 보기"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"알림을 확인하려면 휴대전화 뒷면의 지문 센서에서 아래로 스와이프합니다."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"알림을 확인하려면 태블릿 뒷면의 지문 센서에서 아래로 스와이프합니다."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"알림을 확인하려면 기기 뒷면의 지문 센서에서 아래로 스와이프합니다."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"신속하게 알림 확인하기"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"지문 센서에서 아래로 스와이프합니다."</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"휴대전화를 들어서 카메라 열기"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"자동으로 카메라를 열려면 사진을 촬영하는 자세(가로 또는 세로 방향)로 휴대전화를 들어 올리세요. 휴대전화가 대기상태이거나 잠겨 있을 때 작동합니다."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"휴대전화가 대기 또는 잠금 상태일 때 사진 찍기"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"지원 동작"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"민감도"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"이 인스턴트 앱을 삭제하시겠습니까?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"게임"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"오디오 파일"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"사용 중인 공간"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g>님의 경우 제거됨)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g>님의 경우 사용 안함)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"자동완성 서비스"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"인스턴트 앱"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"저장용량 관리자를 사용 중지하시겠습니까?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"영화 및 TV 앱"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"사용 중인 공간"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Carrier Provisioning Info"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"어떠한 새롭고 흥미로운 기기가 있을까요?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"5가지 주요 기능 확인하기"</string>
 </resources>
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index f711e95..ac99cad 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Жакшы"</item>
     <item msgid="8986346415847956850">"Эң жакшы"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Дайыма"</item>
-    <item msgid="844721238536786870">"Дүрмөттөө учурунда гана"</item>
-    <item msgid="1986753720941888596">"Эч качан"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Дайыма"</item>
-    <item msgid="7433294150916905997">"Бир гана дүрмөттөө учурунда"</item>
-    <item msgid="1390404486722375028">"Эч качан"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Акыркы 30 күн"</item>
     <item msgid="6600989128423965319">"Колдонуу мерчимин коюу…"</item>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 2524088..134cca1 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Сиз өндүрүүчү болдуңуз!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Кереги жок, сиз өндүрүүчү болгонсуз."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Алгач иштеп чыгуучунун параметрлерин иштетиңиз"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Зымсыз тармактар"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Туташуулар"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Түзмөк"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE шарттаган"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Видео чалуу камсыздалган"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi аркылуу чалуу камсыздалган"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Катышуу камсыздалган"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Мобилдик радионун кубаты"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM картадагы дарек китепчесин көрүү"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Туруктуу терүү номерлерин көрүү"</string>
@@ -105,10 +107,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Түзмөктөрдү издөө"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Бул түзмөктүн атын өзгөртүү"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Атын өзгөртүү"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ажыратылсынбы?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Бул кийинкилер менен болгон байланышты үзөт:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Түзмөк ажыратылсынбы?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Телефонуңуз <xliff:g id="DEVICE_NAME">%1$s</xliff:g> түзмөгүнөн ажыратылат."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Планшетиңиз <xliff:g id="DEVICE_NAME">%1$s</xliff:g> түзмөгүнөн ажыратылат."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Түзмөгүңүз <xliff:g id="DEVICE_NAME">%1$s</xliff:g> түзмөгүнөн ажыратылат."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Ажыратуу"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Bluetooth жөндөөлөрүн өзгөртүүгө уруксатыңыз жок."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Жаңы түзмөктү жупташтыруу"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Bluetooth жөндөөлөрү ачылып турганда <xliff:g id="DEVICE_NAME">%1$s</xliff:g> жакын арадагы түзмөктөргө көрүнөт."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Телефондун Bluetooth дареги: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Планшеттин Bluetooth дареги: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Түзмөктүн Bluetooth дареги: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ажыратылсынбы?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Кеңири таратуу"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Профайлды өчүрөсүзбү?"</string>
@@ -120,7 +129,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth жупташтыруу өтүнүчү"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Жупташтыруу өтүнүчү"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> менен жупташуу үчүн таптап коюңуз."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Кабыл алынган файлдар"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Кабыл алынган файлдар"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth түзмөгүн тандоо"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосу Bluetooth\'ду күйгүзгөнү жатат"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> бул түзмөктө Bluetooth\'ду өчүргөнү жатат"</string>
@@ -156,6 +165,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s сиздин баарлашуу билдирүүлөрүңүзгө жеткиси келет. %2$s уруксат берилсинби?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM карта пайдалануу мүмкүнчүлүгүн суроо"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> SIM картаңызды пайдалануу мүмкүнчүлүгүнө ээ болгусу келет. SIM картаны пайдалануу укугу берилсе, түзмөк SIM картага туташып жатканда дайындарды мобилдик тармак аркылуу өткөрүү кызматтары убактылуу иштебей калат. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> түзмөгүнө SIM картаны пайдалануу мүмкүнчүлүгүн берүү"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Башка түзмөктөргө <xliff:g id="DEVICE_NAME">^1</xliff:g> катары көрүнөт"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Түзмөктөрүңүз"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Жаңы түзмөктү жупташтыруу"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Күн жана убакыт"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Саат алкагын тандаңыз"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -328,7 +340,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Каттоо эсептери"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Жайгашкан жер"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Каттоо эсептери"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Коопсуздук жана жайгашкан жер"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрлөө жана эсептик дайындар"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Телефон шифрленген"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Түзмөк шифрленген"</string>
@@ -353,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Кулпну манж из менн ач"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Манжа изиңизди колдонуңуз"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Телефонуңуздун кулпусун ачып, кандайдыр бир нерсени сатып алып жатканыңызды ырастап же колдонмолорго кирүү үчүн жөн гана манжаңызды сенсорго тийгизип коюңуз. Кимдир-бирөөнүн манжа изин кошуп жатканыңызда этият болуңуз. Бир эле манжа изи кошулса да, ушул нерселердин бардыгын аткара алат.\n\nТүзмөгүңүздү манжа изи менен коргоого караганда графикалык ачкыч же PIN код менен коргоо бир кыйла коопсуз."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Кандайдыр бир нерсени сатып алып жатканыңызды ырастап же колдонмолорго кирүү үчүн жөн гана манжаңызды сенсорго тийгизип коюңуз. Кимдир-бирөөнүн манжа изин кошуп жатканыңызда этият болуңуз. Бир эле манжа изи кошулса да, ушул нерселердин бардыгын аткара алат.\n\nЭскертүү: Манжа изиңизди бул түзмөктүн кулпусун ачууга колдоно албайсыз. Көбүрөөк маалымат үчүн ишканаңыздын администраторуна кайрылыңыз."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Телефонуңуздун кулпусун ачып, кандайдыр бир нерсени сатып алып жатканыңызды ырастап же колдонмолорго кирүү үчүн жөн гана манжаңызды сенсорго тийгизип коюңуз. Кимдир-бирөөнүн манжа изин кошуп жатканыңызда этият болуңуз – манжа изи кошулган колдонуучулардын бардыгы бул нерселерди аткара алышат.\n\nЭскертүү: Түзмөгүңүздү манжа изи менен коргоого караганда графикалык ачкыч же PIN код менен коргоо бир кыйла коопсуз."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Телефонуңуздун кулпусун ачуу же сатып алууларды ырастоо үчүн манжа изиңизди пайдаланыңыз.\n\nЭскертүү: Манжа изиңизди бул түзмөктүн кулпусун ачууга колдоно албайсыз. Кеңири маалымат үчүн ишканаңыздын администраторуна кайрылыңыз."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Телефонуңуздун кулпусун ачуу же сатып алууларды ырастоо үчүн манжа изиңизди пайдаланыңыз.\n\nЭскертүү: Түзмөгүңүздү манжа изи менен коргоого караганда графикалык ачкыч же PIN код менен коргоо бир кыйла коопсуз."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Жокко чыгаруу"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Улантуу"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Өткөрүп жиберүү"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Манжа изин кошуу"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Ал жоголуп же уурдалып кетсе же анын ичиндеги дайындар өчүрүлсө, башкалар аны пайдалана беришет."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Ал жоголуп же уурдалып кетсе же анын ичиндеги дайындар өчүрүлсө, башкалар аны пайдалана беришет."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Ал жоголуп же уурдалып кетсе же анын ичиндеги дайындар өчүрүлсө, башкалар аны пайдалана беришет."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Планшет жоголуп же уурдалып кетсе, башкалар аны пайдалана беришет."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Түзмөк жоголуп же уурдалып кетсе, башкалар аны пайдалана беришет."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Телефон жоголуп же уурдалып кетсе, башкалар аны пайдалана беришет."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Кийинки"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Эгер планшет жоголуп же уурдалып кетсе, же баштапкы абалга келтирилсе, башкалар аны пайдалана беришет."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Эгер түзмөк жоголуп же уурдалып кетсе, же баштапкы абалга келтирилсе, башкалар аны пайдалана беришет."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Эгер телефон жоголуп же уурдалып кетсе, же баштапкы абалга келтирилсе, башкалар аны пайдалана беришет."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Планшет жоголуп же уурдалып кетсе, башкалар аны пайдалана беришет."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Түзмөк жоголуп же уурдалып кетсе, башкалар аны пайдалана беришет."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Түзмөктү коргоо мүмкүнчүлүктөрү жандырылбайт. Телефон жоголуп же уурдалып кетсе, башкалар аны пайдалана беришет."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Өткөрүп жиберүү"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Артка баруу"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Сканерди табыңыз"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Манжа изинин сенсорун телефонуңуздун артына жайгаштырыңыз."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Сенсорго тийиңиз"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Сенсор телефонуңуздун аркасында. Сөөмөйүңүз менен тийиңиз."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Түзмөк жана манжа изи сенсорунун жайгашкан жери менен сүрөттөмө"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Аталышы"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Жарайт"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Жок кылуу"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Баштадык"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Сенсорго тийиңиз"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Манжаңызды сенсорго коюп, дирилдегенин сезгенден кийин көтөрүңүз"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Кайталоо"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Манжа изиңиздин ар кайсы бөлүгүн кошуу үчүн манжаңызды кичинеден жылдырыңыз"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Манжа изи кошулду!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Бул белги кандайдыр бир нерселерди сатып алып, өздүгүңүздү ырастоо үчүн манжа изин пайдалана ала турганыңызды билдирет."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Түзмөгүңүздү ойготуп, кулпусун ачуу үчүн, жөн гана манжа изи сенсоруна тийип коюңуз."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Бул сөлөкөттү көргөнүңүздө, сатып алууларга уруксат берип же колдонмолорго кирсеңиз болот."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Көтөрүп, кайра тийип коюңуз"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Манжа изиңиздин ар кайсы бөлүгүн кошуу үчүн манжаңызды кичинеден өйдө жылдырыңыз"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Манжа изи кошулду"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Бул сүрөтчөнү көргөндө, өздүгүңүздү же сатып алууларды ырастоо үчүн манжа изиңизди пайдаланыңыз."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Манжа изин жөндөө өткөрүлсүнбү?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Телефонуңуздун кулпусун манжа изи менен ачуу ыкмасын тандадыңыз. Эгер азыр өткөрүп жиберсеңиз, аны кийинчерээк жөндөшүңүз керек болот. Жөндөөгө бир мүнөтчө эле убакыт кетет."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Экранды кулпулоо ыкмасын коюу"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Даяр"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ой, ал сенсор эмес"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Түзмөгүңүздөгү манжа изи сенсорун колдонуңуз."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Телефонуңуздун аркасындагы сенсорго сөөмөйүңүз менен тийиңиз."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Каттоо аягына чыгарылган жок"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Манжа изин каттоо боюнча убакыт чегине жетти. Кайра аракет кылыңыз."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Манжа изин каттоо иштеген жок. Кайра аракет кылыңыз же башка манжаңызды колдонуңуз."</string>
@@ -448,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Түзмөктү коргоо функциялары жандырылганда, башкалар бул түзмөктү сиздин уруксатыңызсыз пайдалана албай калышат. Колдонгуңуз келген экран кулпусун тандаңыз."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Түзмөктү коргоо функциялары жандырылганда, башкалар бул телефонду сиздин уруксатыңызсыз пайдалана албай калышат. Колдонгуңуз келген экран кулпусун тандаңыз."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Экранды кулпулоонун көмөкчү ыкмасын тандаңыз"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Экранды бөгөттөө ыкмалары"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Экранды бөгөттөө ыкмалары"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Экранды кулпулоо"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Уйку режимине өтөөр замат"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Уйку режимине киргенден <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> кийин"</string>
@@ -518,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Кулпн ачуу үлгсн өзгрт"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Клпн ачуу PIN кдн өзгр"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Кулпн ачуу срсзн өзгрт"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Кайра аракет кылыңыз. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> ичинен <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> аракет калды."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Акыркы аракет"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Эгер ушул жолу жумуштун графикалык ачкычын туура эмес киргизсеңиз, жумуш профилиңиз менен ага байланыштуу дайындар бул түзмөктөн алынып салынат."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Эгер ушул жолу жумуштун PIN кодун туура эмес киргизсеңиз, жумуш профилиңиз менен ага байланыштуу дайындар бул түзмөктөн алынып салынат."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Эгер сырсөздү ушул жолу туура эмес киргизсеңиз, жумуш профилиңиз менен ага байланыштуу дайындар бул түзмөктөн алынып салынат."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Өтө көп жолу туура эмес аракет кылынды. Жумуш профилиңиз менен ага байланыштуу дайындар бул түзмөктөн алынып салынат."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Этибарга албоо"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Кайра аракет кылыңыз. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> аракеттен <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> аракет калды."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Дайындарыңыз жок кылынат"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Эгер графикалык ачкычты кийинки жолу туура эмес киргизсеңиз, бул түзмөктүн дайындары жок кылынат"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Эгер PIN кодду кийинки жолу туура эмес киргизсеңиз, бул түзмөктүн дайындары жок кылынат"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Эгер сырсөздү кийинки жолу туура эмес киргизсеңиз, бул түзмөктүн дайындары жок кылынат"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Эгер графикалык кийинки жолу туура эмес киргизсеңиз, бул колдонуучу жок кылынат"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Эгер PIN кодду кийинки жолу туура эмес киргизсеңиз, бул колдонуучу жок кылынат"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Эгер сырсөздү кийинки жолу туура эмес киргизсеңиз, бул колдонуучу жок кылынат"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Эгер графикалык ачкычты кийинки жолу туура эмес киргизсеңиз, жумуш профилиңиз жана анын дайындары жок кылынат"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Эгер PIN кодду кийинки жолу туура эмес киргизсеңиз, жумуш профилиңиз жана анын дайындары жок кылынат"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Эгер сырсөздү кийинки жолу туура эмес киргизсеңиз, жумуш профилиңиз жана анын дайындары жок кылынат"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Өтө көп жолу туура эмес аракет кылынды. Бул түзмөктүн дайындары жок кылынат."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Өтө көп жолу туура эмес аракет кылынды. Бул колдонуучу жок кылынат."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Өтө көп жолу туура эмес аракет кылынды. Бул жумуш профили жана анын дайындары жок кылынат."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Этибарга албоо"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Кеминде <xliff:g id="COUNT">%d</xliff:g> белгиден турушу керек"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN код кеминде <xliff:g id="COUNT">%d</xliff:g> орундуу сандан турушу керек"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Улантуу"</string>
@@ -625,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Өркүндөтүлгөн Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth күйгүзүлгөндө түзмөгүңүз жакын арадагы башка Bluetooth түзмөктөрү менен байланыша алат."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Кандайдыр бир жерди тагыраак аныктоо үчүн, тутум колдонмолору жана кызматтар жакын арадагы Bluetooth түзмөктөрүн издей берет. Бул функцияны <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>издөө жөндөөлөрүнөн<xliff:g id="LINK_END_1">LINK_END</xliff:g> өзгөртсөңүз болот."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Туташпай калды. Кайра аракет кылыңыз."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Түзмөктүн чоо-жайы"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Түзмөктүн Bluetooth дареги: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Түзмөк унутулсунбу?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Мындан ары телефонуңуз <xliff:g id="DEVICE_NAME">%1$s</xliff:g> түзмөгү менен жупташтырылбайт"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Мындан ары планшетиңиз <xliff:g id="DEVICE_NAME">%1$s</xliff:g> түзмөгү менен жупташтырылбайт"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Мындан ары түзмөгүңүз <xliff:g id="DEVICE_NAME">%1$s</xliff:g> түзмөгү менен жупташтырылбайт"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Түзмөк унутулсун"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Төмөнкүгө туташтыруу…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> медианын аудио түзмөгүнөн ажыратылат."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> колсуз башкаруу аудио түзмөгүнөн ажыратылат."</string>
@@ -777,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Берилбесин"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Күчүнө киргизилбесин"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Эч тастыктама көрсөтүлгөн жок. Туташууңуз купуя болбойт."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Тармактын аталышы өтө узун."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Домен көрсөтүлүшү керек."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS жеткиликтүү"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS жеткиликтүү)"</string>
@@ -808,7 +838,6 @@
       <item quantity="one">1 тармак</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Илгерилетилген Wi‑Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wi‑Fi\'ды конфигурациялоо"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC дареги"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP дарек"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Тармак бөлүктөрүнүн маскасы"</string>
@@ -845,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Бул топ унутулсунбу?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Көчмө Wi‑Fi туташуу түйүнү"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi туташуу түйүнү"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Wi‑Fi тармагын бөлүшүү үчүн мобилдик байланышты пайдалануу"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Планшеттин Интернети туташуу түйүнү аркылуу бөлүшүлгөн жок"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Телефондун Интернети туташуу түйүнү аркылуу бөлүшүлгөн жок"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Интернет же мазмун башка түзмөктөр менен бөлүшүлгөн жок"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Планшеттин Интернети хотспот аркылуу бөлүшүлүүдө"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Телефондун Интернети хотспот аркылуу бөлүшүлүүдө"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Колдонмо мазмун менен бөлүшүүдө. Интернет байланышы менен бөлүшүү үчүн хотспотту өчүрүп, кайра күйгүзүңүз"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi\'дын аталышы"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> күйгүзүлүүдө…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Башка түзмөктөр <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> тармагына туташа алышат"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi\'дын сырсөзү"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP жыштыгы"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Башка түзмөктөрүңүз үчүн Wi‑Fi таратуу үчүн хотспот режимин пайдаланыңыз. Хотспот аркылуу башка түзмөктөр сиздин мобилдик Интернетти колдонот. Мобилдик Интернет үчүн кошумча акы алынышы мүмкүн."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Жакын жердеги түзмөктөр менен мазмунду бөлүшүү үчүн колдонмолор хотспот болуп бере алышат."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Хотспот жандырылууда…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Хоспот өчүрүлүүдө…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> иштеп жатат"</string>
@@ -894,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi чалуу күйгүзүлгөндө, телефонуңуз, жеке жөндөөлөрүңүзгө жана сигналдын күчтүүлүгүнө жараша, чалууларды Wi-Fi тармактары же операторуңуздун тармагы аркылуу багыттай алат. Бул өзгөчөлүктү күйгүзүүдөн мурун, акылары жана башка маалымат боюнча операторуңузга кайрылыңыз."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Өзгөчө кырдаалда кайрыла турган даректи жаңыртуу"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"WiFi аркылуу 911 номерине чалганыңызда куткаруучуларга жайгашкан жериңиз катары көрсөтүлө турган дарек"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
@@ -951,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Бир да натыйжа жок"</string>
     <string name="display_settings" msgid="7965901687241669598">"Дисплей"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Экранды авто-тегеретүү"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Ачык түстөр"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Планшет тегеренип жатканда багытын автоматтык түрдө которуштуруу"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Телефон тегеренип жатканда багытын автоматтык түрдө которуштуруу"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Планшет тегеренип жатканда багытын автоматтык түрдө которуштуруу"</string>
@@ -978,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Жарык деңгээли учурдагы жарыкка карап өзгөрөт. Зарылчылыкка жараша аны убактылуу өзгөртсөңүз болот."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Түнкү жарык"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Түнкү жарыкта экран янтарь түскө боёлот. Ушуну менен күңүрт жерде көзүңүзгө күч келбей, тезирээк уктап каласыз."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Күн тартиби"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Абалы"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Автоматтык түрдө күйгүзүү"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Эч качан"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Ыңгайлаштырылган график"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Күн баткандан, чыкканга чейин"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Графиги"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Эч качан"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Ыңгайлуу убакта күйгүзүлөт"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Күн баткандан, чыкканга чейин күйгүзүлөт"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Баштоо убакыты"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Аяктоо убакыты"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Абалы"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Жарыктыгы"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Өчүк. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Эч качан автоматтык түрдө күйбөйт."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g> болгондо автоматтык түрдө күйөт."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Күн батканда автоматтык түрдө күйөт."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Күйүк. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Эч качан автоматтык түрдө өчпөйт."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g> болгондо автоматтык түрдө өчөт."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Күн чыкканда автоматтык түрдө өчөт."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Өчүк / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Эч качан автоматтык түрдө күйбөйт"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g> болгондо автоматтык түрдө күйөт"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Күн батканда автоматтык түрдө күйөт"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Күйүк / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Эч качан автоматтык түрдө өчпөйт"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g> болгондо автоматтык түрдө өчөт"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Күн чыкканда автоматтык түрдө өчөт"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Көшүү режими"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Экран өчөт"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> колдонулбагандан кийин"</string>
@@ -1018,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Жөндөөлөр"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматтык жарыктык"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ойготуу үчүн көтөрүү"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Градиент дисплейи"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Көшүү режиминин дисплейи"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Ар дайым күйүк"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Жаңы эскертмелер"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Көрсөтүү убагы"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Жаңы эскертмелер"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Эскертмелерди алганыңызда экран күйөт"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Ар дайым күйүк"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Убакытты, эскертме сүрөтчөлөрүн жана башка маалыматты көрсөтүү"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Арип өлчөмү"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Текстти чоңойтуп же кичирейтиңиз"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM картаны кулпулоо жөндөөлөрү"</string>
@@ -1271,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN бош болбошу керек."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC талаасы 3 орундуу болууга тийиш."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC талаасы 2 же 3 орундуу болууга тийиш."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Байланыш оператору %s түрүндөгү APN\'дерди кошууга уруксат бербейт."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Абалкы APN тууралоолорун кайтарууда."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Баштапкы абалга келтирүү"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Абалкы APN тууралоолорун кайтаруу аяктады."</string>
@@ -1300,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD картаны тазалоо"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ички USB сактагычтагы музыка же сүрөттөр сыяктуу бардык берилиштерди тазалоо"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD-картадагы музыка же сүрөттөр сыяктуу бардык берилиштерди тазалоо"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM-карталарын тазалоо"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Телефондогу бардык eSIM-карталар тазалансын. Муну менен мобилдик кызматыңыз өчүрүлбөйт."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Планшеттеги бардык eSIM-карталар тазалансын. Муну менен мобилдик кызматыңыз өчүрүлбөйт."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Планшетти баштапкы абалга келтирүү"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Телефонду баштапкы абалга келтирүү"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Сиздин бардык жеке маалыматтарыңыз жана жүктөп алынган колдонмолоруңуз өчүрүлсүнбү? Сиз бул аракетти кайра кайтара албайсыз!"</string>
@@ -1322,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Трафикти үнөмдөө режиминде түзмөктү модем же көчмө туташуу түйүнү катары колдонууга болбойт"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB модем"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB түзмөгү сайылды, эми мобилдик Интернетти иштетиңиз"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Жалгашты"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USB сактагыч колдонулуп жатканда, интернет бөлүшүү мүмкүн эмес"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB туташкан жок"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Күйгүзүү үчүн туташыңыз"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB модем"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Телефондун Интернетин USB аркылуу бөлүшүү"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Планшеттин Интернетин USB аркылуу бөлүшүү"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth модем"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Планшеттин Интернети Bluetooth аркылуу бөлүшүлүүдө"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Телефондун Интернети Bluetooth аркылуу бөлүшүлүүдө"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Планшеттин Интернети Bluetooth аркылуу 1 түзмөк м-н бөлүш-дө"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Телефондун Интернети Bluetooth аркылуу 1 түзмөк менен бөлүшүлүүдө"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Планшеттин Интернети Bluetooth аркылуу <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> түзмөк м-н бөлүш-дө"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Телефондун Интернети Bluetooth аркылуу <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> түзмөк менен бөлүшүлүүдө"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Планшеттин Интернетин Bluetooth аркылуу бөлүшүү"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Телефондун Интернетин Bluetooth аркылуу бөлүшүү"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g> түзмөгүнүн Интернети Bluetooth аркылуу бөлүш-дө"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Планшеттин Интернети Bluetooth аркылуу бөл-гөн жок"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Телефондун Интернети Bluetooth аркылуу бөлүшүлгөн жок"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Интернет бөлүшүү болгон жок"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> ашык түзмөк менен интернет бөлүшүү болбойт."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> жалгашуудан бошотулат."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Мобилдик Интернетиңиз аркылуу башка түзмөктөргө Интернет таратуу үчүн туташуу түйүнү же модем режимин пайдаланыңыз."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Мобилдик Интернетиңиз аркылуу башка түзмөктөргө Интернет таратуу үчүн хотспот же модем режимин пайдаланыңыз. Жакын жердеги түзмөктөр менен мазмунду бөлүшүү үчүн колдонмолор дагы хотспот болуп бере алышат."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Жардам"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Мобилдик тармак"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Тарифтик план"</string>
@@ -1374,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Жайгашкан жерди аныктоо"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Жайгашкан жерди аныктоо үчүн GPS, Wi‑Fi, Bluetooth же мобилдик Интернет колдонулат"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Жайгашкан жерди аныктоо үчүн GPS, Wi‑Fi, Bluetooth же мобилдик Интернет колдонулат"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Жайгашкан жерди аныктоо үчүн GPS колдонулат"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"GPS жана түзмөктүн сенсорлору аркылуу жайгашкан жери аныкталат"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Издөө"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi тармактарын издөө"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Тутум колдонмолору менен кызматтарына Wi-Fi тармактарын такай издөөгө уруксат берүү менен жайгашкан жерди тагыраак аныктоого болот."</string>
@@ -1419,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Сизде азыр интернет-байланыш жок. Бул маалыматтарды азыр көрүш үчүн, интернет байланышы бар компүтерден  %s кирсеңиз болот:"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Жүктөлүүдө…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Сырсөзүңүздү тандаңыз"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Манжа изин колдонуу үчүн сырсөздү жөндөңүз"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Графикалык ачкычты тандаңыз"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Манжа изин колдонуу үчүн графикалык ачкычты жөндөңүз"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN кодуңузду тандаңыз"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Манжа изин колдонуу үчүн PIN кодду жөндөңүз"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Сырсөзүңүздү ырастаңыз"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Графикалык ачкычыңызды ырастаңыз"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN кодуңузду ырастаңыз"</string>
@@ -1489,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Колдонмонун тууралоолору"</string>
     <string name="install_applications" msgid="4872012136210802181">"Белгисиз булактар"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Бардк колднмо булактрна урукст"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Акыркы ачылган колдонмолор"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"<xliff:g id="COUNT">%1$d</xliff:g> колдонмонун баарын көрүү"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> мурун"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Планшетиңиз жана жеке дайындарыңыз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам планшетиңизге кандайдыр бир зыян келтирилсе же дайындарыңызды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Телефонуңуз жана жеке дайындарыңыз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам телефонуңузга кандайдыр бир зыян келтирилсе же дайындарыңызды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Өркүндөтүлгөн жөндөөлөр"</string>
@@ -1657,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Тутум кызматы токтотулсунбу?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Бул кызматты токтотсоңуз, планшетиңизди өчүрүп, кайра жандырмайынча, анын кээ бир мүмкүнчүлүктөрү туура эмес иштеп калышы мүмкүн."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Бул кызматты токтотсоңуз, телефонуңузду өчүрүп, кайра жандырмайынча, анын кээ бир мүмкүнчүлүктөрү туура эмес иштеп калышы мүмкүн."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Тилдер, киргизүү жана жаңсоолор"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Тилдер жана киргизүү ыкмасы"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Тилдер жана киргизүү ыкмасы"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Текст киргизүүгө жардам"</string>
@@ -1871,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> принтер кызматы иштетилген</item>
       <item quantity="one">1 принтер кызматы иштетилген</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> басып чыгаруу тапшырмасы</item>
+      <item quantity="one">1 басып чыгаруу тапшырмасы</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Принтер кызматтары"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Орнотулган бир дагы кызмат жок"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Эч бир принтер табылган жок"</string>
@@ -1937,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Чоо-жайын колдонуу"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Кубат сарпталышын тууралоо"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Камтылган топтомдор"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Колдонмолор батареяңызды отургузууда"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Түзмөк сергек кармалууда"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Түзмөк фондо ойготулууда"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Жайгашкан жер көп суралууда"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> колдонмо кызыктай иштеп жатат"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Колдонмо токтотулсунбу?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Телефонуңуздун батареясы жөндөгүдөй иштей албайт, себеби <xliff:g id="APP">%1$s</xliff:g> колдонмосу телефонуңузду улам ойготуп жатат.\n\nМаселени чечүү үчүн бул колдонмону мажбурлап токтотуп койсоңуз болот.\n\nЭгер бул кайталана берсе, батареяңызды көбүрөөк пайдалануу үчүн колдонмону чыгарып салышыңыз керек болот."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Планшетиңиздин батареясы жөндөгүдөй иштей албайт, себеби <xliff:g id="APP">%1$s</xliff:g> колдонмосу планшетиңизди улам ойготуп жатат.\n\nМаселени чечүү үчүн бул колдонмону мажбурлап токтотуп койсоңуз болот.\n\nЭгер бул кайталана берсе, батареяңызды көбүрөөк пайдалануу үчүн колдонмону чыгарып салышыңыз керек болот."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Түзмөгүңүздүн батареясы жөндөгүдөй иштей албайт, себеби <xliff:g id="APP">%1$s</xliff:g> колдонмосу түзмөгүңүздү улам ойготуп жатат.\n\nМаселени чечүү үчүн бул колдонмону мажбурлап токтотуп койсоңуз болот.\n\nЭгер бул кайталана берсе, батареяңызды көбүрөөк пайдалануу үчүн колдонмону чыгарып салышыңыз керек болот."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Колдонмону токтотуу"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Фондо колдонулушу өчүрүлсүнбү?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Телефонуңуздун батареясы жөндөгүдөй иштей албайт, себеби <xliff:g id="APP">%1$s</xliff:g> колдонмосу телефонуңузду улам ойготуп жатат.\n\nМаселени чечүү үчүн бул колдонмонун фондо иштегенин токтотуп койсо болот."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Планшетиңиздин батареясы жөндөгүдөй иштей албайт, себеби <xliff:g id="APP">%1$s</xliff:g> колдонмосу планшетиңизди улам ойготуп жатат.\n\nМаселени чечүү үчүн бул колдонмонун фондо иштегенин токтотуп койсо болот."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Түзмөгүңүздүн батареясы жөндөгүдөй иштей албайт, себеби <xliff:g id="APP">%1$s</xliff:g> колдонмосу түзмөгүңүздү улам ойготуп жатат.\n\nМаселени чечүү үчүн бул колдонмонун фондо иштегенин токтотуп койсо болот."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Өчүрүү"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Жайгашкан жер өчүрүлсүнбү?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Телефонуңуздун батареясы жөндөгүдөй иштей албайт, себеби <xliff:g id="APP">%1$s</xliff:g> колдонмосу пайдаланылбай турганда деле жайгашкан жер тууралуу маалыматты сурап жатат.\n\nМаселени чечүү үчүн бул колдонмо үчүн жайгашкан жер тууралуу маалыматты алууну өчүрүп койсоңуз болот."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Планшетиңиздин батареясы жөндөгүдөй иштей албайт, себеби <xliff:g id="APP">%1$s</xliff:g> колдонмосу пайдаланылбай турганда деле жайгашкан жер тууралуу маалыматты сурап жатат.\n\nМаселени чечүү үчүн бул колдонмо үчүн жайгашкан жер тууралуу маалыматты алууну өчүрүп койсоңуз болот."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Түзмөгүңүздүн батареясы жөндөгүдөй иштей албайт, себеби <xliff:g id="APP">%1$s</xliff:g> колдонмосу пайдаланылбай турганда деле жайгашкан жер тууралуу маалыматты сурап жатат.\n\nМаселени чечүү үчүн бул колдонмо үчүн жайгашкан жер тууралуу маалыматты алууну өчүрүп койсоңуз болот."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Өчүрүү"</string>
     <string name="power_screen" msgid="3023346080675904613">"Экран"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Кол чырак"</string>
     <string name="power_camera" msgid="4976286950934622605">"Камера"</string>
@@ -1951,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Колдонмолор"</string>
     <string name="power_service" msgid="1599661212370831780">"Кызматтар"</string>
     <string name="power_system" msgid="8290455327965307383">"Тутум"</string>
-    <string name="power_user" msgid="1889728099253018005">"Колдонуучу"</string>
+    <string name="power_user" msgid="3706143225319881667">"Башка колдонуучулар"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Жалпы CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Алдыңкы фондогу CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ойгоо кармоо"</string>
@@ -2003,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Ашыкча эсептелген кубаттын пайдаланылышы"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> бою колдонулду"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"<xliff:g id="TIME">^1</xliff:g> убакытка жетет"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Экрандын колдонулушу - <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> колдонмосу <xliff:g id="PERCENT">%1$s</xliff:g> сарптады"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Батарея кубатынын <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2566,7 +2638,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN алмаштыруу"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Эскертүүнү көргөзүү"</string>
     <string name="help_label" msgid="6886837949306318591">"Жардам/пикир билдирүү"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Жардам макалалары, телефон жана чат аркылуу колдоо көрсөтүү"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Жардам макалалары, телефон жана чат, баштадык"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Мазмун үчүн эсеп"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Сүрөттүн ID\'си"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Олуттуу коркунучтар"</string>
@@ -2656,9 +2728,12 @@
       <item quantity="one">Жашырылган %d нерсе көрсөтүлсүн</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Тармак жана Интернет"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, мобилдик түзмөк, дайындарды өткөрүү, хотспот"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобилдик"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"дайындардын колдонулушу"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"туташуу түйүнү"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Туташкан түзмөктөр"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Колдонмолор/эскертмелер"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Уруксаттар, демейки колдонмолор"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Колдонуучулар/каттоо эсептер"</string>
@@ -2711,6 +2786,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"жаңсоо"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"төлөө, таптоо, төлөмдөр"</string>
     <string name="keywords_backup" msgid="470070289135403022">"камдык көчүрмөнү сактоо, камдык көчүрмөнү сактоо"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"жаңсоо, кыркуу, жигердүү кыркуу, кысуу, кармоо, жардам берүү, жардамчы, кысуу, кысылма, кысылма, кысылма, ok google, google жардамчы"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"жаңсоо, ойготуу, эскертмелер, экран, дисплей, экран өчүк, экран күйүк, кысуу, кыркуу, уктоо, уктоо, кыркуу"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"жаңсоо, үндү басуу, тындыруу, ойготкуч, кириш чалуу, акырын, дисплей, кулпуланган экран, кысуу, кармоо, кыркуу, токтотуу"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC тегин орнотуу"</string>
     <string name="write_tag" msgid="8571858602896222537">"Жазуу"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Жазуу үчүн тегди таптап коюңуз…"</string>
@@ -2793,7 +2871,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Жумушчу эскертмелер такыр көрүнбөсүн"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Түзмөгүңүз кулпуланып турганда, профиль эскертмелери кандайча көрсөтүлсүн?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Профиль эскертмелери"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Эскертмелер"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Эскертмелер"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Колдонмо эскертмелери"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Эскертменин категориясы"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Маанилүүлүгү"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Колдонмо өзү чечим чыгарсын"</string>
@@ -2808,6 +2887,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Шашылыш"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Добуш чыгарууга уруксат берүү"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Үн чыгарылбасын, дирилдебесин же бул эскертмелер учурдагы экранда көрүнбөсүн."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Маанилүүлү эмес"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Орточо"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Маанилүү"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Өтө маанилүү"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Эскертме жардамчысы"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Эскертмелерди ишт мүмкүнчлгү"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Жумуш профилинин эскертмелерине кирүү бөгөттөлгөн"</string>
@@ -2835,8 +2918,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Сүрөт ичиндеги сүрөт"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Сүрөт ичиндеги сүрөткө уруксат берүү"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Бул колдонмо ачылып турганда же андан чыгып кеткениңизде (мисалы, видео көрүүнү улантуу үчүн), колдонмого сүрөт ичиндеги сүрөт терезсин түзүүгө уруксат бериңиз. Терезе колдонулуп жаткан башка колдонмолордун үстүнөн көрсөтүлөт."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Ооба"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Жок"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"Тынчымды алба\" функциясы"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Орнотулган колдонмолор үчүн \"Тынчымды алба\" функциясы талап кылынбайт"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Колдонмолор жүктөлүүдө…"</string>
@@ -2967,11 +3048,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Бул жумуш профилин төмөнкү башкарат:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Төмөнкү башкарат <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Сынамык)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Түзмөктү буруу"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Көрүнүштү буруу"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Тигинен көрүнө берсин"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Туурасынан көрүнүштө кала берсин"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Учурдагы багытта кала берсин"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Коопсуз баштоо"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Улантуу"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Түзмөгүңүздү коргоо үчүн PIN код менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. PIN кодду коёсузбу?"</string>
@@ -2979,7 +3055,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Түзмөгүңүздү коргоо үчүн аны сырсөз менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Сырсөздү коёсузбу?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Түзмөгүңүздү коргоо үчүн аны манжа изи же PIN код менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. PIN кодду коёсузбу?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Түзмөгүңүздү коргоо үчүн аны манжа изи же графикалык ачкыч менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Графикалык ачкычты коёсузбу?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Түзмөгүңүздү коргоо үчүн аны манжа изи же сырсөз менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Сырсөздү коёсузбу?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Түзмөгүңүздү коргоо үчүн аны манжа изи же сырсөз менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Сырсөздү коёсузбу?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ооба"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Жок"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN талап кылынсынбы?"</string>
@@ -3097,6 +3173,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Батареянын сарпталышы"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Түзмөктүн колдонулушун толук көрсөтүү"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Колдонмонун иштетилиши"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Батарея кубаты көп колдонулат"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> колдонмо кызыктай иштеп жатат</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> колдонмосу кызыктай иштеп жатат</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Колдонмолор батареяңызды отургузууда</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> колдонмосу батареяңызды отургузууда</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Батареяны үнөмдөшпөйт"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Батарянын кубатын үнөмдөшпөйт"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Батареянын кубатын үнөмдөө иштетилген"</string>
@@ -3189,8 +3274,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Башка терезел-н үст-н көрсөтүү"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> колдонмодон <xliff:g id="COUNT_0">%1$d</xliff:g> колдонмо башка терезелердин үстүнөн көрсөтүлөт"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Уруксаты бар колдонмолор"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Ооба"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Жок"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Уруксат берилген"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Тыюу салынган"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"белгисиз булактардан келген колдонмолорду орнотуу"</string>
     <string name="write_settings" msgid="4797457275727195681">"Тутум жөндөөлөрүн өзгөртүү"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"тутум жөндөөлөрүн жазып өзгөртүү"</string>
@@ -3280,6 +3365,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Экран янтарь түскө боёлуп, күңүрт жерде көзүңүзгө күч келбей, тезирээк уктап каласыз."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Сунуштар"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+ Дагы <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> сунуш</item>
+      <item quantity="one">1 сунуш</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> сунуш</item>
+      <item quantity="one">+1 сунуш</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Алып салуу"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Салкын температура түсү"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Салкыныраак дисплей түстөрүн колдонуңуз"</string>
@@ -3298,8 +3392,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Дайындардын өткөрүлүшү боюнча эскертүү: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Дайындардын өткөрүлүшү боюнча эскертүү: <xliff:g id="ID_1">%1$s</xliff:g> / Дайындардын өткөрүлүшүн чектөө: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Эсептешүү мерчими"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Төлөө мерчими ар бир айдын <xliff:g id="ID_1">%1$s</xliff:g>-күнүнөн башталат"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Ар бир айдын <xliff:g id="ID_1">%1$s</xliff:g>-күнүнөн баштап"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Ай сайын <xliff:g id="ID_1">%1$s</xliff:g> күнү"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Тармак чектөөлөрү"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> чектөө</item>
@@ -3319,7 +3412,7 @@
       <item quantity="one">Дайындарды үнөмдөгүч күйүп турганда 1 колдонмо дайындарды чектөөсүз өткөрө алат</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Дайындарды үнөмдөгүч"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Дайындарды чексиз пайдалануу"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Чексиз трафик"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Фондук дайындар өчүрүлгөн"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Күйүк"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Өчүк"</string>
@@ -3383,8 +3476,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Кулпуланган экрндг эскртмнлрд көзөмөлдөө"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Эскертме мазмунун көрсөтүү же жашыруу"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Бардыгы"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Колдоо"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Колдоо жана кеңештер"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Эң кууш"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Орнотулган колдонмолор акы төлөнүүчү SMS пайдаланууга уруксат сураган жок"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Артыкчылыктуу SMS үчүн сизден акы алынып, ал операторуңуздун эсептерине кошулушу мүмкүн. Эгер кайсы бир колдонмого уруксат берсеңиз, ошол колдонмо аркылуу артыкчылыктуу SMS жөнөтө аласыз."</string>
@@ -3449,28 +3541,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Автоматтык"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Нускама"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Орун бошотуу"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Жаңсоолор"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Жаңсоонун кыска жолдору"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Телефонуңузду көзөмөлдөй турган ыкчам жаңсоолор"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Планшетиңизди көзөмөлдөй турган ыкчам жаңсоолор"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Түзмөгүңүздү көзөмөлдөй турган ыкчам жаңсоолор"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Камерага өтүү"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Камераны тез ачуу үчүн каалаган экрандан кубат баскычын эки жолу басыңыз."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Камераны тез ачуу"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Камераны ачуу үчүн күйгүзүү/өчүрүү баскычын эки жолу басыңыз"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Камераны которуштуруу"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Селфилерди тез тартуу"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Селфи режимине өтүү үчүн телефонду эки жолу айландырыңыз"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Селфи режимине өтүү үчүн планшетти эки жолу айландырыңыз"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Селфи режимине өтүү үчүн түзмөктү эки жолу айландырып коюңуз"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Убакыт менен эскертмелерди текшерүү үчүн эки жолу басып коюңуз"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Планшетти текшерүү үчүн эки жолу таптаңыз"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Түзмөктү текшерүү үчүн эки жолу таптаңыз"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Эскертмелериңизди тез текшерүү үчүн экраныңызды эки жолу таптаңыз."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Убакытты, эскертме сүрөтчөлөрүн жана башка маалыматты көрүү үчүн экраныңызды эки жолу таптаңыз."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Эскертмелерди экран өчүп турганда көрүү"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Эскертмелерди текшерүү үчүн телефонду көтөрүңүз"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Планшетти текшерүү үчүн көтөрүңүз"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Түзмөктү текшерүү үчүн көтөрүңүз"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Эскертмелериңизди көрүү үчүн телефонуңузду колуңузга алыңыз."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Эскертмелериңизди тез текшерүү үчүн планшетиңизди алыңыз."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Эскертмелериңизди көрүү үчүн түзмөгүңүздү колуңузга алыңыз."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Убакытты, эскертме сүрөтчөлөрүн жана башка маалыматты көрүү үчүн телефонуңузду колуңузга алыңыз."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Убакытты, эскертме сүрөтчөлөрүн жана башка маалыматты көрүү үчүн планшетиңизди колуңузга алыңыз."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Убакытты, эскертме сүрөтчөлөрүн жана башка маалыматты көрүү үчүн түзмөгүңүздү колуңузга алыңыз."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Эскертмелерди экран өчүп турганда көрүү"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Эскертмелерди көрүү үчүн экранды манжаңыз менен серпип коюңуз"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Эскертмелериңизди текшерүү үчүн телефонуңуздун арткы бетиндеги манжа изинин сенсорун төмөн карай серпип коюңуз."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Эскертмелериңизди текшерүү үчүн планшетиңиздин арткы бетиндеги манжа изинин сенсорун төмөн карай серпип коюңуз."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Эскертмелериңизди текшерүү үчүн түзмөгүңүздүн арткы бетиндеги манжа изинин сенсорун төмөн карай серпип коюңуз."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Эскертмелерди тез көрүү"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Манжа изинин сенсорун ылдый серпиңиз"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Камераны ачуу үчүн телефонду көтөрүңүз"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Камераны автоматтык түрдө ачуу үчүн телефонуңузду сүрөткө тартуучу позицияда (туурасынан же тигинен) кармаңыз. Телефонуңуз уйку режиминде же кулпуланып турганда да иштейт."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Телефон уйку реж-де же кулпуланып турганда сүрөткө тартасыз"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Жардамчы жаңсоо"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Сезгичтик"</string>
@@ -3574,6 +3679,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Бул ыкчам ачылуучу колдонмо алынып салынсынбы?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Оюндар"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудио файлдар"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Эстутумдан ээлеген орду"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> үчүн чыгарылып салынган)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> үчүн өчүрүлгөн)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Автотолтуруу кызматы"</string>
@@ -3587,5 +3693,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Ыкчам ачылуучу колдонмо"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Сактагычты башкаруу функциясы өчүрүлсүнбү?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Тасма жана сыналгы колдонмолору"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Эстутумдан ээлеген орду"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Байланыш оператору жөнүндө маалымат"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Байланыш операторун өзгөртүү"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Эмне жаңылык бар?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Мыкты 5 функцияны карап чыгыңыз"</string>
 </resources>
diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml
index ccb296c..fbc8104 100644
--- a/res/values-lo/arrays.xml
+++ b/res/values-lo/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"ດີ"</item>
     <item msgid="8986346415847956850">"ດີເລີດ"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"ຕະຫຼອດເວລາ"</item>
-    <item msgid="844721238536786870">"ສະເພາະເມື່ອສຽບສາຍສາກ"</item>
-    <item msgid="1986753720941888596">"ບໍ່ໃຊ້"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"ຕະຫຼອດເວລາ"</item>
-    <item msgid="7433294150916905997">"ສະເພາະເມື່ອສຽບສາຍສາກເທົ່ານັ້ນ"</item>
-    <item msgid="1390404486722375028">"ບໍ່ໃຊ້"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 ມື້ທີ່ຜ່ານມາ"</item>
     <item msgid="6600989128423965319">"ຕັ້ງ​ຮອບ​ການ​ນຳ​ໃຊ້..."</item>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 5e71cc3..335ee3b 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ຕອນນີ້ທ່ານເປັນນັກພັດທະນາແລ້ວ!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"ບໍ່ຈຳເປັນ, ທ່ານເປັນນັກພັດທະນາຢູ່ແລ້ວ."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"ກະລຸນາເປີດໃຊ້ຕົວເລືອກນັກພັດທະນາກ່ອນ."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"ລະບົບໄຮ້ສາຍ &amp; ເຄືອຂ່າຍ"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"ການເຊື່ອມຕໍ່"</string>
     <string name="header_category_device" msgid="4544026001618307754">"ອຸປະກອນ"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"ນຳໃຊ້ VoLTE ແລ້ວ"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ຈັດຫາການໂທດ້ວຍວິດີໂອແລ້ວ"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"ຈັດຫາການໂທດ້ວຍ Wi-Fi ແລ້ວ"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presence Provisioned"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"ພະລັງງານວິທະຍຸມືຖື"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"ເບິ່ງສະໝຸດທີ່ຢູ່ໃນ SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ເບິ່ງໝາຍເລກຈຳກັດການໂທອອກ"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"ສະແກນຫາອຸປະກອນ"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"ປ່ຽນຊື່ອຸ​ປະ​ກອນ​ນີ້"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"ປ່ຽນຊື່"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ຕັດການເຊື່ອມຕໍ່ຫຼືບໍ່?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ນີ້ຈະເປັນການຢຸດການເຊື່ອມຕໍ່ຂອງທ່ານກັບ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"ຕັດການເຊື່ອມຕໍ່ອຸປະກອນຫຼືບໍ່?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"ໂທລະສັບຂອງທ່ານຈະຕັດການເຊື່ອມຕໍ່ຈາກ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"ແທັບເລັດຂອງທ່ານຈະຕັດການເຊື່ອມຕໍ່ຈາກ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"ອຸປະກອນຂອງທ່ານຈະຕັດການເຊື່ອມຕໍ່ຈາກ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"ຕັດການເຊື່ອມຕໍ່"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"ທ່ານ​ບໍ່​ມີ​ສິດ​ອະນຸຍາດ​ໃນ​ການ​ແກ້ໄຂ​ການ​ຕັ້ງຄ່າ Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"ຈັບຄູ່ອຸປະກອນໃໝ່"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ສາ​ມາດ​ໃຫ້​ອຸ​ປະ​ກອນ​ໃກ້​ຄຽງ​ເຫັນ​ໄດ້ ໃນ​ຂະ​ນະ​ທີ່ການ​ຕັ້ງ​ຄ່າ Bluetooth ເປີດ."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"ທີ່ຢູ່ Bluetooth ຂອງໂທລະສັບ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"ທີ່ຢູ່ Bluetooth ຂອງແທັບເລັດ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"ທີ່ຢູ່ Bluetooth ຂອງອຸປະກອນ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"​ຕັດ​ການ​ເຊື່ອມ​ຕ​ໍ່ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ບໍ່?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ການກະ​ຈາຍ​ສັນຍານ"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ປິດການນຳໃຊ້ໂປຣໄຟລ໌?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"ຄຳຂໍການຈັບຄູ່ Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"ຄຳຮ້ອງຂໍການຈັບຄູ່"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"ແຕະເພື່ອຈັບຄູ່ກັບ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"ສະແດງໄຟລ໌ທີ່ໄດ້ຮັບ"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"ໄຟລ໌ທີ່ຮັບແລ້ວ"</string>
     <string name="device_picker" msgid="4978696506172252813">"ເລືອກ​ອຸ​ປະ​ກອນ Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ຕ້ອງການເປີດໃຊ້ Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ຕ້ອງການປິດ Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ຕ້ອງການສິດເພື່ອເຂົ້າໄປຂໍ້ຄວາມຂອງທ່ານ. ໃຫ້ສິດແກ່ %2$s ຫຼືບໍ່?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"ການ​ຂໍ​ເຂົ້າ​ຫາ SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ຕ້ອງ​ການ​ເຂົ້າ​ຫາ​ແຜ່ນ SIM ຂອງ​ທ່ານ. ການ​ໃຫ້​ການ​ເຂົ້າ​ເຖິງ​ແຜ່ນ SIM ຈະ​ປິດ​ໃຊ້​ງານ​ການ​ເຊື່ອມ​ຕໍ່​ຂໍ້​ມູນ​ຢູ່​ໃນ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ສຳ​ລັບ​ໄລ​ຍະ​ເວ​ລາ​ຂອງ​ການ​ເຊື່ອມ​ຕໍ່. ໃຫ້​ການ​ເຂົ້າ​ຫາ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"ສະແດງເປັນ \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' ໃຫ້ອຸປະກອນອື່ນເຫັນ"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ອຸປະກອນຂອງທ່ານ"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ຈັບຄູ່ອຸປະກອນໃໝ່"</string>
     <string name="date_and_time" msgid="9062980487860757694">"ວັນ​ທີ &amp; ເວ​ລາ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ເລືອກເຂດເວລາ"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ບັນຊີ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ສະຖານທີ່"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ບັນຊີ"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"ຄວາມປອດໄພ ແລະ ສະຖານທີ່"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"ຄວາມປອດໄພ &amp; ສະຖານທີ່"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ການເຂົ້າລະຫັດ ແລະ ຂໍ້ມູນການເຂົ້າສູ່ລະບົບ"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ເຂົ້າລະຫັດໂທລະສັບແລ້ວ"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"ເຂົ້າລະຫັດອຸປະກອນແລ້ວ"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"ປົດລັອກດ້ວຍລາຍນີ້ວມື"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"ໃຊ້ລາຍນິ້ວມືຂອງທ່ານ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"ພຽງແຕ່ເຊັນເຊີລາຍນິ້ວມືເພື່ອປົດລັອກໂທລະສັບຂອງທ່ານ.\n\nໝາຍເຫດ: ລາຍນິ້ວມືອາດມີຄວາມປອດໄພໜ້ອຍກວ່າຮູບແບບປົດລັອກ ຫຼື ລະຫັດ PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"ພຽງແຕະທີ່ເຊັນເຊີລາຍນິ້ວມືເພື່ອອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບແອັບ. ກະລຸນາລະມັດລະວັງການເພີ່ມລາຍນິ້ວມື. ເຖິງແມ່ນວ່າຈະເພີ່ມລາຍນິ້ວມືດຽວແຕ່ກໍຈະສາມາດເຮັດໄດ້ທຸກຢ່າງທີ່ວ່າມານີ້.\n\nໝາຍເຫດ: ທ່ານບໍ່ສາມາດໃຊ້ລາຍນິ້ວມືຂອງທ່ານໃນການປົດລັອກອຸປະກອນນີ້ໄດ້. ສຳລັບຂໍ້ມູນເພີ່ມເຕີມ, ກະລຸນາຕິດຕໍ່ຜູ້ເບິ່ງແຍງລະບົບອົງກອນຂອງທ່ານ."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"ພຽງແຕະເຊັນເຊີລາຍນິ້ວມືເພື່ອປົດລັອກໂທລະສັບຂອງທ່ານ.\n\nໝາຍເຫດ: ລາຍນິ້ວມືອາດມີຄວາມປອດໄພໜ້ອຍກວ່າຮູບແບບປົດລັອກ ຫຼື ລະຫັດ PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"ໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກໂທລະສັບ ຫຼື ອະນຸມັດການສັ່ງຊື້.\n\nໝາຍເຫດ: ທ່ານບໍ່ສາມາດໃຊ້ນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກອຸປະກອນນີ້ໄດ້. ສຳລັບຂໍ້ມູນເພີ່ມເຕີມ, ໃຫ້ຕິດຕໍ່ຜູ້ເບິ່ງແຍງລະບົບອົງກອນຂອງທ່ານ."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"ໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກໂທລະສັບ ຫຼື ອະນຸມັດການສັ່ງຊື້.\n\nໝາຍເຫດ: ນິ້ວມືຂອງທ່ານອາດມີຄວາມປອດໄພທີ່ໜ້ອຍກວ່າຮູບແບບປົດລັອກ ຫຼື ລະຫັດ PIN ທີ່ຍາກ."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"​ຍົກ​ເລີກ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"​ສືບ​ຕໍ່"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"ຂ້າມ"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"ເພີ່ມລາຍນີ້ວມື"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"ຄຸນສົມບັດການ​ປົກ​ປ້ອງ​ອຸ​ປະ​ກອ​ນ​ຈະ​ບໍ່​ຖືກ​ເປີດ​ນຳ​ໃຊ້. ທ່ານ​ຈະ​ບໍ່​ສາ​ມາດ​ປ້ອງ​ກັນບໍ່ໃຫ້ຄົນ​ອື່ນ​​ໃຊ້​ແທັບເລັດ​ນີ້​ໄດ້ ຖ້າ​ມັນ​ເສຍ​ໄປ, ຖືກ​ລັກ ຫຼື​ ຖືກ​ລ້າງ​ເຄື່ອງ."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"ຄຸນສົມບັດການ​ປົກ​ປ້ອງ​ອຸ​ປະ​ກອ​ນ​ຈະ​ບໍ່​ຖືກ​ເປີດ​ນຳ​ໃຊ້. ທ່ານ​ຈະ​ບໍ່​ສາ​ມາດ​ປ້ອງ​ກັນບໍ່ໃຫ້ຄົນ​ອື່ນ​​ໃຊ້​ອຸ​ປະ​ກອນ​ນີ້​ໄດ້ ຖ້າ​ມັນ​ເສຍ​ໄປ, ຖືກ​ລັກ ຫຼື​ ຖືກ​ລ້າງ​ເຄື່ອງ."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"ຄຸນສົມບັດການ​ປົກ​ປ້ອງ​ອຸ​ປະ​ກອ​ນ​ຈະ​ບໍ່​ຖືກ​ເປີດ​ນຳ​ໃຊ້. ທ່ານ​ຈະ​ບໍ່​ສາ​ມາດ​ປ້ອງ​ກັນບໍ່ໃຫ້ຄົນ​ອື່ນ​​ໃຊ້​ໂທລະສັບ​ນີ້​ໄດ້ ຖ້າ​ມັນ​ເສຍ​ໄປ, ຖືກ​ລັກ ຫຼື​ ຖືກ​ລ້າງ​ເຄື່ອງ."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"ຄຸນສົມບັດການປ້ອງກັນອຸປະກອນຈະບໍ່ຖືກເປີດນຳໃຊ້. ທ່ານຈະບໍ່ສາມາດປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ແທັບເລັດນີ້ໄດ້ ຖ້າມັນເສຍ ຫຼືຖືກລັກ."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"ຄຸນສົມບັດການປ້ອງກັນອຸປະກອນຈະບໍ່ຖືກເປີດນຳໃຊ້. ທ່ານຈະບໍ່ສາມາດປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ອຸປະກອນນີ້ໄດ້ ຖ້າມັນເສຍ ຫຼືຖືກລັກ."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"ຄຸນສົມບັດການປ້ອງກັນອຸປະກອນຈະບໍ່ຖືກເປີດນຳໃຊ້. ທ່ານຈະບໍ່ສາມາດປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ໂທລະສັບນີ້ໄດ້ ຖ້າມັນເສຍ ຫຼືຖືກລັກ."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"ຕໍ່ໄປ"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ບໍ່ສາມາດເປີດຄຸນສົມບັດການປ້ອງກັນອຸປະກອນໄດ້. ທ່ານຈະບໍ່ສາມາດປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ແທັບເລັດນີ້ໄດ້ຫາກມັນເສຍ, ຖືກລັກ ຫຼື ຖືກຣີເຊັດ."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ບໍ່ສາມາດເປີດຄຸນສົມບັດການປ້ອງກັນອຸປະກອນໄດ້. ທ່ານຈະບໍ່ສາມາດປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ອຸປະກອນນີ້ໄດ້ຫາກມັນເສຍ, ຖືກລັກ ຫຼື ຖືກຣີເຊັດ."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ບໍ່ສາມາດເປີດຄຸນສົມບັດການປ້ອງກັນອຸປະກອນໄດ້. ທ່ານຈະບໍ່ສາມາດປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ໂທລະສັບນີ້ໄດ້ຫາກມັນເສຍ, ຖືກລັກ ຫຼື ຖືກຣີເຊັດ."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"ບໍ່ສາມາດເປີດຄຸນສົມບັດການປ້ອງກັນອຸປະກອນໄດ້. ທ່ານຈະບໍ່ສາມາດປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ແທັບເລັດນີ້ໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັກ."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"ບໍ່ສາມາດເປີດຄຸນສົມບັດການປ້ອງກັນອຸປະກອນໄດ້. ທ່ານຈະບໍ່ສາມາດປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ອຸປະກອນນີ້ໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັກ."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"ບໍ່ສາມາດເປີດຄຸນສົມບັດການປ້ອງກັນອຸປະກອນໄດ້. ທ່ານຈະບໍ່ສາມາດປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ໂທລະສັບນີ້ໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັກ."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"ແນວ​ໃດ​ກໍ​ຂ້າມ​ໄປ"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"​ກັບ​ຄືນ"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ຊອກ​ຫາ​ເຊັນ​ເຊີ"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ຊອກ​ເຊັນ​ເຊີກວດຈັບ​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ຢູ່​ດ້ານ​ຫຼັງ​ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"ແຕະທີ່ເຊັນເຊີ"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"ມັນຢູ່ຫຼັງໂທລະສັບຂອງທ່ານ. ໃຫ້ໃຊ້ນິ້ວຊີ້"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ການ​ອະ​ທິ​ບາຍ​ປະ​ກອບ​ດ້ວຍ​ທີ່​ຕັ້ງ​ເຊັນ​ເຊີ​ອຸ​ປະ​ກອນ ແລະ​ລາຍ​ນີ້ວ​ມື"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"ຊື່"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ຕົກລົງ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"​ລຶບ"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"ເລີ່ມກັນເລີຍ"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"ແຕະທີ່ເຊັນເຊີ"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ວາງ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ລົງ​ເທິງ​ເຊັນ​ເຊີ ແລະ ຍົກ​ຂຶ້ນ​ຫຼັງ​ຈາກ​ທ່ານ​ຮູ້​ສຶກ​ມີ​ການ​ສັ່ນ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ເຮັດຕໍ່ໄປ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"ຍ້າຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ໄປ​ເລັກ​ນ້ອຍ ເພື່ອ​ເພີ່ມ​ທຸກ​ສ່ວນ​ທີ່​ແຕກ​ຕ່າງ​ຂອງ​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"ເພີ່ມ​ລາຍ​ນີ້ວ​ມື​ແລ້ວ!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ທຸກ​ຄັ້ງ​ທີ່​ທ່ານ​ເຫັນ​ໄອ​ຄອນ​ນີ້, ທ່ານ​ສາ​ມາດ​ໃຊ້​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ສຳ​ລັບ​ການ​ລະ​ບຸ ຫຼື​ເພື່ອ​ໃຫ້​ສິດ​ການ​ຊື້."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"ພຽງ​ແຕ່​ສຳ​ຜັດ​ເຊັນ​ເຊີ​ລາຍ​ນີ້ວ​ມື ເພື່ອ​ກະ​ຕຸ້ນ ແລະ ປົດ​ລັອກ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"ເມື່ອທ່ານເຫັນໄອຄອນນີ້, ທ່ານສາມາດອະນຸຍາດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບຫາແອັບໄດ້ນຳ."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"ຍົກຂຶ້ນ, ຈາກນັ້ນແຕະອີກຄັ້ງ"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"ຍົກນິ້ວຂອງທ່ານຂຶ້ນເພື່ອເພີ່ມສ່ວນຕ່າງໆຂອງລາຍນິ້ວມືທ່ານ."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"ເພີ່ມລາຍນີ້ວມືແລ້ວ"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"ເມື່ອທ່ານເຫັນໄອຄອນນີ້, ໃຫ້ໃຊ້ນິ້ວມືຂອງທ່ານເພື່ອລະບຸຕົວຕົນ ຫຼື ອະນຸມັດການສັ່ງຊື້."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ຂ້າມ​ການ​ຕັ້ງ​ລາຍ​ນີ້ວ​ມື​ບໍ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ທ່ານ​ເລືອກ​ໃຊ້​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ເປັນ​ວິ​ທີ​ໜຶ່ງໃນການ​ປົດ​ລັອກ​ໂທ​ລ​ະ​ສັບ​ຂອງ​ທ່ານ. ຖ້າ​ທ່ານ​ຂ້າມ​​ດຽວ​ນີ້, ທ່ານ​ຈະ​ຕ້ອງ​ໄດ້​ຕັ້ງ​ອັນ​ນີ້​ພາຍ​ຫຼັງ. ການ​ຕັ້ງ​ໃຊ້​ເວ​ລາ​ພຽງ​ໜຶ່ງ​ນາ​ທີ ຫຼື ປະ​ມານນັ້ນ."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ຕັ້ງຄ່າການລັອກໜ້າຈໍ"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"ແລ້ວໆ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ອຸ້ຍ, ນັ້ນ​ບໍ່​ແມ່ນ​ເຊັນ​ເຊີ"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"ໃຊ້​ເຊັນ​ເຊີ​ລາຍ​ນີ້ວ​ມື​ຢູ່​ເທິງ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"ແຕະທີ່ເຊັນເຊີຢູ່ຫຼັງຂອງໂທລະສັບຂອງທ່ານ. ໃຫ້ໃຊ້ນິ້ວຊີ້ທ່ານ."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ການ​ລົງ​ທະ​ບຽນ​ບໍ່​ສຳ​ເລັດ"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"ຮອດ​ຂີດ​ຈຳ​ກັດ​ເວ​ລາ​ການ​ລົງ​ທະ​ບຽນ​ລາຍ​ນີ້ວ​ມື​ແລ້ວ. ລອງ​ໃໝ່​ອີກ."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ການ​ລົງ​ທະ​ບຽນ​ລາຍ​ນີ້ວ​ມື​ບໍ່​ເຮັດ​ວຽກ. ລອງ​ໃໝ່​ອີກ ຫຼື ໃຊ້​ນີ້ວ​ມື​ນີ້ວ​ອື່ນ."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ອຸປະກອນນີ້ໂດຍບໍ່ໄດ້ຮັບອະນຸຍາດຈາກທ່ານ ໂດຍການເປີດນຳໃຊ້ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນ. ເລືອກການລັອກໜ້າຈໍທີ່ທ່ານຕ້ອງການໃຊ້."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ໂທລະສັບນີ້ໂດຍບໍ່ໄດ້ຮັບອະນຸຍາດຈາກທ່ານ ໂດຍການເປີດນຳໃຊ້ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນ. ເລືອກການລັອກໜ້າຈໍທີ່ທ່ານຕ້ອງການໃຊ້."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"ເລືອກວິ​ທີ​ລັອກ​ໜ້າ​ຈໍ​ການ​ສຳ​ຮອງ​ຂອງ​ທ່ານ"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"ຕົວເລືອກໜ້າຈໍລັອກ"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"ຕົວເລືອກໜ້າຈໍລັອກ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ການລັອກໜ້າຈໍ"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / ທັນທີຫຼັງຈາກນອນ"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> ຫຼັງຈາກນອນ"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ປ່ຽນຮູບແບບການປົດລັອກ"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ປ່ຽນລະຫັດປົດລັອກ PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ປ່ຽນລະຫັດປົດລັອກ"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"ລອງໃໝ່ອີກຄັ້ງ. ຄວາມພະຍາຍາມເທື່ອທີ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ຈາກທັງໝົດ <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"ຄວາມພະຍາຍາມເທື່ອສຸດທ້າຍ"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"ຫາກທ່ານລະບຸຮູບແບບລະຫັດບ່ອນເຮັດວຽກບໍ່ຖືກຕ້ອງໃນເທື່ອນີ້, ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ ແລະ ຂໍ້ມູນທີ່ເຊື່ອມໂຍງໄວ້ຂອງທ່ານຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"ຫາກທ່ານໃສ່ລະຫັດ PIN ບ່ອນເຮັດວຽກບໍ່ຖືກຕ້ອງໃນເທື່ອນີ້, ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ ແລະ ຂໍ້ມູນທີ່ເຊື່ອມໂຍງໄວ້ຂອງທ່ານຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"ຫາກທ່ານໃສ່ລະຫັດຜ່ານບ່ອນເຮັດວຽກບໍ່ຖືກຕ້ອງໃນເທື່ອນີ້, ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ ແລະ ຂໍ້ມູນທີ່ເຊື່ອມໂຍງໄວ້ຂອງທ່ານຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"ພະຍາຍາມບໍ່ສຳເລັດຫຼາຍເທື່ອເກີນໄປ. ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ ແລະ ຂໍ້ມູນທີ່ເຊື່ອມໂຍງໄວ້ຂອງທ່ານຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ປິດໄວ້"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"ກະລຸນາລອງໃໝ່ອີກຄັ້ງ. ຄວາມພະຍາຍາມເທື່ອທີ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ຈາກທັງໝົດ <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"ຂໍ້ມູນຂອງທ່ານຈະຖືກລຶບອອກ"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"ຫາກທ່ານໃສ່ຣູບແບບຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ອຸປະກອນນີ້ຈະຖືກລຶບຂໍ້ມູນອອກ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"ຫາກທ່ານໃສ່ລະຫັດ PIN ຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ອຸປະກອນນີ້ຈະຖືກລຶບຂໍ້ມູນອອກ"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"ຫາກທ່ານໃສ່ລະຫັດຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ອຸປະກອນນີ້ຈະຖືກລຶບຂໍ້ມູນອອກ"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"ຫາກທ່ານໃສ່ຣູບແບບຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ຜູ້ໃຊ້ນີ້ຈະຖືກລຶບອອກ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"ຫາກທ່ານໃສ່ລະຫັດ PIN ຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ຜູ້ໃຊ້ນີ້ຈະຖືກລຶບອອກ"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"ຫາກທ່ານໃສ່ລະຫັດຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ຜູ້ໃຊ້ນີ້ຈະຖືກລຶບອອກ"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"ຫາກທ່ານໃສ່ຣູບແບບຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ໂປຣໄຟລ໌ບ່ອນເຣັດວຽກຂອງທ່ານ ແລະ ຂໍ້ມູນຂອງມັນຈະຖືກລຶບອອກ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"ຫາກທ່ານໃສ່ລະຫັດ PIN ຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ໂປຣໄຟລ໌ບ່ອນເຣັດວຽກຂອງທ່ານ ແລະ ຂໍ້ມູນຂອງມັນຈະຖືກລຶບອອກ"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"ຫາກທ່ານໃສ່ລະຫັດຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ໂປຣໄຟລ໌ບ່ອນເຣັດວຽກຂອງທ່ານ ແລະ ຂໍ້ມູນຂອງມັນຈະຖືກລຶບອອກ"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"ພະຍາຍາມປົດລັອກບໍ່ສຳເລັດຫຼາຍເທື່ອເກີນໄປ. ອຸປະກອນນີ້ຈະຖືກລຶບຂໍ້ມູນອອກ."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"ພະຍາຍາມປົດລັອກບໍ່ສຳເລັດຫຼາຍເທື່ອເກີນໄປ. ຜູ້ໃຊ້ນີ້ຈະຖືກລຶບຂໍ້ມູນອອກ."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"ພະຍາຍາມປົດລັອກບໍ່ສຳເລັດຫຼາຍເທື່ອເກີນໄປ. ໂປຣໄຟລ໌ບ່ອນເຣັດວຽກ ແລະ ຂໍ້ມູນຂອງມັນຈະຖືກລຶບອອກ."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"ປິດໄວ້"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"ຕ້ອງມີຢ່າງຕ່ຳ <xliff:g id="COUNT">%d</xliff:g> ຕົວອັກສອນ"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"ລະ​ຫັດ PIN ຕ້ອງ​ມີ​ຢ່າງ​ໜ້ອຍ <xliff:g id="COUNT">%d</xliff:g> ຕົວເລກ"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ດຳເນີນການຕໍ່"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth ລະດັບສູງ"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ເມື່ອ Bluetooth ຖືກ​ເປີດ​ນຳ​ໃຊ້, ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ຈະ​ສາ​ມາດ​ສື່​ສານ​ກັບ​ອຸ​ປະ​ກອນ Bluetooth ອື່ນ​ທີ່​ຢູ່​ໃກ້​ຄຽງ​ໄດ້."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"ເພື່ອ​ປັບ​ປຸງ​ຄວາມ​ແມ່ນຍຳຂອງ​ສະຖານທີ່, ແອັບ ແລະ ການ​ບໍ​ລິ​ການຍັງ​ຄົງສາ​ມາດສະ​ແກນ​ຫາເຄືອ​ຂ່າຍ Wi‑Fi ໄດ້. ທ່ານ​ສາ​ມາດ​ປ່ຽນ​ແປງ​ໄດ້​ຢູ່​ໃນ <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ການ​ຕັ້ງ​ຄ່າ​ການ​ສະ​ແກນ<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"ບໍ່ສາມາດເຊື່ອມຕໍ່ໄດ້. ກະລຸນາລອງອີກຄັ້ງ."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"ລາຍລະອຽດອຸປະກອນ"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"ທີ່ຢູ່ Bluetooth ຂອງອຸປະກອນ: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"ລືມອຸປະກອນບໍ?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"ໂທລະສັບຂອງທ່ານບໍ່ໄດ້ຈັບຄູ່ກັບ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ອີກຕໍ່ໄປແລ້ວ"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"ແທັບເລັດຂອງທ່ານບໍ່ໄດ້ຈັບຄູ່ກັບ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ອີກຕໍ່ໄປແລ້ວ"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"ອຸປະກອນຂອງທ່ານບໍ່ໄດ້ຈັບຄູ່ກັບ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ອີກຕໍ່ໄປແລ້ວ"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"ລືມອຸປະກອນ"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ເຊື່ອມຕໍ່ກັບ..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ຈະຖືກຖອດການເຊື່ອມຕໍ່ຈາກສື່ດ້ານສຽງ."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ຈະຖືກຕັດການເຊື່ອມຕໍ່ຈາກລະບົບແຮນຟຣີ."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"ບໍ່ໃຫ້"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"ບໍ່ກວດຮັບຮອງ"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"ບໍ່ໄດ້ລະບຸໃບຢັ້ງຢືນໃດໆ. ການເຊື່ອມຕໍ່ຂອງທ່ານຈະບໍ່ເປັນສ່ວນຕົວ."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"ຊື່ເຄືອຂ່າຍຍາວເກີນໄປ."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"ຕ້ອງລະບຸໂດເມນ."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"ສາມາດໃຊ້ WPS ໄດ້"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (ສາມາດໃຊ້ WPS ໄດ້)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 ເຄືອຂ່າຍ</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi ຂັ້ນສູງ"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"ຕັ້ງຄ່າ Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"ທີ່ຢູ່ MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"ທີ່ຢູ່ IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet Mask"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ລືມກຸ່ມນີ້?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Wi-Fi ຮັອດສະປອດເຄື່ອນທີ່"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi ຮັອດ​ສະ​ປອດ"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"ໃຊ້ອິນເຕີເນັດມືຖືເພື່ອໃຫ້ບໍລິການ Wi‑Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"ບໍ່ໄດ້ແບ່ງປັນອິນເຕີເນັດຂອງແທັບເລັດໜ່ວຍນີ້ຜ່ານຮັອດສະປອດ"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"ບໍ່ໄດ້ແບ່ງປັນອິນເຕີເນັດມືຖືຂອງໂທລະສັບໜ່ວຍນີ້ຜ່ານຮັອດສະປອດ"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"ບໍ່ໄດ້ແບ່ງປັນອິນເຕີເນັດ ຫຼື ເນື້ອຫາກັບອຸປະກອນອື່ນ"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ກຳລັງແບ່ງປັນການເຊື່ອມຕໍ່ອິນເຕີເນັດຂອງແທັບເລັດຜ່ານທາງຮັອດສະປອດ"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ກຳລັງແບ່ງປັນການເຊື່ອມຕໍ່ອິນເຕີເນັດຂອງໂທລະສັບຜ່ານທາງຮັອດສະປອດ"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ແອັບກຳລັງແບ່ງປັນເນື້ອຫາ. ເພື່ອແບ່ງປັນອິນເຕີເນັດ, ໃຫ້ປິດຮັອດສະປອດໄວ້ກ່ອນ ຈາກນັ້ນເປີດຄືນໃໝ່"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"ຊື່ Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"ກຳລັງເປີດໃຊ້ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"ອຸປະກອນອື່ນສາມາດເຊື່ອມຕໍ່ຫາ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ໄດ້"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"ລະຫັດຜ່ານ Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"ຄື້ນ AP"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ໃຊ້ຮັອດສະປອດເພື່ອສ້າງເຄືອຂ່າຍ Wi-Fi ສຳລັບອຸປະກອນອື່ນຂອງທ່ານ. ຮັອດສະປອດຈະສະໜອງອິນເຕີເນັດໂດຍໃຊ້ການເຊື່ອມຕໍ່ອິນເຕີເນັດມືຖືຂອງທ່ານ. ອາດມີການຮຽກເກັບຄ່າອິນເຕີເນັດມືຖືເພີ່ມເຕີມໄດ້."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ແອັບຕ່າງໆສາມາດສ້າງຮັອດສະປອດເພື່ອແບ່ງປັນເນື້ອຫາກັບອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງໄດ້."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"ກຳລັງເປີດໃຊ້ຮັອດສະປອດ..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"ກຳລັງປິດຮັອດສະປອດ..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ເຮັດວຽກຢູ່"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ເມື່ອ​ການ​ໂທ Wi-Fi ເປີດ, ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ​ສາ​ມາດ​ໃຫ້​ທິດ​ທາງ​ການ​ໂທ​ຜ່ານ​ເຄືອ​ຂ່າຍ Wi-Fi ຫຼື​ເຄືອ​ຂ່າຍ​ຂອງ​ຜູ້​ໃຫ້​ບໍ​ລິ​ການ​ຂອງ​ທ່ານ, ຂຶ້ນ​ກັບ​ຄວາມ​ມັກ​ຂອງ​ທ່ານ ແລະ​ສັນ​ຍານ​ໃດ​ແຮງ​ກ່ວາ. ກ່ອນ​ເປີດ​ຄຸນ​ສ​ົມ​ບັດ​ນີ້, ກວດ​ເບິ່ງ​ກັບ​ຜູ້​ໃຫ້​ບໍ​ລິ​ການ​ເຄືອ​ຂ່າຍ​ຂອງ​ທ່ານ​ໃນ​ເລື່ອງ​ຄ່າ​ບໍ​ລິ​ການ ແລະ​ລາຍ​ລະ​ອຽດ​ອື່ນໆ."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"ອັບເດດທີ່ຢູ່ສຸກເສີນ"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"ທີ່ຢູ່ທີ່ໃຊ້ໂດຍບໍລິການສຸກເສີນເປັນສະຖານທີ່ຢູ່ຂອງທ່ານຫາກທ່ານໂທຫາ 911 ຜ່ານ WiFi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ການສະແດງຜົນ"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"ບໍ່ມີຜົນການຊອກຫາ"</string>
     <string name="display_settings" msgid="7965901687241669598">"ການສະແດງຜົນ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ໝຸນໜ້າຈໍອັດຕະໂນມັດ"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"ສີສົດໃສ"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ປັບປ່ຽນທິດທາງອັດຕະໂນມັດເມື່ອໝຸນແທັບເລັດ"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ປັບປ່ຽນທິດທາງອັດຕະໂນມັດເມື່ອໝຸນໂທລະສັບ"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"ສະລັບທິດທາງອັດຕະໂນມັດເມື່ອໝຸນແທັບເລັດ"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"ປັບແຕ່ງຄວາມສະຫວ່າງຂອງແສງ. ເມື່ອເປີດໃຊ້ຄຸນສົມບັດນີ້, ທ່ານຈະຍັງຄົງສາມາດປັບແຕ່ງລະດັບຄວາມສະຫວ່າງຊົ່ວຄາວໄດ້ຢູ່."</string>
     <string name="night_display_title" msgid="2626451512200357686">"ແສງກາງຄືນ"</string>
     <string name="night_display_text" msgid="1837277457033025056">"ຄຸນສົມບັດ ແສງກາງຄືນ ຈະໃສ່ສີໜ້າຈໍຂອງທ່ານເປັນສີແດງໃນເວລາກາງຄືນ. ນີ້ຈະເຮັດໃຫ້ສາມາດເບິ່ງໜ້າຈໍໄດ້ງ່າຍຂຶ້ນໃນສະພາບແສງໜ້ອຍ ແລະ ອາດຊ່ວຍໃຫ້ທ່ານນອນຫຼັບງ່າຍຂຶ້ນໄດ້ນຳ."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"ຕັ້ງເວລາ"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"ສະຖານະ"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"ເປີດໃຊ້ອັດຕະໂນມັດ"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"ບໍ່ໃຊ້"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"ກຳນົດການແບບເລືອກເອງ"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"ຕາເວັນຕົກຫາຕາເວັນຂຶ້ນ"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"ຕັ້ງເວລາ"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"ບໍ່ມີ"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"ເປີດໃຊ້ໃນເວລາທີ່ກຳນົດເອງ"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"ເປີດໃຊ້ນັບແຕ່ຕາເວັນຕົກຮອດຕາເວັນຂຶ້ນ"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"ເວລາເລີ່ມ"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"ເວລາສິ້ນສຸດ"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"ສະຖານະ"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"ຄວາມເຂັ້ມຂຸ້ນ"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"ປິດ. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"ຈະບໍ່ເປີດອັດຕະໂນມັດ"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"ຈະເປີດອັດຕະໂນມັດເວລາ <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"ຈະເປີດອັດຕະໂນມັດເມື່ອຕາເວັນຕົກ."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"ເປີດ. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"ຈະບໍ່ປິດອັດຕະໂນມັດ."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"ຂະປິດອັດຕະໂນມັດເວລາ <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"ຈະປິດອັດຕະໂນມັດເມື່ອຕາເວັນຂຶ້ນ."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"ປິດ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"ຈະບໍ່ເປີດອັດຕະໂນມັດ"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"ຈະເປີດອັດຕະໂນມັດເວລາ <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"ຈະເປີດອັດຕະໂນມັດເມື່ອຕາເວັນຕົກ"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"ເປີດ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"ຈະບໍ່ປິດອັດຕະໂນມັດ"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"ຂະປິດອັດຕະໂນມັດເວລາ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"ຈະປິດອັດຕະໂນມັດເມື່ອຕາເວັນຂຶ້ນ"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"ເວລາປິດໜ້າຈໍ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"​ປິດ​ໜ້າ​ຈໍ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"ຫຼັງຈາກ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ທີ່ບໍ່ໄດ້ເຮັດຫຍັງ"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"ການຕັ້ງຄ່າ"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ປັບຄວາມແຈ້ງອັດຕະໂນມັດ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ຍົກ​ເພື່ອ​ເປີດ​ໜ້າ​ຈໍ"</string>
-    <string name="doze_title" msgid="2259176504273878294">"ການ​ສະ​ແດງ​ຜົນ​ສະ​ພາບ​ແວດ​ລ້ອມ"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"ການສະແດງຜົນສະພາບແວດລ້ອມ"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"ເປີດຕະຫຼອດ"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ການແຈ້ງເຕືອນໃໝ່"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ສະແດງຕອນໃດ"</string>
+    <string name="doze_title" msgid="2375510714460456687">"ການແຈ້ງເຕືອນໃໝ່"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ເປີດໜ້າຈໍເມື່ອທ່ານໄດ້ຮັບການແຈ້ງເຕືອນ"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"ເປີດຕະຫຼອດ"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"ສະແດງເວລາ, ໄອຄອນການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ຂະໜາດຕົວອັກສອນ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ເຮັດໃຫ້ຂໍ້ຄວາມໃຫຍ່ຂຶ້ນ ຫຼື ນ້ອຍລົງ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"ການຕັ້ງຄ່າການລັອກ SIM card"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN ບໍ່ສາມາດປ່ອຍໃຫ້ຫວ່າງໄດ້."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"ຊ່ອງຂໍ້ມູນ MMC ຕ້ອງມີ 3 ໂຕເລກ."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"ແຖບຂໍ້ມູນ MNC ຕ້ອງມີໂຕເລກຢ່າງໜ້ອຍ 2 ຫຼື 3 ໂຕ."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"ຜູ້ໃຫ້ບໍລິການບໍ່ອະນຸຍາດໃຫ້ເພີ່ມ APN ປະເພດ %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"ກຳລັງຄືນການຕັ້ງຄ່າ APN ເລີ່ມຕົ້ນ."</string>
     <string name="menu_restore" msgid="8260067415075573273">"ຕັ້ງກັບຄືນໄປໃຊ້ຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ການຕັ້ງຄ່າ APN ເລີ່ມຕົ້ນຄືນໃໝ່ສຳເລັດແລ້ວ."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"ລຶບຂໍ້ມູນ SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"ລຶບຂໍ້ມູນທຸກຢ່າງທີ່ຢູ່ໃນພື້ນທີ່ຈັດເກັບຂໍ້ມູນ USB ພາຍໃນ ເຊັ່ນເພງ ຫຼືຮູບພາບ"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"ລຶບຂໍ້ມູນທັງໝົດໃນ SD card ເຊັ່ນ: ເພງ ແລະຮູບພາບ"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"ລຶບລ້າງ eSIMs"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"ລຶບລ້າງ eSIMs ທັງໝົດໃນໂທລະສັບ. ຂັ້ນຕອນນີ້ບໍ່ແມ່ນການຍົກເລີກແພັກເກດບໍລິການມືຖືຂອງທ່ານ."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"ລຶບລ້າງ eSIMs ທັງໝົດໃນແທັບເລັດ. ຂັ້ນຕອນນີ້ບໍ່ແມ່ນການຍົກເລີກແພັກເກດບໍລິການມືຖືຂອງທ່ານ."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ຣີເຊັດແທັບເລັດ"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ຣີເຊັດໂທລະສັບ"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"​ລຶບ​ຂໍ້​ມູນ​ສ່ວນ​ໂຕ ແລະ​ແອັບທີ່​ດາວ​ໂຫລດ​ມາ​ທັງໝົດ​ບໍ? ທ່ານ​ຈະ​ບໍ່​ສາມາດບໍ່​ເຮັດ​ການ​ກະ​ທຳ​ນີ້ໄດ້​ອີກ!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ບໍ່ສາມາດປ່ອຍສັນຍານ ຫຼື ໃຊ້ຮັອດສະປອດເຄື່ອນທີ່ໃນຂະນະທີ່ເປີດຕົວປະຢັດຂໍ້ມູນໄດ້"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"ການປ່ອຍສັນຍານດ້ວຍ USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"ເຊື່ອມຕໍ່ USB ແລ້ວ, ກວດສອບເພື່ອປ່ອຍສັນຍານ"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"ປ່ອຍສັນຍານແລ້ວ"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"ບໍ່ສາມາດປ່ອຍສັນຍານເມື່ອໃຊ້ USB ເປັນບ່ອນຈັດເກັບຂໍ້ມູນ"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"ບໍ່ໄດ້ເຊື່ອມຕໍ່ USB"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"​ເຊື່ອມ​ຕໍ່​ເພື່ອ​ເປີດ​ນຳ​ໃຊ້"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"ການປ່ອຍສັນຍານຜ່ານ USB ຜິດພາດ"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"ແບ່ງປັນອິນເຕີເນັດຂອງໂທລະສັບຜ່ານທາງ USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"ແບ່ງປັນອິນເຕີເນັດຂອງແທັບເລັດຜ່ານທາງ USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ປ່ອຍສັນຍານຜ່ານ Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"ກຳລັງແບ່ງປັນອິນເຕີເນັດຂອງແທັບເລັດໜ່ວຍນີ້ຜ່ານ Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"ກຳລັງແບ່ງປັນອິນເຕີເນັດມືຖືຂອງໂທລະສັບໜ່ວຍນີ້ຜ່ານ Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"ກຳລັງແບ່ງປັນອິນເຕີເນັດຂອງແທັບເລັດໜ່ວຍນີ້ໃຫ້ກັບ 1 ອຸປະກອນຜ່ານ Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"ກຳລັງແບ່ງປັນອິນເຕີເນັດມືຖືຂອງໂທລະສັບໜ່ວຍນີ້ໃຫ້ກັບ 1 ອຸປະກອນຜ່ານ Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"ກຳລັງແບ່ງປັນອິນເຕີເນັດຂອງແທັບເລັດໜ່ວຍນີ້ໃຫ້ກັບ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ອຸປະກອນຜ່ານ Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"ກຳລັງແບ່ງປັນອິນເຕີເນັດມືຖືຂອງໂທລະສັບໜ່ວຍນີ້ໃຫ້ກັບ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ອຸປະກອນຜ່ານ Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"ແບ່ງປັນການເຊື່ອມຕໍ່ອິນເຕີເນັດຂອງແທັບເລັດຜ່ານທາງ Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"ແບ່ງປັນການເຊື່ອມຕໍ່ອິນເຕີເນັດຂອງໂທລະສັບຜ່ານທາງ Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"ກຳລັງແບ່ງປັນອິນເຕີເນັດຂອງ <xliff:g id="DEVICE_NAME">%1$d</xliff:g> ຜ່ານທາງ Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"ບໍ່ມີການແບ່ງປັນອິນເຕີເນັດຂອງແທັບເລັດໜ່ວຍນີ້ຜ່ານທາງ Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"ບໍ່ມີການແບ່ງປັນອິນເຕີເນັດຂອງໂທລະສັບໜ່ວຍນີ້ຜ່ານທາງ Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"ບໍ່ໄດ້ປ່ອຍສັນຍານ"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"ບໍ່ສາມາດປ່ອຍສັນຍານໃຫ້ໄດ້ຫຼາຍກວ່າ <xliff:g id="MAXCONNECTION">%1$d</xliff:g> ອຸປະກອນ."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ຈະຖືກຍົກເລີກການປ່ອຍສັນຍານ."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"ໃຊ້ຮັອດສະປອດ ແລະ ການປ່ອຍສັນຍາຍເພື່ອສະໜອງອິນເຕີເນັດໃຫ້ກັບອຸປະກອນອື່ນຜ່ານການເຊື່ອມຕໍ່ມືຖືຂອງທ່ານ."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"ໃຊ້ຮັອດສະປອດ ແລະ ການປ່ອຍສັນຍານເພື່ອສະໜອງອິນເຕີເນັດໃຫ້ອຸປະກອນອື່ນຜ່ານທາງການເຊື່ອມຕໍ່ອິນເຕີເນັດມືຖືຂອງທ່ານ. ແອັບຕ່າງໆສາມາດສ້າງຮັອດສະປອດ ແລະ ແບ່ງປັນອິນເຕີເນັດກັບອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງໄດ້."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ຊ່ວຍເຫຼືອ"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"ເຄືອຂ່າຍໂທລະສັບ"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"ແພັກເກດມືຖື"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"ໂຫມດຂໍ້ມູນສະຖານທີ່"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"ໃຊ້ GPS, Wi‑Fi, Bluetooth ຫຼື ເຄືອຂ່າຍມືຖືເພື່ອລະບຸສະຖານທີ່"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"ໃຊ້ Wi‑Fi, Bluetooth ຫຼື ເຄືອຂ່າຍມືຖືເພື່ອລະບຸສະຖານທີ່"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ໃຊ້ GPS ເພື່ອຊອກຫາສະຖານທີ່ຂອງທ່ານ"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"ໃຊ້ GPS ແລະ ເຊັນເຊີຂອງອຸປະກອນເພື່ອລະບຸສະຖານທີ່"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"ການສະແກນ"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"ການ​ສະ​ແກນ Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"​ປັບ​ປຸງ​ທີ່​ຕັ້ງໂດຍ​ການ​ອະ​ນຸຍາດ​ໃຫ້ແອັບ ແລະ ການ​ບໍ​ລິ​ການຂອງລະບົບເພື່ອກວດຫາ​ເຄືອ​ຂ່າຍ Wi‑Fi ໄດ້​ທຸກ​ເວ​ລາ."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"ທ່ານບໍ່ໄດ້ເຊື່ອມຕໍ່ຂໍ້ມູນອິນເຕີເນັດ. ເພື່ອເບິ່ງຂໍ້ມູນນີ້ໃນເວລານີ້, ກະລຸນາໄປທີ່ %s ຈາກຄອມພິວເຕີເຄື່ອງໃດກໍໄດ້ທີ່ເຊື່ອມຕໍ່ກັບອິນເຕີເນັດຢູ່."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ກຳລັງໂຫລດ..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"ເລືອກລະຫັດຜ່ານຂອງທ່ານ"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງລະຫັດຜ່ານກ່ອນ"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"ເລືອກຮູບແບບຂອງທ່ານ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງຮູບແບບປົດລັອກກ່ອນ"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"ເລືອກລະຫັດ PIN ຂອງທ່ານ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ເພື່ອໃຊ້ລາຍນິ້ວມື, ໃຫ້ຕັ້ງລະຫັດ PIN ກ່ອນ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"ຢືນຢັນລະຫັດຜ່ານຂອງທ່ານ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ຢືນຢັນຮູບແບບຂອງທ່ານ"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"ຢືນຢັນລະຫັດ PIN ຂອງທ່ານ"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"ການຕັ້ງຄ່າແອັບຯ"</string>
     <string name="install_applications" msgid="4872012136210802181">"ແຫຼ່ງຂໍ້ມູນທີ່ບໍ່ຮູ້ຈັກ"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"​ອະ​ນຸ​ຍາດ​ແຫລ່ງ​ຂໍ້​ມູນ​ແອັບຯ​ທັງ​ໝົດ"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"ແອັບທີ່ຫາກໍເປີດຫຼ້າສຸດ"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"ເບິ່ງທັງໝົດ <xliff:g id="COUNT">%1$d</xliff:g> ແອັບ"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> ກ່ອນ"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ແທັບເລັດ ແລະ ຂໍ້ມູນສ່ວນຕົວຂອງທ່ານຈະສາມາດຖືກແອັບທີ່ບໍ່ຮູ້ຈັກໂຈມຕີໄດ້ງ່າຍຂຶ້ນ. ໂດຍການຕິດຕັ້ງແອັບຕ່າງໆຈາກແຫລ່ງຂໍ້ມູນເຫຼົ່ານີ້, ແມ່ນທ່ານຍອມຮັບວ່າຈະຮັບຜິດຊອບຕໍ່ຄວາມເສຍຫາຍທີ່ເກີດຂຶ້ນກັບໂທລະສັບຂອງທ່ານ ຫຼື ການສູນເສຍຂໍ້ມູນທີ່ອາດເກີດຂຶ້ນຈາກການນຳໃຊ້ແອັບເຫຼົ່ານັ້ນ."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"ໂທລະສັບ ແລະ ຂໍ້ມູນສ່ວນຕົວຂອງທ່ານຈະສາມາດຖືກແອັບທີ່ບໍ່ຮູ້ຈັກໂຈມຕີໄດ້ງ່າຍຂຶ້ນ. ໂດຍການຕິດຕັ້ງແອັບຕ່າງໆຈາກແຫລ່ງຂໍ້ມູນເຫຼົ່ານີ້, ແມ່ນທ່ານຍອມຮັບວ່າຈະຮັບຜິດຊອບຕໍ່ຄວາມເສຍຫາຍທີ່ເກີດຂຶ້ນກັບໂທລະສັບຂອງທ່ານ ຫຼື ການສູນເສຍຂໍ້ມູນທີ່ອາດເກີດຂຶ້ນຈາກການນຳໃຊ້ແອັບເຫຼົ່ານັ້ນ."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"ການຕັ້ງຄ່າຂັ້ນສູງ"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"ຢຸດບໍລິການຂອງລະບົບ?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"ຫາກທ່ານປິດບໍລິການນີ້ ບາງຄຸນສົມບັດຂອງແທັບເລັດຂອງທ່ານອາດເຮັດວຽກບໍ່ຖືກຕ້ອງໄດ້ ຈົນກວ່າທ່ານຈະປິດແລ້ວເປີດໃໝ່ໃໝ່ອີກຄັ້ງ."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"ຫາກທ່ານຢຸດບໍລິການນີ້ ບາງຄຸນສົມບັດຂອງໂທລະສັບທ່ານອາດເຮັດວຽກໄດ້ບໍ່ຖືກຕ້ອງ ຈົນກວ່າທ່ານຈະປິດແລ້ວເປີດໃໝ່ໃໝ່ອີກຄັ້ງ."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"ພາສາ, ການປ້ອນຂໍ້ມູນ ແລະ ທ່າທາງ"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"ພາສາ ແລະ ການປ້ອນຂໍ້ມູນ"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ພາສາ ແລະ ການປ້ອນຂໍ້ມູນ"</string>
     <string name="input_assistance" msgid="7577795275222555487">"ຜູ້ຊ່ວຍປ້ອນຂໍ້ມູນ"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other">ເປີດ <xliff:g id="COUNT">%1$d</xliff:g> ບໍລິການພິມ</item>
       <item quantity="one">ເປີດ 1 ບໍລິການພິມ</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ວຽກພິມ</item>
+      <item quantity="one">1 ວຽກພິມ</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"ບໍລິການພິມ"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"ບໍ່ມີບໍລິການຖືກຕິດຕັ້ງເທື່ອ"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"ບໍ່ພົບເຄື່ອງພິມ"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"ໃຊ້ລາຍລະອຽດ"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"ປັບແຕ່ງການໃຊ້ພະລັງງານ"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"ແພັກເກດທີ່ຮວມມານຳ"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ແອັບທີ່ໃຊ້ແບັດເຕີຣີ"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"ເປີດໜ້າຈໍໄວ້"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ປຸກໂທລະສັບຂຶ້ນໃນພື້ນຫຼັງ"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ກຳລັງຮ້ອງຂໍສະຖານທີ່ເລື້ອຍໆ"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ແອັບເຮັດວຽກຜິດປົກກະຕິ"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"ຢຸດແອັບໄວ້ບໍ?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"ໂທລະສັບຂອງທ່ານບໍ່ສາມາດຈັດການແບັດເຕີຣີໄດ້ຕາມປົກກະຕິເນື່ອງຈາກ <xliff:g id="APP">%1$s</xliff:g> ພະຍາຍາມເປີດໜ້າຈໍໂທລະສັບຂອງທ່ານໄວ້.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ທ່ານສາມາດບັງຄັບປິດແອັບດັ່ງກ່າວໄວ້ໄດ້.\n\nຫາກບັນຫານີ້ຍັງຄົງເກີດຂຶ້ນເລື້ອຍໆ, ທ່ານອາດຈຳເປັນຕ້ອງຖອນການຕິດຕັ້ງແອັບດັ່ງກ່າວເພື່ອປັບປຸງປະສິດທິພາບແບັດເຕີຣີ."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"ແທັບເລັດຂອງທ່ານບໍ່ສາມາດຈັດການແບັດເຕີຣີໄດ້ຕາມປົກກະຕິເນື່ອງຈາກ <xliff:g id="APP">%1$s</xliff:g> ພະຍາຍາມເປີດໜ້າຈໍແທັບເລັດຂອງທ່ານໄວ້.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ທ່ານສາມາດບັງຄັບປິດແອັບດັ່ງກ່າວໄວ້ໄດ້.\n\nຫາກບັນຫານີ້ຍັງຄົງເກີດຂຶ້ນເລື້ອຍໆ, ທ່ານອາດຈຳເປັນຕ້ອງຖອນການຕິດຕັ້ງແອັບດັ່ງກ່າວເພື່ອປັບປຸງປະສິດທິພາບແບັດເຕີຣີ."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"ອຸປະກອນຂອງທ່ານບໍ່ສາມາດຈັດການແບັດເຕີຣີໄດ້ຕາມປົກກະຕິເນື່ອງຈາກ <xliff:g id="APP">%1$s</xliff:g> ພະຍາຍາມເປີດໜ້າຈໍອຸປະກອນຂອງທ່ານໄວ້.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ທ່ານສາມາດບັງຄັບປິດແອັບດັ່ງກ່າວໄວ້ໄດ້.\n\nຫາກບັນຫານີ້ຍັງຄົງເກີດຂຶ້ນເລື້ອຍໆ, ທ່ານອາດຈຳເປັນຕ້ອງຖອນການຕິດຕັ້ງແອັບດັ່ງກ່າວເພື່ອປັບປຸງປະສິດທິພາບແບັດເຕີຣີ."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"ຢຸດແອັບ"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"ປິດການນຳໃຊ້ໃນພື້ນຫຼັງໄວ້ບໍ?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"ໂທລະສັບຂອງທ່ານບໍ່ສາມາດຈັດການແບັດເຕີຣີຕາມປົກກະຕິໄດ້ເນື່ອງຈາກ <xliff:g id="APP">%1$s</xliff:g> ພະຍາຍາມເປີດໜ້າຈໍໂທລະສັບຂອງທ່ານໄວ້ຕະຫຼອດ.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ໂທລະສັບຂອງທ່ານສາມາດປ້ອງກັນບໍ່ໃຫ້ແອັບນີ້ເປີດໃນພື້ນຫຼັງໄດ້."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"ແທັບເລັດຂອງທ່ານບໍ່ສາມາດຈັດການແບັດເຕີຣີຕາມປົກກະຕິໄດ້ເນື່ອງຈາກ <xliff:g id="APP">%1$s</xliff:g> ພະຍາຍາມເປີດໜ້າຈໍແທັບເລັດຂອງທ່ານໄວ້ຕະຫຼອດ.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ແທັບເລັດຂອງທ່ານສາມາດປ້ອງກັນບໍ່ໃຫ້ແອັບນີ້ເປີດໃນພື້ນຫຼັງໄດ້."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"ອຸປະກອນຂອງທ່ານບໍ່ສາມາດຈັດການແບັດເຕີຣີຕາມປົກກະຕິໄດ້ເນື່ອງຈາກ <xliff:g id="APP">%1$s</xliff:g> ພະຍາຍາມເປີດໜ້າຈໍອຸປະກອນຂອງທ່ານໄວ້ຕະຫຼອດ.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ອຸປະກອນຂອງທ່ານສາມາດປ້ອງກັນບໍ່ໃຫ້ແອັບນີ້ເປີດໃນພື້ນຫຼັງໄດ້."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"ປິດໄວ້"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"ປິດສະຖານທີ່ໄວ້ບໍ?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"ໂທລະສັບຂອງທ່ານບໍ່ສາມາດຈັດການແບັດເຕີຣີໄດ້ເນື່ອງຈາກ <xliff:g id="APP">%1$s</xliff:g> ພະຍາຍາມຮ້ອງຂໍຂໍ້ມູນສະຖານທີ່ຂອງທ່ານໃນຕອນທີ່ທ່ານບໍ່ໄດ້ໃຊ້ແອັບດັ່ງກ່າວ.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ທ່ານສາມາດປິດສະຖານທີ່ສຳລັບແອັບນີ້ໄດ້."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"ແທັບເລັດຂອງທ່ານບໍ່ສາມາດຈັດການແບັດເຕີຣີໄດ້ເນື່ອງຈາກ <xliff:g id="APP">%1$s</xliff:g> ພະຍາຍາມຮ້ອງຂໍຂໍ້ມູນສະຖານທີ່ຂອງທ່ານໃນຕອນທີ່ທ່ານບໍ່ໄດ້ໃຊ້ແອັບດັ່ງກ່າວ.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ທ່ານສາມາດປິດສະຖານທີ່ສຳລັບແອັບນີ້ໄດ້."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"ອຸປະກອນຂອງທ່ານບໍ່ສາມາດຈັດການແບັດເຕີຣີໄດ້ເນື່ອງຈາກ <xliff:g id="APP">%1$s</xliff:g> ພະຍາຍາມຮ້ອງຂໍຂໍ້ມູນສະຖານທີ່ຂອງທ່ານໃນຕອນທີ່ທ່ານບໍ່ໄດ້ໃຊ້ແອັບດັ່ງກ່າວ.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ທ່ານສາມາດປິດສະຖານທີ່ສຳລັບແອັບນີ້ໄດ້."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"ປິດໄວ້"</string>
     <string name="power_screen" msgid="3023346080675904613">"ໜ້າຈໍ"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"​ໄຟ​ສາຍ"</string>
     <string name="power_camera" msgid="4976286950934622605">"ກ້ອງຖ່າຍຮູບ"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"ແອັບ"</string>
     <string name="power_service" msgid="1599661212370831780">"ບໍລິການ"</string>
     <string name="power_system" msgid="8290455327965307383">"ລະ​ບົບ"</string>
-    <string name="power_user" msgid="1889728099253018005">"ຜູ່ໃຊ້"</string>
+    <string name="power_user" msgid="3706143225319881667">"ຜູ້ໃຊ້ອື່ນໆ"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU ຮວມ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ພື້ນໜ້າ"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ເຮັດວຽກຕະຫຼອດເວລາ"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ການໃຊ້ພະລັງງານທີ່ຄິດໄລ່ເກີນ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"ໃຊ້ເປັນເວລາ <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"ເຮັດວຽກເປັນໄລຍະເວລາ <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"ການນຳໃຊ້ໜ້າຈໍ <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> ໃຊ້ໄປແລ້ວໂດຍ <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ຂອງແບັດເຕີຣີໂດຍຮວມ"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"​ປ່ຽນ​ PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"ສະແດງແຈ້ງເຕືອນ"</string>
     <string name="help_label" msgid="6886837949306318591">"ຊ່ວຍເຫຼືອ &amp; ຄຳຕິຊົມ"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Help articles, phone &amp; chat support"</string>
+    <string name="support_summary" msgid="2705726826263742491">"ບົດຄວາມຊ່ວຍເຫຼືອ, ໂທລະສັບ ແລະ ການສົນທະນາ, ການເລີ່ມຕົ້ນ"</string>
     <string name="user_account_title" msgid="1127193807312271167">"ບັນຊີສຳລັບເນື້ອຫາ"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ຮູບປະຈຳໂຕ"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"​ໄພ​ຄຸກ​ຄາມ​ຮ້າຍ​ແຮງ"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">ສະແດງ %d ລາຍການທີ່ເຊື່ອງໄວ້</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ເຄືອຂ່າຍ ແລະ ອິນເຕີເນັດ"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, ມືຖື, ການນຳໃຊ້ອິນເຕີເນັດ, ຮັອດສະປອດ"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ມືຖື"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ການນຳໃຊ້ຂໍ້ມູນ"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ຮັອດສະປອດ"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ອຸປະກອນທີ່ເຊື່ອມຕໍ່ແລ້ວ"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, ສົ່ງສັນຍານ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ແອັບ ແລະ ການແຈ້ງເຕືອນ"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissions, default apps"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"ຜູ້ໃຊ້ ແລະ ບັນຊີ"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"ທ່າທາງ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pay, tap, payments"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ສຳຮອງຂໍ້ມູນ, ສຳຮອງ ຂໍ້ມູນ"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"ທ່າທາງ, ຄວາມງຽບ, ເລື່ອນ, ໂມງປຸກ, ສາຍໂທເຂົ້າ, ງຽບ, ສະແດງ, ໜ້າຈໍລັອກ, ຂອບ, ຢຸດ, ok google, ຜູ້ຊ່ວຍ google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"ທ່າທາງ, ປຸກ, ການແຈ້ງເຕືອນ, ໜ້າຈໍ, ສະແດງ, ປິດໜ້າຈໍ, ເປີດໜ້າຈໍ, ຂອບ, ຫຼັບ, ນອນ"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"ທ່າທາງ, ຄວາມງຽບ, ເລື່ອນ, ໂມງປຸກ, ສາຍໂທເຂົ້າ, ງຽບ, ສະແດງ, ໜ້າຈໍລັອກ, ຂອບ, ຢຸດ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ຕັ້ງ​ຄ່າ​ແທັກ Wi-Fi NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"ຂຽນ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"​ແ​ຕະ​ທີ່​ແທັກ​ເພື່ອ​ຂຽນ..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"ບໍ່ສະແດງການແຈ້ງເຕືອນໂປຣໄຟລ໌ໃດເລີຍ"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"​ທ່ານ​ຕ້ອງ​ການ​ໃຫ້​ສະ​ແດງ​​ການ​ແຈ້ງ​ເຕືອນ​ໂປຣໄຟລ໌ແນວ​ໃດ​ໃນ​ເວ​ລາ​ທີ່​ອຸ​ປະ​ກອນ​ຖືກ​ລັອກ?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"ການແຈ້ງເຕືອນໂປຣໄຟລ໌"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"ການແຈ້ງເຕືອນ"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"ການແຈ້ງເຕືອນ"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"​ການ​ແຈ້ງ​ເຕືອນ​ແອັບຯ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"ໝວດໝູ່ການແຈ້ງເຕືອນ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"ຄວາມສໍາຄັນ"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"ໃຫ້ແອັບຕັດສິນໃຈ"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"ດ່ວນ"</string>
     <string name="allow_sound" msgid="1820188704793497324">"ອະນຸຍາດສຽງ"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"ບໍ່ໃຊ້ສຽງ, ສັ່ນ ຫຼື ເຫັນການແຈ້ງເຕືອນເຫຼົ່ານີ້ໃນໜ້າຈໍປັດຈຸບັນ."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"ຄວາມສໍາຄັນຕໍ່າ"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"ຄວາມສຳຄັນປານກາງ"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"ຄວາມສໍາຄັນສູງ"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"ຄວາມສໍາຄັນດ່ວນ"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"ຕົວຊ່ວຍ​ການ​ແຈ້ງ​ເຕືອນ"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"ການ​ເຂົ້າ​ເຖິງ​ການ​ແຈ້ງ​ເຕືອນ"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"ການເຂົ້າເຖິງການແຈ້ງເຕືອນໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຖືກບລັອກໄວ້"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ສະແດງຜົນຫຼາຍຢ່າງພ້ອມກັນ"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"ອະນຸຍາດການສະແດງຜົນຊ້ອນ"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"ອະນຸຍາດໃຫ້ແອັບນີ້ສ້າງໜ້າຈໍທີ່ຊ້ອນຂຶ້ນມາໃນເວລາເປີດແອັບອື່ນ ຫຼື ຫຼັງຈາກທ່ານອອກຈາກມັນ (ເຊັ່ນ: ເພື່ອສືບຕໍ່ການເບິ່ງວິດີໂອ). ໜ້າຈໍນີ້ຈະສະແດງບັງແອັບອື່ນທີ່ທ່ານກຳລັງໃຊ້ຢູ່."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"ແມ່ນແລ້ວ"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"ບໍ່"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"​ຫ້າມ​ລົບ​ກວນການ​ເຂົ້າ​ຫາ"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ບໍ່​ມີ​ການ​ຂໍ​ແອັບ​ທີ່​ຕິດ​ຕັ້ງ​ໄວ້ ​ຫາ​ຫ້າມ​ລົບ​ກວນການ​ເຂົ້າ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"​ກຳ​ລັງ​ໂຫລດ​ແອັບຯ..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ໂປຣໄຟລບ່ອນເຮັດວຽກນີ້ຖືກຈັດການໂດຍ:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"ຈັດ​ການ​ໂດຍ <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ທົດ​ລອງ)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"ການໝຸນອຸປະກອນ"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"ໝຸນ​ເນື້ອຫາ​ຂອງ​ໜ້າຈໍ"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"ໃຊ້​ທິດທາງ​ລວງຕັ້ງ"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ໃຊ້​ທິດທາງ​ລວງ​ນອນ"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ໃຊ້ທິດທາງ​ປັດຈຸບັນ​ຂອງ​ໜ້າ​ຈໍ"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"ການເລີ່ມຕົ້ນຢ່າງປອດໄພ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ດຳເນີນການຕໍ່"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໄດ້ເພີ່ມເຕີມໂດຍການໃຫ້ໃສ່ລະຫັດ PIN ກ່ອນເປີດຂຶ້ນມາ. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້. \n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ລະຫັດ PIN ເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ່?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໄດ້ເພີ່ມເຕີມໂດຍການໃຫ້ລະບຸລະຫັດຜ່ານກ່ອນເປີດຂຶ້ນມາ. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້. \n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ລະບຸລະຫັດຜ່ານເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ່?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"ນອກເໜືອໄປຈາກການໃຊ້ລາຍນິ້ວມືເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ລະຫັດ PIN ກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ລະຫັດ PIN ເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"ນອກເໜືອໄປຈາກການໃຊ້ລາຍນິ້ວມືເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ຮູບແບບປົດລັອກກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ຮູບແບບປົດລັອກເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"ນອກເໜືອໄປຈາກການໃຊ້ລາຍນິ້ວມືເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ລະຫັດຜ່ານກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ລະບຸລະຫັດຜ່ານເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"ນອກເໜືອໄປຈາກການໃຊ້ລາຍນິ້ວມືເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ລະຫັດຜ່ານກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ລະຫັດຜ່ານເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"ແມ່ນແລ້ວ"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"ບໍ່"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"ຕ້ອງການລະຫັດ PIN ຫຼື​ບໍ່?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"ການແຈ້ງເຕືອນການນຳໃຊ້"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"ສະແດງການນຳໃຊ້ແອັບແບບເຕັມ"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"ສະແດງການນຳໃຊ້ແອັບ"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"ການນຳໃຊ້ສູງ"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ເຮັດວຽກຜິດປົກກະຕິ</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> ເຮັດວຽກຜິດປົກກະຕິ</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">ແອັບກຳລັງໃຊ້ແບັດເຕີຣີ</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> ກຳລັງໃຊ້ແບັດເຕີຣີ</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ບໍ່ໄດ້ປັບໃຫ້ເໝາະສົມ"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ບໍ່ໄດ້ປັບໃຫ້ເໝາະສົມ"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ກຳລັງປັບການໃຊ້ແບັດເຕີຣີໃຫ້ເໝາະສົມ"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"ສະແດງແອັບບັງແອັບອື່ນ"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> ຈາກທັງໝົດ <xliff:g id="COUNT_1">%2$d</xliff:g> ແອັບແມ່ນອະນຸຍາດໃຫ້ສະແດງຜົນບັງແອັບອື່ນໄດ້"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"ແອັບ​ທີ່​ມີ​ການ​ອະ​ນຸ​ຍາດ"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"​ແມ່ນ​ແລ້ວ"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"ບໍ່"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"ອະນຸຍາດແລ້ວ"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"ບໍ່ອະນຸຍາດແລ້ວ"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"ຕິດຕັ້ງແອັບທີ່ບໍ່ຮູ້ແຫລ່ງທີ່ມາ"</string>
     <string name="write_settings" msgid="4797457275727195681">"ແກ້ໄຂການຕັ້ງຄ່າລະບົບ"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"ຂຽນແກ້ໄຂການຕັ້ງຄ່າລະບົບ"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"ໜ້າຈໍເປັນສີອົມແດງແລ້ວ. ນີ້ອາດຊ່ວຍໃຫ້ນອນຫຼັບໄດ້ດີຂຶ້ນ."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"ຄຳແນະນຳ"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> ເພີ່ມເຕີມ"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ການແນະນຳ</item>
+      <item quantity="one">1 ການແນະນຳ</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> ການແນະນຳ</item>
+      <item quantity="one">+1 ການແນະນຳ</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"ລຶບ​ອອກ"</string>
     <string name="color_temperature" msgid="2070126836910615605">"ອຸນຫະພູມສີເຢັນ"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ໃຊ້ສີຈໍສະແດງຜົນທີ່ເຢັນກວ່າ"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"ຄຳເຕືອນຂໍ້ມູນ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"ຄຳເຕືອນຂໍ້ມູນ <xliff:g id="ID_1">%1$s</xliff:g> / ຂີດຈຳກັດຂໍ້ມູນ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"ຮອບການຮຽກເກັບເງິນ"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"ຮອບແບບລາຍເດືອນ ເລີ່ມແຕ່ວັນທີ <xliff:g id="ID_1">%1$s</xliff:g> ຂອງທຸກໆເດືອນ"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"ລາຍເດືອນ ໂດຍເລີ່ມແຕ່ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"ທຸກໆເດືອນໃນວັນທີ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"ການ​ຈຳ​ກັດ​ເຄືອ​ຂ່າຍ"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ຂໍ້ຈຳກັດ</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">ອະນຸຍາດໃຫ້ 1 ແອັບໄດ້ຮັບອະນຸຍາດໃຫ້ໃຊ້ຂໍ້ມູນແບບບໍ່ຈຳກັດ ເມື່ອຕົວປະຢັດຂໍ້ມູນເປີດຢູ່</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"ຕົວປະຢັດຂໍ້ມູນ"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"ການເຂົ້າເຖິງຂໍ້ມູນແບບບໍ່ຈຳກັດ"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"ຂໍ້ມູນທີ່ບໍ່ຖືກຈຳກັດ"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"ຂໍ້ມູນພື້ນຫຼັງຖືກປິດໄວ້"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"ເປີດ"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"ປິດ"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"ຄວບຄຸມການແຈ້ງເຕືອນໃນໜ້າຈໍລັອກ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"ສະແດງ ຫຼື ເຊື່ອງເນື້ອຫາການແຈ້ງເຕືອນ"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"ທັງໝົດ"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"ການຊ່ວຍເຫຼືອ"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"ຊ່ວຍເຫຼືອ ແລະ ເຄັດລັບ"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ຄວາມກວ້າງນ້ອຍທີ່ສຸດ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ບໍ່ມີແອັບທີ່ຕິດຕັ້ງຮ້ອງຂໍການເຂົ້າເຖິງ SMS ແບບພຣີມຽມ"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS ແບບພຣີມຽມອາດເຮັດໃຫ້ທ່ານເສຍເງິນ ແລະ ຈະເພີ່ມຄ່າໃຊ້ຈ່າຍໃຫ້ກັບບິນຜູ້ໃຫ້ບໍລິການຂອງທ່ານ. ຫາກທ່ານເປີດໃຊ້ສິດອະນຸຍາດໃຫ້ກັບແອັບໃດໜຶ່ງ, ທ່ານຈະສາມາດສົ່ງ SMS ແບບພຣີມຽມໂດຍໃຊ້ແອັບນັ້ນໄດ້."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ອັດຕະໂນມັດ"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ຕັ້ງຄ່າເອງ"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"ສ້າງພື້ນທີ່ຈັດເກັບຂໍ້ມູນເພີ່ມ"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"ທ່າທາງ"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"ປຸ່ມລັດທ່າທາງ"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"ການໃຊ້ທ່າທາງເພື່ອຄວບຄຸມໂທລະສັບຂອງທ່ານ"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"ຄຳສັ່ງທ່າທາງເພື່ອຄວບຄຸມແທັບເລັດຂອງທ່ານ"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"ຄຳສັ່ງທ່າທາງເພື່ອຄວບຄຸມອຸປະກອນຂອງທ່ານ"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"ໂດດໄປກ້ອງຖ່າຍຮູບ"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"ເພື່ອເປີດກ້ອງຂຶ້ນມາແບບດ່ວນ, ໃຫ້ກົດປຸ່ມປິດເປີດສອງເທື່ອຕິດກັນ. ສາມາດເຮັດໄດ້ຈາກທຸກໜ້າຈໍ."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"ເປີດກ້ອງຖ່າຍຮູບແບບດ່ວນ"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"ກົດປຸ່ມເປີດປິດສອງເທື່ອຕິດກັນເພື່ອເປີດກ້ອງຖ່າຍຮູບ"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ປີ້ນກ້ອງ"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"ຖ່າຍເຊວຟີໄດ້ໄວຂຶ້ນ"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"ພິກໂທລະສັບສອງເທື່ອຕິດກັນເພື່ອໃຊ້ໂໝດເຊວຟີ"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"ພິກແທັບເລັດສອງເທື່ອຕິດກັນເພື່ອໃຊ້ໂໝດເຊວຟີ"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"ພິກອຸປະກອນສອງເທື່ອຕິດກັນເພື່ອໃຊ້ໂໝດເຊວຟີ"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"ແຕະສອງເທືື່ອເພື່ອກວດສອບໂທລະສັບ"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ແຕະສອງເທືື່ອເພື່ອກວດສອບແທັບເລັດ"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"ແຕະສອງເທືື່ອເພື່ອກວດສອບອຸປະກອນ"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"ເພື່ອກວດສອບການແຈ້ງເຕືອນຂອງທ່ານຢ່າງວ່ອງໄວ, ໃຫ້ແຕະສອງເທື່ອໃສ່ທີ່ໜ້າຈໍ"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"ເພື່ອກວດສອບເວລາ, ໄອຄອນການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ, ໃຫ້ແຕະສອງເທື່ອໃສ່ໜ້າຈໍຂອງທ່ານ."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"ກວດສອບການແຈ້ງເຕືອນເມື່ອປິດໜ້າຈໍໄວ້"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ຍົກຂຶ້ນເພື່ອກວດສອບໂທລະສັບ"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ຍົກຂຶ້ນເພື່ອກວດສອບແທັບເລັດ"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"ຍົກຂຶ້ນເພື່ອກວດສອບອຸປະກອນ"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"ເພື່ອກວດສອບການແຈ້ງເຕືອນຂອງທ່ານຢ່າງວ່ອງໄວ, ໃຫ້ຍົກໂທລະສັບຂອງທ່ານຂຶ້ນມາ"</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"ເພື່ອກວດສອບການແຈ້ງເຕືອນຂອງທ່ານຢ່າງວ່ອງໄວ, ໃຫ້ຍົກແທັບເລັດຂອງທ່ານຂຶ້ນມາ"</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"ເພື່ອກວດສອບການແຈ້ງເຕືອນຂອງທ່ານຢ່າງວ່ອງໄວ, ໃຫ້ຍົກອຸປະກອນຂອງທ່ານຂຶ້ນມາ"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"ເພື່ອກວດສອບເວລາ, ໄອຄອນການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ, ໃຫ້ຈັບໂທລະສັບຂອງທ່ານຂຶ້ນມາ."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"ເພື່ອກວດສອບເວລາ, ໄອຄອນການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ, ໃຫ້ຈັບແທັບເລັດຂອງທ່ານຂຶ້ນມາ."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"ເພື່ອກວດສອບເວລາ, ໄອຄອນການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ, ໃຫ້ຈັບອຸປະກອນຂອງທ່ານຂຶ້ນມາ."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"ກວດສອບການແຈ້ງເຕືອນເມື່ອປິດໜ້າຈໍໄວ້"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"ປັດລາຍນິ້ວມືສຳລັບການແຈ້ງເຕືອນ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"ເພື່ອກວດເບິ່ງການແຈ້ງເຕືອນຂອງທ່ານ, ໃຫ້ເລື່ອນລົງໃສ່ເຊັນເຊີນລາຍນິ້ວມືທີ່ຢູ່ຫຼັງໂທລະສັບຂອງທ່ານ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"ເພື່ອກວດເບິ່ງການແຈ້ງເຕືອນຂອງທ່ານ, ໃຫ້ເລື່ອນລົງໃສ່ເຊັນເຊີນລາຍນິ້ວມືທີ່ຢູ່ຫຼັງແທັບເລັດຂອງທ່ານ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"ເພື່ອກວດເບິ່ງການແຈ້ງເຕືອນຂອງທ່ານ, ໃຫ້ເລື່ອນລົງໃສ່ເຊັນເຊີນລາຍນິ້ວມືທີ່ຢູ່ຫຼັງອຸປະກອນຂອງທ່ານ"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"ເບິ່ງການແຈ້ງເຕືອນແບບດ່ວນ"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"ເລື່ອນນິ້ວລົງໃສ່ເຊັນເຊີລາຍນິ້ວມື"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"ຍົກຂຶ້ນເພື່ອເປີດກ້ອງ"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"ເປີດກ້ອງຖ່າຍຮູບອັດຕະໂນມັດ, ຍົກມືຖືຂອງທ່ານຂຶ້ນມາໃນຕຳແໜ່ງຖ່າຍຮູບ (ລວງນອນ  ຫຼື ລວງຕັ້ງ). ໃຊ້ໄດ້ເມື່ອໂທລະສັບຂອງທ່ານລັອກ ຫຼື ປິດໜ້າຈໍຢູ່."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"ຖ່າຍຮູບເມື່ອປິດໜ້າຈໍໂທລະສັບ ຫຼື ລັອກຢູ່"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"ທ່າທາງແບບຊ່ວຍ"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"ຄວາມອ່ອນໄຫວ"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"ທ່ານຕ້ອງການລຶບອິນສະແຕນແອັບນີ້ອອກບໍ່?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"ເກມ"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ໄຟລ໌ສຽງ"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"ບ່ອນຈັດເກັບຂໍ້ມູນທີ່ໃຊ້ໄປແລ້ວ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ຖືກຖອນການຕິດຕັ້ງສຳລັບຜູ້ໃຊ້ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ຖຶືກປິດໄວ້ສຳລັບຜູ້ໃຊ້ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"ບໍລິການຕື່ມຂໍ້ມູນອັດຕະໂນມັດ"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"ອິນສະແຕນແອັບ"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"ປິດຕົວຈັດການບ່ອນຈັດເກັບຂໍ້ມູນບໍ?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"ແອັບຮູບເງົາ ແລະ ໂທລະທັດ"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"ບ່ອນຈັດເກັບຂໍ້ມູນທີ່ໃຊ້ໄປແລ້ວ"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"ຂໍ້ມູນການເປີດນຳໃຊ້ເຄືອຂ່າຍ"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"ມີຫຍັງໃໝ່ ແລະ ໜ້າຕື່ນເຕັ້ນ?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ກວດເບິ່ງຄຸນສົມບັດຍອດນິຍົມ 5 ອັນດັບ"</string>
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 9b48cb7..1c7be20 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Geras"</item>
     <item msgid="8986346415847956850">"Puikus"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Visada"</item>
-    <item msgid="844721238536786870">"Tik kai įjungtas į lizdą"</item>
-    <item msgid="1986753720941888596">"Niekada"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Visada"</item>
-    <item msgid="7433294150916905997">"Tik kai įjungtas į lizdą"</item>
-    <item msgid="1390404486722375028">"Niekada"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Pastarosios 30 dienų"</item>
     <item msgid="6600989128423965319">"Nustatyti naudojimo ciklą..."</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index ca1ee68..2a1c860 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -32,6 +32,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Dabar esate kūrėjas!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nereikia, jūs jau esate kūrėjas."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Pirmiausia įgalinkite kūrėjo parinktis."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Belaidis ryšys ir tinklai"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Ryšiai"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Įrenginys"</string>
@@ -43,6 +44,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"„VoLTE“ aprūpinimas"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Vaizdo skambutis aprūpinimas"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Skambinimo naudojant „Wi-Fi“ ryšį aprūpinimas"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB / veiklos aprūpinimas"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Mobiliojo ryšio radijo signalas"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Žiūrėti SIM kortelės adresų knygą"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Žiūrėti fiksuoto rinkimo numerius"</string>
@@ -108,10 +110,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Nuskaityti ieškant įrenginių"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Pervardyti šį įrenginį"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Pervardyti"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Atsijungti?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tai nutrauks ryšį su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Atjungti įrenginį?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Telefonas bus atjungtas nuo „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Planšetinis kompiuteris bus atjungtas nuo „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Įrenginys bus atjungtas nuo „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Atjungti"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Neturite leidimo keisti „Bluetooth“ nustatymų."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Susieti naują įrenginį"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ matomas netoliese esantiems įrenginiams, kai įjungti „Bluetooth“ nustatymai."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Telefono „Bluetooth“ adresas: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Planšetinio kompiuterio „Bluetooth“ adresas: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Įrenginio „Bluetooth“ adresas: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Atjungti „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transliavimas"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Neleisti profilio?"</string>
@@ -123,7 +132,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"„Bluetooth“ susiejimo užklausa"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Susiejimo užklausa"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Palieskite, kad susietumėte su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Rodyti gautus failus"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Gauti failai"</string>
     <string name="device_picker" msgid="4978696506172252813">"Pasirinkti „Bluetooth“ įrenginį"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"Programa „<xliff:g id="APP_NAME">%1$s</xliff:g>“ nori įjungti „Bluetooth“"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"Programa „<xliff:g id="APP_NAME">%1$s</xliff:g>“ nori išjungti „Bluetooth“"</string>
@@ -159,6 +168,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s nori pasiekti jūsų pranešimus. Suteikti prieigą %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM prieigos užklausa"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"„<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>“ nori pasiekti jūsų SIM kortelę. Suteikus prieigą prie SIM kortelės bus išjungtas duomenų ryšys įrenginyje, kol veiks šis ryšys. Leiskite pasiekti „<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>“"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Kitiems įrenginiams matomas kaip „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Jūsų įrenginiai"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Susieti naują įrenginį"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data ir laikas"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pasirinkite laiko juostą"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -333,7 +345,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Paskyros"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Vietovė"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Paskyros"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Sauga ir vietovė"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Saugumas ir vieta"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifruotė ir prisijungimo duomenys"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefonas užšifruotas"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Įrenginys šifruotas"</string>
@@ -360,40 +372,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Atrakinimas piršto atspaudu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Kontrolinio kodo naudojimas"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Tiesiog palieskite kontrolinio kodo jutiklį, kad galėtumėte atrakinti telefoną, įgalioti pirkimo operacijas arba prisijungti prie programų. Naudojant visus pridėtus kontrolinius kodus bus galima atlikti šiuos veiksmus, todėl atidžiai rinkitės, kieno kontrolinius kodus pridedate.\n\nPastaba: 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_message_unlock_disabled" msgid="4193477159493347679">"Tiesiog palieskite kontrolinio kodo jutiklį, kad įgalintumėte pirkimo veiksmus arba prisijungtumėte prie programų. Atidžiai rinkitės, kieno kontrolinius kodus pridedate. Net vienu pridėtu kontroliniu kodu galima atlikti visus šiuos veiksmus.\n\nPastaba: naudodami kontrolinį kodą šio įrenginio atrakinti negalite. Daugiau informacijos galite gauti susisiekę su organizacijos administratoriumi."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Tiesiog palieskite kontrolinio kodo jutiklį, kad atrakintumėte telefoną, įgaliotumėte pirkimo operacijas arba prisijungtumėte prie programų. Bet kuriuo kontroliniu kodu bus galima atlikti šiuos veiksmus, todėl atidžiai rinkitės, kieno kontrolinius kodus pridedate.\n\nPastaba: 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_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Atšaukti"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Tęsti"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Praleisti"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Pridėti piršto atsp."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Įrenginio apsaugos funkcijos nebus suaktyvintos. Negalėsite apsaugoti, kad kiti asmenys nenaudotų šio planšetinio kompiuterio, jei jį prarasite, jis bus pavogtas ar išvalytas."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Įrenginio apsaugos funkcija nebus suaktyvinta. Negalėsite apsaugoti, kad kiti asmenys nenaudotų šio įrenginio, jei jį prarasite, jis bus pavogtas ar buvo išvalyti jo duomenys."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Įrenginio apsaugos funkcija nebus suaktyvinta. Negalėsite apsaugoti, kad kiti asmenys nenaudotų šio telefono, jei jį prarasite, jis bus pavogtas ar išvalytas."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Įrenginio apsaugos funkcijos nebus suaktyvintos. Negalėsite užtikrinti, kad kiti asmenys nesinaudotų planšetiniu kompiuteriu, jei jį prarasite ar jis bus pavogtas."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Įrenginio apsaugos funkcijos nebus suaktyvintos. Negalėsite užtikrinti, kad kiti asmenys nesinaudotų įrenginiu, jei jį prarasite ar jis bus pavogtas."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Įrenginio apsaugos funkcijos nebus suaktyvintos. Negalėsite užtikrinti, kad kiti asmenys nesinaudotų telefonu, jei jį prarasite ar jis bus pavogtas."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Kitas"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Įrenginio apsaugos funkcijos nebus įjungtos. Negalėsite užtikrinti, kad kiti asmenys negalėtų pasinaudoti planšetiniu kompiuteriu, jei jis bus pavogtas ar nustatytas iš naujo arba jį pamesite."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Įrenginio apsaugos funkcijos nebus įjungtos. Negalėsite užtikrinti, kad kiti asmenys negalėtų pasinaudoti įrenginiu, jei jis bus pavogtas ar nustatytas iš naujo arba jį pamesite."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Įrenginio apsaugos funkcijos nebus įjungtos. Negalėsite užtikrinti, kad kiti asmenys negalėtų pasinaudoti telefonu, jei jis bus pavogtas ar nustatytas iš naujo arba jį pamesite."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Įrenginio apsaugos funkcijos nebus įjungtos. Negalėsite užtikrinti, kad kiti asmenys negalėtų pasinaudoti planšetiniu kompiuteriu, jei jis bus pavogtas arba jį pamesite."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Įrenginio apsaugos funkcijos nebus įjungtos. Negalėsite užtikrinti, kad kiti asmenys negalėtų pasinaudoti įrenginiu, jei jis bus pavogtas arba jį pamesite."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Įrenginio apsaugos funkcijos nebus įjungtos. Negalėsite užtikrinti, kad kiti asmenys negalėtų pasinaudoti telefonu, jei jis bus pavogtas arba jį pamesite."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Vis tiek praleisti"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Grįžti"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Raskite jutiklį"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Raskite kontrolinio kodo jutiklį telefono užpakalinėje dalyje."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Palieskite jutiklį"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Jis yra telefono užpakalinėje dalyje. Naudokite smilių."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Įrenginio ir kontrolinio kodo jutiklio vietos iliustracija"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Pavadinimas"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Gerai"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Ištrinti"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Pradėkime."</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Palieskite jutiklį"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Uždėkite pirštą ant jutiklio ir pakelkite, kai pajusite vibravimą"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Tęskite"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Truputį pajudinkite pirštą, kad būtų pridėtos visos skirtingos piršto atspaudo dalys"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Piršto atspaudas pridėtas!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kai rodoma ši piktograma, galite naudoti piršto atspaudą tapatybei nustatyti ar pirkimo operacijai autorizuoti."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Tiesiog palieskite kontrolinio kodo jutiklį, kad pažadintumėte ir atrakintumėte įrenginį."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Kai pamatysite šią piktogramą, taip pat galėsite autorizuoti pirkimo operacijas arba prisijungti prie programų."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Patraukite ir vėl prilieskite"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Vis patraukite pirštą, kad pridėtumėte skirtingas piršto atspaudo dalis"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Piršto atspaudas pridėtas"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Kai rodoma ši piktograma, naudokite piršto atspaudą tapatybei nustatyti ar pirkimo operacijai autorizuoti."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Praleisti pirštų atspaudų nustatymą?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Pasirinkote naudoti piršto atspaudą kaip vieną iš telefono atrakinimo būdų. Jei praleisite dabar, turėsite nustatyti funkciją vėliau. Nustatymas apytiksliai užtruks tik minutę."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Nustatyti ekrano užraktą"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Atlikta"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Oi, tai ne jutiklis"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Naudokite įrenginio kontrolinio kodo jutiklį."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Smiliumi palieskite jutiklį tel. užp. dalyje."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registracija neužbaigta"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Pasiektas kontrolinio kodo registracijos laiko apribojimas. Bandykite dar kartą."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Nepavyko užregistruoti kontrolinio kodo. Bandykite dar kartą arba atlikite tai kitu pirštu."</string>
@@ -455,6 +465,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Neleiskite kitiems asmenims naudoti šio įrenginio be jūsų leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Neleiskite kitiems asmenims naudoti šio telefono be jūsų leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Pasirinkite atsarginį ekrano užrakto metodą"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Ekrano užrakto parinktys"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Ekrano užrakto parinktys"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekrano užraktas"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / nedelsiant išjungus miego būseną"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> išjungus miego būseną"</string>
@@ -525,13 +537,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Keisti atrakinimo modelį"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Pakeisti atrakinimo PIN kodą"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Pakeisti atrakinimo slaptažodį"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Bandykite dar kartą. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> bandymas iš <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Paskutinis bandymas"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Jei šiuo bandymu įvesite netinkamą darbinį atrakinimo piešinį, darbo profilis ir susiję duomenys bus pašalinti iš įrenginio."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Jei šiuo bandymu įvesite netinkamą PIN kodą, darbo profilis ir susiję duomenys bus pašalinti iš įrenginio."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Jei šiuo bandymu įvesite netinkamą slaptažodį, darbo profilis ir susiję duomenys bus pašalinti iš įrenginio."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Per daug nesėkmingų bandymų. Darbo profilis ir susiję duomenys bus pašalinti iš įrenginio."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Atsisakyti"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Bandykite dar kartą. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> band. iš <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Duomenys bus ištrinti"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Jei kitu bandymu nupiešite netinkamą atrakinimo piešinį, šio įrenginio duomenys bus ištrinti"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Jei kitu bandymu įvesite netinkamą PIN kodą, šio įrenginio duomenys bus ištrinti"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Jei kitu bandymu įvesite netinkamą slaptažodį, šio įrenginio duomenys bus ištrinti"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Jei kitu bandymu nupiešite netinkamą atrakinimo piešinį, šis naudotojas bus ištrintas"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Jei kitu bandymu įvesite netinkamą PIN kodą, šis naudotojas bus ištrintas"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Jei kitu bandymu įvesite netinkamą slaptažodį, šis naudotojas bus ištrintas"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Jei kitu bandymu nupiešite netinkamą atrakinimo piešinį, darbo profilis ir jo duomenys bus ištrinti"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Jei kitu bandymu įvesite netinkamą PIN kodą, darbo profilis ir jo duomenys bus ištrinti"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Jei kitu bandymu įvesite netinkamą slaptažodį, darbo profilis ir jo duomenys bus ištrinti"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Per daug netinkamų bandymų. Šio įrenginio duomenys bus ištrinti."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Per daug netinkamų bandymų. Šis naudotojas bus ištrintas."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Per daug netinkamų bandymų. Šis darbo profilis ir jo duomenys bus ištrinti."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Atsisakyti"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Turi būti bent <xliff:g id="COUNT">%d</xliff:g> simb."</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN kodas turi būti sudarytas bent iš <xliff:g id="COUNT">%d</xliff:g> skaitm."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Tęsti"</string>
@@ -648,6 +668,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Išplėst. „Bluetooth“ nust."</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kai „Bluetooth“ įj., įreng. gali užm. ryšį su kitais netoliese esančiais „Bluetooth“ įreng."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Kad būtų galima patobulinti vietovės informacijos tikslumą, sistemos programos ir paslaugos vis tiek gali aptikti „Bluetooth“ įrenginius. Tai galite pakeisti <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nuskaitymo nustatymuose<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Nepavyko prisijungti. Bandykite dar kartą."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Išsami įrenginio informacija"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Įrenginio „Bluetooth“ adresas: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Pamiršti įrenginį?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Telefonas nebebus susietas su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Planšetinis kompiuteris nebebus susietas su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Įrenginys nebebus susietas su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Pamiršti įrenginį"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Prijungti prie..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus atjungtas nuo medijos garso."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus atjungtas nuo laisvų rankų įrangos garso."</string>
@@ -800,6 +828,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Neteikti"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Nepatvirtinti"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nenurodytas joks sertifikatas. Ryšys nebus privatus."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Tinklo pavadinimas per ilgas."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Būtina nurodyti domeną."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Galima WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (galima WPS)"</string>
@@ -833,7 +862,6 @@
       <item quantity="other">%d tinklų</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Išplėstinis „Wi-Fi“"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"„Wi‑Fi“ konfigūravimas"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC adresas"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP adresas"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Potinklio kaukė"</string>
@@ -870,9 +898,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Pamiršti šią grupę?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Kilnojamasis „Wi-Fi“ viešosios interneto prieigos taškas"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"„Wi-Fi“ vieš. int. pr. taškas"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Naudoti mobilųjį ryšį „Wi‑Fi“ tinklui teikti"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Nebendrinamas šio planšetinio kompiuterio interneto ryšys per viešosios interneto prieigos tašką"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Nebendrinamas šio telefono interneto ryšys per viešosios interneto prieigos tašką"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Internetas ar turinys nebendrinamas su kitais įrenginiais"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Šio planšetinio kompiuterio interneto ryšys bendrinamas per viešosios interneto prieigos tašką"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Šio telefono interneto ryšys bendrinamas per viešosios interneto prieigos tašką"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Programa bendrina turinį. Norėdami bendrinti interneto ryšį, išjunkite viešosios interneto prieigos tašką ir vėl jį įjunkite."</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"„Wi‑Fi“ pavadinimas"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Įjungiamas „<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Kiti įrenginiai gali prisijungti prie „<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"„Wi-Fi“ slaptažodis"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Prieigos taško juosta"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Naudodami viešosios interneto prieigos tašką, galite sukurti „Wi‑Fi“ tinklą kitiems įrenginiams. Internetas teikiamas per viešosios interneto prieigos tašką naudojant mobiliųjų duomenų ryšį. Gali būti taikomi papildomi mobiliojo ryšio duomenų mokesčiai."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Programos gali sukurti viešosios interneto prieigos tašką ir bendrinti turinį su netoliese esančiais įrenginiais."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Įjungiamas viešosios interneto prieigos taškas…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Išjungiamas viešosios interneto prieigos taškas…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktyvus"</string>
@@ -919,6 +955,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Kai įjungtas skambinimas „Wi-Fi“ ryšiu, telefonas gali nukreipti skambučius per „Wi-Fi“ tinklus ar operatoriaus tinklą pagal jūsų nuostatas ir stipresnį signalą. Prieš įjungdami šią funkciją, pasikonsultuokite su operatoriumi dėl mokesčių ir kitos išsamios informacijos."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Atnaujinkite skubiems atvejams skirtą adresą"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Adresas, kurį kaip jūsų vietovę naudoja pagalbos tarnybos, jei numeriu 911 skambinate naudodami „Wi-Fi“"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekranas"</string>
@@ -976,6 +1013,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nėra jokių rezultatų"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ekranas"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatiškai sukti ekraną"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Ryškios spalvos"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Sukant planšetinį kompiuterį automatiškai perjungti orientaciją"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Perjungti padėtį automatiškai, kai sukamas telefonas"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Sukant planšetinį kompiuterį automatiškai perjungti orientaciją"</string>
@@ -1003,23 +1041,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimizuokite šviesumo lygį pagal esamą šviesą. Kai ši funkcija įjungta, vis tiek galite laikinai koreguoti šviesumą."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Nakties šviesa"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Nustačius „Nakties šviesą“, naktį rodomas gintaro spalvos atspalvio ekranas. Taip bus patogiau žiūrėti į ekraną prietemoje ir galbūt lengviau užmigsite."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Tvarkaraštis"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Būsena"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Įjungti automatiškai"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Niekada"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Tinkintas tvarkaraštis"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Nuo saulėlydžio iki saulėtekio"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Tvarkaraštis"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Nėra"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Įjungiama pasirinktu laiku"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Įjungta nuo saulėl. iki saulėt."</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Pradžios laikas"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Pabaigos laikas"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Būsena"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensyvumas"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Išjungtas. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Niekada nebus įjungtas automatiškai."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Bus įjungtas automatiškai <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Bus įjungtas automatiškai per saulėlydį."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Įjungtas. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Niekada nebus išjungtas automatiškai."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Bus išjungtas automatiškai <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Bus išjungtas automatiškai per saulėtekį."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Išjungta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Niekada nebus įjungta automatiškai"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Bus įjungta automatiškai <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Bus įjungta automatiškai saulei leidžiantis"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Įjungta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Niekada nebus išjungta automatiškai"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Bus išjungta automatiškai <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Bus išjungta automatiškai saulei tekant"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Užmigti"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekranas išjungiamas"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neveiklumo"</string>
@@ -1043,8 +1080,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Nustatymai"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatinis šviesumas"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Pakelti ir pažadinti"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Aplinkos vaizdas"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Adaptyvusis vaizdas"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Visada įjungta"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nauji pranešimai"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kada rodyti"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nauji pranešimai"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Pažadinti ekraną, kai gaunamas pranešimas"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Visada įjungta"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Rodymo laikas, pranešimų piktogramos ir kita informacija"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Šrifto dydis"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Padidinkite arba sumažinkite tekstą"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kortelės užrakto nustatymai"</string>
@@ -1298,6 +1341,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN negali būti tuščias."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MKC lauke turi būti įvesti 3 skaitmenys."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC lauke turi būti įvesti 2 ar 3 skaitmenys."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operatorius neleidžia pridėti %s tipo APN."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Atkuriami numatytieji APN nustatymai."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Nustatyti iš naujo į numatytuosius nustatymus"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Numatytųjų APN nustatymų nustatymas iš naujo baigtas."</string>
@@ -1329,6 +1373,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Ištrinti SD kortelę"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ištrinti visus vidinės USB atminties duomenis, pvz., muzikos failus ar nuotraukas"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ištrinti visus SD kortelės duomenis, pvz., muzikos failus ar nuotraukas"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Ištrinti eSIM korteles"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Ištrinti visas eSIM korteles telefone. Tai atlikus mobiliojo ryšio paslaugos planas nebus atšauktas."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Ištrinti visas eSIM korteles planšetiniame kompiuteryje. Tai atlikus mobiliojo ryšio paslaugos planas nebus atšauktas."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Iš naujo nustatyti planšetinį kompiuterį"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Iš naujo nustatyti telefoną"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Ištrinti visą asmeninę informaciją ir atsisiųstas programas? Šio veiksmo negalėsite anuliuoti!"</string>
@@ -1351,26 +1398,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Negalima naudoti įrenginio kaip modemo arba viešosios interneto prieigos taškų, kai įjungta Duomenų taupymo priemonė"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB susiejimas"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB prijungtas, pažymėkite, kad susietų"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Susieta"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Negalima įrenginio naudoti kaip modemo, kai naudojama USB atmintinė"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB neprijungtas"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Prijunkite, kad įjungtumėte"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB susiejimo klaida"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Bendrinkite telefono interneto ryšį per USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Bendrinkite planšetinio kompiuterio interneto ryšį per USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"„Bluetooth“ susiejimas"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Bendr. šio planš. komp. intern. r. per „Bluetooth“"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Bendr. šio telefono intern. ryšys per „Bluetooth“"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Bendr. šio planš. komp. intern. r. su 1 įr. per „Bluetooth“"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Bendr. šio telef. intern. r. su 1 įrenginiu per „Bluetooth“"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Bendr. šio planš. komp. intern. r. su <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> įr. per „Bluetooth“"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Bendr. šio telefono intern. ryšys su <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> įr. per „Bluetooth“"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Bendrinti planšetinio kompiuterio interneto ryšį per „Bluetooth“"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Bendrinti telefono interneto ryšį per „Bluetooth“"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Nebendrinamas „<xliff:g id="DEVICE_NAME">%1$d</xliff:g>“ interneto ryšys per „Bluetooth“"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Nebendr. šio planš. komp. int. r. per „Bluetooth“"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Nebendr. šio telef. intern. ryšys per „Bluetooth“"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Įrenginys nenaudojamas kaip modemas"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Negalima daugiau nei <xliff:g id="MAXCONNECTION">%1$d</xliff:g> įrenginių (-io) naudoti kaip modemo (-ų)."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus atsietas."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Naudodami viešosios interneto prieigos tašką ir įrenginį kaip modemą galite teikti internetą kitiems įrenginiams per mobiliojo ryšio duomenų tinklą."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Naudodami viešosios interneto prieigos tašką ir įrenginį kaip modemą galite teikti internetą kitiems įrenginiams per mobiliojo ryšio duomenų tinklą. Be to, programos gali sukurti viešosios interneto prieigos tašką ir bendrinti turinį su netoliese esančiais įrenginiais."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pagalba"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobiliojo ryšio tinklas"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiliojo ryšio planas"</string>
@@ -1403,7 +1439,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Vietovės režimas"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Naudoti GPS, „Wi‑Fi“, „Bluetooth“ ar mobiliojo ryšio tinklus vietovei nustatyti"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Naudoti „Wi‑Fi“, „Bluetooth“ ar mobiliojo ryšio tinklus vietovei nustatyti"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Nustatyti vietovę naudojant GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Nustatyti vietovę naudojant GPS ir įrenginio jutiklius"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Nuskaitymas"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"„Wi‑Fi“ nuskaitymas"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Patobulinkite vietovės informaciją leisdami sistemos programoms ir paslaugoms bet kuriuo metu aptikti „Wi-Fi“ ryšio tinklus."</string>
@@ -1448,8 +1484,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nėra duomenų ryšio. Jei norite dabar peržiūrėti šią informaciją, bet kuriuo prie interneto prijungtu kompiuteriu eikite į %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Įkeliama…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Pasirinkite slaptažodį"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Nust. slapt., kad gal. naud. kont. kodą"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Pasirinkite piešinį"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Nust. atrak. pieš., kad gal. naud. kont. kodą"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Pasirinkite PIN kodą"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Nus. PIN kodą, kad gal. naud. kon. kodą"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Patvirtinkite slaptažodį"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Patvirtinkite piešinį"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Patvirtinkite savo PIN kodą"</string>
@@ -1518,6 +1557,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Programos nustatymai"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nežinomi šaltiniai"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Leisti visus progr. šaltinius"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Neseniai atidarytos programos"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Žr. visas programas (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"Prieš <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Įdiegus nežinomų programų didėja planšetinio kompiuterio ir asmeninių duomenų pažeidimo rizika. Diegdami programas iš šio šaltinio sutinkate, kad esate patys atsakingi už žalą planšetiniam kompiuteriui arba duomenų praradimą dėl jų naudojimo."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Įdiegus nežinomų programų didėja telefono ir asmeninių duomenų pažeidimo rizika. Diegdami programas iš šio šaltinio sutinkate, kad esate patys atsakingi už žalą telefonui arba duomenų praradimą dėl jų naudojimo."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Išplėstiniai nustatymai"</string>
@@ -1688,6 +1730,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Sustabdyti sistemos aptarnavimą?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Jei sustabdysite šią paslaugą, kai kurios planšetinio kompiuterio funkcijos gali tinkamai nebeveikti, kol jį išjungsite ir vėl įjungsite."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Jei sustabdysite šią paslaugą, kai kurios telefono funkcijos gali tinkamai nebeveikti, kol jį išjungsite ir vėl įjungsite."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Kalbos, įvestis ir gestai"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Kalbos ir įvestis"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Kalbos ir įvestis"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Pagalba dėl įvesties"</string>
@@ -1914,6 +1960,12 @@
       <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> spausdinimo paslaugos</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> spausdinimo paslaugų</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> spausdinimo užduotis</item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> spausdinimo užduotys</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> spausdinimo užduoties</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> spausdinimo užduočių</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Spausdinimo paslaugos"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nėra įdiegta jokių paslaugų"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nerasta jokių spausdintuvų"</string>
@@ -1980,6 +2032,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Išsami naudojimo informacija"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Reguliuoti maitinimo naudojimą"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Įtraukti paketai"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Programos, eikvojančios akumuliatoriaus energiją"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Neleidžiama įjungti įrenginio miego būsenos"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Įrenginys pažadinamas fone"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Dažnai siunčiamos vietos užklausos"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Netinkamai veikiančių programų: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Sustabdyti programą?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Telefono akumuliatoriaus negalima normaliai tvarkyti, nes „<xliff:g id="APP">%1$s</xliff:g>“ neleidžia įjungti telefono miego būsenos.\n\nGalite pabandyti išspręsti šią problemą priverstinai išjungdami programą.\n\nJei problema išliks, gali tekti pašalinti programą, kad akumuliatoriaus energija būtų naudojama efektyviau."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Planšetinio kompiuterio akumuliatoriaus negalima normaliai tvarkyti, nes „<xliff:g id="APP">%1$s</xliff:g>“ neleidžia įjungti planšetinio kompiuterio miego būsenos.\n\nGalite pabandyti išspręsti šią problemą priverstinai išjungdami programą.\n\nJei problema išliks, gali tekti pašalinti programą, kad akumuliatoriaus energija būtų naudojama efektyviau."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Įrenginio akumuliatoriaus negalima normaliai tvarkyti, nes „<xliff:g id="APP">%1$s</xliff:g>“ neleidžia įjungti įrenginio miego būsenos.\n\nGalite pabandyti išspręsti šią problemą priverstinai išjungdami programą.\n\nJei problema išliks, gali tekti pašalinti programą, kad akumuliatoriaus energija būtų naudojama efektyviau."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Sustabdyti programą"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Išjungti fono naudojimą?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Telefono akumuliatoriaus negalima normaliai tvarkyti, nes „<xliff:g id="APP">%1$s</xliff:g>“ nuolat pažadina telefoną.\n\nKad ši problema būtų išspręsta, galima neleisti programai veikti telefono fone."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Planšetinio kompiuterio akumuliatoriaus negalima normaliai tvarkyti, nes „<xliff:g id="APP">%1$s</xliff:g>“ nuolat pažadina planšetinį kompiuterį.\n\nKad ši problema būtų išspręsta, galima neleisti programai veikti planšetinio kompiuterio fone."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Įrenginio akumuliatoriaus negalima normaliai tvarkyti, nes „<xliff:g id="APP">%1$s</xliff:g>“ nuolat pažadina įrenginį.\n\nKad ši problema būtų išspręsta, galima neleisti programai veikti įrenginio fone."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Išjungti"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Išjungti vietos užklausas?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Telefono akumuliatoriaus negalima normaliai tvarkyti, nes „<xliff:g id="APP">%1$s</xliff:g>“ nuolat siunčia vietos užklausas, kai jos nenaudojate.\n\nKad ši problema būtų išspręsta, galima neleisti programai pasiekti vietos informacijos."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Planšetinio kompiuterio akumuliatoriaus negalima normaliai tvarkyti, nes „<xliff:g id="APP">%1$s</xliff:g>“ nuolat siunčia vietos užklausas, kai jos nenaudojate.\n\nKad ši problema būtų išspręsta, galima neleisti programai pasiekti vietos informacijos."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Įrenginio akumuliatoriaus negalima normaliai tvarkyti, nes „<xliff:g id="APP">%1$s</xliff:g>“ nuolat siunčia vietos užklausas, kai jos nenaudojate.\n\nKad ši problema būtų išspręsta, galima neleisti programai pasiekti vietos informacijos."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Išjungti"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ekranas"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Žibintuvėlis"</string>
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparatas"</string>
@@ -1994,7 +2066,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Programos"</string>
     <string name="power_service" msgid="1599661212370831780">"Paslaugos"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
-    <string name="power_user" msgid="1889728099253018005">"Naudotojas"</string>
+    <string name="power_user" msgid="3706143225319881667">"Kiti naudotojai"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Visas CPU laikas"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU aktyvusis langas"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Neužmigdyti"</string>
@@ -2046,6 +2118,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Per daug apskaičiuotos energijos naudojimas"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Naudojama <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktyvi <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Ekrano naudojimas: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> naudoja „<xliff:g id="APP">%2$s</xliff:g>“"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> visos akumuliatoriaus įkrovos"</string>
@@ -2613,7 +2686,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Keisti PIN kodą"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Rodyti pranešimus"</string>
     <string name="help_label" msgid="6886837949306318591">"Pagalba ir atsiliep."</string>
-    <string name="support_summary" msgid="8276116616493882830">"Pagalba straipsniais, telefonu ir pokalbiais"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Pagalbos straipsniai, palaikymas telefonu ir dalyvaujant pokalbyje, darbo pradžia"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Turiniui skirta paskyra"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Nuotraukos ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Didelė grėsmė"</string>
@@ -2705,9 +2778,12 @@
       <item quantity="other">Rodyti %d paslėptų elementų</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Tinkas ir internetas"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"„Wi-Fi“, mobil., duom. naudojimas, vieš. int. pri. tašk."</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilusis"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"duomenų naudojimas"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"viešosios interneto prieigos taškas"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Prijungti įrenginiai"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"„Bluetooth“, perdavimas, ALR"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"„Bluetooth“, perdavimas"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Programos ir pranešimai"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Leidimai, numatytosios programos"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Naudotojai ir paskyros"</string>
@@ -2760,6 +2836,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gestas"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"mokėti, paliesti, mokėjimai"</string>
     <string name="keywords_backup" msgid="470070289135403022">"atsarginė kopija, kurti atsarginę kopiją"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gestas, kraštas, šonas, aktyvus kraštas, suspausti, sugriebti, pagalba, padėjėjas, suspaudžiamas, suspaudimas, suspaudimai, „Ok Google“, „Google“ padėjėjas"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gestas, pažadinti, pranešimai, ekranas, vaizdas, ekrano išjungimas, ekrano įjungimas, suspausti, kraštas, miega, miegas, sugriebti"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gestas, tyla, snausti, žadintuvas, gaunamasis skambutis, tylus, vaizdas, užrakinimo ekranas, suspausti, sugriebti, kraštas, sustabdyti"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nustatyti „Wi-Fi“ ALR žymą"</string>
     <string name="write_tag" msgid="8571858602896222537">"Rašyti"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Palieskite žymą, kad galėtumėte rašyti..."</string>
@@ -2844,7 +2923,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Nerodyti jokių darbo pranešimų"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kaip norite matyti profilio pranešimus, kai įrenginys užrakintas?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profilio pranešimai"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Pranešimai"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Pranešimai"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Programų pranešimai"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Pranešimo kategorija"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Svarba"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Leisti programai nuspręsti"</string>
@@ -2859,6 +2939,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Skubus"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Leisti garsą"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Neskambėti, nevibruoti arba nerodyti šių pranešimų dabartiniame ekrane."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Maža svarba"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Vidutinė svarba"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Didelė svarba"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Skubi svarba"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Pranešimų pagelbiklis"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Prieiga prie pranešimų"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Prieiga prie darbo profilio pranešimų užblokuota"</string>
@@ -2888,8 +2972,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Vaizdas vaizde"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Leisti vaizdą vaizde"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Leisti šiai programai kurti vaizdo vaizde langą, kol programa atidaryta arba iš jos išėjus (pvz., kad galėtumėte ir toliau žiūrėti vaizdo įrašą). Šis langas rodomas virš kitų naudojamų programų."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Taip"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Ne"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Prieiga „Netrukdyti“"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Jokios įdiegtos programos nepateikė prieigos „Netrukdyti“ užklausos"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Įkeliamos programos..."</string>
@@ -3028,11 +3110,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Šį darbo profilį tvarko:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Tvarkoma naudojant „<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>“"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentinis)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Įrenginio pasukimas"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Pasukti ekrano turinį"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Išlaikyti stačiąjį rodinį"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Išlaikyti gulsčiąjį rodinį"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Išlaikyti esamą orientaciją"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Saugus paleidimas"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Tęsti"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Galite dar labiau apsaugoti šį įrenginį nustatę, kad prieš jį paleidžiant būtų prašoma įvesti PIN kodą. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus. \n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti PIN kodo norint paleisti jūsų įrenginį?"</string>
@@ -3040,7 +3117,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Galite dar labiau apsaugoti šį įrenginį nustatę, kad prieš jį paleidžiat būtų prašoma įvesti slaptažodį. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus. \n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti įvesti slaptažodį norint paleisti jūsų įrenginį?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Be to, kad atrakinant įrenginį prašoma kontrolinio kodo, galite dar labiau apsaugoti šį įrenginį nustatę, kad jį paleidžiant būtų prašoma įvesti PIN kodą. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus.\n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti PIN kodo norint paleisti jūsų įrenginį?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Be to, kad atrakinant įrenginį prašoma kontrolinio kodo, galite dar labiau apsaugoti šį įrenginį nustatę, kad jį paleidžiant būtų prašoma nubrėžti atrakinimo piešinį. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus.\n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti atrakinimo piešinio norint paleisti jūsų įrenginį?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Be to, kad atrakinant įrenginį prašoma kontrolinio kodo, galite dar labiau apsaugoti šį įrenginį nustatę, kad jį paleidžiant būtų prašoma įvesti slaptažodį. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus.\n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti įvesti slaptažodį norint paleisti jūsų įrenginį&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Be kontrolinio kodo, kurį naudodami atrakinate įrenginį, galite dar geriau apsaugoti šį įrenginį reikalaudami įvesti slaptažodį prieš jį paleidžiant. Kol įrenginys nepaleidžiamas, juo negalima gauti skambučių ar pranešimų, įskaitant signalus.\n\nTai padeda apsaugoti duomenis prarastuose arba pavogtuose įrenginiuose. Reikalauti slaptažodžio paleidžiant įrenginį?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Taip"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ne"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Reikalauti PIN kodo?"</string>
@@ -3166,6 +3243,19 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Naudojimo įspėjimai"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Rodyti visą įrenginio naudojimo informaciją"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Rodyti progr. naud. inform."</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Intensyvus naudojimas"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> programa veikia neįprastai</item>
+      <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> programos veikia neįprastai</item>
+      <item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> programos veikia neįprastai</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> programų veikia neįprastai</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Programos, eikvojančios akumuliatoriaus energiją</item>
+      <item quantity="few">Programos, eikvojančios akumuliatoriaus energiją</item>
+      <item quantity="many">Programos, eikvojančios akumuliatoriaus energiją</item>
+      <item quantity="other">Programos, eikvojančios akumuliatoriaus energiją</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Neoptimizuota"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Neoptimizuota"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizuojamas akumuliatoriaus naudojimas"</string>
@@ -3260,8 +3350,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Rodyti virš kitų programų"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> iš <xliff:g id="COUNT_1">%2$d</xliff:g> progr. leidžiama rodyti virš kitų programų"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Leidimą turinčios programos"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Taip"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Ne"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Leidžiama"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Neleidžiama"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"programų diegimas iš nežinomų šaltinių"</string>
     <string name="write_settings" msgid="4797457275727195681">"Keisti sistemos nustatymus"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"rašyti ir keisti sistemos nustatymus"</string>
@@ -3353,6 +3443,19 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekranas rodomas gintaro spalvos atspalviu. Tai gali padėti užmigti."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Pasiūlymai"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"Dar <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"Dar <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> pasiūlymas</item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> pasiūlymai</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> pasiūlymo</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> pasiūlymų</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="one">Dar <xliff:g id="COUNT">%1$d</xliff:g> pasiūlymas</item>
+      <item quantity="few">Dar <xliff:g id="COUNT">%1$d</xliff:g> pasiūlymai</item>
+      <item quantity="many">Dar <xliff:g id="COUNT">%1$d</xliff:g> pasiūlymo</item>
+      <item quantity="other">Dar <xliff:g id="COUNT">%1$d</xliff:g> pasiūlymų</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Pašalinti"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Šaltų spalvų temperatūra"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Naudoti šaltesnes ekrano spalvas"</string>
@@ -3371,8 +3474,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> duomenų įspėjimas"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> duomenų įspėjimas / <xliff:g id="ID_2">%2$s</xliff:g> duomenų apribojimas"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Atsiskaitymo ciklas"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Mėnesio ciklas prasideda kiekvieno mėnesio <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Kas mėnesį nuo <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Kas mėnesį, <xliff:g id="ID_1">%1$s</xliff:g> d."</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Tinklo apribojimai"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> apribojimas</item>
@@ -3396,7 +3498,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> programų leido naudoti neribotus duomenis, kai Duomenų taupymo priemonė įjungta</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Duomenų taupymo priemonė"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Prieiga prie neribotų duomenų"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Neriboti duomenys"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Foniniai duomenys išjungti"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Įjungta"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Išjungta"</string>
@@ -3462,8 +3564,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Užrakinimo ekrano pranešimų valdymas"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Rodykite arba slėpkite pranešimo turinį"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Viskas"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Palaikymas"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Palaik. ir patarimai"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Mažiausias plotis"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nėra jokių įdiegtų programų, pateikusių išskirtinių SMS prieigos užklausą"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Išskirtiniai SMS gali būti mokami ir į operatoriaus sąskaitas gali būti įtraukta papildomų mokesčių. Jei įgalinsite programos leidimą, galėsite siųsti išskirtinius SMS naudodami tą programą."</string>
@@ -3534,28 +3635,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatiniai"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Neautomatiniai"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Atlaisvinkite vietos dabar"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestai"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Gestų spartieji klavišai"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Spartieji gestai, skirti valdyti telefoną"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Spartieji gestai, skirti valdyti planšetinį kompiuterį"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Spartieji gestai, skirti valdyti įrenginį"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Fotoaparato įjungimas"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Jei norite greitai atidaryti fotoaparatą, dukart paspauskite maitinimo mygtuką. Veikia bet kuriame ekrane."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Greitai atidarykite fotoaparatą"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Atidarykite fotoaparatą dukart paspausdami maitinimo mygtuką"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Fotoaparato perjungimas"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Greičiau fotografuokite autoportretus"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Dukart pasukite telefoną norėdami fotografuoti autoportretą"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Dukart pasukite pl. komp. norėdami fotografuoti autoportretą"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Dukart pasukite įrenginį norėdami fotografuoti autoportretą"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Telefono tikrinimas dukart palietus"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Planšetinio kompiuterio tikrinimas dukart palietus"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Įrenginio tikrinimas dukart palietus"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Jei norite greitai patikrinti pranešimus, dukart palieskite ekraną."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Dukart palieskite ekraną, jei norite sužinoti laiką ir peržiūrėti pranešimus, piktogramas bei kitą informaciją."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Rodyti pranešimus, kai ekranas išjungtas"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Telefono tikrinimas pakėlus"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Planšetinio kompiuterio tikrinimas pakėlus"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Įrenginio tikrinimas pakėlus"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Jei norite greitai patikrinti pranešimus, pakelkite telefoną."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Jei norite greitai patikrinti pranešimus, pakelkite planšetinį kompiuterį."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Jei norite greitai patikrinti pranešimus, pakelkite įrenginį."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Paimkite telefoną, jei norite sužinoti laiką ir peržiūrėti pranešimus, piktogramas bei kitą informaciją."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Paimkite planšetinį kompiuterį, jei norite sužinoti laiką ir peržiūrėti pranešimus, piktogramas bei kitą informaciją."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Paimkite įrenginį, jei norite sužinoti laiką ir peržiūrėti pranešimus, piktogramas bei kitą informaciją."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Rodyti pranešimus, kai ekranas išjungtas"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Perbraukimas kontrolinio kodo jutikliu norint peržiūrėti pranešimus"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Jei norite patikrinti pranešimus, perbraukite žemyn kontrolinio kodo jutikliu telefono užpakalinėje dalyje."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Jei norite greitai patikrinti pranešimus, perbraukite žemyn kontrolinio kodo jutikliu planšetinio kompiuterio užpakalinėje dalyje."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Jei norite patikrinti pranešimus, perbraukite žemyn kontrolinio kodo jutikliu įrenginio užpakalinėje dalyje."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Greitai peržiūrėkite pranešimus"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Perbraukite žemyn kontrolinio kodo jutikliu"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Pakelti, kad fotoaparatas būtų atidarytas"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Jei norite automatiškai atidaryti fotoaparatą, pakelkite telefoną į fotografavimo padėtį (laikydami gulsčiai arba stačiai). Veikia, kai telefonas veikia miego režimu arba yra užrakintas."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Fotograf., kai telefonas veikia miego režimu arba yra užrak."</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Pagalbinis gestas"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Jautrumas"</string>
@@ -3673,6 +3787,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Ar norite pašalinti šią akimirksniu įkeliamą programėlę?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Žaidimai"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Garso failai"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Naudojama vieta"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(pašalinta naudotojui <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(išjungta naudotojui <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Automatinio pildymo paslauga"</string>
@@ -3686,5 +3801,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Akimirksniu įkeliama programėlė"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Išjungti saugyklos tvarkytuvę?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Filmai ir TV programos"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Naudojama vieta"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Operatoriaus aprūpinimo informacija"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktyviklio operatoriaus aprūpinimas"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Kas naujo ir verta dėmesio?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Sužinokite 5 geriausias funkcijas"</string>
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 94d6557..4d26a15 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Labs"</item>
     <item msgid="8986346415847956850">"Teicams"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Vienmēr"</item>
-    <item msgid="844721238536786870">"Tikai ja pieslēgts pie strāvas"</item>
-    <item msgid="1986753720941888596">"Nekad"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Vienmēr"</item>
-    <item msgid="7433294150916905997">"Tikai ja pieslēgts pie strāvas"</item>
-    <item msgid="1390404486722375028">"Nekad"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Pēdējās 30 dienas"</item>
     <item msgid="6600989128423965319">"Iestatīt lietojuma ciklu…"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 80e83fd..a9c8d24 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -31,6 +31,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Tagad jūs esat izstrādātājs!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nav nepieciešams, ja jau esat izstrādātājs."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Lūdzu, vispirms iespējojiet izstrādātājiem paredzētās opcijas."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Bezvadu sakari un tīkli"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Savienojumi"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Ierīce"</string>
@@ -42,6 +43,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE nodrošināts"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videozvani ir nodrošināti"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi zvani ir nodrošināti"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/klātbūtne nodrošināta"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Mobilā tālruņa radio signāla stiprums"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Skatīt SIM adrešu grāmatu"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Fiksētās iezvanes numuru skatīšana"</string>
@@ -107,10 +109,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Skenēt ierīces"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Pārdēvēt ierīci"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Pārdēvēt"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vai pārtraukt savienojumu?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tiks pārtraukts savienojums ar:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Vai atvienot ierīci?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Jūsu tālrunis tiks atvienots no ierīces <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Jūsu planšetdators tiks atvienots no ierīces <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Jūsu ierīce tiks atvienota no ierīces <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Atvienot"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Jums nav atļaujas mainīt Bluetooth iestatījumus."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Savienošana pārī ar jaunu ierīci"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Kamēr Bluetooth iestatījumi atvērti, ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ir redzama citām ierīcēm tuvumā."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Tālruņa Bluetooth adrese: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Planšetdatora Bluetooth adrese: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Ierīces Bluetooth adrese: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vai atvienot <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Apraidīšana"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vai atspējot profilu?"</string>
@@ -122,7 +131,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth pāra izveidošanas pieprasījums"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Pāra izveides pieprasījums"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Pieskarieties, lai izveidotu savienojumu pārī ar ierīci “<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Rādīt saņemtos failus"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Saņemtie faili"</string>
     <string name="device_picker" msgid="4978696506172252813">"Izvēlēties Bluetooth ierīci"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"Lietotnē <xliff:g id="APP_NAME">%1$s</xliff:g> tiek mēģināts ieslēgt Bluetooth savienojumu."</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"Lietotnē <xliff:g id="APP_NAME">%1$s</xliff:g> tiek mēģināts izslēgt Bluetooth savienojumu."</string>
@@ -158,6 +167,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Ierīce “%1$s” vēlas piekļūt jūsu ziņojumiem. Vai sniegt piekļuvi ierīcei “%2$s”?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Pieprasījums piekļūt SIM kartei"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> pieprasa piekļuvi SIM kartei. Piešķirot piekļuvi SIM kartei, savienojuma laikā ierīcē tiks atspējota datu savienojamība. Piešķirt piekļuvi ierīcei <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Citām ierīcēm redzama kā “<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Jūsu ierīces"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Savienošana pārī ar jaunu ierīci"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datums un laiks"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Laika joslas izvēle"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -331,7 +343,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Konti"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Atrašanās vieta"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konti"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Drošība un atrašanās vieta"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Drošība un atrašanās vieta"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifrēšana un akreditācijas dati"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Tālrunis ir šifrēts"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Ierīce ir šifrēta"</string>
@@ -357,40 +369,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Atbloķēšana ar pirksta nospiedumu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Pirksta nospieduma lietošana"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Pieskarieties pirksta nospieduma sensoram, lai atbloķētu tālruni, autorizētu pirkumus vai pierakstītos lietotnēs. Rūpīgi apsveriet, kuru personu pirkstu nospiedumus pievienojat. Jebkurš pievienotais pirksta nospiedums ļauj paveikt šīs darbības.\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_message_unlock_disabled" msgid="4193477159493347679">"Pieskarieties pirksta nospieduma sensoram, lai autorizētu pirkumus vai pierakstītos lietotnēs. Rūpīgi apsveriet, kuru personu pirkstu nospiedumus pievienojat. Jebkurš pievienotais pirksta nospiedums ļauj paveikt šīs darbības.\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="3635924459027832861">"Pieskarieties pirksta nospieduma sensoram, lai atbloķētu tālruni, autorizētu pirkumus vai pierakstītos lietotnēs. Rūpīgi apsveriet, kuru personu pirkstu nospiedumus pievienojat. Jebkurš pievienotais pirksta nospiedums ļauj paveikt šīs darbības.\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_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Atcelt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Turpināt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Izlaist"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Pirksta nospiedums"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Ierīces aizsardzības funkcijas netiks aktivizētas. Jūs nevarēsiet nodrošināt, lai šo planšetdatoru nevarētu lietot citas personas, ja tas tiks pazaudēts, nozagts vai tiks dzēsti tajā saglabātie dati."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Ierīces aizsardzības funkcijas netiks aktivizētas. Jūs nevarēsiet nodrošināt, lai šo ierīci nevarētu lietot citas personas, ja tā tiks pazaudēta, nozagta vai tiks dzēsti tajā saglabātie dati."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Ierīces aizsardzības funkcijas netiks aktivizētas. Jūs nevarēsiet nodrošināt, lai šo tālruni nevarētu lietot citas personas, ja tas tiks pazaudēts, nozagts vai tiks dzēsti tajā saglabātie dati."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Ierīces aizsardzības funkcijas netiks aktivizētas. Jūs nevarēsiet nodrošināt, lai šo planšetdatoru nevarētu lietot citas personas, ja tas tiks pazaudēts vai nozagts."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Ierīces aizsardzības funkcijas netiks aktivizētas. Jūs nevarēsiet nodrošināt, lai šo ierīci nevarētu lietot citas personas, ja tā tiks pazaudēta vai nozagta."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Ierīces aizsardzības funkcijas netiks aktivizētas. Jūs nevarēsiet nodrošināt, lai šo tālruni nevarētu lietot citas personas, ja tas tiks pazaudēts vai nozagts."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Tālāk"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Ierīces aizsardzības funkcijas netiks ieslēgtas. Jūs nevarēsiet nodrošināt, ka šo planšetdatoru neizmantos citas personas, ja tas tiks pazaudēts, nozagts vai atiestatīts."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Ierīces aizsardzības funkcijas netiks ieslēgtas. Jūs nevarēsiet nodrošināt, ka šo ierīci neizmantos citas personas, ja tā tiks pazaudēta, nozagta vai atiestatīta."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Ierīces aizsardzības funkcijas netiks ieslēgtas. Jūs nevarēsiet nodrošināt, ka šo tālruni neizmantos citas personas, ja tas tiks pazaudēts, nozagts vai atiestatīts."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Ierīces aizsardzības funkcijas netiks ieslēgtas. Jūs nevarēsiet nodrošināt, ka šo planšetdatoru neizmantos citas personas, ja tas tiks pazaudēts vai nozagts."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Ierīces aizsardzības funkcijas netiks ieslēgtas. Jūs nevarēsiet nodrošināt, ka šo ierīci neizmantos citas personas, ja tā tiks pazaudēta vai nozagta."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Ierīces aizsardzības funkcijas netiks ieslēgtas. Jūs nevarēsiet nodrošināt, ka šo tālruni neizmantos citas personas, ja tas tiks pazaudēts vai nozagts."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Tomēr izlaist"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Atpakaļ"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Sensora atrašana"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Atrodiet pirkstu nospiedumu sensoru tālruņa aizmugurē."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Pieskarieties sensoram"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Tas atrodas tālruņa aizmugurē. Izmantojiet rādītājpirkstu."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"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="7086763077909041106">"Nosaukums"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Labi"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Dzēst"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Sāciet!"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Pieskarieties sensoram"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Novietojiet pirkstu uz sensora un paceliet to pēc tam, kad sajūtat vibrāciju"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Turpināšana"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Nedaudz pakustiniet pirkstu, lai pievienotu dažādas pirksta nospieduma daļas."</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Nospiedums pievienots!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kad tiek rādīta šī ikona, varat izmantot pirksta nospiedumu identifikācijai vai pirkuma autorizēšanai."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Pieskarieties pirkstu nospiedumu sensoram, lai aktivizētu un atbloķētu savu ierīci."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Ja redzat šo ikonu, varat atļaut pirkumus vai pierakstīties lietotnēs."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Paceliet un vēlreiz pieskar."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Atkārtoti uzlieciet pirkstu, lai pievienotu dažādas pirksta nospieduma daļas."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Pirksta nospiedums pievienots"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Kad tiek rādīta šī ikona, izmantojiet pirksta nospiedumu identifikācijai vai pirkuma autorizēšanai."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Izlaist pirksta nospieduma iestatīšanu?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Jūs izvēlējāties pirksta nospiedumu kā vienu no tālruņa atbloķēšanas iespējām. Ja izlaidīsiet šo darbību, iestatīšana būs jāveic vēlāk. Iestatīšanai nepieciešama aptuveni viena minūte."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Iestatīt ekrāna bloķēšanu"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Gatavs"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Tas nav sensors!"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Izmantojiet nospieduma sensoru uz ierīces."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Pieskarieties sensoram tālruņa aizmugurē ar rādītājpirkstu."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Reģistrēšana netika pabeigta"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Ir sasniegts pirksta nospieduma reģistrēšanas laika ierobežojums. Mēģiniet vēlreiz."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Neizdevās reģistrēt pirksta nospiedumu. Mēģiniet vēlreiz vai izmantojiet citu pirkstu."</string>
@@ -452,6 +462,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo ierīci bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo tālruni bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Izvēlieties rezerves ekrāna bloķēšanas metodi"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Ekrāna bloķēšanas opcijas"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Ekrāna bloķēšanas opcijas"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekrāna bloķēšana"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> — uzreiz pēc miega režīma"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> — <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> pēc miega režīma"</string>
@@ -522,13 +534,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Atbloķēšanas kombinācijas maiņa"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Mainīt atbloķēšanas PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mainīt atbloķēšanas paroli"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Mēģiniet vēlreiz (<xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. mēģinājums no <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>)."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Pēdējais mēģinājums"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Ja šajā mēģinājumā ievadīsiet nepareizu kombināciju, jūsu darba profils un ar to saistītie dati tiks noņemti no šīs ierīces."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Ja šajā mēģinājumā ievadīsiet nepareizu PIN, jūsu darba profils un ar to saistītie dati tiks noņemti no šīs ierīces."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Ja šajā mēģinājumā ievadīsiet nepareizu paroli, jūsu darba profils un ar to saistītie dati tiks noņemti no šīs ierīces."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Pārāk daudz neveiksmīgu mēģinājumu. Jūsu darba profils un ar to saistītie dati tiks noņemti no šīs ierīces."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Nerādīt"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Mēģiniet vēlreiz (<xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. mēģinājums no <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>)."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Jūsu dati tiks dzēsti."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ja nākamajā mēģinājumā ievadīsiet nepareizu kombināciju, dati šajā ierīcē tiks dzēsti."</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ja nākamajā mēģinājumā ievadīsiet nepareizu PIN, dati šajā ierīcē tiks dzēsti."</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ja nākamajā mēģinājumā ievadīsiet nepareizu paroli, dati šajā ierīcē tiks dzēsti."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ja nākamajā mēģinājumā ievadīsiet nepareizu kombināciju, šis lietotājs tiks dzēsts."</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ja nākamajā mēģinājumā ievadīsiet nepareizu PIN, šis lietotājs tiks dzēsts."</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ja nākamajā mēģinājumā ievadīsiet nepareizu paroli, šis lietotājs tiks dzēsts."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ja nākamajā mēģinājumā ievadīsiet nepareizu kombināciju, jūsu darba profils un ar to saistītie dati tiks dzēsti."</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ja nākamajā mēģinājumā ievadīsiet nepareizu PIN, jūsu darba profils un ar to saistītie dati tiks dzēsti."</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ja nākamajā mēģinājumā ievadīsiet nepareizu paroli, jūsu darba profils un ar to saistītie dati tiks dzēsti."</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Pārāk daudz neveiksmīgu mēģinājumu. Dati šajā ierīcē tiks dzēsti."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Pārāk daudz neveiksmīgu mēģinājumu. Šis lietotājs tiks dzēsts."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Pārāk daudz neveiksmīgu mēģinājumu. Šis darba profils un ar to saistītie dati tiks dzēsti."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Nerādīt"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Ir jāietver vismaz <xliff:g id="COUNT">%d</xliff:g> rakstzīmes."</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN kodā ir jāietver vismaz <xliff:g id="COUNT">%d</xliff:g> cipari."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Turpināt"</string>
@@ -637,6 +657,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth papildu iestatījumi"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kad Bluetooth ir ieslēgts, ierīce var sazināties ar citām Bluetooth ierīcēm tuvumā."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Lai uzlabotu atrašanās vietas noteikšanas precizitāti, sistēmas lietotnēs un pakalpojumos joprojām var noteikt Bluetooth ierīces. Varat to mainīt <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>meklēšanas iestatījumos<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Nevarēja izveidot savienojumu. Mēģiniet vēlreiz."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Ierīces dati"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Ierīces Bluetooth adrese: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Vai aizmirst ierīci?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Jūsu tālrunis vairs nebūs savienots pārī ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Jūsu planšetdators vairs nebūs savienots pārī ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Jūsu ierīce vairs nebūs savienota pārī ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Aizmirst ierīci"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Savienot ar..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atvienota no datu nesēja audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atvienota no brīvroku audio."</string>
@@ -789,6 +817,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Nenorādīt"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Neapstiprināt"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Sertifikāts nav norādīts. Savienojums nebūs privāts."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Tīkla nosaukums ir pārāk garš."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Norādiet domēnu."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ir pieejams"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ir pieejams)"</string>
@@ -821,7 +850,6 @@
       <item quantity="other">%d tīkli</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Papildu Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfigurēt Wi-Fi tīklu"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC adrese"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP adrese"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Apakštīkla maska"</string>
@@ -858,9 +886,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vai aizmirst šo grupu?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Pārnēsājams Wi-Fi tīklājs"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi tīklājs"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Izmantot mobilo datu savienojumu Wi-Fi tīkla darbībai"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Šī planšetdatora interneta savienojums netiek koplietots, izmantojot tīklāju"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Šī tālruņa interneta savienojums netiek koplietots, izmantojot tīklāju"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Nenotiek interneta vai satura kopīgošana ar citām ierīcēm"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Šī planšetdatora interneta savienojums tiek kopīgots, izmantojot tīklāju"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Šī tālruņa interneta savienojums tiek kopīgots, izmantojot tīklāju"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Lietotne kopīgo saturu. Lai kopīgotu interneta savienojumu, izslēdziet un ieslēdziet tīklāju"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi nosaukums"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Notiek tīklāja <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ieslēgšana..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Citas ierīces var savienot ar tīklāju <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi parole"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Piekļuves punkta josla"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Izmantojiet tīklāju, lai izveidotu Wi‑Fi tīklu citām savām ierīcēm. Tīklājs nodrošina internetu, izmantojot mobilo datu savienojumu. Var tikt piemērota papildu maksa par mobilo datu pārraidi."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Lietotnes var izveidot tīklāju satura kopīgošanai ar tuvumā esošajām ierīcēm."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Notiek tīklāja ieslēgšana…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Notiek tīklāja izslēgšana…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ir aktīvs"</string>
@@ -907,6 +943,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Ja ir ieslēgti Wi-Fi zvani, varat veikt tālruņa zvanus Wi-Fi tīklos vai savā mobilo sakaru operatora tīkla atkarībā no savām preferencēm un no tā, kurš signāls ir spēcīgāks. Pirms ieslēdzat šo funkciju, sazinieties ar savu mobilo sakaru operatoru, lai noskaidrotu tarifus un citu informāciju."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Atjaunināt adresi ārkārtas gadījumiem"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Adrese, ko izmantos ārkārtas palīdzības dienesti kā jūsu atrašanās vietu, ja zvanīsiet uz numuru 911, lietojot Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Displejs"</string>
@@ -964,6 +1001,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nav rezultātu"</string>
     <string name="display_settings" msgid="7965901687241669598">"Attēls"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automātiska ekrāna pagriešana"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Izteiksmīgas krāsas"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Mainīt orientāciju automātiski, rotējot planšetdatoru"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Automātiski pārslēgt orientāciju, kad tālrunis tiek pagriezts"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Mainīt orientāciju automātiski, rotējot planšetdatoru"</string>
@@ -991,23 +1029,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimizēt spilgtumu apgaismojumam. Ja funkcija ieslēgta, tāpat varat īslaicīgi pielāgot spilgtumu."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Nakts režīms"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Nakts režīmā ekrāns iekrāsojas dzintara krāsā, lai jums būtu vieglāk skatīties ekrānā un lasīt blāvā apgaismojumā, kā arī vieglāk iemigt."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Ieplānot"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Statuss"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Ieslēgt automātiski"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nekad"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Pielāgots grafiks"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"No saulrieta līdz saullēktam"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Ieplānot"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Nav"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Tiek ieslēgts pielāgotā laikā"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Ieslēgts no rieta līdz lēktam"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Sākuma laiks"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Beigu laiks"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Statuss"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensitāte"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Izslēgts. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nekad netiks automātiski ieslēgts."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Tiks automātiski ieslēgts plkst. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Tiks automātiski ieslēgts saulrietā."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Ieslēgts. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nekad netiks automātiski izslēgts."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Tiks automātiski izslēgts plkst. <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Tiks automātiski izslēgts saullēktā."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Izslēgts/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Nekad netiks automātiski ieslēgts"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Tiks automātiski ieslēgts plkst. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Tiks automātiski ieslēgts saulrietā"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Ieslēgts/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Nekad netiks automātiski izslēgts"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Tiks automātiski izslēgts plkst. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Tiks automātiski izslēgts saullēktā"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Miega režīms"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekrāns tiek izslēgts"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pēc <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivitātes"</string>
@@ -1031,8 +1068,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Iestatījumi"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automātisks spilgtums"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Pacelt, lai ieslēgtu"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Ambients displejs"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Gaidstāves ekrāns"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Vienmēr ieslēgts"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Jauni paziņojumi"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kad rādīt"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Jauni paziņojumi"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktivizēt ekrānu, kad tiek saņemts paziņojums"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Vienmēr ieslēgts"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Tiek rādīts laiks, paziņojumu ikonas un cita informācija."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fonta lielums"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Palielināt vai samazināt tekstu"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kartes bloķēšanas iestatījumi"</string>
@@ -1285,6 +1328,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN nedrīkst būt tukšs."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC laukā jābūt 3 cipariem."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC laukā jābūt diviem vai trim cipariem."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Mobilo sakaru operators neatļauj pievienot šāda veida APN: %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Notiek APN noklusējuma iestatījumu atjaunošana."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Atiestatīt noklusējuma vērtības"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Noklusējuma APN iestatījumu atiestatīšana ir pabeigta."</string>
@@ -1315,6 +1359,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Dzēst SD karti"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Dzēst visus iekšējā USB atmiņā saglabātos datus, piemēram, mūziku vai fotoattēlus"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Izdzēst visus SD kartē saglabātos datus, piemēram, mūziku vai fotoattēlus"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Dzēst eSIM kartes"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Dzēsiet visas tālrunī esošās eSIM kartes. Veicot šo darbību, netiks atcelts jūsu mobilo pakalpojumu plāns."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Dzēsiet visas planšetdatorā esošās eSIM kartes. Veicot šo darbību, netiks atcelts jūsu mobilo pakalpojumu plāns."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Atiestatīt planšetdatoru"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Atiestatīt tālruni"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Vai dzēst visu jūsu personīgo informāciju un visas lejupielādētās lietotnes? Šo darbību nevarēs atsaukt."</string>
@@ -1337,26 +1384,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Kamēr ir ieslēgts datu lietojuma samazinātājs, nevar veikt piesaisti vai izmantot pārnēsājamus tīklājus"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB piesaiste"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB kopne pievienota, pārbaudiet, lai piesaistītu"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Piesaistīts"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Nevar izveidot piesaisti, kad tiek lietota USB atmiņa"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB nav pievienota"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Lai ieslēgtu, izveidojiet savienojumu."</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB piesaistes kļūda"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Kopīgojiet tālruņa interneta savienojumu, izmantojot USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Kopīgojiet planšetdatora interneta savienojumu, izmantojot USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth saistīšana"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Koplieto planšetdat. interneta sav. caur Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Koplieto tālruņa interneta sav. caur Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Koplieto planšetd. interneta sav. ar 1 ierīci caur Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Koplieto tālruņa interneta sav. ar 1 ierīci caur Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Koplieto planšetd. interneta sav. ar <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ierīcēm caur Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Koplieto tālruņa interneta sav. ar <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ierīcēm caur Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Kopīgojiet planšetdatora interneta savienojumu, izmantojot Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Kopīgojiet tālruņa interneta savienojumu, izmantojot Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Koplieto ierīces <xliff:g id="DEVICE_NAME">%1$d</xliff:g> interneta sav. caur Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Nekoplieto planšetd. interneta sav. caur Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Nekoplieto tālruņa interneta sav. caur Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Nav piesaistes"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Nevar izveidot piesaisti vairāk nekā <xliff:g id="MAXCONNECTION">%1$d</xliff:g> ierīcēm."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atsaistīta."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Izmantojiet tīklāju un piesaisti, lai varētu lietot internetu citās ierīcēs, izveidojot mobilo datu savienojumu."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Izmantojiet tīklāju un piesaisti, lai varētu lietot internetu citās ierīcēs, izveidojot mobilo datu savienojumu. Lietotnes tīklāju var izveidot arī satura kopīgošanai ar tuvumā esošajām ierīcēm."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Palīdzība"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobilais tīkls"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilo sakaru pakalpojumu plāns"</string>
@@ -1389,7 +1425,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Vietas režīms"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Izmantot GPS, Wi‑Fi, Bluetooth vai mobilos tīklus, lai noteiktu atrašanās vietu"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Izmantot Wi‑Fi, Bluetooth vai mobilos tīklus, lai noteiktu atrašanās vietu"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Lietot GPS atrašanās vietas noteikšanai"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Lietot GPS un ierīces sensorus atrašanās vietas noteikšanai"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Pārbaudīšana"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi meklēšana"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Uzlabojiet atrašanās vietas noteikšanas precizitāti, ļaujot sistēmas lietotnēm un pakalpojumiem noteikt Wi-Fi tīklus jebkurā laikā."</string>
@@ -1434,8 +1470,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nav izveidots datu pārraides savienojums. Lai skatītu šo informāciju tūlīt, jebkurā datorā ar interneta savienojumu apmeklējiet vietni %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Notiek ielāde…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Izvēlieties paroli"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Parole pirksta nosp. lietošanai"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Izvēlieties kombināciju"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Komb. pirksta nosp. lietošanai"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Izvēlieties PIN kodu"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"PIN pirksta nosp. lietošanai"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Apstipriniet paroli"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Apstipriniet kombināciju"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Apstipriniet savu PIN kodu"</string>
@@ -1504,6 +1543,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Lietotnes iestatījumi"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nezināmi avoti"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Atļaut visus lietotņu avotus"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Nesen atvērtās lietotnes"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Visu lietotņu (<xliff:g id="COUNT">%1$d</xliff:g>) skatīšana"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"Pirms <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Jūsu planšetdators un personīgie dati ir neaizsargātāki pret nezināmu lietotņu uzbrukumiem. Instalējot no šī avota iegūtas lietotnes, jūs piekrītat, ka esat atbildīgs par jebkādiem planšetdatora bojājumiem vai datu zudumu, kas varētu rasties šo lietotņu izmantošanas dēļ."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Jūsu tālrunis un personīgie dati ir neaizsargātāki pret nezināmu lietotņu uzbrukumiem. Instalējot no šī avota iegūtas lietotnes, jūs piekrītat, ka esat atbildīgs par jebkādiem tālruņa bojājumiem vai datu zudumu, kas varētu rasties šo lietotņu izmantošanas dēļ."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Papildu iestatījumi"</string>
@@ -1673,6 +1715,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Vai apturēt sistēmas pakalpojumu?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Ja apturēsiet šī pakalpojuma darbību, dažas planšetdatora funkcijas var nedarboties pareizi līdz brīdim, kad planšetdators tiks izslēgts un atkal ieslēgts."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ja apturēsiet šī pakalpojuma darbību, dažas tālruņa funkcijas var nedarboties pareizi līdz brīdim, kad tālrunis tiks izslēgts un atkal ieslēgts."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Valodas, ievade un žesti"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Valodas un ievade"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Valodas un ievade"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Ievades palīgs"</string>
@@ -1893,6 +1939,11 @@
       <item quantity="one">Ieslēgts <xliff:g id="COUNT">%1$d</xliff:g> drukāšanas pakalpojums</item>
       <item quantity="other">Ieslēgti <xliff:g id="COUNT">%1$d</xliff:g> drukāšanas pakalpojumi</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="zero"><xliff:g id="COUNT">%1$d</xliff:g> drukas uzdevumi</item>
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> drukas uzdevums</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> drukas uzdevumi</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Drukāšanas pakalpojumi"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nav instalēts neviens pakalpojums"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nav atrasts neviens printeris."</string>
@@ -1959,6 +2010,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Izmantot detaļas"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Noregulēt strāvas patēriņu"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Iekļautās pakotnes"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Lietotņu darbības dēļ var tikt izlādēts akumulators"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Ierīce arvien tiek aktivizēta"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ierīce tiek aktivizēta fonā"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Bieži tiek pieprasīti atrašanās vietas dati"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> lietotnēm ir neatbilstoša darbība"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Vai apturēt lietotni?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Jūsu tālrunis nevar pārvaldīt akumulatora darbību kā parasti, jo lietotne <xliff:g id="APP">%1$s</xliff:g> arvien aktivizē tālruni.\n\nLai novērstu šo problēmu, varat veikt lietotnes piespiedu apturēšanu.\n\nJa problēma atkārtojas, iespējams, būs jāatinstalē lietotne, lai uzlabotu akumulatora veiktspēju."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Jūsu planšetdators nevar pārvaldīt akumulatora darbību kā parasti, jo lietotne <xliff:g id="APP">%1$s</xliff:g> arvien aktivizē planšetdatoru.\n\nLai novērstu šo problēmu, varat veikt lietotnes piespiedu apturēšanu.\n\nJa problēma atkārtojas, iespējams, būs jāatinstalē lietotne, lai uzlabotu akumulatora veiktspēju."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Jūsu ierīce nevar pārvaldīt akumulatora darbību kā parasti, jo lietotne <xliff:g id="APP">%1$s</xliff:g> arvien aktivizē ierīci.\n\nLai novērstu šo problēmu, varat veikt lietotnes piespiedu apturēšanu.\n\nJa problēma atkārtojas, iespējams, būs jāatinstalē lietotne, lai uzlabotu akumulatora veiktspēju."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Apturēt lietotni"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Vai izslēgt lietošanu fonā?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Jūsu tālrunis nevar pārvaldīt akumulatora darbību kā parasti, jo lietotne <xliff:g id="APP">%1$s</xliff:g> arvien aktivizē tālruni.\n\nLai atrisinātu šo problēmu, tālrunis var bloķēt šīs lietotnes darbību fonā."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Jūsu planšetdators nevar pārvaldīt akumulatora darbību kā parasti, jo lietotne <xliff:g id="APP">%1$s</xliff:g> arvien aktivizē planšetdatoru.\n\nLai atrisinātu šo problēmu, planšetdators var bloķēt šīs lietotnes darbību fonā."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Jūsu ierīce nevar pārvaldīt akumulatora darbību kā parasti, jo lietotne <xliff:g id="APP">%1$s</xliff:g> arvien aktivizē ierīci.\n\nLai atrisinātu šo problēmu, ierīce var bloķēt šīs lietotnes darbību fonā."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Izslēgt"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Vai izslēgt atrašanās vietas datus?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Jūsu tālrunis nevar pārvaldīt akumulatora darbību kā parasti, jo lietotne <xliff:g id="APP">%1$s</xliff:g> arvien pieprasa atrašanās vietas datus, kad neizmantojat lietotni.\n\nLai atrisinātu šo problēmu, varat izslēgt atrašanās vietas datus šai lietotnei."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Jūsu planšetdators nevar pārvaldīt akumulatora darbību kā parasti, jo lietotne <xliff:g id="APP">%1$s</xliff:g> arvien pieprasa atrašanās vietas datus, kad neizmantojat lietotni.\n\nLai atrisinātu šo problēmu, varat izslēgt atrašanās vietas datus šai lietotnei."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Jūsu ierīce nevar pārvaldīt akumulatora darbību kā parasti, jo lietotne <xliff:g id="APP">%1$s</xliff:g> arvien pieprasa atrašanās vietas datus, kad neizmantojat lietotni.\n\nLai atrisinātu šo problēmu, varat izslēgt atrašanās vietas datus šai lietotnei."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Izslēgt"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ekrāns"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Zibspuldze"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1973,7 +2044,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Lietotnes"</string>
     <string name="power_service" msgid="1599661212370831780">"Pakalpojumi"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistēma"</string>
-    <string name="power_user" msgid="1889728099253018005">"Lietotājs"</string>
+    <string name="power_user" msgid="3706143225319881667">"Citi lietotāji"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU kopā"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU akt. režīms"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Neļaut pāriet miega rež."</string>
@@ -2025,6 +2096,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Par daudz uzskaitītais enerģijas patēriņš"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Izmantots šādu laiku: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktīva šādu laika periodu: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Ekrāna lietojums: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> izmanto lietotne <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> no vispārējā akumulatora lietojuma"</string>
@@ -2588,7 +2660,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Mainīt PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Rādīt paziņojumus"</string>
     <string name="help_label" msgid="6886837949306318591">"Palīdzība/atsauksmes"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Palīdzības raksti, tālruņa un tērzēšanas atbalsts"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Palīdzības raksti, tālruņa zvani un tērzēšana, darba sākšana"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Konts saturam"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Dokuments ar foto"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ārkārtas apdraudējums"</string>
@@ -2679,9 +2751,12 @@
       <item quantity="other">Rādīt %d slēptus vienumus</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Tīkls un internets"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobilie dati, datu lietojums, tīklājs"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilais tīkls"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datu lietojums"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"tīklājs"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Pievienotās ierīces"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Lietotnes un paziņojumi"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Atļaujas, noklusējuma lietotnes"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Lietotāji un konti"</string>
@@ -2734,6 +2809,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"žests"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"maksāt, pieskarties, maksājumi"</string>
     <string name="keywords_backup" msgid="470070289135403022">"dublēšana, dublēt"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"žests, mala, sāni, aktīva mala, saspiest, satvert, asistēt, asistents, squeezy, squeezie, squeezey, squeezee, ok google, google asistents"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"žests, aktivizēt, paziņojumi, ekrāns, displejs, izslēgt ekrānu, ieslēgt ekrānu, saspiest, mala, aizmidzis, miegs, satvert"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"žests, klusums, atlikt, signāls, ienākošais zvans, kluss, displejs, bloķēšanas ekrāns, saspiest, satvert, mala, apturēt"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Iestatīt Wi-Fi NFC atzīmi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Rakstīt"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Pieskarieties atzīmei, lai rakstītu."</string>
@@ -2817,7 +2895,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Vispār nerādīt darba profila paziņojumus"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kā ierīcē rādīt profila paziņojumus, kad tā ir bloķēta?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profila paziņojumi"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Paziņojumi"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Paziņojumi"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Lietotņu paziņojumi"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Paziņojuma kategorija"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Svarīgums"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Atkarībā no lietotnes iestatījumiem"</string>
@@ -2832,6 +2911,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Steidzams"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Atļaujiet skaņu"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Nerādīt šos paziņojumus pašreizējā ekrāna skatā, kā arī neatskaņot to skaņas signālu un nevibrēt"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Nav svarīgs"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Vidēji svarīgs"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Ļoti svarīgs"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Steidzams"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Paziņojumu palīgs"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Piekļuve paziņojumiem"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Piekļuve darba profila paziņojumiem ir bloķēta"</string>
@@ -2860,8 +2943,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Attēls attēlā"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Atļaut attēlu attēlā"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Atļaut šai lietotnei izveidot logu ar attēlu attēlā, kad lietotne ir atvērta vai pēc tās aizvēršanas (piemēram, lai turpinātu skatīties video). Šis logs tiek rādīts pāri citām izmantotajām lietotnēm."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Jā"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Nē"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Piekļuve pie “Netraucēt”"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nevienā instalētajā lietotnē nav pieprasīta piekļuve režīmam “Netraucēt”."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Notiek lietotņu ielāde..."</string>
@@ -2996,11 +3077,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Šis darba profils tiek pārvaldīts, izmantojot:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Pārvalda <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentāla)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Ierīces pagriešana"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Pagriezt ekrāna saturu"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Saglabāt portreta skatu"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Saglabāt ainavas skatu"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Saglabāt pašreizējo virzienu"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Drošā palaišana"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Turpināt"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Varat uzlabot šīs ierīces drošības līmeni, iestatot, lai pirms ierīces palaišanas tiktu pieprasīts PIN. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus un paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt PIN pirms ierīces palaišanas?"</string>
@@ -3008,7 +3084,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Varat uzlabot šīs ierīces drošības līmeni, iestatot, lai pirms ierīces palaišanas tiktu pieprasīta parole. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus un paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt paroli pirms ierīces palaišanas?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Papildus ierīces atbloķēšanai ar pirksta nospiedumu varat uzlabot ierīces drošības līmeni, iestatot, lai pirms ierīces palaišanas tiktu pieprasīts PIN. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus un paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt PIN pirms ierīces palaišanas?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Papildus ierīces atbloķēšanai ar pirksta nospiedumu varat uzlabot ierīces drošības līmeni, iestatot, lai pirms ierīces palaišanas tiktu pieprasīta kombinācija. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus un paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt kombināciju pirms ierīces palaišanas?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Papildus ierīces atbloķēšanai ar pirksta nospiedumu varat uzlabot ierīces drošības līmeni, iestatot, lai pirms ierīces palaišanas tiktu pieprasīta parole. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus un paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt paroli pirms ierīces palaišanas?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Papildus atbloķēšanai ar pirksta nospiedumu varat uzlabot šīs ierīces aizsardzību, iestatot, lai pirms ierīces palaišanas tiktu pieprasīta parole. Kamēr ierīce nav palaista, nevar saņemt zvanus, īsziņas vai paziņojumus, tostarp signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt paroli pirms ierīces palaišanas?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Jā"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nē"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Vai pieprasīt PIN?"</string>
@@ -3130,6 +3206,17 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Brīdinājumi par lietojumu"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Rādīt pilnu ierīces lietojumu"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Rādīt lietotnes izmantojumu"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Augsts lietojuma līmenis"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="zero"><xliff:g id="NUMBER">%2$d</xliff:g> lietotnēs ir neparastas darbības</item>
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> lietotnē ir neparastas darbības</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> lietotnēs ir neparastas darbības</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="zero">Lietotņu darbības dēļ var tikt izlādēts akumulators</item>
+      <item quantity="one">Lietotņu darbības dēļ var tikt izlādēts akumulators</item>
+      <item quantity="other">Lietotņu darbības dēļ var tikt izlādēts akumulators</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Netiek optimizēts"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Netiek optimizēts"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Akumulatora darbība tiek optimizēta"</string>
@@ -3223,8 +3310,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Rādīt pāri citām lietotnēm"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> lietotnes no <xliff:g id="COUNT_1">%2$d</xliff:g> drīkst rādīt pāri citām lietotnēm"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Lietotnes ar atļauju"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Jā"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Nē"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Atļauts"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Nav atļauts"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instalēt lietotnes nezināmi avoti"</string>
     <string name="write_settings" msgid="4797457275727195681">"Iestatījumu pārveidošana"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"rakstīt, pārveidot sistēmas iestatījumus"</string>
@@ -3315,6 +3402,17 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekrāns iekrāsojas dzintara krāsā. Tas var palīdzēt jums iemigt."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Ieteikumi"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"un vēl <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="zero"><xliff:g id="COUNT">%1$d</xliff:g> ieteikumu</item>
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> ieteikums</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ieteikumi</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="zero">un vēl <xliff:g id="COUNT">%1$d</xliff:g> ieteikumu</item>
+      <item quantity="one">un vēl <xliff:g id="COUNT">%1$d</xliff:g> ieteikums</item>
+      <item quantity="other">un vēl <xliff:g id="COUNT">%1$d</xliff:g> ieteikumi</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Noņemt"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Vēsu krāsu temperatūra"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Izmantot vēsākas krāsas"</string>
@@ -3333,8 +3431,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Datu brīdinājums: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Datu brīdinājums: <xliff:g id="ID_1">%1$s</xliff:g>/ datu ierobežojums: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Norēķinu cikls"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Mēneša cikls sākas katra mēneša <xliff:g id="ID_1">%1$s</xliff:g>. datumā."</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mēneša sākums: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Reizi mēnesī: <xliff:g id="ID_1">%1$s</xliff:g>. datumā"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Tīkla ierobežojumi"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="zero"><xliff:g id="COUNT">%1$d</xliff:g> ierobežojumi</item>
@@ -3356,7 +3453,7 @@
       <item quantity="other">Esot ieslēgtam datu lietojuma samazinātājam, neierobežotus datus ir atļauts izmantot <xliff:g id="COUNT">%1$d</xliff:g> lietotnēs.</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Datu lietojuma samazinātājs"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Neierobežota piekļuve datiem"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Neierobežoti dati"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Fona dati ir izslēgti."</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Ieslēgts"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Izslēgts"</string>
@@ -3421,8 +3518,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Bloķēšanas ekrāna paziņojumu kontrole"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Rādīt vai slēpt paziņojumu saturu"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Visas"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Atbalsts"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Atbalsts un padomi"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Mazākais platums"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nevienā instalētajā lietotnē nav pieprasīta piekļuve maksas īsziņām."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Par maksas īsziņām no jums var tikt iekasēta samaksa, kas tiks pievienota jūsu mobilo sakaru operatora rēķinam. Ja kādai lietotnei iespējosiet piekļuves atļauju, varēsiet sūtīt maksas īsziņas, izmantojot šo lietotni."</string>
@@ -3490,28 +3586,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automātiski"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuāli"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Atbrīvot vietu"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Žesti"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Žestu saīsnes"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Ātri žesti tālruņa pārvaldībai"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Ātri žesti planšetdatora pārvaldībai"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Ātri žesti ierīces pārvaldībai"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Pāriešana uz kameru"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Lai ātri atvērtu kameru, divreiz nospiediet barošanas pogu. Šī funkcija darbojas jebkurā ekrānā."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Atveriet kameru ātri"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Divreiz nospiediet barošanas pogu, lai atvērtu kameru"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Apvērst kameru"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Uzņemiet pašbildes ātrāk"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Divreiz pagrieziet tālruni, lai atvērtu pašbildes režīmu"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Divreiz pagrieziet planšetdatoru, lai atvērtu pašbildes rež."</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Divreiz pagrieziet ierīci, lai atvērtu pašbildes režīmu"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dubultskāriens, lai skatītu tālruņa paziņojumus"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dubultskāriens, lai skatītu planšetdatora paziņojumus"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dubultskāriens, lai skatītu ierīces paziņojumus"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Lai ātri skatītu paziņojumus, veiciet dubultskārienu ekrānam."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Lai skatītu laiku, paziņojumu ikonas un citu informāciju, divreiz ātri pieskarieties ekrānam."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Skatiet paziņojumus, kad ekrāns ir izslēgts"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Tālruņa pārbaude paceļot"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Planšetdatora pacelšana, lai skatītu paziņojumus"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Ierīces pacelšana, lai skatītu paziņojumus"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Lai ātri skatītu paziņojumus, paņemiet tālruni."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Lai ātri skatītu paziņojumus, paņemiet planšetdatoru."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Lai ātri skatītu paziņojumus, paņemiet ierīci."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Lai skatītu laiku, paziņojumu ikonas un citu informāciju, paņemiet tālruni."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Lai skatītu laiku, paziņojumu ikonas un citu informāciju, paņemiet planšetdatoru."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Lai skatītu laiku, paziņojumu ikonas un citu informāciju, paņemiet ierīci."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Skatiet paziņojumus, kad ekrāns ir izslēgts"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Ziņu skatīšana ar pirksta nospiedumu"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Lai skatītu paziņojumus, velciet uz leju pār pirksta nospieduma sensoru tālruņa aizmugurē."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Lai skatītu paziņojumus, velciet uz leju pār pirksta nospieduma sensoru planšetdatora aizmugurē."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Lai skatītu paziņojumus, velciet uz leju pār pirksta nospieduma sensoru ierīces aizmugurē."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Skatiet paziņojumus ātri"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Velciet uz leju pār pirksta nospieduma sensoru"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Pavirzīt augšup, lai atvērtu kameru"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Lai atvērtu kameru automātiski, paceliet tālruni augšup fotoattēla uzņemšanas pozīcijā (ainavas vai portreta orientācijā). Automātiskā atvēršana darbojas, kad tālrunis ir miega režīmā vai bloķēts."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Uzņemt fotoattēlus, kad tālrunis ir miega režīmā vai bloķēts"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Palīga žests"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Jutīgums"</string>
@@ -3622,6 +3731,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Vai vēlaties noņemt šo tūlītējo lietotni?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Spēles"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio faili"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Izmantotā vieta krātuvē"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(atinstalēts lietotājam <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(atspējots lietotājam <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Automātiskā aizpilde"</string>
@@ -3635,5 +3745,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Tūlītējā lietotne"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Vai izslēgt krātuves pārvaldnieku?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Filmu un TV pārraižu lietotnes"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Izmantotā vieta krātuvē"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Informācija par operatora nodrošināšanu"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivizēt operatora nodrošināšanu"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Kādas ir jaunākās funkcijas?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Skatiet 5 jaunākās funkcijas"</string>
 </resources>
diff --git a/res/values-mcc262-mnc02-af/strings.xml b/res/values-mcc262-mnc02-af/strings.xml
new file mode 100644
index 0000000..557ded3
--- /dev/null
+++ b/res/values-mcc262-mnc02-af/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Jy kan nie noodoproepe met Wi-Fi-oproepe maak nie. As jy probeer om \'n noodoproep te maak, sal jou toestel outomaties die mobiele netwerk gebruik. Noodoproepe kan net gemaak word in gebiede met selnetwerkdekking."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-am/strings.xml b/res/values-mcc262-mnc02-am/strings.xml
new file mode 100644
index 0000000..d65f1c8
--- /dev/null
+++ b/res/values-mcc262-mnc02-am/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"በWi-Fi ጥሪ ማድረጊያ በኩል የአደጋ ጥሪዎችን ማድረግ አይችሉም።  የአደጋ ጥሪ ለማድረግ ከሞከሩ የእርስዎ መሣሪያ በራስሰር የሞባይል አውታረመረቡን ይጠቀማል። የአደጋ ጥሪዎች የሞባይል አውታረ መረብ ሽፋን ባለባቸው አካባቢዎች ብቻ ይደረጋሉ።"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ar/strings.xml b/res/values-mcc262-mnc02-ar/strings.xml
new file mode 100644
index 0000000..852ae302
--- /dev/null
+++ b/res/values-mcc262-mnc02-ar/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">"‏\n\nلا يمكنك إجراء مكالمات الطوارئ من خلال الاتصال عبر Wi-Fi. إذا حاولت إجراء مكالمة طوارئ، سيستخدم جهازك تلقائيًا شبكة الجوّال. يمكن إجراء مكالمات الطوارئ فقط في المناطق التي تشتمل على تغطية لشبكة الجوّال."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-az/strings.xml b/res/values-mcc262-mnc02-az/strings.xml
new file mode 100644
index 0000000..78e5c6d
--- /dev/null
+++ b/res/values-mcc262-mnc02-az/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Wi-Fi vasitəsilə təcili zənglər edə bilməzsiniz. Əgər təcili zəng etməyə çalışsanız, cihaz avtomatik olaraq mobil şəbəkədən istifadə edəcək. Təcili zənglər təkcə mobil şəbəkə əhatəsində olan ərazilərdə edilə bilər."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-b+sr+Latn/strings.xml b/res/values-mcc262-mnc02-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..cdf2c42
--- /dev/null
+++ b/res/values-mcc262-mnc02-b+sr+Latn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Ne možete da upućujete hitne pozive pomoću pozivanja preko Wi-Fi-ja. Ako probate da uputite hitan poziv, uređaj će automatski koristiti mobilnu mrežu. Hitni pozivi mogu da se upućuju samo u oblastima pokrivenim mobilnom mrežom."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-be/strings.xml b/res/values-mcc262-mnc02-be/strings.xml
new file mode 100644
index 0000000..1098c18
--- /dev/null
+++ b/res/values-mcc262-mnc02-be/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Вы не можаце рабіць экстранныя выклікі з дапамогай Wi-Fi-тэлефаніі. Калі вы паспрабуеце зрабіць экстранны выклік, ваша прылада аўтаматычна выкарыстае мабільную сетку. Экстранныя выклікі можна рабіць толькі ў зонах пакрыцця мабільнай сеткі."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-bg/strings.xml b/res/values-mcc262-mnc02-bg/strings.xml
new file mode 100644
index 0000000..0aea8da
--- /dev/null
+++ b/res/values-mcc262-mnc02-bg/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Не можете да извършвате спешни обаждания чрез функцията Обаждания през Wi-Fi. Ако опитате да го направите, устройството ви автоматично ще използва мобилната мрежа. Спешните обаждания могат да бъдат осъществявани само в райони с покритие за мобилна мрежа."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-bn/strings.xml b/res/values-mcc262-mnc02-bn/strings.xml
new file mode 100644
index 0000000..1b66ebf
--- /dev/null
+++ b/res/values-mcc262-mnc02-bn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"ওয়াই-ফাই এর মাধ্যমে জরুরী কল করা যাবে না। জরুরী কল করার চেষ্টা করলে আপনার ডিভাইস নিজে থেকেই মোবাইল নেটওয়ার্ক ব্যবহার করতে শুরু করবে। যেখানে মোবাইল নেটওয়ার্ক কভারেজ আছে, শুধুমাত্র সেখানেই জরুরী কল করা যাবে।"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-bs/strings.xml b/res/values-mcc262-mnc02-bs/strings.xml
new file mode 100644
index 0000000..cbf6ad6
--- /dev/null
+++ b/res/values-mcc262-mnc02-bs/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Ne možete upućivati hitne pozive putem Wi-Fi pozivanja. Ukoliko pokušate uputiti hitan poziv, vaš uređaj će automatski koristiti mobilnu mrežu. Hitni pozivi se mogu obavljati isključivo u području pokrivenom mobilnom mrežom."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ca/strings.xml b/res/values-mcc262-mnc02-ca/strings.xml
new file mode 100644
index 0000000..48107c1
--- /dev/null
+++ b/res/values-mcc262-mnc02-ca/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"No pots fer trucades d\'emergència per Wi-Fi. Si proves de fer-ho, el dispositiu utilitzarà automàticament la xarxa de telefonia mòbil. Les trucades d\'emergència només es poden fer en zones amb cobertura de telefonia mòbil."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-cs/strings.xml b/res/values-mcc262-mnc02-cs/strings.xml
new file mode 100644
index 0000000..99f2183
--- /dev/null
+++ b/res/values-mcc262-mnc02-cs/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Prostřednictvím volání přes Wi-Fi nelze uskutečňovat tísňová volání. Pokud se pokusíte zavolat na tísňovou linku, zařízení automaticky použije mobilní síť. Tísňová volání lze uskutečňovat jen v oblastech pokrytých mobilní sítí."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-da/strings.xml b/res/values-mcc262-mnc02-da/strings.xml
new file mode 100644
index 0000000..46596f4
--- /dev/null
+++ b/res/values-mcc262-mnc02-da/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Du kan ikke foretage nødopkald med Opkald via Wi-Fi. Hvis du prøver at foretage et nødopkald, anvender enheden automatisk dit mobilnetværk. Nødopkald kan kun foretages i områder med dækning af dit mobilnetværk."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-de/strings.xml b/res/values-mcc262-mnc02-de/strings.xml
new file mode 100644
index 0000000..4cb45d4
--- /dev/null
+++ b/res/values-mcc262-mnc02-de/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Du kannst von deinem Gerät via \"Anrufe über WLAN\" keine Notrufe tätigen. Wenn du versuchst, den Notruf zu erreichen, nutzt dein Gerät automatisch das Mobilfunknetz. Notrufe sind nur an Orten mit Mobilfunkabdeckung möglich."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-el/strings.xml b/res/values-mcc262-mnc02-el/strings.xml
new file mode 100644
index 0000000..4dc42c5
--- /dev/null
+++ b/res/values-mcc262-mnc02-el/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Δεν μπορείτε να πραγματοποιείτε κλήσεις έκτακτης ανάγκης μέσω της Κλήσης Wi-Fi. Εάν προσπαθήσετε να πραγματοποιήσετε μια κλήση έκτακτης ανάγκης, η συσκευή σας θα χρησιμοποιήσει αυτόματα το δίκτυο κινητής τηλεφωνίας. Οι κλήσεις έκτακτης ανάγκης μπορούν να πραγματοποιηθούν μόνο σε περιοχές με κάλυψη δικτύου κινητής τηλεφωνίας."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-en-rAU/strings.xml b/res/values-mcc262-mnc02-en-rAU/strings.xml
new file mode 100644
index 0000000..45cff38
--- /dev/null
+++ b/res/values-mcc262-mnc02-en-rAU/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"You can’t make emergency calls through Wi-Fi calling. If you try to make an emergency call, your device will automatically use the mobile network. Emergency calls can only be made in areas with mobile network coverage."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-en-rGB/strings.xml b/res/values-mcc262-mnc02-en-rGB/strings.xml
new file mode 100644
index 0000000..45cff38
--- /dev/null
+++ b/res/values-mcc262-mnc02-en-rGB/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"You can’t make emergency calls through Wi-Fi calling. If you try to make an emergency call, your device will automatically use the mobile network. Emergency calls can only be made in areas with mobile network coverage."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-en-rIN/strings.xml b/res/values-mcc262-mnc02-en-rIN/strings.xml
new file mode 100644
index 0000000..45cff38
--- /dev/null
+++ b/res/values-mcc262-mnc02-en-rIN/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"You can’t make emergency calls through Wi-Fi calling. If you try to make an emergency call, your device will automatically use the mobile network. Emergency calls can only be made in areas with mobile network coverage."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-es-rUS/strings.xml b/res/values-mcc262-mnc02-es-rUS/strings.xml
new file mode 100644
index 0000000..dbfe694
--- /dev/null
+++ b/res/values-mcc262-mnc02-es-rUS/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"No puedes usar las llamadas por Wi-Fi para hacer llamadas de emergencia. Si lo intentas, el dispositivo se conectará automáticamente a la red móvil. Solo puedes hacer este tipo de llamadas en zonas con cobertura de red móvil."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-es/strings.xml b/res/values-mcc262-mnc02-es/strings.xml
new file mode 100644
index 0000000..453decf
--- /dev/null
+++ b/res/values-mcc262-mnc02-es/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"No puedes utilizar las llamadas por Wi-Fi para hacer llamadas de emergencia. Si lo intentas, el dispositivo se conectará automáticamente a la red móvil. Solo puedes hacer este tipo de llamadas en zonas con cobertura de red móvil."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-et/strings.xml b/res/values-mcc262-mnc02-et/strings.xml
new file mode 100644
index 0000000..19b7dbc
--- /dev/null
+++ b/res/values-mcc262-mnc02-et/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Te ei saa WiFi-kõnede kaudu hädaabikõnesid teha. Kui proovite teha hädaabikõnet, kasutab seade automaatselt mobiilsidevõrku. Hädaabikõnesid saab teha ainult mobiilsidevõrgu katvusega piirkondades."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-eu/strings.xml b/res/values-mcc262-mnc02-eu/strings.xml
new file mode 100644
index 0000000..cac4c72
--- /dev/null
+++ b/res/values-mcc262-mnc02-eu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Ezin duzu egin larrialdi-deirik Wi-Fi bidez. Larrialdi-dei bat egiten saiatzen bazara, gailua sare mugikorrera aldatuko da automatikoki. Sare mugikorren estaldura-eremuetan bakarrik egin daitezke larrialdi-deiak."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-fa/strings.xml b/res/values-mcc262-mnc02-fa/strings.xml
new file mode 100644
index 0000000..1440fc6
--- /dev/null
+++ b/res/values-mcc262-mnc02-fa/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">"‏\n\nنمی‌توانید با تماس ازطریق Wi-Fi، تماس‌های اضطراری برقرار کنید. اگر در تلاشید تماس اضطراری برقرار کنید، دستگاه شما به‌طور خودکار از شبکه دستگاه همراه استفاده می‌کند. فقط در مناطقی که پوشش شبکه دستگاه همراه دارند می‌توان تماس‌های اضطراری برقرار کرد."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-fi/strings.xml b/res/values-mcc262-mnc02-fi/strings.xml
new file mode 100644
index 0000000..0108dad
--- /dev/null
+++ b/res/values-mcc262-mnc02-fi/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Hätäpuheluja ei voi soittaa Wi-Fi-verkossa. Laite käyttää hätäpuhelun soittamiseen automaattisesti mobiiliverkkoa. Hätäpuhelun soittaminen on mahdollista vain mobiiliverkon peittoalueella."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-fr-rCA/strings.xml b/res/values-mcc262-mnc02-fr-rCA/strings.xml
new file mode 100644
index 0000000..92c8a27
--- /dev/null
+++ b/res/values-mcc262-mnc02-fr-rCA/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Vous ne pouvez pas effectuer d\'appels d\'urgence à l\'aide des appels Wi-Fi. Si vous essayez de faire un appel d\'urgence, votre appareil utilisera automatiquement le réseau cellulaire. Les appels d\'urgence ne sont possibles que dans les zones disposant d\'une couverture réseau cellulaire."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-fr/strings.xml b/res/values-mcc262-mnc02-fr/strings.xml
new file mode 100644
index 0000000..63e2f57
--- /dev/null
+++ b/res/values-mcc262-mnc02-fr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Vous ne pouvez pas effectuer d\'appels d\'urgence via les appels Wi-Fi. Si vous essayez de passer un appel d\'urgence, votre appareil utilisera automatiquement le réseau mobile. Les appels d\'urgence ne sont possibles que dans les zones disposant d\'une couverture réseau mobile."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-gl/strings.xml b/res/values-mcc262-mnc02-gl/strings.xml
new file mode 100644
index 0000000..2c70218
--- /dev/null
+++ b/res/values-mcc262-mnc02-gl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Non podes facer chamadas de emerxencia mediante as chamadas por wifi. Se tentas realizar unha chamada de emerxencia, o dispositivo utilizará automaticamente a rede móbil. As chamadas de emerxencia só se poden facer en zonas con cobertura de rede de telefonía móbil."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-gu/strings.xml b/res/values-mcc262-mnc02-gu/strings.xml
new file mode 100644
index 0000000..ac24429
--- /dev/null
+++ b/res/values-mcc262-mnc02-gu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"તમે Wi-Fi કૉલિંગ મારફતે કટોકટીનો કૉલ કરી શકતા નથી. જો તમે કોઈ કટોકટીનો કૉલ કરવાનો પ્રયાસ કરો છો, તો તમારું ઉપકરણ આપમેળે મોબાઇલ નેટવર્કનો ઉપયોગ કરશે. માત્ર મોબાઇલ નેટવર્ક કવરેજવાળા વિસ્તારમાં જ કટોકટીનો કૉલ કરી શકાય છે."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-hi/strings.xml b/res/values-mcc262-mnc02-hi/strings.xml
new file mode 100644
index 0000000..496c6a6
--- /dev/null
+++ b/res/values-mcc262-mnc02-hi/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"आप वाई-फ़ाई कॉलिंग के ज़रिए आपातकालीन कॉल नहीं कर सकते हैं. अगर आप आपातकालीन कॉल करने की कोशिश कर रहे हैं, तो आपका डिवाइस अपने आप मोबाइल नेटवर्क का उपयोग करेगा. आपातकालीन कॉल केवल मोबाइल नेटवर्क कवरेज वाले क्षेत्रों से किए जा सकते हैं."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-hr/strings.xml b/res/values-mcc262-mnc02-hr/strings.xml
new file mode 100644
index 0000000..1b1500e
--- /dev/null
+++ b/res/values-mcc262-mnc02-hr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Wi-Fi pozivi ne mogu se upotrebljavati za hitne pozive. Ako pokušate uputiti hitni poziv, uređaj će automatski prijeći na mobilnu mrežu. Hitni se pozivi mogu upućivati samo u područjima pokrivenim mobilnom mrežom."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-hu/strings.xml b/res/values-mcc262-mnc02-hu/strings.xml
new file mode 100644
index 0000000..f299826
--- /dev/null
+++ b/res/values-mcc262-mnc02-hu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Wi-Fi-hívással nem tud vészhívást kezdeményezni. Vészhívás kezdeményezéséhez eszköze automatikusan mobilhálózatra vált. Vészhívást csak hálózatilag lefedett helyekről indíthat."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-hy/strings.xml b/res/values-mcc262-mnc02-hy/strings.xml
new file mode 100644
index 0000000..9bcea7e
--- /dev/null
+++ b/res/values-mcc262-mnc02-hy/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Դուք չեք կարող կատարել շտապ կանչեր` զանգելով Wi-Fi կապ միջոցով: Շտապ կանչի զանգ կատարելու փորձի դեպքում ձեր հեռախոսն ավտոմատ կերպով կմիանա բջջային ցանցին: Շտապ կանչերը կարող են կատարվել միայն բջջային ցանցի ծածկույթում:"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-in/strings.xml b/res/values-mcc262-mnc02-in/strings.xml
new file mode 100644
index 0000000..3a3a302
--- /dev/null
+++ b/res/values-mcc262-mnc02-in/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Anda tidak dapat melakukan panggilan darurat melalui panggilan Wi-Fi. Jika mencoba melakukan panggilan darurat, perangkat akan otomatis menggunakan jaringan seluler. Panggilan darurat hanya dapat dilakukan di area dengan cakupan jaringan seluler."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-is/strings.xml b/res/values-mcc262-mnc02-is/strings.xml
new file mode 100644
index 0000000..f44c667
--- /dev/null
+++ b/res/values-mcc262-mnc02-is/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Ekki er hægt að hringja neyðarsímtöl með Wi-Fi símtölum. Ef þú hringir neyðarsímtal mun tækið notast sjálfkrafa við farsímakerfið. Eingöngu er hægt að hringja neyðarsímtöl á svæðum með tengingu við farsímakerfi."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-it/strings.xml b/res/values-mcc262-mnc02-it/strings.xml
new file mode 100644
index 0000000..80e1723
--- /dev/null
+++ b/res/values-mcc262-mnc02-it/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Non puoi fare chiamate di emergenza tramite la funzione Chiamate Wi-Fi. Se provi a fare una chiamata di emergenza, il dispositivo userà automaticamente la rete mobile. È possibile fare chiamate di emergenza soltanto nelle zone coperte dalla rete mobile."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-iw/strings.xml b/res/values-mcc262-mnc02-iw/strings.xml
new file mode 100644
index 0000000..94cb402
--- /dev/null
+++ b/res/values-mcc262-mnc02-iw/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">"‏\n\nלא ניתן לבצע שיחות חירום באמצעות שיחות Wi-Fi. אם תנסה לבצע שיחת חירום, המכשיר ישתמש באופן אוטומטי ברשת הסלולרית. ניתן לבצע שיחות חירום רק באזורים עם כיסוי רשת סלולרית."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ja/strings.xml b/res/values-mcc262-mnc02-ja/strings.xml
new file mode 100644
index 0000000..e7ca679
--- /dev/null
+++ b/res/values-mcc262-mnc02-ja/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Wi-Fi 通話で緊急通報を行うことはできません。緊急通報を試みると、端末は自動的にモバイル ネットワークを使用します。緊急通報は、モバイル ネットワーク対応のエリア内でのみ行えます。"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ka/strings.xml b/res/values-mcc262-mnc02-ka/strings.xml
new file mode 100644
index 0000000..fc4b903
--- /dev/null
+++ b/res/values-mcc262-mnc02-ka/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"გადაუდებელი ზარების Wi-Fi-ს მეშვეობით განხორციელება ვერ მოხერხდება. თუ გადაუდებელი ზარის გაშვებას ეცდებით, თქვენი მოწყობილობა ავტომატურად გამოიყენებს მობილურ ქსელს. გადაუდებელი ზარების განხორციელება მხოლოდ იმ ტერიტორიებზეა შესაძლებელი, რომელზეც მობილური ქსელის დაფარვა ვრცელდება."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-kk/strings.xml b/res/values-mcc262-mnc02-kk/strings.xml
new file mode 100644
index 0000000..5241b1a
--- /dev/null
+++ b/res/values-mcc262-mnc02-kk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Сіз Wi-Fi қоңырауы арқылы жедел қызметке қоңырау шала алмайсыз. Егер жедел қызметке қоңырау шалғыңыз келсе, құрылғыңыз автоматты түрде мобильдік желіні қолданады. Тек мобильдік желі бар аймақтарда ғана жедел қызметке қоңырау шалуға болады."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-km/strings.xml b/res/values-mcc262-mnc02-km/strings.xml
new file mode 100644
index 0000000..1b04dea
--- /dev/null
+++ b/res/values-mcc262-mnc02-km/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"អ្នកមិនអាចធ្វើការហៅបន្ទាន់តាមរយៈការហៅទូរសព្ទដោយប្រើ Wi-Fi បានទេ។ ប្រសិនបើអ្នកព្យាយាមធ្វើការហៅបន្ទាន់ ឧបករណ៍របស់អ្នកនឹងប្រើបណ្ដាញ​ទូរសព្ទ​ចល័តដោយស្វ័យប្រវត្តិ។ ការហៅបន្ទាន់អាចធ្វើបានតែក្នុងតំបន់ដែលមានការគ្របដណ្តប់បណ្តាញ​ទូរសព្ទ​ចល័តតែប៉ុណ្ណោះ។"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-kn/strings.xml b/res/values-mcc262-mnc02-kn/strings.xml
new file mode 100644
index 0000000..9e87f57
--- /dev/null
+++ b/res/values-mcc262-mnc02-kn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"ನೀವು ವೈ-ಫೈ ಕರೆಯ ಮೂಲಕ ತುರ್ತು ಕರೆಗಳನ್ನು ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ನೀವು ತುರ್ತು ಕರೆ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿದರೆ, ನಿಮ್ಮ ಸಾಧನ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ ಬಳಸುತ್ತದೆ. ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್ ಲಭ್ಯ ಇರುವಲ್ಲಿ ಮಾತ್ರ ತುರ್ತು ಕರೆಗಳನ್ನು ಮಾಡಬಹುದು."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ko/strings.xml b/res/values-mcc262-mnc02-ko/strings.xml
new file mode 100644
index 0000000..8b6b40f
--- /dev/null
+++ b/res/values-mcc262-mnc02-ko/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Wi-Fi 통화로는 긴급 전화를 걸 수 없습니다. 긴급 전화를 걸 경우 기기에서 자동으로 모바일 네트워크가 사용됩니다. 긴급 전화는 모바일 네트워크가 제공되는 지역에서만 걸 수 있습니다."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ky/strings.xml b/res/values-mcc262-mnc02-ky/strings.xml
new file mode 100644
index 0000000..12d5d6b
--- /dev/null
+++ b/res/values-mcc262-mnc02-ky/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n" Өзгөчө кырдаалда Wi-Fi чалуу кызматынан чала албайсыз. Өзгөчө кырдаалда чалууга аракет кылганыңызда түзмөгүңүз автоматтык түрдө мобилдик тармакты пайдаланат. Өзгөчө кырдаалда чалууларды мобилдик тармак кармаган аймактарда гана аткара аласыз."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-lo/strings.xml b/res/values-mcc262-mnc02-lo/strings.xml
new file mode 100644
index 0000000..449655b
--- /dev/null
+++ b/res/values-mcc262-mnc02-lo/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"ທ່ານບໍ່ສາມາດໂທສຸກເສີນຜ່ານການໂທ Wi-Fi ໄດ້. ຫາກທ່ານລອງໂທສຸກເສີນ, ອຸປະກອນຂອງທ່ານຈະໃຊ້ເຄືອຂ່າຍມືຖືໂດຍອັດຕະໂນມັດ. ການໂທສຸກເສີນຈະເກີດຂຶ້ນຜ່ານເຄືອຂ່າຍມືຖືໄດ້ເທົ່ານັ້ນ."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-lt/strings.xml b/res/values-mcc262-mnc02-lt/strings.xml
new file mode 100644
index 0000000..1aeeca4
--- /dev/null
+++ b/res/values-mcc262-mnc02-lt/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Negalite atlikti skambučių pagalbos numeriais naudodami „Wi-Fi“ skambinimą. Jei bandysite atlikti skambutį pagalbos numeriu, įrenginys automatiškai naudos mobiliojo ryšio tinklą. Skambučius pagalbos numeriais galite atlikti tik tose srityse, kuriose veikia mobiliojo ryšio tinklas."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-lv/strings.xml b/res/values-mcc262-mnc02-lv/strings.xml
new file mode 100644
index 0000000..d6c7f88
--- /dev/null
+++ b/res/values-mcc262-mnc02-lv/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Jūs nevarat veikt ārkārtas izsaukumus, izmantojot Wi-Fi zvanus. Ja mēģināsiet veikt ārkārtas izsaukumu, jūsu ierīcē tiks automātiski izmantots mobilais tīkls. Ārkārtas izsaukumus var veikt tikai apgabalos ar mobilā tīkla pārklājumu."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-mk/strings.xml b/res/values-mcc262-mnc02-mk/strings.xml
new file mode 100644
index 0000000..bee5428
--- /dev/null
+++ b/res/values-mcc262-mnc02-mk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Не може да воспоставите итни повици преку Wi-Fi. Ако се обидете да воспоставите итен повик, уредот автоматски ќе ја користи мобилната мрежа. Итните повици може да се воспостават само во области покриени со мобилна мрежа."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ml/strings.xml b/res/values-mcc262-mnc02-ml/strings.xml
new file mode 100644
index 0000000..3304a0e
--- /dev/null
+++ b/res/values-mcc262-mnc02-ml/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"വൈഫൈ കോളിംഗിലൂടെ നിങ്ങൾക്ക് അടിയന്തിര കോളുകൾ വിളിക്കാനാകില്ല. നിങ്ങൾ ഒരു അടിയന്തിര കോൾ ചെയ്യാൻ ശ്രമിച്ചാൽ, നിങ്ങളുടെ ഉപകരണം സ്വയമേവ മൊബൈല്‍ നെറ്റ്‍വര്‍ക്ക് ഉപയോഗിക്കും. മൊബൈല്‍ നെറ്റ്‍വര്‍ക്കുള്ള സ്ഥലങ്ങളിൽ മാത്രമേ അടിയന്തിര കോളുകൾ ചെയ്യാനാവൂ."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-mn/strings.xml b/res/values-mcc262-mnc02-mn/strings.xml
new file mode 100644
index 0000000..4045045
--- /dev/null
+++ b/res/values-mcc262-mnc02-mn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Та Wi-Fi дуудлагаар яаралтай дуудлага хийх боломжгүй. Хэрэв та яаралтай дуудлага хийвэл таны төхөөрөмж мобайл сүлжээг автоматаар ашиглана. Яаралтай дуудлагыг зөвхөн мобайл сүлжээтэй газар хийх боломжтой."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-mr/strings.xml b/res/values-mcc262-mnc02-mr/strings.xml
new file mode 100644
index 0000000..d53b508
--- /dev/null
+++ b/res/values-mcc262-mnc02-mr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"वाय-फाय कॉलिंगने तुम्ही आपत्कालीन कॉल करू शकत नाही. तुम्ही आपत्कालीन कॉल करण्याचा प्रयत्न करत असल्यास, तुमचे डिव्हाइस आपोआप मोबाइल नेटवर्कचा वापर करेल. आपत्कालीन कॉल फक्त मोबाइल नेटवर्क कव्हरेज असलेल्या क्षेत्रात केले जाऊ शकतात."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ms/strings.xml b/res/values-mcc262-mnc02-ms/strings.xml
new file mode 100644
index 0000000..a0c1af5
--- /dev/null
+++ b/res/values-mcc262-mnc02-ms/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Anda tidak dapat membuat panggilan kecemasan melalui panggilan Wi-Fi. Jika anda cuba membuat panggilan kecemasan, peranti anda akan menggunakan rangkaian mudah alih secara automatik. Panggilan kecemasan hanya dapat dibuat di kawasan yang terdapat liputan rangkaian mudah alih."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-my/strings.xml b/res/values-mcc262-mnc02-my/strings.xml
new file mode 100644
index 0000000..8018dd8
--- /dev/null
+++ b/res/values-mcc262-mnc02-my/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Wi-Fi ခေါ်ဆိုမှုမှတစ်ဆင့် အရေးပေါ်ဖုန်းဆက်၍မရပါ။ အရေးပေါ်ဖုန်းခေါ်ဆိုမှုတစ်ခု ပြုလုပ်ရန်ကြိုးပမ်းပါက သင်၏စက်ပစ္စည်းသည် မိုဘိုင်းကွန်ရက်ကို အလိုအလျောက် အသုံးပြုပါလိမ့်မည်။ မိုဘိုင်းကွန်ရက်လိုင်းဆွဲအားရှိသော နေရာများတွင်သာ အရေးပေါ်ဖုန်းခေါ်ဆိုမှုများကိုပြုလုပ်နိုင်ပါသည်။"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-nb/strings.xml b/res/values-mcc262-mnc02-nb/strings.xml
new file mode 100644
index 0000000..7313a27
--- /dev/null
+++ b/res/values-mcc262-mnc02-nb/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Du kan ikke ringe nødnumre via Wi-Fi-anrop. Hvis du prøver å ringe et nødnummer, bruker enheten automatisk mobilnettverket. Du kan bare ringe nødnumre i områder med mobildekning."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ne/strings.xml b/res/values-mcc262-mnc02-ne/strings.xml
new file mode 100644
index 0000000..3ff5b21
--- /dev/null
+++ b/res/values-mcc262-mnc02-ne/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"तपाईं Wi-Fi को कल गर्ने सुविधामार्फत आपतकालीन कलहरू गर्न सक्नुहुन्न। तपाईंले आपतकालीन कल गर्न खोज्नुभयो भने तपाईंको यन्त्रले स्वतः मोबाइल नेटवर्कको प्रयोग गर्नेछ। मोबाइल नेटवर्क उपलब्ध भएका क्षेत्रहरूबाट मात्र आपतकालीन कलहरू गर्न सकिन्छ।"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-nl/strings.xml b/res/values-mcc262-mnc02-nl/strings.xml
new file mode 100644
index 0000000..ea4fe1c
--- /dev/null
+++ b/res/values-mcc262-mnc02-nl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Je kunt geen noodoproepen plaatsen met \'Bellen via wifi\'. Als je een noodoproep probeert te plaatsen, maakt je apparaat automatisch gebruik van het mobiele netwerk. Noodoproepen kunnen alleen worden geplaatst in gebieden met mobiele netwerkdekking."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-pa/strings.xml b/res/values-mcc262-mnc02-pa/strings.xml
new file mode 100644
index 0000000..39b1080
--- /dev/null
+++ b/res/values-mcc262-mnc02-pa/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"ਤੁਸੀਂ Wi-Fi ਕਾਲਿੰਗ ਰਾਹੀਂ ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ ਕੋਈ ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਵਰਤੋਂ ਕਰੇਗੀ। ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਸਿਰਫ਼ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਕਵਰੇਜ ਵਾਲੇ ਖੇਤਰਾਂ ਵਿੱਚ ਕੀਤੀਆਂ ਜਾ ਸਕਦੀਆਂ ਹਨ।"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-pl/strings.xml b/res/values-mcc262-mnc02-pl/strings.xml
new file mode 100644
index 0000000..68173c9
--- /dev/null
+++ b/res/values-mcc262-mnc02-pl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Nie możesz wykonywać połączeń alarmowych przez Wi-Fi. Przy próbie wykonania takiego połączenia urządzenie automatycznie skorzysta z sieci komórkowej. Połączenia alarmowe są możliwe tylko w zasięgu sieci komórkowej."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-pt-rBR/strings.xml b/res/values-mcc262-mnc02-pt-rBR/strings.xml
new file mode 100644
index 0000000..2b30ccb
--- /dev/null
+++ b/res/values-mcc262-mnc02-pt-rBR/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Não é possível fazer chamadas de emergência por Wi-Fi. Se você tentar fazer isso, seu dispositivo usará automaticamente a rede móvel. Chamadas de emergência só podem ser feitas em áreas com cobertura de rede móvel."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-pt-rPT/strings.xml b/res/values-mcc262-mnc02-pt-rPT/strings.xml
new file mode 100644
index 0000000..f9eef56
--- /dev/null
+++ b/res/values-mcc262-mnc02-pt-rPT/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Não pode fazer chamadas de emergência através das Chamadas Wi-Fi. Se tentar fazer uma chamada de emergência, o dispositivo utiliza automaticamente a rede móvel. Apenas é possível fazer chamadas de emergência em áreas com cobertura de rede móvel."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-pt/strings.xml b/res/values-mcc262-mnc02-pt/strings.xml
new file mode 100644
index 0000000..2b30ccb
--- /dev/null
+++ b/res/values-mcc262-mnc02-pt/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Não é possível fazer chamadas de emergência por Wi-Fi. Se você tentar fazer isso, seu dispositivo usará automaticamente a rede móvel. Chamadas de emergência só podem ser feitas em áreas com cobertura de rede móvel."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ro/strings.xml b/res/values-mcc262-mnc02-ro/strings.xml
new file mode 100644
index 0000000..2a51c05
--- /dev/null
+++ b/res/values-mcc262-mnc02-ro/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Nu puteți să inițiați apeluri de urgență folosind Apelarea prin Wi-Fi. Dacă încercați să inițiați un apel de urgență, dispozitivul va folosi automat rețeaua mobilă. Apelurile de urgență pot fi inițiate numai în zonele în care funcționează rețeaua mobilă."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ru/strings.xml b/res/values-mcc262-mnc02-ru/strings.xml
new file mode 100644
index 0000000..3dc8c3c
--- /dev/null
+++ b/res/values-mcc262-mnc02-ru/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Вы не можете совершать экстренные вызовы по Wi-Fi. Для экстренного вызова устройство будет автоматически использовать мобильную сеть. Экстренные вызовы доступны только в зонах покрытия мобильной сети."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-si/strings.xml b/res/values-mcc262-mnc02-si/strings.xml
new file mode 100644
index 0000000..3d72049
--- /dev/null
+++ b/res/values-mcc262-mnc02-si/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"ඔබට Wi-Fi ඇමතීම හරහා හදිසි අවස්ථා ඇමතුම් සිදු කළ නොහැකිය. ඔබ හදිසි අවස්ථා ඇමතුමක් සිදු කිරීමට උත්සාහ ක‍ළහොත්, ඔබේ උපාංගය ස්වයංක්‍රියව ජංගම ජාලය භාවිත කරනු ඇත. හදිසි අවස්ථා ඇමතුම් ජංගම ජාල ආවරණය ඇති ප්‍රදේශවල පමණක් සිදු කළ හැකිය."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-sk/strings.xml b/res/values-mcc262-mnc02-sk/strings.xml
new file mode 100644
index 0000000..c951070
--- /dev/null
+++ b/res/values-mcc262-mnc02-sk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Tiesňové volania môžete uskutočniť prostredníctvom funkcie volania cez Wi-Fi. Ak sa pokúsite uskutočniť tiesňové volanie, zariadenie automaticky použije mobilnú sieť. Tiesňové volania je možné uskutočniť iba v oblastiach s mobilným pokrytím."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-sl/strings.xml b/res/values-mcc262-mnc02-sl/strings.xml
new file mode 100644
index 0000000..42e3137
--- /dev/null
+++ b/res/values-mcc262-mnc02-sl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Klicanje v sili prek Wi-Fi-ja ni mogoče. Če poskusite opraviti klic v sili, bo naprava samodejno uporabila mobilno omrežje. Klice v sili lahko opravite samo na območjih s signalom mobilnega omrežja."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-sq/strings.xml b/res/values-mcc262-mnc02-sq/strings.xml
new file mode 100644
index 0000000..80fa491
--- /dev/null
+++ b/res/values-mcc262-mnc02-sq/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Nuk mund të kryesh telefonata urgjence përmes telefonatave me Wi-Fi. Nëse përpiqesh të kryesh një telefonatë urgjence, pajisja do të përdorë automatikisht rrjetin celular. Telefonatat e urgjencës mund të kryhen vetëm në zona që kanë mbulim me rrjet celular."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-sr/strings.xml b/res/values-mcc262-mnc02-sr/strings.xml
new file mode 100644
index 0000000..0d67699
--- /dev/null
+++ b/res/values-mcc262-mnc02-sr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Не можете да упућујете хитне позиве помоћу позивања преко Wi-Fi-ја. Ако пробате да упутите хитан позив, уређај ће аутоматски користити мобилну мрежу. Хитни позиви могу да се упућују само у областима покривеним мобилном мрежом."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-sv/strings.xml b/res/values-mcc262-mnc02-sv/strings.xml
new file mode 100644
index 0000000..82848f8
--- /dev/null
+++ b/res/values-mcc262-mnc02-sv/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Det går inte att ringa nödsamtal via Wi-Fi. Om du ringer ett nödnummer på enheten används mobilnätverket automatiskt. Det går bara att ringa nödsamtal där mobilnätet har täckning."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-sw/strings.xml b/res/values-mcc262-mnc02-sw/strings.xml
new file mode 100644
index 0000000..5c98759
--- /dev/null
+++ b/res/values-mcc262-mnc02-sw/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Huwezi kupiga simu za dharura ukitumia huduma ya Kupiga simu kupitia Wi-Fi. Ukijaribu kupiga simu za dharura, kifaa chako kitatumia mtandao wa simu kiotomatiki. Unaweza tu kupiga simu za dharura katika sehemu ambapo mtandao wa simu unapatikana."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ta/strings.xml b/res/values-mcc262-mnc02-ta/strings.xml
new file mode 100644
index 0000000..168b3bf
--- /dev/null
+++ b/res/values-mcc262-mnc02-ta/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"வைஃபை அழைப்பு மூலம் அவசர அழைப்புகளைச் செய்ய முடியாது. அவசர அழைப்பைச் செய்ய முயன்றால், உங்கள் சாதனம் தானாகவே மொபைல் நெட்வொர்க்கைப் பயன்படுத்தும். மொபைல் நெட்வொர்க் கவரேஜ் உள்ள பகுதிகளில் மட்டுமே அவசர அழைப்புகளைச் செய்ய முடியும்."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-te/strings.xml b/res/values-mcc262-mnc02-te/strings.xml
new file mode 100644
index 0000000..ca0786e
--- /dev/null
+++ b/res/values-mcc262-mnc02-te/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"మీరు Wi-Fi కాలింగ్ ద్వారా అత్యవసర కాల్‌లను చేయలేరు. అత్యవసర కాల్ చేయడానికి ప్రయత్నిస్తే, మీ పరికరం స్వయంచాలకంగా మొబైల్ నెట్‌వర్క్‌ని ఉపయోగిస్తుంది. మొబైల్ నెట్‌వర్క్‌ కవరేజ్ ఉన్న ప్రాంతాల్లో మాత్రమే అత్యవసర కాల్‌లు చేయబడతాయి."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-th/strings.xml b/res/values-mcc262-mnc02-th/strings.xml
new file mode 100644
index 0000000..3128bfe
--- /dev/null
+++ b/res/values-mcc262-mnc02-th/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"คุณไม่สามารถโทรฉุกเฉินด้วยการโทรผ่าน Wi-Fi หากคุณพยายามโทรฉุกเฉิน อุปกรณ์จะใช้เครือข่ายมือถือโดยอัตโนมัติ การโทรฉุกเฉินสามารถใช้งานได้ในบริเวณที่มีสัญญาณเครือข่ายมือถือเท่านั้น"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-tl/strings.xml b/res/values-mcc262-mnc02-tl/strings.xml
new file mode 100644
index 0000000..4671d66
--- /dev/null
+++ b/res/values-mcc262-mnc02-tl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Hindi ka makakapagsagawa ng mga emergency na tawag sa pamamagitan ng pagtawag gamit ang Wi-Fi. Kung susubukan mong magsagawa ng emergency na tawag, awtomatikong gagamitin ng iyong device ang mobile network. Makakapagsagawa lang ng mga emergency na tawag sa mga lugar na nasasaklawan ng mobile network."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-tr/strings.xml b/res/values-mcc262-mnc02-tr/strings.xml
new file mode 100644
index 0000000..9fe9d25
--- /dev/null
+++ b/res/values-mcc262-mnc02-tr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Kablosuz çağrı ile acil durum aramaları yapamazsınız. Acil durum araması yapmaya çalışırsanız cihazınız otomatik olarak mobil ağa geçecektir. Acil durum aramaları yalnızca mobil ağ kapsamında olan yerlerden yapılabilir."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-uk/strings.xml b/res/values-mcc262-mnc02-uk/strings.xml
new file mode 100644
index 0000000..1cf0381
--- /dev/null
+++ b/res/values-mcc262-mnc02-uk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Ви не можете здійснювати екстрені виклики через Wi-Fi. Якщо ви спробуєте здійснити екстрений виклик, пристрій автоматично використовуватиме мобільну мережу. Екстрені виклики доступні лише в місцевостях із мобільним покриттям."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ur/strings.xml b/res/values-mcc262-mnc02-ur/strings.xml
new file mode 100644
index 0000000..c1cee4d
--- /dev/null
+++ b/res/values-mcc262-mnc02-ur/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">"‏\n\nآپ Wi-Fi کالنگ کے ذریعے ایمرجنسی کالز نہیں کر سکتے۔ اگر آپ کوئی ایمرجنسی کال کرنے کی کوشش کرتے ہیں، تو آپ کا آلہ خودکار طور پر موبائل نیٹ ورک کا استعمال کرے گا۔ ایمرجنسی کللز صرف موبائل نیٹ ورک کوریج کے ساتھ ہی کی جا سکتی ہیں۔"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-uz/strings.xml b/res/values-mcc262-mnc02-uz/strings.xml
new file mode 100644
index 0000000..5e1b59e
--- /dev/null
+++ b/res/values-mcc262-mnc02-uz/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Wi-Fi chaqiruv orqali favqulodda chaqiruvlarni amalga oshirib bo‘lmaydi. Agar favqulodda chaqirishni boshlasangiz, qurilmangiz avtomatik ravishda mobil tarmoqdan foydalanadi. Favqulodda chaqiruvlar faqat mobil tarmoq doirasidagina ishlaydi."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-vi/strings.xml b/res/values-mcc262-mnc02-vi/strings.xml
new file mode 100644
index 0000000..126bc50
--- /dev/null
+++ b/res/values-mcc262-mnc02-vi/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Bạn không thể thực hiện cuộc gọi khẩn cấp thông qua tính năng Gọi qua Wi-Fi. Nếu bạn cố gắng thực hiện cuộc gọi khẩn cấp, thiết bị của bạn sẽ tự động sử dụng mạng di động. Chỉ có thể thực hiện cuộc gọi khẩn cấp ở những khu vực có phủ sóng mạng di động."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-zh-rCN/strings.xml b/res/values-mcc262-mnc02-zh-rCN/strings.xml
new file mode 100644
index 0000000..b2967b6
--- /dev/null
+++ b/res/values-mcc262-mnc02-zh-rCN/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"您无法通过 WLAN 通话功能拨打紧急呼救电话。如果您尝试拨打紧急呼救电话，您的设备将自动使用移动网络。您只能在有移动网络的地方拨打紧急呼救电话。"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-zh-rHK/strings.xml b/res/values-mcc262-mnc02-zh-rHK/strings.xml
new file mode 100644
index 0000000..22d5c0d
--- /dev/null
+++ b/res/values-mcc262-mnc02-zh-rHK/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"您不可透過 Wi-Fi 通話撥打緊急電話。如果您嘗試撥打緊急電話，裝置會自動使用流動網絡。您只可在有流動網絡覆蓋的地方撥打緊急電話。"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-zh-rTW/strings.xml b/res/values-mcc262-mnc02-zh-rTW/strings.xml
new file mode 100644
index 0000000..9e6b3a5
--- /dev/null
+++ b/res/values-mcc262-mnc02-zh-rTW/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Wi-Fi 通話功能無法用來撥打緊急電話。如果你嘗試撥打緊急電話，裝置將自動使用行動網路。在行動網路覆蓋的區域中才能撥打緊急電話。"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-zu/strings.xml b/res/values-mcc262-mnc02-zu/strings.xml
new file mode 100644
index 0000000..3c2dfba
--- /dev/null
+++ b/res/values-mcc262-mnc02-zu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Ungenza amakholi aphuthumayo ngokushaya kwe-Wi-Fi. Uma uzama ukwenza ikholi ephuthumayo, idivayisi yakho izosebenzisa ngokuzenzakalela inethiwekhi yeselula. Amakholi aphuthumayo angenziwa kuphela ezindaweni ezinenethiweki yeselula."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02/strings.xml b/res/values-mcc262-mnc02/strings.xml
new file mode 100644
index 0000000..17f9272
--- /dev/null
+++ b/res/values-mcc262-mnc02/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Wi-Fi Calling settings. Additional text displayed when Wi-Fi Calling is off. Default empty. [CHAR LIMIT=NONE] -->
+    <string name="wifi_calling_off_explanation_2">\n\nYou can\u2019t make emergency calls through Wi-Fi calling. If you try to make an emergency call, your device will automatically use the mobile network. Emergency calls can only be made in areas with mobile network coverage.</string>
+</resources>
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index 6f1a4f4..1f76012 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Добар"</item>
     <item msgid="8986346415847956850">"Одличен"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Секогаш"</item>
-    <item msgid="844721238536786870">"Само кога е вклучено"</item>
-    <item msgid="1986753720941888596">"Никогаш"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Секогаш"</item>
-    <item msgid="7433294150916905997">"Само кога е вклучено"</item>
-    <item msgid="1390404486722375028">"Никогаш"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Последните 30 дена"</item>
     <item msgid="6600989128423965319">"Пост. цикл. на корист...."</item>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 4ecd6d8..886baee 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Сега сте развивач"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Нема потреба, веќе сте развивач"</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Прво овозможете ги опциите за програмери."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Безжичен и мрежи"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Поврзувања"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Уред"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Обезбедување на VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Овозможено е видеоповикување"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Овозможено е повикување преку Wi-Fi"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Овозможено е присуство на подобрен адресар"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Напојување на мобилното радио"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Прикажи SIM адресар"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Прикажи броеви на фиксно бирање"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Скенирај за уреди"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Преименувај го уредот"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Преименувај"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Исклучи?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Ова ќе ја прекине вашата врска со:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Да прекине врската со уредот?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Телефонот ќе ја прекине врската со <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Таблетот ќе ја прекине врската со <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Уредот ќе ја прекине врската со <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Прекини"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Немате дозвола за промена на поставките на Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Спарете нов уред"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> е видлив за уредите во близина кога се отворени Поставки за Bluetooth."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Адреса на Bluetooth на телефонот: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Адреса на Bluetooth на таблетот: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Адреса на Bluetooth на уредот: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Исклучи <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Емитување"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Оневозможи профил?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Барање за спарување преку Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Барање за спарување"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Допрете за да се спари со <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Прикажи добиени датотеки"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Примени датотеки"</string>
     <string name="device_picker" msgid="4978696506172252813">"Изберете уред со Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> сака да се вклучи Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> сака да се исклучи Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s сака да пристапи кон вашите пораки. Дозволи пристап на %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Побаран е пристап до SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> сака да пристапи до вашата SIM-картичка. Доколку дозволите пристап до SIM-картичката, ќе се исклучи поврзувањето со податоци на уредот сѐ додека трае поврзувањето. Дозволете пристап до <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Другите уреди го гледаат како „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ваши уреди"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Спарување нов уред"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Датум и време"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Избери временска зона"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Сметки"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Локација"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Сметки"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Безбедност и локација"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрирање и акредитиви"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Телефонот е шифриран"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Уредот е шифриран"</string>
@@ -354,40 +367,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Отклучи со отпечаток"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Користење на отпечатокот"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Само допрете го сензорот за отпечаток за отклучување на телефонот, за одобрување купувања или за најавување на апликациите. Внимавајте чии отпечатоци додавате. Само еден додаден отпечаток може да ги прави сите тие работи.\n\nЗабелешка: вашиот отпечаток може да биде помалку безбеден од силна шема или PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Само допрете го сензорот за отпечаток за да ги одобрите купувањата или да се најавувате на апликациите. Внимавајте чии отпечатоци додавате. Секој додаден отпечаток ќе може да ги прави овие работи.\n\nЗабелешка: не може да го користите отпечатокот за да го отклучувате уредов. За повеќе информации, контактирајте со администраторот на организацијата."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Само допрете го сензорот за отпечаток за отклучување на телефонот, за одобрување купувања или за најавување на апликациите. Внимавајте чии отпечатоци додавате. Секој додаден отпечаток ќе може да ги прави овие работи.\n\nЗабелешка: вашиот отпечаток може да биде помалку безбеден од силна шема или PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Користете го отпечатокот за да го отклучите телефонот или да ги одобрите купувањата.\n\nЗабелешка: може да го користите отпечатокот за да го отклучите уредов. За повеќе информации, контактирајте со администраторот на вашата организација."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Користете го отпечатокот за да го отклучите телефонот или да ги одобрите купувањата.\n\nЗабелешка: отпечатокот може да биде помалку безбеден од силна шема или PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Откажи"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Продолжи"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Прескокни"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Додај отпечаток"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Функциите за заштита на уредот нема да се активираат. Нема да може да ги спречите другите да го користат таблетот доколку е изгубен, украден или избришан."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Функциите за заштита на уредот нема да се активираат. Нема да може да ги спречите другите да го користат уредот доколку е изгубен, украден или избришан."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Функциите за заштита на уредот нема да се активираат. Нема да може да ги спречите другите да го користат телефонот доколку е изгубен, украден или избришан."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Функциите за заштита на уредот нема да се активираат. Нема да може да ги спречите другите да го користат таблетот ако го загубите или ви го украдат."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Функциите за заштита на уредот нема да се активираат. Нема да може да ги спречите другите да го користат уредот ако го загубите или ви го украдат."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Функциите за заштита на уредот нема да се активираат. Нема да може да ги спречите другите да го користат телефонот ако го загубите или ви го украдат."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Следно"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Функциите за заштита на уредот нема да се вклучат. Нема да може да ги спречите другите да го користат таблетов ако го изгубите, ви го украдат или се ресетира."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Функциите за заштита на уредот нема да се вклучат. Нема да може да ги спречите другите да го користат уредов ако го изгубите, ви го украдат или се ресетира."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Функциите за заштита на уредот нема да се вклучат. Нема да може да ги спречите другите да го користат телефонов ако го изгубите, ви го украдат или се ресетира."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Функциите за заштита на уредот нема да се вклучат. Нема да може да ги спречите другите да го користат таблетов ако го изгубите или ви го украдат."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Функциите за заштита на уредот нема да се вклучат. Нема да може да ги спречите другите да го користат уредов ако го изгубите или ви го украдат."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Функциите за заштита на уредот нема да се вклучат. Нема да може да ги спречите другите да го користат телефонов ако го изгубите или ви го украдат."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Сепак прескокни"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Врати се"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Најдете го сензорот"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Пронајдете го сензорот за отпечатоци на задната страна на телефонот."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Допрете го сензорот"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Се наоѓа на задната страна на телефонот. Користете го показалецот."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Илустрација со локација на уредот и сензорот за отпечаток"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Име"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Во ред"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Избриши"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Да почнеме"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Допрете го сензорот"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Ставете го прстот на сензорот и подигнете го откако ќе почувствувате вибрации"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Допрете повторно"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Мрдајте малку со прстот за да ги додадете сите различни делови од вашиот отпечаток"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Отпечатокот е додаден!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Секогаш кога ќе ја видите оваа икона, може да го користите вашиот отпечаток за идентификација или да авторизирате купување."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Само допрете го сензорот за отпечатоци за да го разбудите и отклучите уредот."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Кога ќе ја видите иконата, исто така може да одобрувате купувања или да се најавувате на апликации."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Подигнете и допрете повторно"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Подигнувајте го прстот за да ги додадете различните делови на отпечатокот"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Отпечатокот е додаден"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Кога ќе ја видите иконава, користете го отпечатокот за идентификација или да ги одобрите купувањата."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Да се прескокне поставувањето отпечаток?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Избравте да го користите отпечатокот од прстот како еден од начините на отклучување на телефонот. Ако го прескокнете сега, ќе треба да го поставите подоцна. За поставувањето ќе ви треба околу една минута."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Поставете заклучување на екранот"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Готово"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Упс, тоа не е сензорот"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Користи сензор за отпечаток на уредот."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Допрете го сензорот одзади со показалецот."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Запишувањето не е завршено"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Се достигна временското ограничување на запишувањето со отпечаток од прст. Обидете се повторно."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Запишувањето со отпечаток од прст не работеше. Обидете се повторно или користете друг прст."</string>
@@ -449,6 +460,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Спречете ги другите да го користат уредот без ваша дозвола со активирање на функциите за заштита на уред. Изберете го заклучувањето екран што сакате да го користите."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Спречете ги другите да го користат телефонот без ваша дозвола со активирање на функциите за заштита на уред. Изберете го заклучувањето екран што сакате да го користите."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Изберете резервен метод за заклучување на екранот"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Опции за заклучување на екранот"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Опции за заклучување на екранот"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Заклучување на екран"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/веднаш по режим во мирување"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> по режим во мирување"</string>
@@ -519,13 +532,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Смени шема на отклуч."</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промени PIN за отклучување"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Смени лозинка за откл."</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Обиди се повторно. Обид <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> од <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Последен обид"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Работниот профил и податоците во врска со него ќе бидат отстранети од уредот ако и при овој обид внесете погрешна работна шема."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Работниот профил и податоците во врска со него ќе бидат отстранети од уредот ако и при овој обид внесете погрешен работен PIN."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Работниот профил и податоците во врска со него ќе бидат отстранети од уредот ако и при овој обид внесете погрешна работна лозинка."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Премногу погрешни обиди. Работниот профил и податоците во врска со него ќе бидат отстранети од уредот."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Отфрли"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Обидете се повторно. Обид <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> од <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Податоците ќе се избришат"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ако впишете погрешна шема при следниот обид, податоците на уредов ќе се избришат"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ако впишете погрешен PIN при следниот обид, податоците на уредов ќе се избришат"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ако впишете погрешна лозинка при следниот обид, податоците на уредов ќе се избришат"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ако впишете погрешна шема при следниот обид, корисников ќе се избрише"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ако впишете погрешен PIN при следниот обид, корисников ќе се избрише"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ако впишете погрешна лозинка при следниот обид, корисников ќе се избрише"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ако впишете погрешна шема при следниот обид, работниот профил и неговите податоци ќе се избришат"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ако впишете погрешен PIN при следниот обид, работниот профил и неговите податоци ќе се избришат"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ако впишете погрешна лозинка при следниот обид, работниот профил и неговите податоци ќе се избришат"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Премногу погрешни обиди. Податоците на уредов ќе се избришат."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Премногу погрешни обиди. Корисникот ќе се избрише."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Премногу погрешни обиди. Работниот профил и неговите податоци ќе се избришат."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Отфрли"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Мора да има најмалку <xliff:g id="COUNT">%d</xliff:g> знаци"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN-от мора да има најмалку <xliff:g id="COUNT">%d</xliff:g> цифри"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Продолжи"</string>
@@ -626,6 +647,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Напреден Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Кога е вклучен Bluetooth, уредот може да комуницира со други уреди со Bluetooth во близина."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"За да се подобри точноста на локацијата, системските апликации и услуги сѐ уште може да откриваат уреди со Bluetooth. Ова може да го измените во <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>поставките за скенирање<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Не можеше да се поврзе. Обидете се повторно."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Детали за уредот"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Адреса на Bluetooth на уредот: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Да се заборави уредот?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Телефонот веќе нема да биде спарен со <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Таблетот веќе нема да биде спарен со <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Уредот веќе нема да биде спарен со <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Заборави го уредот"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Поврзи се со..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ќе се исклучи од аудио на медиум."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ќе се исклучи од аудио на интерфон."</string>
@@ -778,6 +807,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Не обезбедувај"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Не потврдувај"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Нема назначено сертификат. Вашата врска нема да биде приватна."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Името на мрежата е премногу долго."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Мора да се наведе домен."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Достапен WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Достапен WPS)"</string>
@@ -809,7 +839,6 @@
       <item quantity="other">%d мрежи</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Напредна Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Конфигурирање на Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC адреса"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"ИП адреса"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска на подмрежа"</string>
@@ -846,9 +875,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Заборави ја оваа група?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Точка на пристап на пренослива Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Жешко место за Wi‑Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Користи мобилна врска за да создадеш Wi‑Fi мрежа"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Интернет-врската на таблетов не се споделува преку точка на пристап"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Интернет-врската на телефонов не се споделува преку точка на пристап"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Не се споделува интернет или содржини со други уреди"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Интернет-врската на таблетов се споделува преку точка на пристап"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Интернет-врската на телефонов се споделува преку точка на пристап"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Апликацијата споделува содржини. За споделување на интернет-врската, исклучете ја, а потоа вклучете ја точката на пристап"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Име на Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Се вклучува <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Другите уреди може да се поврзат на <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Лозинка за Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Појас на точката на пристап"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Користете точка на пристап за да создадете Wi‑Fi мрежа за другите уреди. Точката на пристап обезбедува интернет со помош на мобилната интернет-врска. Може да ви се наплатат дополнителни трошоци за мобилниот интернет."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Апликациите може да создадат точка на пристап за да споделуваат содржини со уредите во близина."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Вклучување точка на пристап..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Исклучување точка на пристап..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> е активно"</string>
@@ -895,6 +932,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Кога е вклучено повикувањето преку Wi-Fi, телефонот може да насочува повици преку мрежи на Wi-Fi или мрежата на операторот, зависно од параметрите и кој сигнал е посилен. Пред да ја вклучите функцијата, проверете кај операторот за давачки и други детали."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Ажурирајте ја адресата за итни случаи"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Адреса што ќе ја користат службите за итни случаи како ваша локација ако повикате 192 преку Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Екран"</string>
@@ -952,6 +990,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Нема резултати"</string>
     <string name="display_settings" msgid="7965901687241669598">"Приказ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Автоматско ротирање на екранот"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Интензивни бои"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Автоматски префрли ја ориентацијата при ротирање на таблетот"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Автоматски префрли ја ориентацијата при ротирање на телефонот"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Автоматски префрли ја ориентацијата при ротирање на таблетот"</string>
@@ -979,23 +1018,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Оптимизирајте го нивото на осветленост. Може привремено да ја приспособите и при вклучена функција."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Ноќно светло"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Ноќното светло го обојува екранот во килибарна боја. Тоа го олеснува гледањето во екранот или читањето при затемнето светло и може да ви помогне полесно да заспиете."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Распоред"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Статус"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Вклучи автоматски"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Никогаш"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Приспособен распоред"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Од зајдисонце до изгрејсонце"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Распоред"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Никогаш"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Се вклучува во одредено време"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Од зајдисонце до изгрејсонце"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Време на започнување"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Време на завршување"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Статус"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Интензитет"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Исклучен. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Никогаш нема да се вклучи автоматски."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Ќе се вклучи автоматски во <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Ќе се вклучи автоматски на зајдисонце."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Вклучен. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Никогаш нема да се исклучи автоматски."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Ќе се исклучи автоматски во <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Ќе се исклучи автоматски на изгрејсонце."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Исклучен/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Никогаш нема да се вклучи автоматски"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Ќе се вклучи автоматски во <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Ќе се вклучи автоматски на зајдисонце"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Вклучен/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Никогаш нема да се исклучи автоматски"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Ќе се исклучи автоматски во <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Ќе се исклучи автоматски на изгрејсонце"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Режим на штедење"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Екранот се исклучува"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"По <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
@@ -1019,8 +1057,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Поставки"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматска осветленост"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Подигнете да се активира"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Амбиентален екран"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Амбиентален екран"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Секогаш вклучен"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Нови известувања"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Кога да се прикажува"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Нови известувања"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Разбудете го екранот кога ќе примите известувања"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Секогаш вклученa"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Прикажување на времето, икони за известување и други информации"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Големина на фонт"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Намалете го или зголемете го текстот"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Поставки на заклучување на SIM картичка"</string>
@@ -1272,6 +1316,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN не може да биде празна."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Полето MNC мора да биде 3 цифри."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Полето MNC мора да биде 2 или 3 бројни места."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Операторот не дозволува додавање APN од типот %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Враќање стандардни подесувања на APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Ресетирај на стандардни вредности"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ресетирањето стандардни подесувања на APN е завршено."</string>
@@ -1301,6 +1346,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Избриши СД картичка"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Избриши ги сите податоци во внатрешната USB меморија, како што се музика или фотографии"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Избриши ги сите податоци на СД картичката, како што се музика или фотографии"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Избриши ги eSIM-картичките"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Избришете ги сите eSIM-картички на телефонот. Тоа ќе го откаже вашиот план за мобилна услуга."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Избришете ги сите eSIM-картички на таблетот.Тоа ќе го откаже вашиот план за мобилна услуга."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Ресетирај таблет"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Ресетирај телефон"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Да се избришат сите ваши лични податоци и преземени апликации? Не може да го вратите ова дејство!"</string>
@@ -1323,26 +1371,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Не може да се врзе или се да користат преносни точки на пристап додека е вклучен Штедачот на интернет"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Поврзување со USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB е поврзано, активирајте за поврзување"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Поврзано"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Не може да се поврзе кога е во употреба USB меморија"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB не е поврзано"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Поврзи се да се вклучи"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Грешка при поврзувањето со USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Споделете ја интернет-врската на телефонот преку USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Споделете ја интернет-врската на таблетот преку USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Поврзување со Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Интернетот на таблетов се сподел. преку Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Интернетот на телефонов се сподел. преку Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Интернетот на таблетов се сподел. со 1 уред преку Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Интернетот на телефонов се сподел. со 1 уред преку Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Интернетот на таблетов се сподел. со <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> уреди преку Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Интернетот на телефонов се сподел. со <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> уреди преку Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Споделете ја интернет-врската на таблетот преку Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Споделете ја интернет-врската на телефонот преку Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Интернетот на <xliff:g id="DEVICE_NAME">%1$d</xliff:g> се споделува преку Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Интернетот на таблетов не се спод. преку Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Интерн. на телефонов не се спод. преку Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Неповрзан"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Не може да се поврзе со повеќе од <xliff:g id="MAXCONNECTION">%1$d</xliff:g> уреди."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ќе се исклучи."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Користете „Точка на пристап и врзување“ за да обезбедите интернет за другите уреди преку вашата мобилна интернет-врска."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Користете точка на пристап и врзување за да овозможите интернет за другите уреди преку вашата мобилна интернет-врска. И апликациите може да создадат точка на пристап за да споделуваат содржини со уредите во близина."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Помош"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Мобилна мрежа"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Мобилен план"</string>
@@ -1375,7 +1412,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим на локација"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Користи GPS, Wi‑Fi, Bluetooth или мобилни мрежи за утврдување на локацијата"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Користи Wi‑Fi, Bluetooth или мобилни мрежи за утврдување на локацијата"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Користи GPS за да се утврди локацијата"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Користи GPS и сензорите на уредот за утврдување на локацијата"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Скенирање"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Скенирање на Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"За да ја подобрите локацијата, дозволете системските апликации и услуги да откриваат Wi‑Fi мрежи во секое време."</string>
@@ -1420,8 +1457,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Немате врска со податоци. За да ги видите овие информации сега, одете на %s од кој било компјутер поврзан на интернет."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Се вчитува..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Изберете лозинка"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Поставете лозинка за отпечаток"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Изберете шема"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Поставете шема за отпечаток"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Изберете PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Поставете PIN за отпечаток"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Потврдете ја лозинката"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Потврдете ја шемата"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Потврдете го PIN-от"</string>
@@ -1490,6 +1530,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Поставки на апликација"</string>
     <string name="install_applications" msgid="4872012136210802181">"Непознати извори"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Дозв. ги сите изв. на аплик."</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Неодамна отворени апликации"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Видете ги сите <xliff:g id="COUNT">%1$d</xliff:g> апликации"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"Пред <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Вашиот таблет и личните податоци се повеќе подложни на напади од апликации од непознати извори. Ако инсталирате апликации од изворов, се согласувате дека сте одговорни за каква било штета на таблетот или губењето податоци што може да произлезат од користењето на овие апликации."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Вашиот телефон и личните податоци се повеќе подложни на напади од апликации од непознати извори. Ако инсталирате апликации од изворов, се согласувате дека сте одговорни за каква било штета на телефонот или губењето податоци што може да произлезат од користењето на овие апликации."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Напредни поставки"</string>
@@ -1658,6 +1701,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Запри системска услуга?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Ако ја запрете оваа услуга, некои карактеристики на вашиот таблет може да престанат да работат правилно, додека не го исклучите и повторно не го вклучите."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ако ја запрете оваа услуга, некои карактеристики на вашиот телефон може да престанат да работат правилно, додека не го исклучите и повторно не го вклучите."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Јазици, внесување и движења"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Јазици и внесување"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Јазици и внесување"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Помош при внесување"</string>
@@ -1872,6 +1919,10 @@
       <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="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <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="print_settings_title" msgid="3685449667822217816">"Услуги за печатење"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Нема инсталирано услуги"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Не се пронајдени печатачи"</string>
@@ -1938,6 +1989,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Користи детали"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Приспособи употреба на струја"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Вклучени пакети"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Апликации што ја трошат батеријата"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Го држи уредот активен"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Го активира уредот во заднина"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Често бара локација"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> апликации се однесуваат необично"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Да се исклучи апликацијата?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Телефонот не може да управува со батеријата нормално затоа што <xliff:g id="APP">%1$s</xliff:g> го држи телефонот активен.\n\nВо обид да го решите проблемов, може присилно да ја исклучите апликацијата.\n\nАко проблемот постои и понатаму, можеби ќе треба да ја деинсталирате апликацијата за да се подобри изведбата на батеријата."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Таблетот не може да управува со батеријата нормално затоа што <xliff:g id="APP">%1$s</xliff:g> го држи телефонот активен.\n\nВо обид да го решите проблемов, може присилно да ја исклучите апликацијата.\n\nАко проблемот постои и понатаму, можеби ќе треба да ја деинсталирате апликацијата за да се подобри изведбата на батеријата."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Уредот не може да управува со батеријата нормално затоа што <xliff:g id="APP">%1$s</xliff:g> го држи уредот активен.\n\nВо обид да го решите проблемов, може присилно да ја исклучите апликацијата.\n\nАко проблемот постои и понатаму, можеби ќе треба да ја деинсталирате апликацијата за да се подобри изведбата на батеријата."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Исклучи ја апликацијата"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Да се исклучи користењето во заднина?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Телефонот не може да управува со батеријата нормално затоа што <xliff:g id="APP">%1$s</xliff:g> го активира телефонот.\n\nЗа да се справи со проблемов, телефонот може да ја спречи апликацијава да работи во заднина."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Таблетот не може да управува со батеријата нормално затоа што <xliff:g id="APP">%1$s</xliff:g> го активира таблетот.\n\nЗа да се справи со проблемов, таблетот може да ја спречи апликацијава да работи во заднина."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Уредот не може да управува со батеријата нормално затоа што <xliff:g id="APP">%1$s</xliff:g> го активира уредот.\n\nЗа да се справи со проблемов, уредот може да ја спречи апликацијава да работи во заднина."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Исклучи"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Да се исклучи локацијата?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Телефонот не може да управува со батеријата нормално затоа што <xliff:g id="APP">%1$s</xliff:g> ви ја бара локацијата и кога не ја користите апликацијата.\n\nЗа да го решите проблемов, може да ја исклучите локацијата за апликацијава."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Таблетот не може да управува со батеријата нормално затоа што <xliff:g id="APP">%1$s</xliff:g> ви ја бара локацијата и кога не ја користите апликацијата.\n\nЗа да го решите проблемов, може да ја исклучите локацијата за апликацијава."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Уредот не може да управува со батеријата нормално затоа што <xliff:g id="APP">%1$s</xliff:g> ви ја бара локацијата и кога не ја користите апликацијата.\n\nЗа да го решите проблемов, може да ја исклучите локацијата за апликацијава."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Исклучи"</string>
     <string name="power_screen" msgid="3023346080675904613">"Екран"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Светилка"</string>
     <string name="power_camera" msgid="4976286950934622605">"Камера"</string>
@@ -1952,7 +2023,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Апликации"</string>
     <string name="power_service" msgid="1599661212370831780">"Услуги"</string>
     <string name="power_system" msgid="8290455327965307383">"Систем"</string>
-    <string name="power_user" msgid="1889728099253018005">"Корисник"</string>
+    <string name="power_user" msgid="3706143225319881667">"Други корисници"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Вкупно CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Преден план на CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Задржи активен"</string>
@@ -2004,6 +2075,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Надмината употреба на напојување"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Користење <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Активен <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Користење на екранот <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> искористени од <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> од целокупната батерија"</string>
@@ -2563,7 +2635,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Промени PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Прикажи известувања"</string>
     <string name="help_label" msgid="6886837949306318591">"Помош и информации"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Статии за помош, подршка за телефон и разговор"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Статии за помош, телефон и разговор, вовед"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Сметка за содржина"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ИД со фотографија"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Екстремни закани"</string>
@@ -2653,9 +2725,12 @@
       <item quantity="other">Прикажи %d сокриени ставки</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Мрежа и Интернет"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, мобилен, потрошен сообраќај, точка на пристап"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобилна"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"потрошен сообраќај"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"точка на пристап"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Поврзани уреди"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Апликации и известувања"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Дозволи, стандардни апликации"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Корисници и сметки"</string>
@@ -2708,6 +2783,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"движење"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"плати, допри, плаќања"</string>
     <string name="keywords_backup" msgid="470070289135403022">"бекап, прави бекап"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"движење, раб, страна, активен раб, стискање, стисок, помош, помошник, squeezy, squeezie, squeezey, squeezee, ok google, помошник на google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"движење, активен, известувања, екран, приказ, исклучен екран, вклучен екран, стискање, раб, во мирување, режим во мирување, стисок"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"движење, тишина, одложи аларм, аларм, дојдовен повик, тивко, приказ, заклучен екран, стискање, стисок, раб, сопри"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Поставете Wi-Fi ознака за NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"Пишувај"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Допрете ознака да пишувате…"</string>
@@ -2790,7 +2868,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Не прикажувај известувања од работниот профил"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Кога уредот е заклучен, како сакате да се прикажуваат известувањата на профилот?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Известувања на профилот"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Известувања"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Известувања"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Известувања за апликација"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Категорија на известувањето"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Важност"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Дозволи апликацијата да одлучи"</string>
@@ -2805,6 +2884,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Итно"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Дозволете звук"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Прикажувај ги овие апликации на тековниот екран без звук, вибрации или ѕиркање."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Мала важност"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Средна важност"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Голема важност"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Итна важност"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Помошник за известувања"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Пристап до известување"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Пристапот до известувањата на работниот профил е блокиран"</string>
@@ -2832,8 +2915,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Слика во слика"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Дозволете слика во слика"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Дозволете апликацијава да создава прозорец за слика во слика додека апликацијата е отворена или пак, откако ќе ја напуштите (на пр., за да продолжите со гледање видео). Прозорецот се прикажува врз другите апликации што ги користите."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Да"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Не"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Пристап до „Не вознемирувај“"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ниту една од инсталираните апликации не побарала пристап до „Не вознемирувај“"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Вчитување апликации…"</string>
@@ -2964,11 +3045,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Овој работен профил е управуван од:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Управувано од <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментално)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Ротација на уредот"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Ротирај ја содржината на екранот"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Остани во приказ на портрет"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Остани во приказ на пејзаж"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Остани во тековната ориентација"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Безбедно стартување"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Продолжи"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Може дополнително да го заштитите уредот ако го бара PIN-кодот пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара PIN за стартување на уредот?"</string>
@@ -2976,7 +3052,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Може дополнително да го заштитите уредот ако ја бара лозинката пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара лозинка за стартување на уредот?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Освен користењето на отпечатокот од прст за отклучување на уредот, може да го заштитите уредот дополнително ако бара ПИН пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара PIN за стартување на уредот?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Освен користењето на отпечатокот од прст за отклучување на уредот, може да го заштитите уредот дополнително ако ја бара шемата пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара шема за стартување на уредот?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Освен користењето на отпечатокот од прст за отклучување на уредот, може да го заштитите уредот дополнително ако ја бара лозинката пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара лозинка за стартување на уредот?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Освен користењето на отпечатокот за отклучување на уредот, може дополнително да го заштитите ако бара лозинка пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, вклучувајќи и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара лозинка за стартување на уредот?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Да"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Не"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Барајте PIN?"</string>
@@ -3094,6 +3170,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Предупредувања за батеријата"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Прикажи ја употребата на целосно полниот уред"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Прикажи употреба на апликација"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Голема искористеност"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> апликација се однесува невообичаено</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> апликации се однесуваат невообичаено</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Апликации ја трошат батеријата</item>
+      <item quantity="other">Апликации ја трошат батеријата</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Не се оптимизирани"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Не е оптимизирано"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Се оптимизира користењето на батеријата"</string>
@@ -3186,8 +3271,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Приказ врз други апликации"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> од <xliff:g id="COUNT_1">%2$d</xliff:g> аплик. имаат дозвола за прикажување врз други апликации"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Апликации со дозвола"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Да"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Не"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Дозволено"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Не е дозволено"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"инсталирање апликации непознати извори"</string>
     <string name="write_settings" msgid="4797457275727195681">"Менување поставки на системот"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"пишувај менувај поставки на системот"</string>
@@ -3277,6 +3362,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Екранот е обоен во килибарна боја. Ова може да ви помогне да заспиете."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Предлози"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"Уште <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <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="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <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="suggestion_remove" msgid="904627293892092439">"Отстрани"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Ладна боја за температура"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Користи поладни бои на екранот"</string>
@@ -3295,8 +3389,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> предупредување за потрошен интернет"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> Предупредување за податоците/<xliff:g id="ID_2">%2$s</xliff:g> Ограничување на податоците"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Циклус за наплата"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Месечниот циклус почнува на <xliff:g id="ID_1">%1$s</xliff:g> секој месец"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Месечно, почнувајќи на <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"На <xliff:g id="ID_1">%1$s</xliff:g> секој месец"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Ограничувања на мрежата"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> ограничување</item>
@@ -3316,7 +3409,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> апликации имаат дозвола да користат неограничен интернет кога е вклучен Штедачот на интернет</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Штедач на интернет"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Неограничен интернет"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Неограничен интернет"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Исклучен сообраќај во заднина"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Вклучено"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Исклучено"</string>
@@ -3380,8 +3473,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Контролирајте ги известувањата на заклучениот екран"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Прикажете или сокријте содржина на известување"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Сите"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Поддршка"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Поддршка и совети"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Најмала ширина"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ниедна од инсталираните апликации не побара пристап до премиум SMS"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Премиум SMS може да ве чини пари, а сумата ќе се додаде на сметките од операторот. Ако овозможите дозвола за апликацијата, ќе може да испраќате премиум SMS со неа."</string>
@@ -3446,28 +3538,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Автоматски"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Рачни"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Ослободете простор сега"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Движења"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Кратенки со движење"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Брзи движења за контролирање на телефонот"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Брзи движења за контролирање на таблетот"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Брзи движења за контролирање на уредот"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Скокнете до камерата"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"За брзо отворање на камерата, притиснете го копчето за вклучување двапати. Работи од секој екран."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Отворајте ја камерата набрзина"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"За камерата, притиснете го копчето за вклучување двапати"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Превртете ја камерата"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Направете селфи-фотографии побрзо"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Завртете го телефонот двапати за режим на селфи"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Завртете го таблетот двапати за режим на селфи"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Завртете го уредот двапати за режим на селфи"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Допрете двапати за да го проверите телефонот"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Допрете двапати за да го проверите таблетот"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Допрете двапати за да го проверите уредот"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"За да ги проверите известувањата набрзина, допрете двапати на екранот."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"За да ги проверите времето, иконите за известување и другите информации, допрете двапати на екранот."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Проверувајте ги известувањата кога екранот е исклучен"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Подигнете за да го проверите телефонот"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Подигнете за да го проверите таблетот"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Подигнете за да го проверите уредот"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"За да ги проверите известувањата набрзина, земете го телефонот."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"За да ги проверите известувањата набрзина, земете го таблетот."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"За да ги проверите известувањата набрзина, земете го уредот."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"За да ги проверите времето, иконите за известување и другите информации, земете го телефонот."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"За да ги проверите времето, иконите за известување и другите информации, земете го таблетот."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"За да ги проверите времето, иконите за известување и другите информации, земете го уредот."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Проверувајте ги известувањата кога екранот е исклучен"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Повлечете отпечаток за известувања"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"За да ги проверите известувањата, повлечете надолу на сензорот за отпечатоци на задната страна на телефонот."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"За да ги проверите известувањата, повлечете надолу на сензорот за отпечатоци на задната страна на таблетот."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"За да ги проверите известувањата, повлечете надолу на сензорот за отпечатоци на задната страна на уредот."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Видете ги известувањата набрзина"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Повлечете надолу на сензорот за отпечатоци"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Подигнете за отворање на камерата"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"За отворање на камерата автоматски, подигнете го телефонот во положба за снимање фотографија (пејсаж или портрет). Функционира кога телефонот мирува или е заклучен."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Фотографирајте кога телефонот е во мирување или заклучен"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Движење за помош"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Чувствителност"</string>
@@ -3571,6 +3676,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Дали сакате да ја отстраните оваа инстант апликација?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Игри"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудио датотеки"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Искористен простор"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(деинсталирано за корисникот <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(оневозможено за корисникот <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Услуга за автоматско пополнување"</string>
@@ -3584,5 +3690,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Инстант апликација"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Да се исклучи управникот со меморијата?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Апликации за филм и ТВ"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Искористен простор"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Информации за обезбедување оператор"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Активирајте обезбедување оператор"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Што има ново и интересно?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Погледнете ги најдобрите 5 функции"</string>
 </resources>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index 428a516..85d818f 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"നല്ലത്"</item>
     <item msgid="8986346415847956850">"മികച്ചത്"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"എല്ലായ്പ്പോഴും"</item>
-    <item msgid="844721238536786870">"പ്ലഗ്ഗുചെയ്‌തിരിക്കവേ"</item>
-    <item msgid="1986753720941888596">"ഒരിക്കലും"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"എല്ലായ്പ്പോഴും"</item>
-    <item msgid="7433294150916905997">"പ്ലഗ്ഗുചെയ്‌തിരിക്കവേ"</item>
-    <item msgid="1390404486722375028">"ഒരിക്കലും"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"കഴിഞ്ഞ 30 ദിവസം"</item>
     <item msgid="6600989128423965319">"ഉപയോഗ സൈക്കിൾ സജ്ജമാക്കുക..."</item>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index dc6849b..990cfa9 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"നിങ്ങൾ ഇപ്പോൾ ഒരു ഡവലപ്പറാണ്!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"ആവശ്യമില്ല, നിങ്ങൾ ഇതിനകം ഒരു ഡവലപ്പറാണ്."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"ആദ്യം ഡെവലപ്പർ ഓ‌പ്ഷനുകൾ പ്രവർത്തനക്ഷമമാക്കുക."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"വയർലെസും നെറ്റ്‌വർക്കുകളും"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"കണക്ഷനുകൾ"</string>
     <string name="header_category_device" msgid="4544026001618307754">"ഉപകരണം"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE പ്രൊവിഷൻ"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"വീഡിയോ കോളിംഗ് ഏർപ്പെടുത്തി"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"വൈഫൈ കോളിംഗ് ഏർപ്പെടുത്തി"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/സാന്നിധ്യം പ്രൊവിഷൻ ചെയ്‌തു"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"മൊബൈൽ റേഡിയോ പവർ"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"സിം വിലാസ പുസ്‌‌തകം കാണുക"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"സ്ഥിര ഡയലിംഗ് നമ്പറുകൾ കാണുക"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"ഉപകരണങ്ങൾക്കായി സ്‌കാൻ ചെയ്യുക"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"ഈ ഉപകരണത്തിന്റെ പേരുമാറ്റുക"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"പേര് മാറ്റുക"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"വിച്ഛേദിക്കണോ?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ഇത് ഇനിപ്പറയുന്നതുമായുള്ള നിങ്ങളുടെ കണക്ഷൻ അവസാനിപ്പിക്കും:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"ഉപകരണം വിച്‌ഛേദിക്കണോ?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ഉപകരണത്തിൽ നിന്ന് നിങ്ങളുടെ ഫോൺ വിച്ഛേദിക്കും."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ഉപകരണത്തിൽ നിന്ന് നിങ്ങളുടെ ടാബ്‌ലെറ്റ് വിച്ഛേദിക്കും."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ഉപകരണത്തിൽ നിന്ന് നിങ്ങളുടെ ഉപകരണം വിച്ഛേദിക്കും."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"വിച്ഛേദിക്കുക"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"ബ്ലൂടൂത്ത് ക്രമീകരണങ്ങൾ മാറ്റാൻ നിങ്ങൾക്ക് അനുമതിയില്ല."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"പുതിയ ഉപകരണവുമായി ജോടിയാക്കുക"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Bluetooth ക്രമീകരണം തുറന്നിരിക്കുമ്പോൾ വിളിപ്പാടരികെയുള്ള ഉപകരണങ്ങൾക്ക് <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ദൃശ്യമാകുന്നു."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"ഫോണിന്റെ Bluetooth വിലാസം: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"ടാബ്‌ലെറ്റിന്റെ Bluetooth വിലാസം: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"ഉപകരണത്തിന്റെ Bluetooth വിലാസം: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> വിച്ഛേദിക്കണോ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"പ്രക്ഷേപണം ചെയ്യുന്നു"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"പ്രൊഫൈൽ പ്രവർത്തനരഹിതമാക്കണോ?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"ബ്ലൂടൂത്ത് ജോടിയാക്കൽ അഭ്യർത്ഥന"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"ജോടിയാക്കൽ അഭ്യർത്ഥന"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> എന്ന ഉപകരണവുമായി ജോടിയാക്കാൻ ടാപ്പുചെയ്യുക."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"ലഭിച്ച ഫയലുകൾ ദൃശ്യമാക്കുക"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"സ്വീകരിച്ച ഫയലുകള്‍"</string>
     <string name="device_picker" msgid="4978696506172252813">"ബ്ലൂടൂത്തുപകരണം തിരഞ്ഞെടുക്കൂ"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"Bluetooth ഓണാക്കാൻ <xliff:g id="APP_NAME">%1$s</xliff:g> താൽപ്പര്യപ്പെടുന്നു"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"Bluetooth ഓഫാക്കാൻ <xliff:g id="APP_NAME">%1$s</xliff:g> താൽപ്പര്യപ്പെടുന്നു"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s, നിങ്ങളുടെ സന്ദേശങ്ങൾ ആക്‌സസ്സുചെയ്യാൻ താൽപ്പര്യപ്പെടുന്നു. %2$s എന്നതിലേക്ക് ആക്‌സസ്സ് നൽകണോ?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM ആക്‌സസ്സ് അഭ്യർത്ഥന"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ഉപകരണം SIM കാർഡ് ആക്‌സസ്സ് ചെയ്യാൻ താൽപ്പര്യപ്പെടുന്നു. SIM കാർഡിലേക്ക് ആക്‌സസ്സ് അനുവദിക്കുന്നത് കണക്ഷന്റെ സമയപരിധിയ്‌ക്കായി ഉപകരണത്തിൽ ഡാറ്റ കണക്റ്റിവിറ്റിയെ പ്രവർത്തനരഹിതമാക്കുന്നതിനിടയാക്കും. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> ഉപകരണത്തിന് ആക്‌സസ്സ് നൽകുക"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"<xliff:g id="DEVICE_NAME">^1</xliff:g> എന്ന പേരിൽ മറ്റ് ഉപകരണങ്ങൾക്ക് ദൃശ്യമാക്കുക"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"നിങ്ങളുടെ ഉപകരണങ്ങൾ"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"പുതിയ ഉപകരണവുമായി ജോടിയാക്കുക"</string>
     <string name="date_and_time" msgid="9062980487860757694">"തീയതിയും സമയവും"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"സമയ മേഖല തിരഞ്ഞെടുക്കുക"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"അക്കൗണ്ടുകൾ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ലൊക്കേഷൻ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"അക്കൗണ്ടുകൾ"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"സുരക്ഷയും ലൊക്കേഷനും"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"എൻക്രിപ്‌ഷനും ക്രെഡന്‍ഷ്യലുകളും"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ഫോൺ എൻക്രിപ്‌റ്റ് ചെയ്‌തു"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"ഉപകരണം എൻക്രിപ്റ്റ് ചെയ്തു"</string>
@@ -354,40 +367,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"വിരലടയാളം വഴി അൺലോക്കുചെയ്യുക"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"നിങ്ങളുടെ വിരലടയാളം ഉപയോഗിക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"ഫോൺ അൺലോക്കുചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്സിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ വിരലടയാള സെൻസർ തൊട്ടാൽ മാത്രം മതി. ആരുടെയൊക്കെ വിരലടയാളങ്ങൾ ചേർക്കുന്നു എന്ന കാര്യത്തിൽ നിങ്ങൾ ജാഗ്രത പുലർത്തുക. ചേർത്തിട്ടുള്ള ഒരു വിരലടയാളത്തിന് പോലും ഈ സംഗതികളൊക്കെ ചെയ്യാനാകും.\n\nശ്രദ്ധിക്കുക: നിങ്ങളുടെ വിരലടയാളത്തിന്റെ സുരക്ഷ, ശക്തമായ പാറ്റേണിനേക്കാളോ PIN-നേക്കാളോ കുറവായിരിക്കാം."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്സിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ വിരലടയാള സെൻസറിൽ സ്പർശിച്ചാൽ മാത്രം മതി. ആരുടെയൊക്കെ വിരലടയാളങ്ങൾ ചേർക്കുന്നു എന്ന കാര്യത്തിൽ നിങ്ങൾ ജാഗ്രത പുലർത്തുക. ചേർത്തിട്ടുള്ള ഒരു വിരലടയാളത്തിന് പോലും ഈ സംഗതികളൊക്കെ ചെയ്യാനാകും.\n\nശ്രദ്ധിക്കുക: ഈ ഉപകരണം അൺലോക്കുചെയ്യുന്നതിന് നിങ്ങളുടെ വിരലടയാളം ഉപയോഗിക്കാനാകില്ല. കൂടുതൽ വിവരങ്ങൾക്ക്, നിങ്ങളുടെ സ്ഥാപനത്തിന്റെ അഡ്‌മിനുമായി ബന്ധപ്പെടുക."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"ഫോൺ അൺലോക്കുചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്സിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ വിരലടയാള സെൻസർ തൊട്ടാൽ മാത്രം മതി. ആരുടെയൊക്കെ വിരലടയാളങ്ങൾ ചേർക്കുന്നു എന്ന കാര്യത്തിൽ നിങ്ങൾ ജാഗ്രത പുലർത്തുക. ചേർത്തിട്ടുള്ള ഒരു വിരലടയാളത്തിന് പോലും ഈ സംഗതികളൊക്കെ ചെയ്യാനാകും.\n\nശ്രദ്ധിക്കുക: നിങ്ങളുടെ വിരലടയാളത്തിന്റെ സുരക്ഷ, ശക്തമായ പാറ്റേണിനേക്കാളോ പിന്നിനേക്കാളോ കുറവായിരിക്കാം."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"നിങ്ങളുടെ ഫോൺ അൺലോക്കുചെയ്യുന്നതിനോ വാങ്ങലിന് അംഗീകാരം നൽകാനോ നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കുക.\n\nശ്രദ്ധിക്കുക: ഈ ഉപകരണം അൺലോക്കുചെയ്യുന്നതിന് നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കാൻ കഴിയില്ല. കൂടുതൽ വിവരങ്ങൾക്ക്, നിങ്ങളുടെ സ്ഥാപനത്തിന്റെ അഡ്‌മിനെ ബന്ധപ്പെടുക."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"നിങ്ങളുടെ ഫോൺ അൺലോക്കുചെയ്യുന്നതിനോ വാങ്ങലിന് അംഗീകാരം നൽകാനോ നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കുക.\n\nശ്രദ്ധിക്കുക: നിങ്ങളുടെഫിംഗർപ്രിന്റിന്റെ സുരക്ഷ, ശക്തമായ പാറ്റേണിനേക്കാളോ പിന്നിനേക്കാളോ കുറവായിരിക്കാം."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"റദ്ദാക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"തുടരൂ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"ഒഴിവാക്കുക"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"വിരലടയാളം ചേർക്കുക"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കില്ല. ടാബ്‌ലെറ്റ് നഷ്‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്താൽ മറ്റുള്ളവർ അത് ഉപയോഗിക്കുന്നത് ഒഴിവാക്കാനാവില്ല."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കില്ല. ഉപകരണം നഷ്‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്താൽ മറ്റുള്ളവർ അത് ഉപയോഗിക്കുന്നത് ഒഴിവാക്കാനാവില്ല."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കില്ല. ഫോൺ നഷ്‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്താൽ മറ്റുള്ളവർ അത് ഉപയോഗിക്കുന്നത് ഒഴിവാക്കാനാവില്ല."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കില്ല. ടാബ്‌ലെറ്റ് നഷ്‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്താൽ മറ്റുള്ളവർ ടാബ്‌ലെറ്റ് ഉപയോഗിക്കുന്നത് നിങ്ങൾക്ക് തടയാനാകില്ല."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കില്ല. ഉപകരണം നഷ്‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്താൽ മറ്റുള്ളവർ ഉപകരണം ഉപയോഗിക്കുന്നത് നിങ്ങൾക്ക് തടയാനാകില്ല."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കില്ല. ഫോൺ നഷ്‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്താൽ മറ്റുള്ളവർ ഫോൺ ഉപയോഗിക്കുന്നത് നിങ്ങൾക്ക് തടയാനാകില്ല."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"അടുത്തത്"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ ഓണാക്കില്ല. ഈ ടാബ്‌ലെറ്റ് നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ പുനഃക്രമീകരിക്കുകയോ ചെയ്താൽ, ടാബ്‌ലെറ്റ് ഉപയോഗിക്കുന്നതിൽ നിന്ന് മറ്റുള്ളവരെ തടയാൻ നിങ്ങൾക്കാവില്ല."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ ഓണാക്കില്ല. ഈ ഉപകരണം നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ പുനഃക്രമീകരിക്കുകയോ ചെയ്താൽ, ഉപകരണം ഉപയോഗിക്കുന്നതിൽ നിന്ന് മറ്റുള്ളവരെ തടയാൻ നിങ്ങൾക്കാവില്ല."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ ഓണാക്കില്ല. ഈ ഫോൺ നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ പുനഃക്രമീകരിക്കുകയോ ചെയ്താൽ, ഫോൺ ഉപയോഗിക്കുന്നതിൽ നിന്ന് മറ്റുള്ളവരെ തടയാൻ നിങ്ങൾക്കാവില്ല."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ ഓണാക്കില്ല. ഈ ടാബ്‌ലെറ്റ് നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ, ടാബ്‌ലെറ്റ് ഉപയോഗിക്കുന്നതിൽ നിന്ന് മറ്റുള്ളവരെ തടയാൻ നിങ്ങൾക്കാവില്ല."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ ഓണാക്കില്ല. ഈ ഉപകരണം നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ, ഉപകരണം ഉപയോഗിക്കുന്നതിൽ നിന്ന് മറ്റുള്ളവരെ തടയാൻ നിങ്ങൾക്കാവില്ല."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ ഓണാക്കില്ല. ഈ ഫോൺ നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ, ഫോൺ ഉപയോഗിക്കുന്നതിൽ നിന്ന് മറ്റുള്ളവരെ തടയാൻ നിങ്ങൾക്കാവില്ല."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"ഏതുവിധേയനയും ഒഴിവാക്കുക"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"തിരിച്ചുപോവുക"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"സെൻസർ കണ്ടെത്തുക"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"നിങ്ങളുടെ ഫോണിന്റെ പിൻഭാഗത്ത് ഫിംഗർപ്രിന്റ് സെൻസർ കണ്ടെത്തുക."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"സെൻസർ സ്പർശിക്കുക"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"ഫോണിന്റെ പിൻവശത്താണ് അതുള്ളത്. നിങ്ങളുടെ ചൂണ്ടുവിരൽ ഉപയോഗിക്കുക."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ഉപകരണത്തിലെ ചിത്രീകരണവും ഫിംഗർപ്രിന്റ് സെൻസർ ലൊക്കേഷനും"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"പേര്"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ശരി"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ഇല്ലാതാക്കുക"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"ആരംഭിക്കാം"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"സെൻസർ സ്പർശിക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"സെൻസറിൽ വിരൽ വച്ച് ഒരു വൈബ്രേഷൻ അനുഭവപ്പെട്ട ശേഷം വിരൽ മാറ്റുക."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"അങ്ങനെത്തന്നെ തുടരുക"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"നിങ്ങളുടെ വിരലടയാളത്തിന്റെ എല്ലാ വ്യത്യസ്ത ഭാഗങ്ങളും ചേർക്കുന്നതിന് വിരൽ പതുക്കെ നീക്കുക"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"വിരലടയാളം ചേർത്തു!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"നിങ്ങൾ ഈ ഐക്കൺ കാണുമ്പോഴെല്ലാം, തിരിച്ചറിയാനോ ഒരു വാങ്ങലിന് അംഗീകാരം നൽകാനോ വിരലടയാളം ഉപയോഗിക്കാനാകും."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"നിങ്ങളുടെ ഉപകരണം ഉണർത്താനും അൺലോക്കുചെയ്യാനും വിരലടയാള സെൻസറിൽ തൊട്ടാൽ മതിയാകും."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"ഈ ഐക്കൺ കാണുമ്പോൾ നിങ്ങൾക്ക്, വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്‌സിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയും."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"ഉയർത്തുക, വീണ്ടും സ്പർശിക്കുക"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"നിങ്ങളുടെ ഫിംഗർപ്രിന്റിന്റെ വ്യത്യസ്ത ഭാഗങ്ങൾ ചേർക്കുന്നതിന് നിങ്ങളുടെ വിരൽ ഉയർത്തിക്കൊണ്ടിരിക്കുക"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"ഫിംഗർപ്രിന്റ് ചേർത്തു"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"നിങ്ങൾ ഈ ഐക്കൺ കാണുമ്പോൾ, തിരിച്ചറിയലിനോ ഒരു വാങ്ങലിന് അംഗീകാരം നൽകാനോ നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കുക."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"വിരലടയാളം സജ്ജമാക്കൽ ഒഴിവാക്കണോ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"നിങ്ങളുടെ ഫോൺ അൺലോക്കുചെയ്യുന്നതിനുള്ള ഒരു മാർഗ്ഗമായി നിങ്ങൾ വിരലടലാളം ഉപയോഗിക്കുന്നതിന് തീരുമാനിച്ചിരിക്കുന്നു. നിങ്ങളിത് ഇപ്പോൾ ഒഴിവാക്കുന്നുവെങ്കിൽ, പിന്നീട് സജ്ജമാക്കേണ്ടി വരും. സജ്ജീകരിക്കലിന് ഒരൽപ്പസമയമേ എടുക്കുകയുള്ളൂ."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"സ്‌ക്രീൻ ലോക്ക് സജ്ജമാക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"പൂർത്തിയായി"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ക്ഷമിക്കണം, അത് സെൻസർ അല്ല"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"നിങ്ങളുടെ ഉപകരണത്തിൽ ഫിംഗർപ്രിന്റ് സെൻസർ ഉപയോഗിക്കുക."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"നിങ്ങളുടെ ഫോണിന്റെ പിൻവശത്തെ സെൻസർ സ്പർശിക്കുക. ചൂണ്ടുവിരൽ ഉപയോഗിക്കുക."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"എൻറോൾമെന്റ് പൂർത്തിയായിട്ടില്ല"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"വിരലടയാള എൻറോൾമെന്റിന്റെ സമയ പരിധി എത്തി. വീണ്ടും ശ്രമിക്കുക."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"വിരലടയാള എൻറോൾമെന്റ് പ്രവർത്തിച്ചില്ല. വീണ്ടും ശ്രമിക്കുകയോ മറ്റൊരു വിരൽ ഉപയോഗിക്കുകയോ ചെയ്യുക."</string>
@@ -449,6 +460,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കുന്നതിലൂടെ നിങ്ങളുടെ അനുമതിയില്ലാതെ മറ്റുള്ളവർ ഈ ഉപകരണം ഉപയോഗിക്കുന്നത് തടയുക. നിങ്ങൾ ഉപയോഗിക്കാൻ ആഗ്രഹിക്കുന്ന സ്ക്രീൻ ലോക്ക് തിരഞ്ഞെടുക്കുക."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കുന്നതിലൂടെ നിങ്ങളുടെ അനുമതിയില്ലാതെ മറ്റുള്ളവർ ഈ ഫോൺ ഉപയോഗിക്കുന്നത് തടയുക. നിങ്ങൾ ഉപയോഗിക്കാൻ ആഗ്രഹിക്കുന്ന സ്ക്രീൻ ലോക്ക് തിരഞ്ഞെടുക്കുക."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"നിങ്ങളുടെ ബാക്കപ്പ് സ്ക്രീൻ ലോക്ക് രീതി തിരഞ്ഞെടുക്കുക"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"സ്‌ക്രീൻ ലോക്ക് ഓപ്ഷനുകള്‍"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"സ്‌ക്രീൻ ലോക്ക് ഓപ്ഷനുകള്‍"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"സ്ക്രീൻ ലോക്ക്"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / സുഷുപ്‌തിയിലായ ശേഷം ഉടൻ"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> സുഷുപ്‌തിയിലായ ശേഷം"</string>
@@ -519,13 +532,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"അൺലോക്ക് പാറ്റേൺ മാറ്റുക"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"അൺലോക്ക് പിൻ മാറ്റുക"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"അൺലോക്ക് പാസ്‌വേഡ് മാറ്റുക"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"വീണ്ടും ശ്രമിക്കുക. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> / <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> ശ്രമം."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"അവസാന ശ്രമം"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"ഈ ശ്രമത്തിൽ നിങ്ങൾ തെറ്റായ ഔദ്യോഗിക പാറ്റേണാണ് നൽകുന്നതെങ്കിൽ, നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലും ബന്ധപ്പെട്ട വിവരങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"ഈ ശ്രമത്തിൽ നിങ്ങൾ തെറ്റായ ഔദ്യോഗിക പിൻ ആണ് നൽകുന്നതെങ്കിൽ, നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലും ബന്ധപ്പെട്ട വിവരങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"ഈ ശ്രമത്തിൽ നിങ്ങൾ തെറ്റായ ഔദ്യോഗിക പാസ്‌വേഡാണ് നൽകുന്നതെങ്കിൽ, നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലും ബന്ധപ്പെട്ട വിവരങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"ഒരുപാട് തെറ്റായ ശ്രമങ്ങൾ. നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലും ബന്ധപ്പെട്ട വിവരങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ഡിസ്മിസ് ചെയ്യുക"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"വീണ്ടും ശ്രമിക്കുക. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> / <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> ശ്രമം."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"നിങ്ങളുടെ ഡാറ്റ ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായൊരു പാറ്റേണാണ് നൽകുന്നതെങ്കിൽ, ഈ ഉപകരണത്തിലെ ഡാറ്റ ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായൊരു പിന്നാണ് നൽകുന്നതെങ്കിൽ, ഈ ഉപകരണത്തിലെ ഡാറ്റ ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായൊരു പാസ്‌വേഡാണ് നൽകുന്നതെങ്കിൽ, ഈ ഉപകരണത്തിലെ ഡാറ്റ ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായൊരു പാറ്റേണാണ് നൽകുന്നതെങ്കിൽ, ഈ ഉപയോക്താവ് ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായൊരു പിന്നാണ് നൽകുന്നതെങ്കിൽ, ഈ ഉപയോക്താവ് ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായൊരു പാസ്‌വേഡാണ് നൽകുന്നതെങ്കിൽ, ഈ ഉപയോക്താവ് ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായൊരു പാറ്റേണാണ് നൽകുന്നതെങ്കിൽ, നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലും അതിന്റെ ഡാറ്റയും ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായൊരു പിന്നാണ് നൽകുന്നതെങ്കിൽ, നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലും അതിന്റെ ഡാറ്റയും ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായൊരു പാസ്‌വേഡാണ് നൽകുന്നതെങ്കിൽ, നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലും അതിന്റെ ഡാറ്റയും ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"ഒരുപാട് തെറ്റായ ശ്രമങ്ങൾ. ഈ ഉപകരണത്തിലെ ഡാറ്റ ഇല്ലാതാക്കപ്പെടും."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"ഒരുപാട് തെറ്റായ ശ്രമങ്ങൾ. ഈ ഉപയോക്താവ് ഇല്ലാതാക്കപ്പെടും."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"ഒരുപാട് തെറ്റായ ശ്രമങ്ങൾ. ഈ ഔദ്യോഗിക പ്രൊഫൈലും അതിന്റെ ഡാറ്റയും ഇല്ലാതാക്കപ്പെടും."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"നിരസിക്കുക"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"കുറഞ്ഞത് <xliff:g id="COUNT">%d</xliff:g> പ്രതീകങ്ങളെങ്കിലും അടങ്ങിയിരിക്കണം"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"പിൻ നമ്പറിൽ കുറഞ്ഞത് <xliff:g id="COUNT">%d</xliff:g> അക്കങ്ങളെങ്കിലും അടങ്ങിയിരിക്കണം"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"തുടരുക"</string>
@@ -626,6 +647,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"വിപുലമായ ബ്ലൂടൂത്ത്"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ബ്ലൂടൂത്ത് ഓണായിരിക്കുമ്പോൾ, സമീപമുള്ള മറ്റു ബ്ലൂടൂത്ത് ഉപകരണങ്ങളുമായി നിങ്ങളുടെ ഉപകരണത്തിന് ആശയവിനിമയം നടത്താനാകും."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"ലൊക്കേഷൻ കൃത്യത മെച്ചപ്പെടുത്താൻ, ആപ്സ്, സേവനങ്ങൾ എന്നിവയ്ക്ക് തുടർന്നും Bluetooth ഉപകരണങ്ങളെ തിരിച്ചറിയാൻ കഴിയും. നിങ്ങൾക്കിത് <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>സ്‌കാനിംഗ് ക്രമീകരണത്തിൽ<xliff:g id="LINK_END_1">LINK_END</xliff:g> മാറ്റാനാകും."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"കണക്റ്റുചെയ്യാനായില്ല. വീണ്ടും ശ്രമിക്കുക."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"ഉപകരണ വിശദാംശങ്ങൾ"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"ഉപകരണത്തിന്റെ Bluetooth വിലാസം: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"ഉപകരണം മറക്കണോ?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"നിങ്ങളുടെ ഫോൺ ഇനിയങ്ങോട്ട് <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ഉപകരണവുമായി ജോടിയാക്കുകയില്ല"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"നിങ്ങളുടെ ടാബ്‌ലെറ്റ് ഇനിയങ്ങോട്ട് <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ഉപകരണവുമായി ജോടിയാക്കുകയില്ല"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"നിങ്ങളുടെ ഉപകരണം ഇനിയങ്ങോട്ട് <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ഉപകരണവുമായി ജോടിയാക്കുകയില്ല"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"ഉപകരണം മറക്കുക"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ഇതിൽ കണക്റ്റുചെയ്യുക..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"മീഡിയ ഓഡിയോയിൽ നിന്ന് <xliff:g id="DEVICE_NAME">%1$s</xliff:g> വിച്‌ഛേദിക്കപ്പെടും."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"ഹാൻഡ്സ്ഫ്രീ ഓഡിയോയിൽ നിന്ന് <xliff:g id="DEVICE_NAME">%1$s</xliff:g> വിച്‌ഛേദിക്കപ്പെടും."</string>
@@ -778,6 +807,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"നൽകരുത്"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"മൂല്യനിർണ്ണയം ചെയ്യരുത്"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"സർട്ടിഫിക്കറ്റൊന്നും വ്യക്തമാക്കിയിട്ടില്ല. നിങ്ങളുടെ കണക്ഷൻ സ്വകാര്യമായിരിക്കുകയില്ല."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"നെറ്റ്‌വർക്കിന്റെ പേര് ദൈർഘ്യമേറിയതാണ്."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"ഒരു ഡൊമെയ്ൻ വ്യക്തമാക്കിയിരിക്കണം."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ലഭ്യമാണ്"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ലഭ്യമാണ്)"</string>
@@ -809,7 +839,6 @@
       <item quantity="one">1 നെറ്റ്‌വർക്ക്</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"വിപുലമായ വൈഫൈ"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"വൈഫൈ കോൺഫിഗർ ചെയ്യുക"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC വിലാസം"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP വിലാസം"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"സബ്‌നെറ്റ് മാസ്‌ക്"</string>
@@ -846,9 +875,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ഈ ഗ്രൂപ്പിനെ മറക്കണോ?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"പോർട്ടബിൾ വൈഫൈ ഹോട്ട്‌സ്പോട്ട്"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"വൈഫൈ ഹോട്ട്‌സ്‌പോട്ട്"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"വൈഫൈ നെറ്റ്‌വർക്ക് നൽകുന്നതിന് മൊബൈൽ കണക്ഷൻ ഉപയോഗിക്കുക"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"ഹോട്ട്‌സ്‌പോട്ട് വഴി, ഈ ടാബ്‌ലെറ്റിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുന്നില്ല"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"ഹോട്ട്‌സ്‌പോട്ട് വഴി, ഈ ഫോണിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുന്നില്ല"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"മറ്റ് ഉപകരണങ്ങളുമായി ഇന്റർനെറ്റോ ഉള്ളടക്കമോ പങ്കിടുന്നില്ല"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ഹോട്ട്‌സ്‌പോട്ട് വഴി, ഈ ടാബ്‌ലെറ്റിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുന്നു"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ഹോട്ട്‌സ്‌പോട്ട് വഴി, ഈ ഫോണിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുന്നു"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ആപ്പ് ഉള്ളടക്കം പങ്കിടുന്നു. ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുന്നതിന്, ഹോട്ട്‌സ്പോട്ട് ഓഫാക്കുക, തുടർന്ന് ഓണാക്കുക"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"വൈഫൈയുടെ പേര്"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ഓണാക്കുന്നു..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ഹോട്ട്‌സ്പോട്ടിലേക്ക് മറ്റ് ഉപകരണങ്ങൾക്ക് കണക്റ്റുചെയ്യാൻ കഴിയും"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"വൈഫൈ പാസ്‌വേഡ്"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP ബാൻഡ്"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"നിങ്ങളുടെ മറ്റ് ഉപകരണങ്ങൾക്കായി ഒരു വൈഫൈ നെറ്റ്‌വർക്ക് സൃഷ്ടിക്കുന്നതിന് ഹോട്ട്‌സ്പോട്ട് ഉപയോഗിക്കുക. ഹോട്ട്‌സ്പോട്ട് ഇന്റർനെറ്റ് നൽകുന്നത് നിങ്ങളുടെ മൊബൈൽ ഡാറ്റാ കണക്ഷൻ ഉപയോഗിച്ചുകൊണ്ടാണ്. അധിക മൊബൈൽ ഡാറ്റ നിരക്കുകൾ ബാധകമായേക്കാം."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ചുറ്റുവട്ടത്തുള്ള ഉപകരണങ്ങളുമായി ഉള്ളടക്കം പങ്കിടുന്നതിന് ആപ്പുകൾക്ക് ഹോട്ട്‌സ്പോട്ട് സൃഷ്ടിക്കാൻ കഴിയും."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"ഹോട്ട്‌സ്പോട്ട് ഓണാക്കുന്നു…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"ഹോട്ട്‌സ്പോട്ട് ഓഫാക്കുന്നു…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> സജീവമാണ്"</string>
@@ -895,6 +932,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"വൈഫൈ കോളിംഗ് ഓണായിരിക്കുമ്പോൾ, നിങ്ങളുടെ മുൻഗണനയും ഏത് സിഗ്നലാണ് ശക്തമെന്നതും അടിസ്ഥാനമാക്കി ഫോണിന് വൈഫൈ നെറ്റ്‌വർക്കോ കാരിയർ നെറ്റ്‌വർക്കോ വഴി കോളുകൾ റൂട്ട് ചെയ്യാനാകും. ഈ ഫീച്ചർ ഓണാക്കുന്നതിനുമുമ്പ്, നിരക്കുകളും മറ്റ് വിശദാംശങ്ങളും അറിയുന്നതിന് നിങ്ങളുടെ കാരിയറെ ബന്ധപ്പെടുക."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"അടിയന്തര വിലാസം അപ്ഡേറ്റുചെയ്യുക"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"വൈഫൈ ഉപയോഗിച്ച് നിങ്ങൾ 911-ലേക്ക് വിളിക്കുമ്പോൾ, ലൊക്കേഷൻ പോലുള്ള അടിയന്തര സേവനങ്ങൾ ഉപയോഗിക്കുന്ന വിലാസം"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ഡിസ്പ്ലേ"</string>
@@ -952,6 +990,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"ഫലങ്ങൾ ഇല്ല"</string>
     <string name="display_settings" msgid="7965901687241669598">"ഡിസ്പ്ലേ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"സ്‌ക്രീൻ സ്വയമേ തിരിക്കുക"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"കടും നിറങ്ങൾ"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ടാബ്‌ലെറ്റ് തിരിക്കുമ്പോൾ സ്വയമേവ ഓറിയന്റേഷൻ മാറുക"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ഫോൺ തിരിക്കുമ്പോൾ സ്വയമേവ ഓറിയന്റേഷൻ മാറുക"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"ടാബ്‌ലെറ്റ് തിരിക്കുമ്പോൾ സ്വയമേവ ഓറിയന്റേഷൻ മാറുക"</string>
@@ -979,23 +1018,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"ലഭ്യമായ പ്രകാശത്തിന് അനുസരിച്ച് തെളിച്ചം ഒപ്‌റ്റിമൈസ് ചെയ്യുക. ഈ ഫീച്ചർ ഓണായിരിക്കുമ്പോഴും താൽക്കാലികമായി തെളിച്ചം ക്രമീകരിക്കാം."</string>
     <string name="night_display_title" msgid="2626451512200357686">"നൈറ്റ് ലൈറ്റ്"</string>
     <string name="night_display_text" msgid="1837277457033025056">"നിങ്ങളുടെ സ്ക്രീനിന് \'നൈറ്റ് ലൈറ്റ്\' ആംബർ നിറം നൽകുന്നു. മങ്ങിയ വെളിച്ചത്തിൽ സ്ക്രീനിൽ നോക്കുന്നത് ഈ ഡിസ്പ്ലേ സുഗമമാക്കുന്നു, എളുപ്പത്തിൽ ഉറങ്ങുന്നതിന് ഇത് നിങ്ങളെ സഹായിച്ചേക്കാം."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"സമയക്രമം"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"നില"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"സ്വയമേവ ഓണാക്കുക"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"ഒരിക്കലും വേണ്ട"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"ഷെഡ്യൂൾ ഇഷ്‌ടാനുസൃതമാക്കുക"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"സൂര്യോദയം മുതൽ അസ്തമയം വരെ"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"സമയക്രമം"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"ഒന്നുമില്ല"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"ഇഷ്ടാനുസൃത സമയത്ത് ഓണാക്കുന്നു"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"സൂര്യോദയം മുതൽ അസ്തമയം വരെ ഓണാക്കുന്നു"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"ആരംഭിക്കുന്ന സമയം"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"അവസാനിക്കുന്ന സമയം"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"നില"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"തീക്ഷ്ണത"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"ഓഫ്. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"ഒരിക്കലും സ്വയമേവ ഓണാക്കില്ല."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g>-ന് സ്വയമേവ ഓണാക്കും."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"സൂര്യാസ്തമയ സമയത്ത് സ്വയമേവ ഓണാക്കും."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"ഓൺ. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"ഒരിക്കലും സ്വയമേവ ഓഫാക്കില്ല."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g>-ന് സ്വയമേവ ഓഫാക്കും."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"സൂര്യോദയ സമയത്ത് സ്വയമേവ ഓഫാക്കും."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"ഓഫ്/ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"ഒരിക്കലും സ്വയമേവ ഓണാക്കില്ല"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g>-ന് സ്വയമേവ ഓണാക്കും"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"സൂര്യാസ്തമയ സമയത്ത് സ്വയമേവ ഓണാക്കും"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"ഓൺ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"ഒരിക്കലും സ്വയമേവ ഓഫാക്കില്ല"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g>-ന് സ്വയമേവ ഓഫാക്കും"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"സൂര്യോദയ സമയത്ത് സ്വയമേവ ഓഫാക്കും"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"സ്ലീപ്പിലാക്കുക"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"സ്ക്രീൻ ഓഫാക്കുന്നു"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"നിഷ്ക്രിയത്വത്തിന് <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> കഴിഞ്ഞ്"</string>
@@ -1019,8 +1057,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"ക്രമീകരണം"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"യാന്ത്രിക തെളിച്ചം"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"സജീവമാക്കാൻ ലിഫ്റ്റുചെയ്യുക"</string>
-    <string name="doze_title" msgid="2259176504273878294">"അറിയിപ്പിനു സ്ക്രീൻ ഓണാക്കുക"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"അറിയിപ്പിനു സ്ക്രീൻ ഓണാക്കുക"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"എല്ലായ്‌പ്പോഴും ഓണാണ്"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"പുതിയ അറിയിപ്പുകൾ"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"കാണിക്കേണ്ട സമയം"</string>
+    <string name="doze_title" msgid="2375510714460456687">"പുതിയ അറിയിപ്പുകൾ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"നിങ്ങൾക്ക് അറിയിപ്പുകൾ ലഭിക്കുന്ന സമയത്ത് സ്ക്രീൻ സജീവമാക്കുക"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"എല്ലായ്‌പ്പോഴും ഓണാണ്"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"സമയം, അറിയിപ്പ് ഐക്കണുകൾ എന്നിവയും മറ്റ് വിവരങ്ങളും കാണിക്കുക"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ഫോണ്ട് വലുപ്പം"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ടെക്സ്റ്റ് ചെറുതോ വലുതോ ആക്കുക"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"സിം കാർഡ് ലോക്ക് ക്രമീകരണങ്ങൾ"</string>
@@ -1272,6 +1316,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN ശൂന്യമായിരിക്കരുത്."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC ഫീൽഡിൽ 3 സംഖ്യകൾ ഉണ്ടായിരിക്കണം."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC ഫീൽഡിൽ 2 അല്ലെങ്കിൽ 3 സംഖ്യകൾ ഉണ്ടായിരിക്കണം."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"%s തരത്തിലുള്ള APN-കൾ ചേർക്കുന്നത് കാരിയർ അനുവദിക്കുന്നില്ല."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"സ്ഥിര APN ക്രമീകരണങ്ങൾ പുനഃസ്ഥാപിക്കുന്നു"</string>
     <string name="menu_restore" msgid="8260067415075573273">"സ്ഥിരമായതിലേക്ക് പുനഃസജ്ജമാക്കുക"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"സ്ഥിര APN ക്രമീകരണങ്ങൾ പുനഃസജ്ജീകരിക്കൽ പൂർത്തിയാക്കി."</string>
@@ -1301,6 +1346,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD കാർഡ് മായ്ക്കുക"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"ആന്തരിക USB സംഭരണത്തിലെ സംഗീതമോ ഫോട്ടോകളോ പോലുള്ള എല്ലാ ഡാറ്റയും മായ്ക്കുക"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"സംഗീതമോ ഫോട്ടോകളോ പോലുള്ള, SD കാർഡിലെ എല്ലാ ഡാറ്റയും മായ്ക്കുക"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIMs മായ്‌ക്കുക"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"ഫോണിലെ എല്ലാ eSIM-കളും മായ്‌ക്കുക. ഇത് നിങ്ങളുടെ മൊബൈൽ സേവന പ്ലാൻ റദ്ദാക്കുകയില്ല."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"ടാബ്‌ലെറ്റിലെ എല്ലാ eSIM-കളും മായ്‌ക്കുക. ഇത് നിങ്ങളുടെ മൊബൈൽ സേവന പ്ലാൻ റദ്ദാക്കുകയില്ല."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ടാബ്‌ലെറ്റ് പുനഃസജ്ജമാക്കുക"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ഫോൺ പുനഃസജ്ജമാക്കുക"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"നിങ്ങളുടെ എല്ലാ വ്യക്തിഗത വിവരവും ഡൗൺലോഡ് ചെയ്‌ത അപ്ലിക്കേഷനുകളും മായ്‌ക്കണോ? നിങ്ങൾക്ക് ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാകില്ല!"</string>
@@ -1323,26 +1371,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ഡാറ്റ സേവർ ഓണായിരിക്കുന്ന സമയത്ത് പോർട്ടബിൾ ഹോട്ട്സ്പോട്ടുകൾ ടെതർ ചെയ്യാനോ ഉപയോഗിക്കാനോ കഴിയില്ല"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB ടെതറിംഗ്"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB കണ‌ക്റ്റുചെ‌യ്തു, ടെതറിനായി പരിശോധിക്കുക"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"ടെതർചെയ്‌തു"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USB സ്റ്റോറേജ്  ഉപയോഗത്തിലായിരിക്കുമ്പോൾ ടെതർചെയ്യാനാവില്ല"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB കണ‌ക്റ്റുചെയ്തിട്ടില്ല"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"ഓണാക്കുന്നതിന് കണ‌ക്‌റ്റുചെയ്യുക"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB ടെതറിംഗ് പിശക്"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"USB വഴിയായി ഫോണിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുക"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"USB വഴിയായി ടാബ്‌ലെറ്റിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുക"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ബ്ലൂടൂത്ത് ടെതറിംഗ്"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Bluetooth വഴി ഈ ടാബ്‌ലെറ്റിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുന്നു"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Bluetooth വഴി ഈ ഫോണിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുന്നു"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Bluetooth വഴി, ഒരു ഉപകരണവുമായി ഈ ടാബ്‌ലെറ്റിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുന്നു"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Bluetooth വഴി, ഒരു ഉപകരണവുമായി ഈ ഫോണിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുന്നു"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Bluetooth വഴി, <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ഉപകരണങ്ങളുമായി ഈ ടാബ്‌ലെറ്റിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുന്നു"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Bluetooth വഴി, <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ഉപകരണങ്ങളുമായി ഈ ഫോണിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുന്നു"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Bluetooth വഴിയായി ടാബ്‌ലെറ്റിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുക"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Bluetooth വഴിയായി ഫോണിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുക"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Bluetooth വഴി, ഈ <xliff:g id="DEVICE_NAME">%1$d</xliff:g> ഉപകരണത്തിന്റെ ഇന്റർനെറ്റ് കണ‌ക്ഷൻ പങ്കിടുന്നു"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Bluetooth വഴി, ഈ ടാബ്‌ലെറ്റിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുന്നില്ല"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Bluetooth വഴി, ഈ ഫോണിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുന്നില്ല"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"ടെതർ ചെയ്‌തിട്ടില്ല"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g>-ൽ കൂടുതൽ ഉപകരണങ്ങളിൽ ടെതർ ചെയ്യാനായില്ല."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ടെതർ ചെയ്‌തത് മാറ്റും."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"നിങ്ങളുടെ മൊബൈൽ ഡാറ്റാ കണക്ഷനിലൂടെ മറ്റ് ഉപകരണങ്ങളിലേക്ക് ഇന്റർനെറ്റ് നൽകുന്നതിന് ഹോട്ട്‌സ്പോട്ടും ‌ടെതറിംഗും ഉപയോഗിക്കുക."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"നിങ്ങളുടെ മൊബൈൽ ഡാറ്റാ കണക്ഷനിലൂടെ മറ്റ് ഉപകരണങ്ങളിലേക്ക് ഇന്റർനെറ്റ് നൽകുന്നതിന് ഹോട്ട്‌സ്പോട്ടും ‌ടെതറിംഗും ഉപയോഗിക്കുക. ചുറ്റുവട്ടത്തുള്ള ഉപകരണങ്ങളുമായി ഉള്ളടക്കം പങ്കിടുന്നതിന് ആപ്പുകൾക്കും ഹോട്ട്‌സ്പോട്ട് സൃഷ്ടിക്കാൻ കഴിയും."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"സഹായം"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"മൊബൈൽ നെറ്റ്‌വർക്ക്"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"മൊബൈൽ പ്ലാൻ"</string>
@@ -1375,7 +1412,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"ലൊക്കേഷൻ മോഡ്"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"GPS, വൈഫൈ, Bluetooth, മൊബൈൽ നെറ്റ്‌വർക്കുകൾ എന്നിവയിലൊന്ന് ലൊക്കേഷൻ നിർണ്ണയിക്കുന്നതിന് ഉപയോഗിക്കുക"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"വൈഫൈ, Bluetooth, മൊബൈൽ നെറ്റ്‌വർക്കുകൾ എന്നിവയിലൊന്ന് ലൊക്കേഷൻ നിർണ്ണയിക്കുന്നതിന് ഉപയോഗിക്കുക"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ലൊക്കേഷൻ നിർണ്ണയിക്കാൻ GPS ഉപയോഗിക്കുക"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"ലൊക്കേഷൻ നിർണ്ണയിക്കാൻ GPS-ഉം ഉപകരണ സെൻസറുകളും ഉപയോഗിക്കുക"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"സ്കാനിംഗ്"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"വൈഫൈ സ്‌കാനിംഗ്"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ഏത് സമയത്തും വൈഫൈ നെറ്റ്‌വർക്കുകളെ തിരിച്ചറിയാൻ സിസ്റ്റം ആപ്സിനെയും സേവനങ്ങളെയും അനുവദിച്ചുകൊണ്ട് ലൊക്കേഷൻ മെച്ചപ്പെടുത്തുക."</string>
@@ -1420,8 +1457,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"നിങ്ങൾക്ക് ഒരു ഡാറ്റ കണ‌ക്ഷൻ ഇല്ല. ഈ വിവരം ഇപ്പോൾ കാണുന്നതിന്, ഇന്റ‌ർനെറ്റിൽ കണ‌ക്റ്റുചെ‌യ്‌തിരിക്കുന്ന ഏതൊരു കമ്പ്യൂട്ടറിൽ നിന്നും %s എന്നതിലേക്ക് പോകുക."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ലോഡുചെയ്യുന്നു..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"പാസ്‌വേഡ് തിരഞ്ഞെടുക്കൂ"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"വിരലടയാളം ഉപയോഗിക്കാൻ, പാസ്‌വേഡ് സജ്ജമാക്കുക"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"പാറ്റേൺ തിരഞ്ഞെടുക്കൂ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"വിരലടയാളം ഉപയോഗിക്കാൻ, പാറ്റേൺ സജ്ജമാക്കുക"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"പിൻ തിരഞ്ഞെടുക്കൂ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"വിരലടയാളം ഉപയോഗിക്കാൻ, പിൻ സജ്ജമാക്കുക"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"നിങ്ങളുടെ പാസ്‌വേഡ് സ്ഥിരീകരിക്കുക"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"നിങ്ങളുടെ പാറ്റേൺ സ്ഥിരീകരിക്കുക"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"നിങ്ങളുടെ പിൻ സ്ഥിരീകരിക്കുക"</string>
@@ -1490,6 +1530,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങൾ"</string>
     <string name="install_applications" msgid="4872012136210802181">"അജ്ഞാത ഉറവിടങ്ങൾ"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"എല്ലാ അപ്ലിക്കേഷൻ ഉറവിടങ്ങളും അനുവദിക്കുക"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"ഈയടുത്ത് തുറന്ന ആപ്പുകൾ"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"എല്ലാ <xliff:g id="COUNT">%1$d</xliff:g> ആപ്പുകളും കാണൂ"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> മുമ്പ്"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"തിരിച്ചറിയാനാകാത്ത ആപ്‌സിനാൽ നിങ്ങളുടെ ടാബ്‌ലെറ്റും വ്യക്തിഗത ഡാറ്റയും ആക്രമിക്കപ്പെടാനുള്ള സാധ്യത വളരെ കൂടുതലാണ്. ഈ ഉറവിടത്തിൽ നിന്ന് ആപ്‌സ് ഇൻസ്റ്റാൾ ചെയ്യുന്നതിലൂടെ, ഈ ആപ്‌സ് ഉപയോഗിക്കുന്നതിനാൽ നിങ്ങളുടെ ടാബ്‌ലെറ്റിന് സംഭവിച്ചേക്കാവുന്ന എല്ലാ നാശനഷ്‌ടങ്ങൾക്കും അല്ലെങ്കിൽ ഡാറ്റാ നഷ്‌ടങ്ങൾക്കും നിങ്ങൾക്കാണ് ഉത്തരവാദിത്തമെന്ന് നിങ്ങൾ അംഗീകരിക്കുന്നു."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"തിരിച്ചറിയാനാകാത്ത ആപ്‌സിനാൽ നിങ്ങളുടെ ഫോണും വ്യക്തിഗത ഡാറ്റയും ആക്രമിക്കപ്പെടാനുള്ള സാധ്യത വളരെ കൂടുതലാണ്. ഈ ഉറവിടത്തിൽ നിന്ന് ആപ്‌സ് ഇൻസ്റ്റാൾ ചെയ്യുന്നതിലൂടെ, ഈ ആപ്‌സ് ഉപയോഗിക്കുന്നതിനാൽ നിങ്ങളുടെ ഫോണിന് സംഭവിച്ചേക്കാവുന്ന എല്ലാ നാശനഷ്‌ടങ്ങൾക്കും അല്ലെങ്കിൽ ഡാറ്റാ നഷ്‌ടങ്ങൾക്കും നിങ്ങൾക്കാണ് ഉത്തരവാദിത്തമെന്ന് നിങ്ങൾ അംഗീകരിക്കുന്നു."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"വിപുലമായ ക്രമീകരണം"</string>
@@ -1658,6 +1701,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"സി‌സ്റ്റം സേവനം നിർത്തണോ?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"നിങ്ങൾ ഈ സേവനം നിർത്തുകയാണെങ്കിൽ, നിങ്ങളുടെ ടാബ്‌ലെറ്റ് ഓഫാക്കി വീണ്ടും ഓണാക്കുന്നതുവരെ അതിലെ ചില സവിശേഷതകൾ ശരിയായി പ്രവർത്തിക്കുന്നത് അവസാനിപ്പിക്കാനിടയുണ്ട്."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"നിങ്ങൾ ഈ സേവനം നിർത്തുകയാണെങ്കിൽ, നിങ്ങളുടെ ഫോൺ ഓഫാക്കി വീണ്ടും ഓണാക്കുന്നതുവരെ അതിലെ ചില സവിശേഷതകൾ ശരിയായി പ്രവർത്തിക്കുന്നത് അവസാനിപ്പിക്കാനിടയുണ്ട്."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"ഭാഷയും ഇൻപുട്ടും ജെസ്‌റ്ററുകളും"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"ഭാഷകളും ഇൻപുട്ടും"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ഭാഷകളും ഇൻപുട്ടും"</string>
     <string name="input_assistance" msgid="7577795275222555487">"ഇൻപുട്ട് സഹായം"</string>
@@ -1872,6 +1919,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> പ്രിന്റ് സേവനങ്ങൾ ഓണാണ്</item>
       <item quantity="one">1 പ്രിന്റ് സേവനം ഓണാണ്</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> പ്രിന്റ് ജോലികൾ</item>
+      <item quantity="one">1 പ്രിന്റ് ജോലി</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"പ്രിന്റ് സേവനങ്ങൾ"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"സേവനങ്ങളൊന്നും ഇൻസ്റ്റാളുചെയ്‌തിട്ടില്ല"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"പ്രിന്ററുകളൊന്നും കണ്ടെത്തിയില്ല"</string>
@@ -1938,6 +1989,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"വിശദാംശം ഉപയോഗിക്കൂ"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"പവർ ഉപയോഗം ക്രമീകരിക്കുക"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"ഉൾപ്പെടുത്തിയ പാക്കേജുകൾ"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ആപ്പുകൾ ബാറ്ററി ഉപയോഗിച്ചുതീർക്കുന്നു"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"ഉപകരണം സജീവമാക്കി നിലനിർത്തുന്നു"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"പശ്ചാത്തലത്തിൽ ഉപകരണം സജീവമാക്കുന്നു"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ലൊക്കേഷൻ കൂടെക്കൂടെ അഭ്യർത്ഥിക്കുന്നു"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ആപ്പുകൾ അസ്വാഭാവികമായി പ്രവർത്തിക്കുന്നു"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"ആപ്പ് അവസാനിപ്പിക്കണോ?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"നിങ്ങളുടെ ഫോണിനെ <xliff:g id="APP">%1$s</xliff:g> സജീവമാക്കി നിലനിർത്തുന്നതിനാൽ ഫോണിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ പ്രശ്നത്തിന് പരിഹാരം കാണാൻ ശ്രമിക്കുന്നതിന് ഈ ആപ്പിനെ നിർബന്ധമായി അവസാനിപ്പിക്കുക.\n\nപ്രശ്നം നിലനിൽക്കുകയാണെങ്കിൽ, ബാറ്ററി പ്രകടനം മെച്ചപ്പെടുത്തുന്നതിന് നിങ്ങൾക്ക് ഈ ആപ്പ് അൺ‌ഇൻസ്റ്റാൾ ചെയ്യേണ്ടി വന്നേക്കാം."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"നിങ്ങളുടെ ടാബ്‌ലെറ്റിനെ <xliff:g id="APP">%1$s</xliff:g> സജീവമാക്കി നിലനിർത്തുന്നതിനാൽ ടാബ്‌ലെറ്റിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ പ്രശ്നത്തിന് പരിഹാരം കാണാൻ ശ്രമിക്കുന്നതിന് ഈ ആപ്പിനെ നിർബന്ധമായി അവസാനിപ്പിക്കുക.\n\nപ്രശ്നം നിലനിൽക്കുകയാണെങ്കിൽ, ബാറ്ററി പ്രകടനം മെച്ചപ്പെടുത്തുന്നതിന് നിങ്ങൾക്ക് ഈ ആപ്പ് അൺ‌ഇൻസ്റ്റാൾ ചെയ്യേണ്ടി വന്നേക്കാം."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"നിങ്ങളുടെ ഉപകരണത്തെ <xliff:g id="APP">%1$s</xliff:g> സജീവമാക്കി നിലനിർത്തുന്നതിനാൽ ഉപകരണത്തിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ പ്രശ്നത്തിന് പരിഹാരം കാണാൻ ശ്രമിക്കുന്നതിന് ഈ ആപ്പിനെ നിർബന്ധമായി അവസാനിപ്പിക്കുക.\n\nപ്രശ്നം നിലനിൽക്കുകയാണെങ്കിൽ, ബാറ്ററി പ്രകടനം മെച്ചപ്പെടുത്തുന്നതിന് നിങ്ങൾക്ക് ഈ ആപ്പ് അൺ‌ഇൻസ്റ്റാൾ ചെയ്യേണ്ടി വന്നേക്കാം."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"ആപ്പ് അവസാനിപ്പിക്കുക"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"പശ്ചാത്തല ഉപയോഗം ഓഫാക്കണോ?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"നിങ്ങളുടെ ഫോണിനെ <xliff:g id="APP">%1$s</xliff:g> സജീവമാക്കി നിലനിർത്തുന്നതിനാൽ ഫോണിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nപശ്ചാത്തലത്തിൽ ഈ ആപ്പ് റൺ ചെയ്യുന്നത് തടഞ്ഞുകൊണ്ട് നിങ്ങളുടെ ഫോണിന് ഈ പ്രശ്നത്തിന് പരിഹാരം കാണാൻ കഴിയും."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"നിങ്ങളുടെ ടാബ്‌ലെറ്റിനെ <xliff:g id="APP">%1$s</xliff:g> സജീവമാക്കി നിലനിർത്തുന്നതിനാൽ ടാബ്‌ലെറ്റിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nപശ്ചാത്തലത്തിൽ ഈ ആപ്പ് റൺ ചെയ്യുന്നത് തടഞ്ഞുകൊണ്ട് നിങ്ങളുടെ ടാബ്‌ലെറ്റിന് ഈ പ്രശ്നത്തിന് പരിഹാരം കാണാൻ കഴിയും."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"നിങ്ങളുടെ ഉപകരണത്തെ <xliff:g id="APP">%1$s</xliff:g> സജീവമാക്കി നിലനിർത്തുന്നതിനാൽ ഉപകരണത്തിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nപശ്ചാത്തലത്തിൽ ഈ ആപ്പ് റൺ ചെയ്യുന്നത് തടഞ്ഞുകൊണ്ട് നിങ്ങളുടെ ഉപകരണത്തിന് ഈ പ്രശ്നത്തിന് പരിഹാരം കാണാൻ കഴിയും."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"ഓഫുചെയ്യുക"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"ലൊക്കേഷൻ ഓഫാക്കണോ?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"നിങ്ങൾ <xliff:g id="APP">%1$s</xliff:g> ആപ്പ് ഉപയോഗിക്കാത്ത സമയത്തും ആപ്പ് നിങ്ങളുടെ ലൊക്കേഷൻ അഭ്യർത്ഥിച്ചുകൊണ്ടിരിക്കുന്നതിനാൽ,  ഫോണിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ ആപ്പിന്റെ ലൊക്കേഷൻ ഓഫാക്കിക്കൊണ്ട് നിങ്ങളുടെ ഫോണിന് ഈ പ്രശ്നത്തിന് പരിഹാരം കാണാൻ കഴിയും."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"നിങ്ങൾ <xliff:g id="APP">%1$s</xliff:g> ആപ്പ് ഉപയോഗിക്കാത്ത സമയത്തും ആപ്പ് നിങ്ങളുടെ ലൊക്കേഷൻ അഭ്യർത്ഥിച്ചുകൊണ്ടിരിക്കുന്നതിനാൽ,  ടാബ്‌ലെറ്റിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ ആപ്പിന് ലൊക്കേഷൻ ഓഫാക്കിക്കൊണ്ട് നിങ്ങളുടെ ടാബ്‌ലെറ്റിന് ഈ പ്രശ്നത്തിന് പരിഹാരം കാണാൻ കഴിയും."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"നിങ്ങൾ <xliff:g id="APP">%1$s</xliff:g> ആപ്പ് ഉപയോഗിക്കാത്ത സമയത്തും ആപ്പ് നിങ്ങളുടെ ലൊക്കേഷൻ അഭ്യർത്ഥിച്ചുകൊണ്ടിരിക്കുന്നതിനാൽ,  ഉപകരണത്തിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ ആപ്പിന്റെ ലൊക്കേഷൻ ഓഫാക്കിക്കൊണ്ട് നിങ്ങളുടെ ഉപകരണത്തിന് ഈ പ്രശ്നത്തിന് പരിഹാരം കാണാൻ കഴിയും."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"ഓഫുചെയ്യുക"</string>
     <string name="power_screen" msgid="3023346080675904613">"സ്‌ക്രീൻ"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"ടോർച്ച്"</string>
     <string name="power_camera" msgid="4976286950934622605">"ക്യാമറ"</string>
@@ -1952,7 +2023,7 @@
     <string name="power_apps" msgid="2043554781293951327">"ആപ്സ്"</string>
     <string name="power_service" msgid="1599661212370831780">"സേവനങ്ങള്‍"</string>
     <string name="power_system" msgid="8290455327965307383">"സിസ്റ്റം"</string>
-    <string name="power_user" msgid="1889728099253018005">"ഉപയോക്താവ്"</string>
+    <string name="power_user" msgid="3706143225319881667">"മറ്റ് ഉപയോക്താക്കൾ"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"മൊത്തം CPU ഉപയോഗം"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ഫോർഗ്രൗണ്ട്"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"സജീവമായി തുടരുക"</string>
@@ -2004,6 +2075,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"കണക്കാക്കിയ പവർ ഉപയോഗം"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> സമയം ഉപയോഗിച്ചു"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"<xliff:g id="TIME">^1</xliff:g> നേരത്തേയ്ക്ക് സജീവം"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"സ്‌ക്രീൻ ഉപയോഗം <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ആപ്പ് <xliff:g id="PERCENT">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"മൊത്തം ബാറ്ററിയുടെ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2563,7 +2635,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"പിൻ മാറ്റുക"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"അറിയിപ്പുകൾ ദൃശ്യമാക്കുക"</string>
     <string name="help_label" msgid="6886837949306318591">"സഹായവും ഫീഡ്‌ബാക്കും"</string>
-    <string name="support_summary" msgid="8276116616493882830">"സഹായ ‌ലേഖനങ്ങൾ, ഫോണിലൂടെയും ചാറ്റിലൂടെയുമുള്ള പിന്തുണ"</string>
+    <string name="support_summary" msgid="2705726826263742491">"സഹായ ലേഖനങ്ങൾ, ഫോൺ, ചാറ്റ് എന്നിവ ആരംഭിക്കുക"</string>
     <string name="user_account_title" msgid="1127193807312271167">"ഉള്ളടക്കത്തിനുള്ള അക്കൗണ്ട്"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ഫോട്ടോ ഐഡി"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"അതീവ ഗുരുതരമായ ഭീഷണികൾ"</string>
@@ -2653,9 +2725,12 @@
       <item quantity="one">മറച്ച %d ഇനം കാണിക്കുക</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"നെറ്റ്‌വർക്കും ഇന്റർനെറ്റും"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"വൈ-ഫൈ, മൊബൈൽ, ഡാറ്റ ഉപഭോഗം, ഹോട്ട്‌സ്‌പോട്ട്"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"മൊബൈല്‍"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ഡാറ്റ ഉപയോഗം"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ഹോട്ട്‌സ്‌പോട്ട്"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"കണക്‌റ്റുചെയ്ത ഉപകരണം"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, കാസ്റ്റ്, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, കാസ്‌റ്റ്"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ആപ്‌സും അറിയിപ്പുകളും"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"അനുമതികൾ, ‌ഡിഫോൾട്ട് ആപ്പുകൾ"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"ഉപയോക്താക്കളും അക്കൗണ്ടും"</string>
@@ -2708,6 +2783,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"ജെസ്‌റ്റർ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"പണമടയ്ക്കുക. ടാപ്പുചെയ്യുക, പേയ്‌മെന്റുകൾ"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ബാക്കപ്പ് ചെയ്യൂ"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"ജെസ്‌റ്റർ, അരിക്, വശം, സജീവ അരിക്, ഞെരിക്കുക, ഗ്രിപ്പ്, സഹായി, അസിസ്റ്റന്റ്, ഞെരിക്കൽ, ഞെരിക്കുക, സ്ക്യൂസ് ചെയ്യുക, സ്ക്യൂസി, സ്ക്യൂസിംഗ്, ok google, google അസിസ്റ്റന്റ്"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"ജെസ്‌റ്റർ, സജീവമാക്കുക, അറിയിപ്പുകൾ, സ്ക്രീൻ, ഡിസ്പ്ലേ, സ്ക്രീൻ ഓഫ്, സ്ക്രീൻ ഓൺ, ഞെരിക്കുക, അരിക്, സുഷുപ്തി, സുഷുപ്തിയിലാക്കുക, ഗ്രിപ്പ്"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"ജെസ്‌റ്റർ, നിശബ്ദത, സ്നൂസ്, അലാറം, ഇൻകമിംഗ് കോൾ, നിശബ്ദം, ഡിസ്പ്ലേ, ലോക്ക്‌സ്ക്രീൻ, ഞെരിക്കുക, ഗ്രിപ്പ്, അരിക്, നിർത്തുക"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"വൈഫൈ NFC ടാഗ് സജ്ജമാക്കുക"</string>
     <string name="write_tag" msgid="8571858602896222537">"റൈറ്റുചെയ്യുക"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"റൈറ്റുചെയ്യാൻ ഒരു ടാഗ് ടാപ്പുചെയ്യുക..."</string>
@@ -2790,7 +2868,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"പ്രൊഫൈൽ അറിയിപ്പുകൾ കാണിക്കുകയേ അരുത്"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"നിങ്ങളുടെ ഉപകരണം ലോക്കുചെയ്തിരിക്കുമ്പോൾ, പ്രൊഫൈൽ അറിയിപ്പുകൾ എങ്ങനെ കാണിക്കാനാണ് നിങ്ങൾ ആഗ്രഹിക്കുന്നത്?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"പ്രൊഫൈൽ അറിയിപ്പുകൾ"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"അറിയിപ്പുകൾ"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"അറിയിപ്പുകൾ"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"ആപ്പ് അറിയിപ്പുകൾ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"അറിയിപ്പ് വിഭാഗം"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"പ്രാധാന്യം"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"ആപ്പ് തീരുമാനിക്കട്ടെ"</string>
@@ -2805,6 +2884,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"അടിയന്തിരാവശ്യം"</string>
     <string name="allow_sound" msgid="1820188704793497324">"ശ‌ബ്‌ദം അനുവദിക്കുക"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"ഈ അറിയിപ്പുകൾ ശബ്ദമുണ്ടാക്കുകയോ വൈബ്രേറ്റുചെയ്യുകയോ നിലവിലെ സ്ക്രീനിലെ കാഴ്ചയിൽ കാണിക്കുകയോ അരുത്."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"താഴ്ന്ന പ്രാധാന്യം"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"ഇടത്തരം പ്രാധാന്യം"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"ഉയർന്ന പ്രാധാന്യം"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"അടിയന്തര പ്രാധാന്യം"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"അറിയിപ്പ് സഹായി"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"അറിയിപ്പ് ക്രമീകരണം"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"ഔദ്യോഗിക പ്രൊഫൈൽ അറിയിപ്പുകളിലേക്കുള്ള ആക്‌സസ്സ് ബ്ലോക്കുചെയ്‌തു"</string>
@@ -2832,8 +2915,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ചിത്രത്തിനുള്ളിൽ ചിത്രം"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"ചിത്രത്തിനുള്ളിൽ ചിത്രം അനുവദിക്കുക"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"ഈ ആപ്പ് തുറന്നിരിക്കുന്ന സമയത്തോ നിങ്ങളത് വിട്ടുകഴിഞ്ഞാലോ (ഉദാഹരണത്തിന്, ഒരു വീഡിയോ കാണുന്നത് തുടരുന്നതിന്) ഒരു ചിത്രത്തിനുള്ളിൽ ചിത്ര വിൻഡോ സൃഷ്ടിക്കാൻ ഈ ആപ്പിനെ അനുവദിക്കുക. നിങ്ങൾ ഉപയോഗിക്കുന്ന മറ്റ് ആപ്‌സിന്റെ മുകളിൽ ഈ വിൻഡോ പ്രദർശിപ്പിക്കുന്നു."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"അതെ"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"ഇല്ല"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\'ശല്യപ്പെടുത്തരുത്\' ആക്‌സസ്സ്"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ഇൻസ്റ്റാളുചെയ്‌തവയൊന്നും \'ശല്യപ്പെടുത്തരുത്\' മോഡിൽ പ്രവേശിക്കാൻ അഭ്യർത്ഥിച്ചിട്ടില്ല"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"അപ്ലിക്കേഷനുകൾ ലോഡുചെയ്യുന്നു..."</string>
@@ -2964,11 +3045,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ഈ വർക്ക് പ്രൊഫൈൽ നിയന്ത്രിക്കുന്നത്:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> നിയന്ത്രിക്കുന്നു"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(പരീക്ഷണാത്മകം)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"ഉപകരണം തിരിക്കൽ"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"സ്‌ക്രീനിന്റെ ഉള്ളടക്കങ്ങൾ തിരിക്കുക"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"പോർട്രെയ്റ്റ് കാഴ്‌ചയിൽ തുടരുക"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ലാൻഡ്‌സ്‌കേപ്പ് കാഴ്‌ചയിൽ തുടരുക"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"നിലവിലുള്ള ഓറിയന്റേഷനിൽ തുടരുക"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"സുരക്ഷിത തുടക്കം"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"തുടരുക"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"ഉപകരണം ആരംഭിക്കുന്നതിന് ‌മുമ്പ്, പിൻ ആവശ്യപ്പെടുന്ന തരത്തിൽ സജ്ജീകരിച്ചുകൊണ്ട് നിങ്ങൾക്ക് ഉപകരണത്തിന് അധിക പരിരക്ഷ നൽകാവുന്നതാണ്. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടപ്പെട്ടതോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ വിവരങ്ങൾ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കുന്നതിന് പിൻ ആവശ്യമാക്കണോ?"</string>
@@ -2976,7 +3052,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ഉപകരണം ആരംഭിക്കുന്നതിന് ‌മുമ്പ്, പാസ്‌വേഡ് ആവശ്യപ്പെടുന്ന തരത്തിൽ സജ്ജീകരിച്ചുകൊണ്ട് നിങ്ങൾക്ക് ഉപകരണത്തിന് അധിക പരിരക്ഷ നൽകാവുന്നതാണ്. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ വിവരങ്ങൾ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കുന്നതിന് പാസ്‌വേഡ് ആവശ്യമാക്കണോ&gt;"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"ഉപകരണം അൺലോക്കുചെയ്യാൻ വിരലടയാളം ഉപയോഗിക്കുന്നതിന് പുറമെ, ഉപകരണം ആരംഭിക്കുന്നതിന് ‌മുമ്പ്, പിൻ ആവശ്യപ്പെടുന്ന തരത്തിൽ സജ്ജീകരിച്ചുകൊണ്ട് നിങ്ങൾക്ക് ഉപകരണത്തിന് അധിക പരിരക്ഷ നൽകാവുന്നതാണ്. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടപ്പെട്ടതോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ വിവരങ്ങൾ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കുന്നതിന് പിൻ ആവശ്യമാക്കണോ?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"ഉപകരണം അൺലോക്കുചെയ്യാൻ വിരലടയാളം ഉപയോഗിക്കുന്നതിന് പുറമെ, ഉപകരണം ആരംഭിക്കുന്നതിന് ‌മുമ്പ്, പാറ്റേൺ ആവശ്യപ്പെടുന്ന തരത്തിൽ സജ്ജീകരിച്ചുകൊണ്ട് നിങ്ങൾക്ക് ഉപകരണത്തിന് അധിക പരിരക്ഷ നൽകാവുന്നതാണ്. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ വിവരങ്ങൾ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കുന്നതിന് പാറ്റേൺ ആവശ്യമാക്കണോ?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"ഉപകരണം അൺലോക്കുചെയ്യാൻ വിരലടയാളം ഉപയോഗിക്കുന്നതിന് പുറമെ, ഉപകരണം ആരംഭിക്കുന്നതിന് ‌മുമ്പ്, പാസ്‌വേഡ് ആവശ്യപ്പെടുന്ന തരത്തിൽ സജ്ജീകരിച്ചുകൊണ്ട് നിങ്ങൾക്ക് ഉപകരണത്തിന് അധിക പരിരക്ഷ നൽകാവുന്നതാണ്. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ വിവരങ്ങൾ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കുന്നതിന് പാസ്‌വേഡ് ആവശ്യമാക്കണോ&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"ഉപകരണം അൺലോക്കുചെയ്യാൻ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കുന്നതിന് പുറമെ, ഉപകരണം ആരംഭിക്കുന്നതിന് ‌മുമ്പ്, പാറ്റേൺ ആവശ്യപ്പെടുന്ന തരത്തിൽ സജ്ജീകരിച്ചുകൊണ്ട് നിങ്ങൾക്ക് ഉപകരണത്തിന് അധിക പരിരക്ഷ നൽകാവുന്നതാണ്. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ വിവരങ്ങൾ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കുന്നതിന് പാറ്റേൺ ആവശ്യമാക്കണോ?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"അതെ"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"ഇല്ല"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN ആവശ്യമാണോ?"</string>
@@ -3094,6 +3170,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"ബാറ്ററി ഉപഭോഗ മുന്നറിയിപ്പ്"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"ഉപകരണത്തിന്റെ മുഴുവൻ ഉപയോഗം കാണിക്കുക"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"ആപ്പ് ഉപയോഗം കാണിക്കുക"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"ഉയർന്ന ഉപയോഗം"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ആപ്പുകൾ അസ്വാഭാവികമായി പ്രവർത്തിക്കുന്നു</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> അസ്വാഭാവികമായി പ്രവർത്തിക്കുന്നു</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">ആപ്പുകൾ ബാറ്ററി ഉപയോഗിച്ചുതീർക്കുന്നു</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g>, ബാറ്ററി ഉപയോഗിച്ചുതീർക്കുന്നു</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ഓപ്റ്റിമൈസ് ചെയ്തിട്ടില്ല"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ഓപ്റ്റിമൈസ് ചെയ്തിട്ടില്ല"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ബാറ്ററി ഉപയോഗം ഓപ്റ്റിമൈസ് ചെയ്യുന്നു"</string>
@@ -3186,8 +3271,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"മറ്റ് ആപ്‌സിന് മുകളിൽ പ്രദർശിപ്പിക്കുക"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"മറ്റ് ആപ്‌സിന് മുകളിൽ പ്രദർശിപ്പിക്കാൻ <xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g> ആപ്‌സിനെ അനുവദിച്ചു"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"അനുമതിയുള്ള ആപ്സ്"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"ഉണ്ട്"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"ഇല്ല"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"അനുവദനീയം"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"അനുവദിച്ചിട്ടില്ല"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"തിരിച്ചറിയാനാകാത്ത ഉറവിടങ്ങളിൽ നിന്നുള്ള ആപ്‌സ് ഇൻസ്റ്റാൾ ചെയ്യുക"</string>
     <string name="write_settings" msgid="4797457275727195681">"സിസ്റ്റം ക്രമീകരണങ്ങൾ പരിഷ്‌ക്കരിക്കുക"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"സിസ്റ്റം ക്രമീകരണം പരിഷ്കരിക്കാൻ എഴുതുക"</string>
@@ -3277,6 +3362,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"സ്ക്രീനിന് ആംബർ ശോഭയാണുള്ളത്. എളുപ്പത്തിൽ ഉറങ്ങുന്നതിന് ഇത് നിങ്ങളെ സഹായിച്ചേക്കാം."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"നിര്‍ദ്ദേശങ്ങള്‍"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> കൂടുതൽ"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> നിർദ്ദേശങ്ങൾ</item>
+      <item quantity="one">1 നിർദ്ദേശം</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> നിർദ്ദേശങ്ങൾ</item>
+      <item quantity="one"> +1 നിർദ്ദേശം</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"നീക്കംചെയ്യുക"</string>
     <string name="color_temperature" msgid="2070126836910615605">"തണുത്ത വർണ്ണ താപനില"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"കൂടുതൽ തണുത്ത ഡിസ്പ്ലേ വർണ്ണങ്ങൾ ഉപയോഗിക്കുക"</string>
@@ -3295,8 +3389,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> ഡാറ്റാ മുന്നറിയിപ്പ്"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> ഡാറ്റാ മുന്നറിയിപ്പ് / <xliff:g id="ID_2">%2$s</xliff:g> ഡാറ്റാ പരിധി"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"ബില്ലിംഗ് കാലയളവ്"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"ഓരോ മാസത്തിന്റെയും <xliff:g id="ID_1">%1$s</xliff:g>-നാണ് പ്രതിമാസ സൈക്കിൾ ആരംഭിക്കുന്നത്"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"പ്രതിമാസ സൈക്കിൾ, <xliff:g id="ID_1">%1$s</xliff:g>-ന് ആരംഭിക്കുന്നു"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"എല്ലാ മാസവും <xliff:g id="ID_1">%1$s</xliff:g>-മത്തെ ദിവസം"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"നെറ്റ്‌വർക്ക് നിയന്ത്രണം"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> നിയന്ത്രണങ്ങൾ</item>
@@ -3316,7 +3409,7 @@
       <item quantity="one">ഡാറ്റ സേവർ ഓണായിരിക്കുമ്പോൾ, പരിധിയില്ലാതെ ഡാറ്റ ഉപയോഗിക്കുന്നത് ഒരു ആപ്പിനെ അനുവദിച്ചു</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"ഡാറ്റ സേവർ"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"ഇഷ്ടം പോലെ ഡാറ്റ"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"നിയന്ത്രണമില്ലാത്ത ഡാറ്റ"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"പശ്ചാത്തല ഡാറ്റ ഓഫാക്കി"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"ഓൺ"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"ഓഫ്"</string>
@@ -3380,8 +3473,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"ലോക്ക് സ്ക്രീൻ അറിയിപ്പുകൾ നിയന്ത്രിക്കുക"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"അറിയിപ്പ് ഉള്ളടക്കം കാണിക്കുക അല്ലെങ്കിൽ മറയ്ക്കുക"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"എല്ലാം"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"പിന്തുണ"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"സഹായവും ‌നുറുങ്ങുകളും"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ഏറ്റവും ചെറിയ വീതി"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ഇൻസ്റ്റാൾ ചെയ്തിട്ടുള്ള ആപ്സൊന്നും പ്രീമിയം SMS ആക്‌സസ് അഭ്യർത്ഥിച്ചിട്ടില്ല"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"പ്രീമിയം SMS-ന് നിങ്ങൾ പണം നൽകേണ്ടി വന്നേക്കാം, കാരിയറുടെ ബില്ലിലേക്ക് ഈ തുക ചേർക്കുന്നതാണ്. നിങ്ങളൊരു ആപ്പിന് അനുമതി പ്രവർത്തനക്ഷമമാക്കുന്നുവെങ്കിൽ, ആ ആപ്പ് ഉപയോഗിച്ച് പ്രീമിയം SMS അയയ്ക്കാനാകും."</string>
@@ -3446,28 +3538,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"സ്വയമേവ"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"മാനുവൽ"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"ഇപ്പോൾ ഇടം സൃഷ്ടിക്കുക"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"ജെസ്‌റ്ററുകൾ"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"ജെസ്‌റ്റർ കുറുക്കുവഴികൾ"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"നിങ്ങളുടെ ഫോൺ നിയന്ത്രിക്കുന്നതിനുള്ള ദ്രുത ജെസ്റ്ററുകൾ"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"നിങ്ങളുടെ ടാബ്‌ലെറ്റ് നിയന്ത്രിക്കുന്നതിനുള്ള അതിവേഗ ജെസ്റ്ററുകൾ"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"നിങ്ങളുടെ ഉപകരണം നിയന്ത്രിക്കുന്നതിനുള്ള അതിവേഗ ജെസ്റ്ററുകൾ"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"ക്യാമറയിലേക്ക് മാറുക"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"ക്യാമറ വേഗത്തിൽ തുറക്കുന്നതിന്, പവർ ബട്ടൺ രണ്ടുതവണ ടാപ്പുചെയ്യുക. ഏത് സ്ക്രീനിലും പ്രവർത്തിക്കും."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"അതിവേഗം ക്യാമറ തുറക്കുക"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"ക്യാമറ തുറക്കുന്നതിന് പവർ ബട്ടണിൽ രണ്ടുതവണ അമർത്തുക"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ക്യാമറ ഫ്ലിപ്പുചെയ്യുക"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"അതിവേഗം സെൽഫികൾ എടുക്കുക"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"സെൽഫി മോഡിന് ഫോൺ രണ്ടുതവണ തിരിക്കുക"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"സെൽഫി മോഡിന് ടാബ്‌ലെറ്റ് രണ്ടുതവണ തിരിക്കുക"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"സെൽഫി മോഡിന് ഉപകരണം രണ്ടുതവണ തിരിക്കുക"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"ഫോൺ പരിശോധിക്കുന്നതിന്, രണ്ടുതവണ ടാപ്പുചെയ്യുക"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ടാബ്‌ലെറ്റ് പരിശോധിക്കുന്നതിന്, രണ്ടുതവണ ടാപ്പുചെയ്യുക"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"ഉപകരണം പരിശോധിക്കുന്നതിന്, രണ്ടുതവണ ടാപ്പുചെയ്യുക"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"അറിയിപ്പുകൾ വേഗത്തിൽ പരിശോധിക്കുന്നതിന്, സ്ക്രീനിൽ രണ്ടുതവണ ടാപ്പുചെയ്യുക."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"സമയം, അറിയിപ്പ് ഐക്കണുകൾ, മറ്റ് വിവരങ്ങൾ എന്നിവ നോക്കുന്നതിന്, സ്ക്രീനിൽ രണ്ടുതവണ ടാപ്പുചെയ്യുക."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"സ്ക്രീൻ ഓഫായിരിക്കുമ്പോൾ അറിയിപ്പുകൾ പരിശോധിക്കുക"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"പരിശോധിക്കാൻ ഫോണുയർത്തുക"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"പരിശോധിക്കുന്നതിന് ടാബ്‌ലെറ്റ് എടുത്തുയർത്തുക"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"പരിശോധിക്കുന്നതിന് ഉപകരണം എടുത്തുയർത്തുക"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"അറിയിപ്പുകൾ വേഗത്തിൽ പരിശോധിക്കുന്നതിന്, നിങ്ങളുടെ ഫോൺ കയ്യിലെടുക്കുക."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"അറിയിപ്പുകൾ വേഗത്തിൽ പരിശോധിക്കുന്നതിന്, നിങ്ങളുടെ ടാബ്‌ലെറ്റ് കയ്യിലെടുക്കുക."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"അറിയിപ്പുകൾ വേഗത്തിൽ പരിശോധിക്കുന്നതിന്, നിങ്ങളുടെ ഉപകരണം കയ്യിലെടുക്കുക."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"സമയം, അറിയിപ്പ് ഐക്കണുകൾ, മറ്റ് വിവരങ്ങൾ എന്നിവ നോക്കുന്നതിന്, ഫോൺ കയ്യിലെടുക്കുക."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"സമയം, അറിയിപ്പ് ഐക്കണുകൾ, മറ്റ് വിവരങ്ങൾ എന്നിവ നോക്കുന്നതിന്, ടാബ്‌ലെറ്റ് കയ്യിലെടുക്കുക."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"സമയം, അറിയിപ്പ് ഐക്കണുകൾ, മറ്റ് വിവരങ്ങൾ എന്നിവ നോക്കുന്നതിന്, ഫോൺ കയ്യിലെടുക്കുക."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"സ്ക്രീൻ ഓഫായിരിക്കുമ്പോൾ അറിയിപ്പുകൾ പരിശോധിക്കുക"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"അറിയിപ്പുകൾക്ക് വിരലടയാളം സ്വൈപ്പുചെയ്യുക"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"നിങ്ങളുടെ അറിയിപ്പുകൾ പരിശോധിക്കാൻ ഫോണിന്റെ പിൻവശത്തുള്ള വിരലടയാള സെൻസറിൽ താഴേക്ക് സ്വൈപ്പുചെയ്യുക."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"നിങ്ങളുടെ അറിയിപ്പുകൾ പരിശോധിക്കാൻ, ടാബ്‌ലെറ്റിന്റെ പിൻവശത്തുള്ള വിരലടയാള സെൻസറിൽ താഴേക്ക് സ്വൈപ്പുചെയ്യുക."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"നിങ്ങളുടെ അറിയിപ്പുകൾ പരിശോധിക്കാൻ, ഉപകരണത്തിന്റെ പിൻവശത്തുള്ള വിരലടയാള സെൻസറിൽ താഴേക്ക് സ്വൈപ്പുചെയ്യുക."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"അറിയിപ്പുകൾ വേഗത്തിൽ കാണുക"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"വിരലടയാള സെൻസറിൽ താഴേക്ക് സ്വൈപ്പുചെയ്യുക"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"ക്യാമറ തുറക്കാൻ ഫോൺ ഉയർത്തുക"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"ക്യാമറ സ്വയമേവ തുറക്കാൻ, ഫോൺ ഫോട്ടോ എടുക്കുന്ന രീതിയിൽ (ലാൻഡ്‌സ്‌കേപ്പ് അല്ലെങ്കിൽ പോർട്രെയ്‌റ്റ്) ഉയർത്തിപ്പിടിക്കുക. നിങ്ങളുടെ ഫോൺ സുഷുപ്‌തിയിലായിരിക്കുമ്പോഴോ ലോക്കുചെയ്‌തിരിക്കുമ്പോഴോ ഇത് പ്രവർത്തിക്കുന്നു."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"ഫോൺ സുഷുപ്‌തിയിലായിരിക്കുമ്പോഴോ ലോക്കുചെയ്തിരിക്കുമ്പോഴോ ഫോട്ടോകൾ എടുക്കുക"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"ജെസ്‌റ്റർ സഹായം"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"സെന്‍‌സിറ്റിവിറ്റി"</string>
@@ -3571,6 +3676,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"ഈ ഇൻസ്റ്റന്റ് ആപ്പ് നീക്കംചെയ്യാൻ ആഗ്രഹിക്കുന്നുണ്ടോ?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"ഗെയിമുകള്‍"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ഓഡിയോ ഫയലുകള്‍‌"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"ഉപയോഗിച്ച ഇടം"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> എന്നയാൾക്ക് ‌അൺഇൻസ്റ്റാൾചെയ്തു)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> എന്നയാൾക്ക് കാണാനാവില്ല)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"സ്വയമേവ പൂരിപ്പിക്കൽ സേവനം"</string>
@@ -3584,5 +3690,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"ഇൻസ്‌റ്റന്റ് ആപ്പ്"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"സ്റ്റോറേജ് ​​മാനേജർ ഓഫാക്കണോ?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"സിനിമ, ടിവി ആപ്പുകൾ"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"ഉപയോഗിച്ച ഇടം"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"കാരിയര്‍ പ്രൊവിഷനിംഗ് വിവരം"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"കാരിയർ പ്രൊവിഷനിംഗ് തുടങ്ങുക"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"പുതിയതും ആവേശമുണർത്തുന്നതും എന്തൊക്കെയാണ്?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"പ്രധാന 5 ഫീച്ചറുകൾ പരിശോധിക്കുക"</string>
 </resources>
diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml
index 32550f5..039d16a 100644
--- a/res/values-mn/arrays.xml
+++ b/res/values-mn/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Сайн"</item>
     <item msgid="8986346415847956850">"Маш сайн"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Байнга"</item>
-    <item msgid="844721238536786870">"Зөвхөн залгасан үед"</item>
-    <item msgid="1986753720941888596">"Хэзээ ч үгүй"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Байнга"</item>
-    <item msgid="7433294150916905997">"Зөвхөн залгасан үед"</item>
-    <item msgid="1390404486722375028">"Хэзээ ч үгүй"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Сүүлийн 30 өдөр"</item>
     <item msgid="6600989128423965319">"Ашиглалтын циклийг тохируулах..."</item>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 1545dcf..d3f1c9a 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Та одоо хөгжүүлэгч боллоо!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Шаардлагагүй, та аль хэдийн хөгжүүлэгч болсон."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Эхлээд хөгжүүлэгчийн сонголтыг идэвхжүүлнэ үү."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Утасгүй &amp; сүлжээ"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Холболтууд"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Төхөөрөмж"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE хэлбэрт оруулсан"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Видео дуудлагыг бэлтгэсэн"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi дуудлагыг бэлтгэсэн"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presence-г бэлтгэсэн"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Мобайл радио цахилгаан"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM хаягийн лавлахыг харах"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Тогтвортой залгах дугаарыг харах"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Төхөөрөмжүүдийг скан хийх"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Энэ төхөөрөмжийг дахин нэрлэх"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Нэр солих"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Салгах уу?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Энэ таныг дараах холболтоос салгах болно:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Төхөөрөмжийг салгах уу?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Таны утас <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-с сална."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Таны таблет <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-с сална."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Таны төхөөрөмж <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-с сална."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Салгах"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Танд Bluetooth тохиргоог өөрчлөх зөвшөөрөл байхгүй байна."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Шинэ төхөөрөмж холбох"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> нь Bluetooth асаалттай үед ойрхон байгаа бусад төхөөрөмжүүдэд харагдана."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Утасны Bluetooth хаяг: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Таблетын Bluetooth хаяг: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Төхөөрөмжийн Bluetooth хаяг: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-г салгах уу?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Цацалт"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Профайлыг идэвхгүйжүүлэх үү?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth хослуулах хүсэлт"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Хослуулах хүсэлт"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-тай хослохын тулд дарна уу."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Хүлээн авсан файлуудыг харуулах"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Ирсэн файл"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth төхөөрөмж сонгох"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> Bluetooth-г асаах хүсэлтэй байна"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> Bluetooth-г унтраах хүсэлтэй байна"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s таны зурвасуудад хандалт хийх хүсэлтэй байна. %2$s-д хандалт хийхийг зөвшөөрөх үү?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"СИМ хандалтын хүсэлт"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> нь таны СИМ картанд хандах хүсэлтэй байна. СИМ картанд хандалтыг нээж өгснөөр холболтын хугацааны туршид төхөөрөмжийн дата холболтыг идэвхгүй болгоно. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>-д хандалтыг нээх"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Бусад төхөөрөмжид <xliff:g id="DEVICE_NAME">^1</xliff:g>-р харагдана"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Таны төхөөрөмж"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Шинэ төхөөрөмж холбох"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Огноо &amp; цаг"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Цагийн бүсийг сонгоно уу"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Бүртгэл"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Байршил"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Бүртгэл"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Аюулгүй байдал, байршил"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Аюулгүй байдал &amp; байршил"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифр, мандат үнэмлэх"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Утсыг кодолсон"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Төхөөрөмж шифрлэсэн"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Хурууны хээгээр түгжээ тайлах"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Хурууныхаа хээг ашиглах"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Утасныхаа түгжээг тайлах, худалдан авалт хийх болон апп-д нэвтрэхдээ хурууны хээний мэдрэгчид хүрэхэд хангалттай. Та хурууных нь хээг нэмэх хүнээ болгоомжтой сонгоно уу. Таны нэмсэн ганц л хурууны хээгээр дээрх үйлдлийг хийх боломжтой.\n\nСанамж: Таны хурууны хээ нь хэцүү зурган түгжээ, эсвэл ПИН-с хамгаалалт муутай байдаг."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Худалдан авалтыг баталгаажуулах, апп-д нэвтрэх бол хурууны хээ мэдрэгчийг дарна уу. Хурууных нь хээг нэмсэн дурын хүн дээрх үйлдлийг хийх боломжтой тул нэмэх хүнээ хянамгай сонгоно уу.\n\nСанамж: Та энэ төхөөрөмжийн түгжээг хурууны хээгээр тайлах боломжгүй. Дэлгэрэнгүй мэдээлэл авахын тулд байгууллагынхаа админтай холбогдоно уу."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Утасныхаа түгжээг тайлах, худалдан авалт баталгаажуулах болон апп-д нэвтрэхдээ хурууны хээ мэдрэгчид хүрэхэд хангалттай. Та хурууных нь хээг нэмэх хүнээ болгоомжтой сонгоно уу. Хурууны хээг нь нэмсэн дурын хүн дээрх үйлдлийг хийх боломжтой.\n\nСанамж: Таны хурууны хээ нь хэцүү зурган түгжээ, эсвэл ПИН-с хамгаалалт муутай байдаг."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Утасныхаа түгжээг тайлах, худалдан авалт зөвшөөрөхийн тулд хурууны хээгээ ашиглана уу.\n\nСанамж: Та хурууны хээгээр энэ төхөөрөмжийн түгжээг тайлах боломжгүй. Дэлгэрэнгүй мэдээлэл авахын тулд байгууллагынхаа админтай холбогдоно уу."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Утасныхаа түгжээг тайлах, худалдан авалт зөвшөөрөхөд хурууны хээгээ ашиглана уу.\n\nСанамж: Таны хурууны хээ нь хүчтэй зурган түгжээ эсвэл PIN-с хамгаалалт муутай байж болзошгүй."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Цуцлах"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Үргэлжлүүлэх"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Алгасах"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Хурууны хээ нэмэх"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Төхөөрөмжийн хамгаалалтын функц идэвхжихгүй. Энэ таблетийг алга болгох, хулгайд алдах эсвэл мэдээлэл нь устсан тохиолдолд та уг таблетийг бусад этгээд ашиглахаас сэргийлж чадахгүй."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Төхөөрөмжийн хамгаалалтын функц идэвхжихгүй. Энэ төхөөрөмжийг алга болгох, хулгайд алдах эсвэл мэдээлэл нь устсан тохиолдолд та уг төхөөрөмжийг бусад этгээд ашиглахаас сэргийлж чадахгүй."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Төхөөрөмжийн хамгаалалтын функц идэвхжихгүй. Энэ утсыг алга болгох, хулгайд алдах эсвэл мэдээлэл нь устсан тохиолдолд та уг утсыг бусад этгээд ашиглахаас сэргийлж чадахгүй."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Төхөөрөмжийн хамгаалалтын тохиргоо идэвхжихгүй. Энэ тaблетыг алга болгосон, эсвэл хулгайд алдсан тохиолдолд та уг таблетийг бусад этгээд ашиглахаас сэргийлж чадахгүй."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Төхөөрөмжийн хамгаалалтын тохиргоо идэвхжихгүй. Энэ төхөөрөмжийг алга болгосон, эсвэл хулгайд алдсан тохиолдолд та уг төхөөрөмжийг бусад этгээд ашиглахаас сэргийлж чадахгүй."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Төхөөрөмжийн хамгаалалтын тохиргоо идэвхжихгүй. Энэ утсыг aлга болгосон, эсвэл хулгайд алдсан тохиолдолд та уг утсыг бусад этгээд ашиглахаас сэргийлж чадахгүй."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Дараагийн"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Төхөөрөмжийн хамгаалалтын онцлогийг асаахгүй. Та таблетаа гээсэн,  хулгайд алдсан эсвэл сэргээсэн тохиолдолд үүнийг хэн нэгэн этгээд ашиглахаас сэргийлэх боломжгүй."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Төхөөрөмжийн хамгаалалтын онцлогийг асаахгүй. Та төхөөрөмжөө гээсэн, хулгайд алдсан эсвэл сэргээсэн тохиолдолд үүнийг хэн нэгэн этгээд ашиглахаас сэргийлэх боломжгүй."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Төхөөрөмжийн хамгаалалтын онцлогийг асаахгүй. Та утсаа гээсэн, хулгайд алдсан эсвэл сэргээсэн тохиолдолд үүнийг хэн нэгэн этгээд ашиглахаас сэргийлэх боломжгүй."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Төхөөрөмжийн хамгаалалтын онцлогийг асаахгүй. Та таблетаа гээсэн эсвэл хулгайд алдсан тохиолдолд үүнийг хэн нэгэн этгээд ашиглахаас сэргийлэх боломжгүй."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Төхөөрөмжийн хамгаалалтын онцлогийг асаахгүй. Та төхөөрөмжөө гээсэн эсвэл хулгайд алдсан тохиолдолд үүнийг хэн нэгэн этгээд ашиглахаас сэргийлэх боломжгүй."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Төхөөрөмжийн хамгаалалтын онцлогийг асаахгүй. Та утсаа гээсэн эсвэл хулгайд алдсан тохиолдолд үүнийг хэн нэгэн этгээд ашиглахаас сэргийлэх боломжгүй."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Хэдийд ч алгасах"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Буцах"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Мэдрэгч хай"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Утасныхаа ард хурууны хээ мэдрэгчийг байршуул"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Мэдрэгчид хүрнэ үү"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Мэдрэгч таны утасны ард байдаг. Долоовор хуруугаа ашиглана уу."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Төхөөрөмж болон хурууны хээний мэдрэгчийн байршлын зураг"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Нэр"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ТИЙМ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Устгах"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Эхэлцгээе"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Мэдрэгчид хүрнэ үү"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Мэдрэгч дээр хуруугаа тавиад, чичиргээ мэдрэгдэхэд аваарай"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Үргэлжлүүлээд байгаарай"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Хурууны хээгээ бүрэн гаргахын тулд хуруугаа удаанаар хөдөлгөнө үү."</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Хурууны хээ нэмсэн!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Энэ тэмдэг гарч ирэхэд та өөрийн хурууны хээг оруулах, худалдан авалтыг зөвшөөрөх боломжтой болно."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Утсаа сэрээх, түгжээг тайлахдаа хурууны хээ мэдрэгчид хүрээрэй."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Та энэ дүрс тэмдгийг харснаар худалдан авалт баталгаажуулах, эсвэл апп-д нэвтрэх боломжтой."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Хуруугаа өргөөд, дахин хүрнэ үү"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Хурууныхаа хээг бүрэн гаргахын тулд хуруугаа өргөсөн хэвээр байлгана уу"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Хурууны хээ нэмсэн"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Та энэ дүрс тэмдгийг харсан үедээ өөрийгөө мөн болохыг баталгаажуулах, худалдан авалтыг зөвшөөрөхийн тулд хурууны хээгээ ашиглана уу."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Хурууны хээн тохиргоог алгасах уу?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Та утасны түгжээг тайлах нэг хувилбараар хурууны хээн тохиргоог сонголоо. Хэрэв та одоо алгасвал энэ тохиргоог дараа хийх шаардлагатай болно. Тохиргоо хийхэд хэдхэн хором шаардлагатай."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Дэлгэцийн түгжээ тохируулах"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Гүйцэтгэв"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Уучлаарай, энэ мэдрэгч биш байна"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Төхөөрөмж дээрээ хурууны хээ мэдрэгчээ ашиглана уу"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Утасныхаа ар талын мэдрэгчид хүрнэ үү. Долоовор хуруугаа ашиглана уу."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Бүртгэлийг гүйцэт хийж чадсангүй"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Хурууны хээ оруулах хугацаа өнгөрсөн байна. Дахин оруулна уу."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Хурууны хээг оруулж чадсангүй. Дахин оролдох, эсвэл өөр хуруу ашиглана уу."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Төхөөрөмжийн хамгаалалтын функцийг идэвхжүүлж хэн нэгэн таны зөвшөөрөлгүйгээр энэ төхөөрөмжийг ашиглахаас сэргийлнэ үү. Өөрийн ашиглахыг хүссэн дэлгэцийн түгжээг сонгоно уу."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Төхөөрөмжийн хамгаалалтын функцийг идэвхжүүлж хэн нэгэн таны зөвшөөрөлгүйгээр энэ утсыг ашиглахаас сэргийлнэ үү. Өөрийн ашиглахыг хүссэн дэлгэцийн түгжээг сонгоно уу."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Дэлгэц түгжих нөөц аргачлалаа сонгох"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Дэлгэцийн түгжээний сонголт"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Дэлгэцийн түгжээний сонголт"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Дэлгэцийн түгжээ"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Идэвхгүй болсны дараа нэн даруй"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"идэвхгүй болсны <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g>-н дараа <xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Тайлах хээг өөрчлөх"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Тайлах PIN өөрчлөх"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Тайлах нууц үгийг өөрчлөх"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Дахин оролдоно уу. Оролдого <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>-н <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Сүүлийн оролдлого"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Хэрэв та энэ оролдлогоор ажлын зурган түгжээг буруу оруулвал, таны ажлын профайл болон үүнтэй холбогдох өгөгдөл энэ төхөөрөмжөөс устах болно."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Хэрэв та энэ оролдлогоор ажлын PIN-г буруу оруулвал, таны ажлын профайл болон үүнтэй холбогдох өгөгдөл энэ төхөөрөмжөөс устах болно."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Хэрэв та энэ оролдлогоор ажлын нууц үгээ буруу оруулвал, таны ажлын профайл болон үүнтэй холбогдох өгөгдөл энэ төхөөрөмжөөс устах болно."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Хэт олон удаагийн буруу оролдлого. Таны ажлын профайл болон үүнтэй холбогдох өгөгдөл энэ төхөөрөмжөөс устах болно."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Хаах"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Дахин оролдоно уу. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>-с <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> оролдлого үлдсэн байна."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Таны өгөгдлийг устгах болно"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Та дараагийн оролдлогоор буруу загвар оруулбал энэ төхөөрөмжийн өгөгдлийг устгах болно"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Та дараагийн оролдлогоор буруу ПИН оруулбал энэ төхөөрөмжийн өгөгдлийг устгах болно"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Та дараагийн оролдлогоор буруу нууц үг оруулбал энэ төхөөрөмжийн өгөгдлийг устгах болно"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Та дараагийн оролдлогоор буруу загвар оруулбал энэ хэрэглэгчийг устгах болно"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Та дараагийн оролдлогоор буруу ПИН оруулбал энэ хэрэглэгчийг устгах болно"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Та дараагийн оролдлогоор буруу нууц үг оруулбал энэ хэрэглэгчийг устгах болно"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Та дараагийн оролдлогоор буруу загвар оруулбал таны ажлын профайлыг үүний өгөгдлийн хамтаар устгах болно"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Та дараагийн оролдлогоор буруу ПИН оруулбал таны ажлын профайлыг үүний өгөгдлийн хамтаар устгах болно"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Та дараагийн оролдлогоор буруу нууц үг оруулбал таны ажлын профайлыг үүний өгөгдлийн хамтаар устгах болно"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Түгжээг хэт олон удаа буруу оруулсан тул энэ төхөөрөмжийн өгөгдлийг устгах болно."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Түгжээг хэт олон удаа буруу оруулсан тул энэ хэрэглэгчийг устгах болно."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Түгжээг хэт олон удаа буруу оруулсан тул энэ ажлын профайлыг үүний өгөгдлийн хамтаар устгах болно."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Хаах"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Хамгийн багадаа <xliff:g id="COUNT">%d</xliff:g> тэмдэгт байх шаардлагатай"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"ПИН хамгийн багадаа <xliff:g id="COUNT">%d</xliff:g> цифртэй байх шаардлагатай"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Үргэлжлүүлэх"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth дэлгэрэнгүй"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetoothийг идэвхжүүлсэн үед таны төхөөрөмж ойролцоо байгаа Bluetooth төхөөрөмжүүдтэй холбогдох боломжтой болно."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Байршлын нарийвчлалыг сайжруулахын тулд системийн апп болон үйлчилгээ нь Bluetooth төхөөрөмжийг илрүүлэх боломжтой. Ta үүнийг <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>Хайлт хийх тохиргоо<xliff:g id="LINK_END_1">LINK_END</xliff:g> дотроос өөрчилж болно."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Холбогдож чадсангүй. Дахин оролдоно уу."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Төхөөрөмжийн дэлгэрэнгүй мэдээлэл"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Төхөөрөмжийн Bluetooth хаяг: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Төхөөрөмжийг мартах уу?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Tаны утас <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-с сална"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Таны таблет <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-с сална"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Таны төхөөрөмж <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-с сална"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Төхөөрөмжийг мартах"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Холбох…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> медиа аудиогоос салгагдах болно."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> нь гар чөлөөтэй аудиогоос салгагдах болно."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"\"Бүү олго\""</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Хүчин төгөлдөр бүү болго"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Ямар ч сертификат заагаагүй байна. Таны холболт хувийн биш байх болно."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Сүлжээний нэр хэтэрхий урт байна."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Домэйн зааж өгөх шаардлагатай."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS боломжтой"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS боломжтой)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 сүлжээ</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi‑Fi дэлгэрэнгүй"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wi-Fi оновчлох"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC хаяг"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP хаяг"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet маск"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Энэ бүлгэмийг устгах уу?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Зөөврийн Wi‑Fi сүлжээний цэг"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi хотспот"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Wi‑Fi сүлжээг хангахын тулд мобайл холболт ашиглах"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Энэ таблетын интернэт холболтыг сүлжээний цэгээр хуваалцаагүй"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Энэ утасны интернэт холболтыг сүлжээний цэгээр хуваалцаагүй"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Интернэт эсвэл агуулгыг бусад төхөөрөмжтэй хуваалцаагүй"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Энэ таблетын интернэт холболтыг сүлжээний цэгээр хуваалцаагүй"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Энэ утасны интернэт холболтыг сүлжээний цэгээр хуваалцаагүй"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Апп агуулга хуваалцаж байна. Интернэт холболтыг хуваалцахын тулд сүлжээний цэгийг унтрааж дахин асаана уу"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi-н нэр"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-г асааж байна..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Бусад төхөөрөмж <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-д холбогдох боломжтой"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi нууц үг"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Бусад төхөөрөмждөө Wi‑Fi холболт үүсгэхийн тулд сүлжээний цэгийг ашиглана уу. Сүлжээний цэг нь таны мобайл датаны холболтоор интернэтэд холбогдоно. Мобайл датаны нэмэлт төлбөр гарна."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Апп ойролцоох төхөөрөмжтэй агуулга хуваалцахын тулд сүлжээний цэг үүсгэх боломжтой."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Сүлжээний цэгийг асааж байна…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Сүлжээний цэгийг унтрааж байна…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> идэвхтэй байна"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi дуудлага асаалттай байгаа үед таны сонголт болон аль дохио илүү хүчтэй байгаагаас шалтгаалан Wi-Fi сүлжээ болон таны операторын сүлжээгээр дамжуулан таны утас дуудлагуудыг хянаж дамжуулна. Энэ горимыг асаахаасаа өмнө өөрийнхөө операторын төлбөр болон бусад дэлгэрэнгүй мэдээллүүдийг шалгаж үзээрэй."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Онцгой байдлын хаягийг шинэчлэх"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"WiFi-р 911-н дуудлага хийх үед яаралтай тусламжийн үйлчилгээнийхнээс танд тусламж үзүүлэх байршлын хаяг"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дэлгэц"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Илэрц алга"</string>
     <string name="display_settings" msgid="7965901687241669598">"Дэлгэц"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Дэлгэцийг автоматаар эргүүлэх"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Тод өнгө"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Таблетыг эргүүлбэл харагдацыг автоматаар эргүүлэх"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Утсыг эргүүлбэл харагдацыг автоматаар эргүүлэх"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Таблетыг эргүүлбэл харагдацыг автоматаар эргүүлэх"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Боломжит гэрэлд тохируулан гэрэлтүүлгийг зохицуулна. Энэ онцлог асаалттай үед та гэрэлтүүлгийг түр хугацаанд тохируулах боломжтой."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Шөнийн гэрэл"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Шөнийн гэрэл нь таны дэлгэцийг улбар шар туяатай болгодог. Дэлгэцээ бүдэг гэрэлтэй үед харах, уншихад илүү хялбар болохоос гадна энэ нь танд хурдан унтахад тусална."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Хуваарь"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Төлөв"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Автоматаар асаах"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Хэзээ ч үгүй"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Хуваарийг өөрчлөх"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Нар мандахаас нар жаргах хүртэл"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Хуваарь"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Аль нь ч биш"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Тохируулсан хугацаанд асна"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Нар мандахаас жаргах хүртэл асна"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Эхлэх цаг"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Дуусах цаг"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Төлөв"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Нэвчилт"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Унтраалттай. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Хэзээ ч автоматаар асахгүй."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g>-д автоматаар асна."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Нар жаргахад автоматаар асна."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Асаалттай. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Хэзээ ч автоматаар унрахгүй."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g>-д автоматаар унтарна."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Нар мандахад автоматаар унтарна."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Унтраасан / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Огт автоматаар асахгүй"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g>-д автоматаар асна"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Нар жаргахад автоматаар асна"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Асаалттай / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Огт автоматаар унтрахгүй"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g>-д автоматаар унтарна"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Нар мандахад автоматаар унтарна"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Идэвхгүй"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Дэлгэц унтарна"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Идвэхгүй <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> болсны дараа"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Тохиргоо"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автомат гэрэлтүүлэг"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Сэрээхийн тулд өргөх"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Орчинтой тохирсон дэлгэц"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Идэвхгүй дэлгэц"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Байнга асаалттай"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Шинэ мэдэгдэл"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Хэзээ харуулах вэ"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Шинэ мэдэгдэл"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Дэлгэцийг мэдэгдэл авсан үедээ сэрээх"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Байнга асаалттай"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Цаг, мэдэгдлийн дүрс тэмдэг, бусад мэдээллийг харуулах"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Фонтын хэмжээ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Текстийг том эсвэл жижиг болгох"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM картын түгжээний тохиргоо"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN хоосон байж болохгүй."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC талбар 3 цифртэй байх ёстой."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC талбар 2 буюу 3 цифртэй байх ёстой."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Оператор компани нь %s төрлийн APN нэмэхийг зөвшөөрдөггүй."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Үндсэн APN тохиргоог сэргээж байна"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Үндсэн рүү сэргээх"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Үндсэн APN тохиргоог дахин шинэчилж дууслаа."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD картыг арилгах"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Дотоод USB сан дээрх хөгжим буюу зураг гэх мэт бүх өгөгдлийг арилгах"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD карт дээрх хөгжим, зураг гэх мэт бүх өгөгдлүүдийг арчих"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIMs-г устгах"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Утасны бүх eSIMs-г устгана уу. Энэ нь таны мобайл үйлчилгээний төлөвлөгөөг цуцлахгүй."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Таблетын бүх eSIMs-г устгана уу. Энэ нь таны мобайл үйлчилгээний төлөвлөгөөг цуцлахгүй."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Таблетыг дахин шинэчлэх"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Утсыг дахин шинэчлэх"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Бүх хувийн мэдээллээ устгаад, аппыг татаж авмаар байна уу? Энэ үйлдлийг буцаах боломжгүй!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Өгөгдөл хамгаалагчийг асаалттай үед зөөврийн сүлжээний цэгийг ашиглах болон модем болгох боломжгүй"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB модем болгох"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB холбогдсон, модем болгохын тулд шалгана уу"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Модем болгосон"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USB сан ашиглагдаж байгаа үед модем болгох боломжгүй"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB холбогдоогүй"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Асаахын тулд холбогдох"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB модем болгох алдаа"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Утасны Интернэт холболтыг USB-р хуваалцах"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Tаблетын Интернэт холболтыг USB-р хуваалцах"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth модем болгох"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Энэ таблетын интернэт холболтыг Bluetooth-р хуваалцаж байна"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Энэ утасны интернэт холболтыг Bluetooth-р хуваалцаж байна"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Энэ таблетын интернэт холболтыг 1 төхөөрөмжтэй Bluetooth-р хуваалцаж байна"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Энэ утасны интернэт холболтыг 1 төхөөрөмжтэй Bluetooth-р хуваалцаж байна"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Энэ таблетын интернэт холболтыг <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> төхөөрөмжтэй Bluetooth-р хуваалцаж байна"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Энэ утасны интернэт холболтыг <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> төхөөрөмжтэй Bluetooth-р хуваалцаж байна"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Таблетын интернэт холболтыг Bluetooth-р хуваалцах"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Утасны интернэт холболтыг Bluetooth-р хуваалцах"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Энэ <xliff:g id="DEVICE_NAME">%1$d</xliff:g>-н интернэт холболтыг Bluetooth-р хуваалцаж байна"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Энэ таблетын интернэт холболтыг Bluetooth-р хуваалцаагүй байна"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Энэ утасны интернэт холболтыг Bluetooth-р хуваалцаагүй байна"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Модем болгоогүй"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g>-с олон төхөөрөмжид модем болгох боломжгүй."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> модем болгохыг болиулах болно."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Мобайл дата холболтоороо бусад төхөөрөмжийг интернэт холболтоор хангахын тулд сүлжээний цэг, модем болгохыг ашиглана уу."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Мобайл дата холболтоороо бусад төхөөрөмжид интернэт холболт түгээхийн тулд сүлжээний цэг, модем болгохыг ашиглана уу. Апп ойролцоох төхөөрөмжид агуулга хуваалцахын тулд сүлжээний цэг үүсгэх боломжтой."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Тусламж"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Мобайл сүлжээ"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Мобайл төлбөрийн багц"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Байршлын горим"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Байршил тогтоохын тулд GPS, Wi-Fi, Bluetooth болон мобайл сүлжээ ашиглах"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Байршил тогтоохын тулд Wi-Fi, Bluetooth болон мобайл сүлжээ ашиглах"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Байршлыг тогтоохын тулд GPS ашиглах"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Байршил тогтоохын тулд GPS, төхөөрөмжийн мэдрэгчийг ашиглах"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Скан хийж байна"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi скан"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Системийн апп болон үйлчилгээнд Wi-Fi-г ямар ч үед хайх боломжийг олгох замаар байршлыг сайжруулах"</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Танд дата холболт байхгүй байна. Энэ мэдээллийг одоо харахын тулд Интернэтэд холбогдсон дурын компьютерээс %s руу очно уу."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Ачаалж байна..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Нууц үгээ сонгоно уу"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Хурууны хээ ашиглахын тулд нууц үг тохируулах"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Өөрийн хээг сонгоно уу"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Хурууны хээ ашиглахын тулд загвар тохируулах"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Өөрийн PIN-г сонгоно уу"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Хурууны хээ ашиглахын тулд ПИН тохируулах"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Нууц үгээ баталгаажуулна уу"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Хээгээ баталгаажуулна уу"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Өөрийн PIN-г баталгаажуулна уу"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Апп тохиргоо"</string>
     <string name="install_applications" msgid="4872012136210802181">"Тодорхойгүй эх үүсвэр"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Бүх апп эх үүсвэрийг зөвшөөрөх"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Саяхан нээсэн апп"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Бүх <xliff:g id="COUNT">%1$d</xliff:g> аппыг харах"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g>-н өмнө"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Таны таблет болон хувийн өгөгдөл тодорхойгүй апп суулгасан тохиолдолд гэмтэж болзошгүй. Энэ эх сурвалжаас апп суулгаснаар та тухайн аппыг ашигласнаас үүдэн таны таблетад гэмтэл гарах, эсвэл өгөгдөл устах зэрэг гарсан эрсдлийг хариуцна гэдгээ зөвшөөрч байна."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Таны утас болон хувийн өгөгдөл тодорхойгүй апп суулгасан тохиолдолд гэмтэж болзошгүй. Энэ эх сурвалжаас апп суулгаснаар та тухайн аппыг ашигласнаас үүдэн таны утсанд гэмтэл гарах, эсвэл өгөгдөл устах зэрэг гарсан эрсдлийг хариуцна гэдгээ зөвшөөрч байна."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Дэлгэрэнгүй тохиргоо"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Системийн үйлчилгээг зогсоох уу?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Хэрэв та энэ үйлчилгээг зогсоовол таблетаа унтраагаад асаахаас нааш таны таблетын зарим функцууд зөв ажиллахаа больж магадгүй."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Хэрэв та энэ үйлчилгээг зогсоовол утсаа унтраагаад асаахаас нааш таны утасны зарим функцууд зөв ажиллахаа больж магадгүй."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Хэл, оролт, зангаа"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Хэл, оролт"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Хэл, оролт"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Оролтын дэмжлэг"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> хэвлэх үйлчилгээ асаалттай</item>
       <item quantity="one">1 хэвлэх үйлчилгээ асаалттай</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> хэвлэх ажил</item>
+      <item quantity="one">1 хэвлэх ажил</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Хэвлэх үйлчилгээнүүд"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Үйлчилгээ суулгагдаагүй байна"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Принтер олдсонгүй"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Ашиглалтын мэдээлэл"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Цэнэг ашиглалтыг тохируулах"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Агуулагдсан багцууд"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Батерей дуусгаж буй апп"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Төхөөрөмжийг идэвхтэй байлгаж байна"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Төхөөрөмжийг цаана сэрээж байна"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Байршлыг тогтмол хүсэж байна"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> апп буруу ажиллаж байна"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Аппыг зогсоох уу?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"<xliff:g id="APP">%1$s</xliff:g> таны утсыг асаалттай байлгаж байгаа тул таны утас батерейг хэвийн түвшинд байлгах боломжгүй байна.\n\nЭнэ асуудлыг шийдвэрлэхийн тулд та аппыг зогсоох боломжтой.\n\nХэрэв энэ асуудал үргэлжилсээр байвал та батерейны хэрэглээг сайжруулахын тулд аппыг устгаж болно."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"<xliff:g id="APP">%1$s</xliff:g> таны таблетыг асаалттай байлгаж байгаа тул таны таблет батерейг хэвийн түвшинд байлгах боломжгүй байна.\n\nЭнэ асуудлыг шийдвэрлэхийн тулд та аппыг зогсоох боломжтой.\n\nХэрэв энэ асуудал үргэлжилсээр байвал та батерейны хэрэглээг сайжруулахын тулд аппыг устгаж болно."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"<xliff:g id="APP">%1$s</xliff:g> таны төхөөрөмжийг асаалттай байлгаж байгаа тул таны төхөөрөмж батерейг хэвийн түвшинд байлгах боломжгүй байна.\n\nЭнэ асуудлыг шийдвэрлэхийн тулд та аппыг зогсоох боломжтой.\n\nХэрэв энэ асуудал үргэлжилсээр байвал та батерейны хэрэглээг сайжруулахын тулд аппыг устгаж болно."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Аппыг зогсоох"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Цаана ашиглалтыг унтраах уу?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"<xliff:g id="APP">%1$s</xliff:g> таны утсыг тогтмол сэрээж байгаа тул таны утас батерейг хэвийн түвшинд байлгах боломжгүй байна.\n\nЭнэ асуудлыг шийдвэрлэхийн тулд таны утас энэ аппыг цаана ажиллахаас сэргийлэх боломжтой."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"<xliff:g id="APP">%1$s</xliff:g> таны таблетыг тогтмол сэрээж байгаа тул таны таблет батерейг хэвийн түвшинд байлгах боломжгүй байна.\n\nЭнэ асуудлыг шийдвэрлэхийн тулд таны таблет энэ аппыг цаана ажиллахаас сэргийлэх боломжтой."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"<xliff:g id="APP">%1$s</xliff:g> таны төхөөрөмжийг тогтмол сэрээж байгаа тул таны төхөөрөмж батерейг хэвийн түвшинд байлгах боломжгүй байна.\n\nЭнэ асуудлыг шийдвэрлэхийн тулд таны төхөөрөмж энэ аппыг цаана ажиллахаас сэргийлэх боломжтой."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Унтраах"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Байршлыг унтраах уу?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"<xliff:g id="APP">%1$s</xliff:g> таныг энэ аппыг ашиглаагүй үед таны байршлын мэдээллийг тогтмол шаардаж байгаа тул таны утас батерейг хэвийн түвшинд байлгах боломжгүй байна.\n\nЭнэ асуудлыг шийдвэрлэхийн тулд энэ аппын байршлыг унтраах боломжтой."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"<xliff:g id="APP">%1$s</xliff:g> таныг энэ аппыг ашиглаагүй үед таны байршлын мэдээллийг тогтмол шаардаж байгаа тул таны таблет батерейг хэвийн түвшинд байлгах боломжгүй байна.\n\nЭнэ асуудлыг шийдвэрлэхийн тулд энэ аппын байршлыг унтраах боломжтой."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"<xliff:g id="APP">%1$s</xliff:g> таныг энэ аппыг ашиглаагүй үед таны байршлын мэдээллийг тогтмол шаардаж байгаа тул таны төхөөрөмж батерейг хэвийн түвшинд байлгах боломжгүй байна.\n\nЭнэ асуудлыг шийдвэрлэхийн тулд энэ аппын байршлыг унтраах боломжтой."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Унтраах"</string>
     <string name="power_screen" msgid="3023346080675904613">"Дэлгэц"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Гар чийдэн"</string>
     <string name="power_camera" msgid="4976286950934622605">"Камер"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Апп"</string>
     <string name="power_service" msgid="1599661212370831780">"Үйлчилгээ"</string>
     <string name="power_system" msgid="8290455327965307383">"Систем"</string>
-    <string name="power_user" msgid="1889728099253018005">"Хэрэглэгч"</string>
+    <string name="power_user" msgid="3706143225319881667">"Бусад хэрэглэгч"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU нийт"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ил"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Сэрүүн байлгах"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Хэтрүүлэн тооцсон цахилгаан ашиглалт"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>-д ашигласан"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"<xliff:g id="TIME">^1</xliff:g>-н хугацаанд идэвхтэй"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Дэлгэц ашиглалт <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g>-г ашигласан"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Бүх батерейны <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN өөрчлөх"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Мэдэгдлүүдийг харуулах"</string>
     <string name="help_label" msgid="6886837949306318591">"Тусламж &amp; санал хүсэлт"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Тусламжийн нийтлэл, утас, чатны дэмжлэг"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Тусламжийн нийтлэл, утас &amp; чат, эхлүүлэх"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Контентын бүртгэл"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Зургийн ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ноцтой аюул занал"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Нуусан %d зүйлийг харуулах</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Сүлжээ &amp; интернэт"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, мобайл, дата хэрэглээ, сүлжээний цэг"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобайл"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"дата ашиглалт"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"сүлжээний цэг"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Холбогдсон төхөөрөмж"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Апп; мэдэгдэл"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Зөвшөөрөл, өгөгдмөл апп"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Хэрэглэчийн бүртгэл"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"зангаа"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"төлөх, товших, төлбөр"</string>
     <string name="keywords_backup" msgid="470070289135403022">"нөөцлөлт, нөөцлөх"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"зангаа, ирмэг, булан, идэвхтэй ирмэг, базах, атгах, туслах, туслагч, squeezy, squeezie, squeezey, squeezee, ok google, google туслах"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"зангаа, сэрээх, мэдэгдэл, дэлгэц, харуулах, дэлгэц унтраалттай, дэлгэц асаалттай, базах, ирмэг, унтаа, унтах, атгах"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"зангаа, дуугүй болгох, түр хойшлуулах, ирсэн дуудлага, чимээгүй, түгжигдсэн дэлгэц, базах, атгах, ирмэг, зогсоох"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC Tагь тохируулах"</string>
     <string name="write_tag" msgid="8571858602896222537">"Бичих"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Бичихийн тулд тагь дээр дарах ..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Профайлын мэдэгдлийг огт үзүүлэхгүй"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Таны төхөөрөмж түгжээтэй үед та профайлын мэдэгдлээ хэрхэн харахыг хүсэж байна вэ?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Профайлын мэдэгдэл"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Мэдэгдэл"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Мэдэгдэл"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Aпп мэдэгдлүүд"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Мэдэгдлийн ангилал"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Ач холбогдол"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Апп-р шийдүүлнэ үү"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Яаралтай"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Дууг зөвшөөрөх"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Эдгээр мэдэгдлүүдийг одоогийн дэлгэцэд харахдаа дуугүй, чичиргээгүй болон яаралтай гаргаж ирэхгүй болгож тохируулна уу."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Бага ач холбогдолтой"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Дунд зэргийн ач холбогдолтой"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Өндөр ач холбогдолтой"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Нэн яаралтай ач холбогдолтой"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Мэдэгдлийн туслагч"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Мэдэгдлийн хандалт"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Ажлын профайлын мэдэгдэлд хандахыг блоклосон байна"</string>
@@ -2830,8 +2912,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Зураг доторх зураг"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Зураг доторх зургийг зөвшөөрөх"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Апп нээлттэй эсвэл таныг энэ апп-с гарсны дараа (жишээ нь видео үргэлжлүүлэн үзэхийн тулд) зураг доторх зургийн цонх үүсгэхийг энэ аппад зөвшөөрнө үү. Энэ цонх нь таны ашиглаж буй бусад аппын дээр харагдана."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Тийм"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Үгүй"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"Бүү саад бол\" хандалт"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Суулгасан апп-аас \"Бүү саад бол\" хандалтыг хүссэн апп байхгүй байна."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Апп-уудыг ачаалж байна..."</string>
@@ -2962,11 +3042,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Энэ ажлын профайлыг удирдагч нь:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>-аар удирдана"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Туршилтын)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Төхөөрөмжийн эргүүлэлт"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Дэлгэцийн контентийг эргүүлэх"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Босоо харагдацаар хадгалах"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Хөндлөн харагдацаар хадгалах"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Одоогийн байрлалаар хадгалах"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Аюулгүй эхлэл"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Үргэлжлүүлэх"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Та цаашид энэ төхөөрөмжийг хамгаалахын тулд эхлүүлэхээс нь өмнө ПИН шаардах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
@@ -2974,7 +3049,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Та цаашид энэ төхөөрөмжийг хамгаалахын тулд эхлүүлэхээс нь өмнө нууц үг шаардах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурууны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө ПИН шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурууны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө зурган түгжээ шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд зурган хээ шаардах уу?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурааны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө нууц үг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурууны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө нууц үг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Тийм"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Үгүй"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN шаардах уу?"</string>
@@ -3092,6 +3167,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Хэрэглээний сануулга"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Төхөөрөмжийн бүрэн ашиглалтыг харуулах"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Апп ашиглалтыг харуулах"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Өндөр хэрэглээ"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> апп хэвийн бус ажиллаж байна</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> хэвийн бус ажиллаж байна</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Апп батерейг дуусгаж байна</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> батерейг дуусгаж байна</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Оновчлоогүй"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Оновчлоогүй"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Тэжээлийн хэрэглээг оновчилж байна"</string>
@@ -3184,8 +3268,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Бусад апп дээр харуулах"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> аппын <xliff:g id="COUNT_0">%1$d</xliff:g>-г бусад апп дээр харуулахыг зөвшөөрсөн"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Зөвшөөрөлтэй Апп"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Тийм"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Үгүй"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Зөвшөөрсөн"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Зөвшөөрөөгүй"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"тодорхойгүй эх сурвалжаас апп суулгах"</string>
     <string name="write_settings" msgid="4797457275727195681">"Системийн тохиргоо өөрчлөх"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"системийн тохиргоо өөрчлөхийг бичих"</string>
@@ -3275,6 +3359,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Дэлгэц улбар шар туяатай байна. Энэ нь таныг унтахад тусална."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Санал зөвлөмж"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"Бусад +<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> зөвлөмж</item>
+      <item quantity="one">1 зөвлөмж</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> зөвлөмж</item>
+      <item quantity="one">+1 зөвлөмж</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Арилгах"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Хүйтэн өнгөний температур"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Илүү хүйтэн дэлгэцийн өнгө ашиглах"</string>
@@ -3293,8 +3386,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> Дата хэрэглээний сануулга"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> Дата хэрэглээний сануулга / <xliff:g id="ID_2">%2$s</xliff:g> Дата хязгаар"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Тооцооны мөчлөг"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Сарын мөчлөг сар бүрийн <xliff:g id="ID_1">%1$s</xliff:g>-ны өдөр эхлэнэ"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Сар бүрийн төлбөр <xliff:g id="ID_1">%1$s</xliff:g>-с эхлэнэ"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Сар бүрийн <xliff:g id="ID_1">%1$s</xliff:g>-д"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Сүлжээний хязгаарлалт"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> хязгаарлалт</item>
@@ -3314,7 +3406,7 @@
       <item quantity="one">1 апп нь өгөгдөл хамгаалагчийг асаалттай үед хязгаарлагдаагүй өгөгдлийг ашиглах боломжтой</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Өгөгдөл хамгаалагч"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Хязгаарлагдаагүй өгөгдлийн хандалт"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Хязгаарлалтгүй дата"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Арын дата унтарсан байна"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Идэвхтэй"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Идэвхгүй"</string>
@@ -3378,8 +3470,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Дэлгэцийн түгжээний мэдэгдлийг хянах"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Харуулах эсвэл нуух мэдэгдлийн агуулга"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Бүгд"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Дэмжлэг"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Дэмжлэг &amp; зөвлөгөө"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Хамгийн бага өргөн"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Суулгасан апп гуравдагч талын SMS хандалтыг шаардаагүй байна"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Гуравдагч талын SMS нь таны оператор компанийн төлбөр дээр нэмэгдэж болно. Хэрэв та энэ апп-д зөвшөөрлийг идэвхжүүлбэл энэ апп-р гуравдагч тал SMS илгээх боломжтой болно."</string>
@@ -3444,28 +3535,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Автомат"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Гар ажиллагаатай"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Одоо багтаамжаа нэмэгдүүлнэ үү"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Зангаа"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Зангааны товчлол"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Утсаа хянах шуурхай дохио"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Таблетаа хянах шуурхай зангаа"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Төхөөрөмжөө хянах шуурхай зангаа"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Камер руу очих"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Камерыг хурдан нээхийн тулд асаах товчлуурыг хоёр удаа дарна уу. Дурын дэлгэцэд ажиллана."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Камерыг хурдан нээх"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Камерыг нээхийн тулд асаах товчийг хоёр удаа дарна уу"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Камер солих"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Селфиг илүү хурдан авах"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Селфи горимд очихын тулд утсыг хоёр удаа эргүүлнэ үү"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Селфи горимд очихын тулд таблетыг хоёр удаа эргүүлнэ үү"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Селфи горимд очихын тулд төхөөрөмжийг хоёр удаа эргүүлнэ үү"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Утсаа шалгахын тулд хоёр товшино уу"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Таблетаа шалгахын тулд хоёр товшино уу"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Төхөөрөмжийг шалгахын тулд хоёр товшино уу"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Мэдэгдлээ түргэн шалгахын тулд дэлгэцээ хоёр товшино уу."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Цаг, мэдэгдлийн дүрс тэмдэг болон бусад мэдээллийг шалгахын тулд дэлгэцээ хоёр удаа товшино уу."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Дэлгэц унтраалттай үед мэдэгдэл шалгах"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Утсаа шалгахын тулд өргөнө үү"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Таблетаа шалгахын тулд өргөнө үү"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Төхөөрөмжийг шалгахын тулд өргөнө үү"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Мэдэгдлээ түргэн шалгахын тулд утсаа авна уу."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Мэдэгдлээ түргэн шалгахын тулд таблетаа авна уу."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Мэдэгдлээ түргэн шалгахын тулд төхөөрөмжөө авна уу."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Цаг, мэдэгдлийн дүрс тэмдэг болон бусад мэдээллийг шалгахын тулд утсаа авна уу."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Цаг, мэдэгдлийн дүрс тэмдэг болон бусад мэдээллийг шалгахын тулд таблетаа авна уу."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Цаг, мэдэгдлийн дүрс тэмдэг болон бусад мэдээллийг шалгахын тулд төхөөрөмжөө aвна уу."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Дэлгэц унтраалттай үед мэдэгдэл шалгах"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Мэдэгдэл харах бол хурууны хээгээ шударна уу"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Мэдэгдлээ шалгахын тулд утасныхаа арын хурууны хээ мэдрэгчийг доош шударна уу."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Мэдэгдлээ шалгахын тулд таблетынхаа арын хурууны хээ мэдрэгчийг доош шударна уу."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Мэдэгдлээ шалгахын тулд төхөөрөмжийнхөө арын хурууны хээ мэдрэгчийг доош шударна уу."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Мэдэгдлийг хурдан харах"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Хурууны хээ мэдрэгчээр доош шударна уу"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Камерыг нээхийн тулд утсаа өргөнө үү"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Камерыг автоматаар нээхийн тулд утсаа зураг авах байршилд (хөндлөн эсвэл босоо) өргөнө үү. Таны утас түр амарсан эсвэл түгжээтэй үед ажиллана."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Утас идэвхгүй эсвэл түгжигдсэн үед зураг авна уу"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Дэмжлэгийн зангаа"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Мэдрэг"</string>
@@ -3569,6 +3673,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Та энэ шуурхай аппыг устгах уу?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Тоглоом"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудио файл"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Ашигласан зай"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> хэрэглэгчээс устгасан)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> хэрэглэгчид идэвхгүй болгосон)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Автоматаар бөглөх үйлчилгээ"</string>
@@ -3582,5 +3687,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Шуурхай апп"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Сангийн менежерийг унтраах уу?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Кино, ТВ апп"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Ашигласан зай"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Оператор компанийн хангалтын мэдээлэл"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Оператор компанийн хангалтыг асаах"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Шинэ соргог зүйл юу байна?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Шилдэг 5 онцлогийг харна уу"</string>
 </resources>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index d7d49c0..3940dab 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"उत्तम"</item>
     <item msgid="8986346415847956850">"उत्कृष्ट"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"नेहमी"</item>
-    <item msgid="844721238536786870">"फक्त प्लग इन केलेले असते तेव्हा"</item>
-    <item msgid="1986753720941888596">"कधीही नाही"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"नेहमी"</item>
-    <item msgid="7433294150916905997">"फक्त प्लग इन केलेले असते तेव्हा"</item>
-    <item msgid="1390404486722375028">"कधीही नाही"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"अंतिम 30 दिवस"</item>
     <item msgid="6600989128423965319">"वापर चक्र सेट करा..."</item>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 74e25c5..e729472 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"आता आपण एक विकासक आहात!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"आवश्यकता नाही, आपण आधीपासून एक विकासक आहात."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"कृपया सर्वात आधी विकासक पर्याय सक्रिय करा."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"वायरलेस आणि नेटवर्क"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"कनेक्शन"</string>
     <string name="header_category_device" msgid="4544026001618307754">"डिव्हाइस"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE तरतूद केली"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"व्हिडिओ कॉलिंगची तरतूद केली"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"वायफाय कॉलिंगची तरतूद केली"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/उपस्थितीची तरतूद आहे"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"मोबाइल रेडिओ पॉवर"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"सिम अॅड्रेस बुक पहा"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"निश्चित डायलिंग नंबर पहा"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"डिव्हाइसेससाठी स्कॅन करा"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"हा डिव्हाइस पुनर्नामित करा"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"पुनर्नामित करा"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"‍डिस्कनेक्ट करायचे?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"हे यासह आपले कनेक्शन समाप्त करेल:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"डिव्‍हाइस डिस्‍कनेक्‍ट करायचे का?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"तुमचा फोन <xliff:g id="DEVICE_NAME">%1$s</xliff:g>वरून डिस्कनेक्ट होईल."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"तुमचे टॅबलेट <xliff:g id="DEVICE_NAME">%1$s</xliff:g>वरून डिस्कनेक्ट होईल."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"तुमचे डिव्हाइस <xliff:g id="DEVICE_NAME">%1$s</xliff:g>वरून डिस्कनेक्ट होईल."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"‍डिस्कनेक्ट करा"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"आपल्‍याकडे ब्लूटुथ सेटिंग्‍ज बदलण्‍याची परवानगी नाही."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"नवीन डिव्हाइस जोडा"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"ब्लूटुथ सेटिंग्ज उघड्या असताना जवळपासच्या डिव्हाइसेसवर <xliff:g id="DEVICE_NAME">%1$s</xliff:g> दृश्यमान असते."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"फोनचा ब्लुटूथ अ‍ॅड्रेस: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"टॅबलेटचा ब्लुटूथ अ‍ॅड्रेस: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"डिव्हाइसचा ब्लुटूथ अ‍ॅड्रेस: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> डिस्कनेक्ट करायचे?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"प्रसारण"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"प्रोफाईल अक्षम करायचे?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"ब्लूटुथ जोडणी विनंती"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"जोडणी विनंती"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> सह जोडण्यासाठी टॅप करा."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"प्राप्त झालेल्या फायली दर्शवा"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"मिळालेल्या फायली"</string>
     <string name="device_picker" msgid="4978696506172252813">"ब्लूटुथ डिव्हाइस निवडा"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटुथ चालू करू इच्छितो"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटुथ बंद करू इच्छितो"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ला आपल्या संदेशामध्ये प्रवेश करण्याची आवश्यकता आहे. %2$s ला प्रवेश करण्याची अनुमती द्यायची?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"सिम प्रवेश विनंती"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> आपल्या सिम कार्डवर प्रवेश करू इच्छित आहे. सिम कार्डवर प्रवेश मंजूर केल्यामुळे कनेक्शनच्या कालावधीसाठी आपल्या डिव्हाइसवरील डेटा कनेक्टिव्हिटी अक्षम होईल. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> वर प्रवेश द्या"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"अन्‍य डिव्‍हाइसला \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' म्‍हणून दिसत आहे"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"तुमचे डिव्हाइस"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"नवीन डिव्हाइस जोडा"</string>
     <string name="date_and_time" msgid="9062980487860757694">"तारीख आणि वेळ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"टाइम झोन निवडा"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"खाती"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"स्थान"</string>
     <string name="account_settings_title" msgid="626177544686329806">"खाती"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"सुरक्षितता आणि स्थान"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"कूटबद्धीकरण आणि क्रेडेन्शियल"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"फोन कूटबद्ध केला"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"डिव्‍हाइस एन्क्रिप्‍ट केले"</string>
@@ -354,40 +367,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"फिंगरप्रिंटने अनलॉक करा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"आपले फिंगरप्रिंट वापरा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"आपला फोन अनलॉक करण्यासाठी, खरेदी अधिकृत किंवा अॅप्समध्ये साइन इन करण्‍यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा. आपण ज्यांचे फिंगरप्रिंट जोडता त्याविषयी सावधगिरी बाळगा. जोडलेला एक प्रिंट देखील यापैकी कोणतीही गोष्ट करू शकतो. \n\n टीप: आपले फिंगरप्रिंट मजबूत नमुना किंवा पिन पेक्षा कमी सुरक्षित असू शकतात."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"खरेदी अधिकृत करण्यासाठी किंवा अ‍ॅप्समध्ये साइन इन करण्यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा. आपण ज्यांचे फिंगरप्रिंट जोडता त्याविषयी सावधगिरी बाळगा. आपण जोडलेले एक प्रिंट देखील यापैकी काहीही करू शकते.\n\nटीप: हे डिव्हाइस अनलॉक करण्यासाठी आपण आपले फिंगरप्रिंट वापरू शकत नाही. अधिक माहितीसाठी, आपल्या संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"आपला फोन अनलॉक करण्यासाठी, खरेदी अधिकृत करण्यासाठी किंवा अॅप्समध्ये साइन इन करण्‍यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा. आपण ज्यांचे फिंगरप्रिंट जोडता त्याविषयी सावधगिरी बाळगा. जोडलेला एक प्रिंट देखील यापैकी कोणतीही गोष्ट करू शकतो.\n\nटीप: आपले फिंगरप्रिंट मजबूत नमुना किंवा पिन पेक्षा कमी सुरक्षित असू शकते."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"फोन अनलॉक करण्यासाठी किंवा खरेदींना मंजूरी देण्यासाठी तुमचे फिंगरप्रिंट वापरा.\n\nटीप: तुम्ही हे डिव्हाइस अनलॉक करण्यासाठी तुम्‍ही तुमचे फिंगरप्रिंट वापरू शकत नाही. अधिक माहितीसाठी संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"फोन अनलॉक करण्यासाठी किंवा खरेदीला मंजूरी देण्यासाठी तुमचे फिंगरप्रिंट वापरा.\n\nटीप: सक्षम पॅटर्न किंवा पिनच्या तुलनेत तुमचे फिंगरप्रिंट ही कमी सुरक्षित असू शकते."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"रद्द करा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"सुरु ठेवा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"वगळा"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"फिंगरप्रिंट जोडा"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हा टॅबलेट गहाळ झाल्यास, चोरी झाल्यास किंवा पुसला गेल्यास, तो वापरण्यापासून इतरांना प्रतिबंधित करण्यात आपण सक्षम असणार नाही."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हे डिव्हाइस गहाळ झाल्यास, चोरी झाल्यास किंवा पुसले गेल्यास, ते वापरण्यापासून इतरांना प्रतिबंधित करण्यात आपण सक्षम असणार नाही."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हा फोन हरवल्यास, चोरी झाल्यास किंवा पुसला गेल्यास, तो वापरण्यापासून आपण इतरांना प्रतिबंधित करू शकणार नाही."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हा टॅबलेट गहाळ किंवा चोरी झाल्यास तो वापरण्यापासून आपण इतरांना प्रतिबंधित करण्यात सक्षम असणार नाही."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हे डिव्हाइस गहाळ किंवा चोरी झाल्यास ते वापरण्यापासून आपण इतरांना प्रतिबंधित करण्यात सक्षम असणार नाही."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हा फोन हरवल्यास किंवा चोरी झाल्यास तो वापरण्यापासून आपण इतरांना प्रतिबंधित करू शकणार नाही."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"पुढील"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"डिव्हाइस संरक्षण वैशिष्ट्ये चालू होणार नाहीत. हा टॅबलेट हरवल्यास, चोरी झाल्यास किंवा रीसेट केल्यास तुम्ही इतरांना तो वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"डिव्हाइस संरक्षण वैशिष्ट्ये सुरू होणार नाहीत. हे डिव्‍हाइस हरवल्यास, चोरी झाल्यास किंवा रीसेट केल्यास तुम्ही इतरांना तो वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"डिव्हाइस संरक्षण वैशिष्ट्ये सुरू होणार नाहीत. हा फोन हरवल्यास, चोरी झाल्यास किंवा रीसेट केल्यास तुम्ही इतरांना तो वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"डिव्हाइस संरक्षण्‍ा वैशिष्ट्ये सुरू होणार नाहीत. हा टॅबलेट हरवल्यास किंवा चोरी झाल्यास तुम्ही इतरांना तो वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"डिव्हाइस संरक्षण्‍ा वैशिष्ट्ये सुरू होणार नाहीत. हे डिव्हाइस हरवल्यास किंवा चोरी झाल्यास तुम्ही इतरांना ते वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"डिव्हाइस संरक्षण्‍ा वैशिष्ट्ये सुरू होणार नाहीत. हा फोन हरवल्यास किंवा चोरी झाल्यास तुम्ही इतरांना तो वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"तरीही वगळा"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"परत जा"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"सेन्सर शोधा"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"आपल्‍या फोनच्या पाठीमागे फिंगरप्रिंट सेन्सर शोधा."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"सेंसरला स्पर्श करा"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"ते तुमच्या फोनच्या मागील भागावर आहे. तुमची तर्जनी वापरा."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"डिव्हाइस आणि फिंगरप्रिंट सेन्सर स्थानासह चित्रे"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"नाव"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ठीक आहे"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"हटवा"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"आपण प्रारंभ करूया"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"सेंसरला स्पर्श करा"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"आपले बोट सेन्सरवर ठेवा आणि आपल्‍याला कंपन जाणवल्यावर ते उचला"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"सुरु ठेवावे"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"आपल्‍या फिंगरप्रिंटचे सर्व भिन्न प्रकार जोडण्‍यासाठी आपले बोट किंचित हलवा"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"फिंगरप्रिंट जोडले!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"जेव्हाही आपण हे चिन्ह पाहता, तेव्हा आपण ओळखीसाठी किंवा खरेदी अधिकृत करण्यासाठी आपले फिंगरप्रिंट वापरू शकता."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"आपले डिव्‍हाइस सक्रिय आणि अनलॉक करण्‍यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"आपण हे चिन्ह पाहता तेव्हा, आपण आपल्या खरेदी अधिकृत करू शकता किंवा अॅप्समध्ये साइन इन देखील करू शकता."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"उचला, नंतर पुन्हा स्पर्श करा"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"तुमच्‍या फिंगरप्रिंटचे वेगवेगळे भाग जोडण्यासाठी तुमचे बोट उचलत रहा"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"फिंगरप्रिंट जोडला"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"तुम्हाला हा आयकन दिसताच ओळख पडताळणीसाठी किंवा खरेदी मंजूर करण्यासाठी तुमचे फिंगरप्रिंट वापरा."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फिंगरप्रिंट सेटअप वगळायचे?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"आपण आपला फोन अनलॉक करण्याची एक पद्धत म्हणून आपण आपले फिंगरप्रिंट वापरणे निवडले. आता आपण वगळल्यास, आपल्याला हे नंतर सेट करण्याची आवश्यकता असेल. सेटअपला केवळ एक मिनिट लागेल."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"स्क्रीन लॉक सेट करा"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"पूर्ण झाले"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"अरेरे, तो सेन्सर नाही"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"आपल्या डिव्हाइसवर फिंगरप्रिंट सेन्सर वापरा."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"तुमच्या फोनच्या मागील बाजूस असलेल्या सेंसरला स्पर्श करा. तुमची तर्जनी वापरा."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"नोंदणी पूर्ण झाली नाही"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"फिंगरप्रिंट नोंदणी वेळ मर्यादा गाठली. पुन्हा प्रयत्न करा."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"फिंगरप्रिंट नोंदणीने कार्य केले नाही. पुन्हा प्रयत्न करा किंवा भिन्न बोट वापरून पहा."</string>
@@ -449,6 +460,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करून आपल्या परवानगीशिवाय हे डिव्हाइस वापरण्यापासून इतरांना प्रतिबंधित करा. आपण वापरू इच्छित असलेला स्क्रीन लॉक निवडा."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय करून आपल्या परवानगीशिवाय हा फोन वापरण्यापासून इतरांना प्रतिबंधित करा. आपण वापरू इच्छित असलेला स्क्रीन लॉक निवडा."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"आपली बॅक अप स्क्रीन लॉक पद्धत निवडा"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"स्क्रीन लॉक पर्याय"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"स्क्रीन लॉक पर्याय"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"स्क्रीन लॉक"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / निष्क्रिय केल्यानंतर त्वरित"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / निष्क्रिय झाल्याच्या <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> नंतर"</string>
@@ -519,13 +532,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"अनलॉक नमुना बदला"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"अनलॉक पिन बदला"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"संकेतशब्द अनलॉक करा बदला"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"पुन्हा प्रयत्न करा. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> पैकी <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> प्रयत्न."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"अखरेचा प्रयत्न"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"आपण या प्रयत्नात चुकीचा कार्य नमुना प्रविष्ट केल्यास, आपले कार्य प्रोफाईल आणि संबद्ध डेटा या डिव्हाइस वरून काढला जाईल."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"आपण या प्रयत्नात चुकीचा कार्य पिन प्रविष्ट केल्यास, आपले कार्य प्रोफाईल आणि संबद्ध डेटा या डिव्हाइस वरून काढला जाईल."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"आपण या प्रयत्नात चुकीचा कार्य संकेतशब्द प्रविष्ट केल्यास, आपले कार्य प्रोफाईल आणि संबद्ध डेटा या डिव्हाइस वरून काढला जाईल."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"बरेच चुकीचे प्रयत्न. आपले कार्य प्रोफाईल आणि संबद्ध डेटा या डिव्हाइस वरून काढला जाईल."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"डिसमिस करा"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"पुन्हा प्रयत्न करा. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> पैकी <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> प्रयत्न."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"तुमचा डेटा हटवला जाईल"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"तुम्‍ही पुढच्‍या वेळी एखादा चुकीचा पॅटर्न टाकल्‍यास, या डिव्‍हाइसचा डेटा हटवला जाईल"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"तुम्‍ही पुढच्‍या वेळी एखादा चुकीचा पिन टाकल्‍यास, या डिव्‍हाइसचा डेटा हटवला जाईल"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"तुम्‍ही पुढच्‍या वेळी एखादा चुकीचा पासवर्ड टाकल्‍यास, या डिव्‍हाइसचा डेटा हटवला जाईल"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"तुम्‍ही पुढच्‍या वेळी एखादा चुकीचा पॅटर्न टाकल्‍यास, हा वापरकर्ता हटवला जाईल"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"तुम्‍ही पुढच्‍या वेळी एखादा चुकीचा पिन टाकल्‍यास, हा वापरकर्ता हटवला जाईल"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"तुम्‍ही पुढच्‍या वेळी एखादा चुकीचा पासवर्ड टाकल्‍यास, हा वापरकर्ता हटवला जाईल"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"तुम्‍ही पुढच्‍या वेळी एखादा चुकीचा पॅटर्न टाकल्‍यास, तुमची कामाची प्रोफाइल आणि त्‍याचा डेटा हटवला जाईल"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"तुम्‍ही पुढच्‍या वेळी एखादा चुकीचा पिन टाकल्‍यास, तुमची कामाची प्रोफाइल आणि त्‍याचा डेटा हटवला जाईल"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"तुम्‍ही पुढच्‍या वेळी एखादा चुकीचा पासवर्ड टाकल्‍यास, तुमची कामाची प्रोफाइल आणि त्‍याचा डेटा हटवला जाईल"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"बरेच चुकीचे प्रयत्‍न. या डिव्‍हाइसचा डेटा हटवला जाईल."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"बरेच चुकीचे प्रयत्‍न. हा वापरकर्ता हटवला जाईल."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"बरेच चुकीचे प्रयत्‍न. ही कामाची प्रोफाइल आणि त्‍याचा डेटा हटवला जाईल."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"डिसमिस करा"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"किमान <xliff:g id="COUNT">%d</xliff:g> वर्ण असणे आवश्यक आहे"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"पिन किमान <xliff:g id="COUNT">%d</xliff:g> अंकी असणे आवश्यक आहे"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"सुरु ठेवा"</string>
@@ -626,6 +647,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"प्रगत ब्लूटुथ"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ब्लूटुथ चालू असते तेव्हा, आपले डिव्हाइस इतर जवळच्या ब्लूटुथ डिव्हाइसेससह संप्रेषण करु शकते."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"स्‍थान अचूकता सुधारण्‍यासाठी, सिस्टीम अ‍ॅप्स आणि सेवा अद्याप ब्लूटुथ डिव्‍हाइसेस शोधू शकतात. आपण हे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्‍ये बदलू शकता."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"कनेक्ट होऊ शकत नाही. पुन्हा प्रयत्न करा."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"डिव्हाइस तपशील"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"डिव्हाइसचा ब्लुटूथ अ‍ॅड्रेस: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"डिव्हाइस विसरलात का?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"तुमचा फोन यापुढे <xliff:g id="DEVICE_NAME">%1$s</xliff:g>शी जोडलेला राहणार नाही"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"तुमचा टॅबलेट यापुढे <xliff:g id="DEVICE_NAME">%1$s</xliff:g>शी जोडलेला राहणार नाही"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"तुमचे डिव्हाइस यापुढे <xliff:g id="DEVICE_NAME">%1$s</xliff:g>शी जोडलेले राहणार नाही"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"डिव्हाइस विसरलात का"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"यावर कनेक्ट करा…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> मीडिया ऑडिओवरून डिस्कनेक्ट होईल."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> हँड्सफ्री ऑडिओवरून डिस्कनेक्ट होईल."</string>
@@ -778,6 +807,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"प्रदान करू नका"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"प्रमाणित करू नका"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"कोणतेही प्रमाणपत्र निर्दिष्ट केले नाही. आपले कनेक्शन खाजगी होणार नाही."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"नेटवर्कचे नाव फार लांबलचक आहे."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"एक डोमेन निर्दिष्ट करणे आवश्यक आहे."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्ध"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्ध)"</string>
@@ -809,7 +839,6 @@
       <item quantity="other">%d नेटवर्क</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"प्रगत वाय-फाय"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"वाय‑फाय कॉन्फिगर करा"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC पत्ता"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP पत्ता"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"सबनेट मास्क"</string>
@@ -846,9 +875,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"हा समूह विसरायचा?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"पोर्टेबल वाय-फाय हॉटस्पॉट"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"वाय-फाय हॉटस्पॉट"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"वाय-फाय नेटवर्क प्रदान करण्यासाठी मोबाइल कनेक्शन वापरा"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"या टॅबलेटचे इंटरनेट कनेक्शन हॉटस्पॉटद्वारे शेअर करत नाही"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"या फोनचे इंटरनेट कनेक्शन हॉटस्पॉटद्वारे शेअर करत नाही"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"इंटरनेट किंवा आशय इतर डिव्हाइससोबत शेअर करत नाही"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"या टॅबलेटचे इंटरनेट कनेक्शन हॉटस्पॉटने शेअर करत आहे"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"या फोनचे इंटरनेट कनेक्शन हॉटस्पॉटने शेअर करत आहे"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"अ‍ॅप आशय शेअर करत आहे. इंटरनेट कनेक्शन शेअर करण्यासाठी, हॉटस्‍पॉट बंद करा, नंतर चालू करा"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"वाय-फायचे नाव"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> चालू करत आहे..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"इतर डिव्हाइस <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>शी कनेक्ट होऊ शकतात"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"वाय-फाय पासवर्ड"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"तुमच्या इतर डिव्हाइससाठी वाय-फाय नेटवर्क तयार करण्यासाठी हॉटस्पॉटचा वापर करा. हॉटस्पॉट हे तुमच्या मोबाइल डेटा कनेक्शनमधून इंटरनेट पुरवते. अतिरिक्त मोबाइल डेटा शुल्क लागू होऊ शकते."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"जवळपासच्या डिव्हाइससोबत आशय शेअर करण्यासाठी अ‍ॅप्स हॉटस्पॉट तयार करू शकतात."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"हॉटस्पॉट चालू करीत आहे…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"हॉटस्पॉट बंद करीत आहे…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> सक्रिय आहे"</string>
@@ -895,6 +932,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"वाय-फाय कॉलिंग चालू असताना, आपला फोन आपल्या प्राधान्यावर आणि कोणता सिग्नल मजबूत आहे याच्या आधारावर, वाय-फाय नेटवर्क किंवा आपल्या वाहकाच्या नेटवर्कद्वारे कॉल मार्गस्थ करू शकतो. हे वैशिष्ट्य चालू करण्यापूर्वी, फी आणि इतर तपशीलांच्या संबंधात आपल्या वाहकास विचारा."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"आणीबाणी पत्ता अद्यतनित करा"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"वायफाय वापरून आपण 911 वर कॉल केल्यास आपले स्थान म्हणून आणीबाणी सेवांनी वापरलेला पत्ता"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"प्रदर्शन"</string>
@@ -952,6 +990,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"कोणतेही परिणाम नाहीत"</string>
     <string name="display_settings" msgid="7965901687241669598">"प्रदर्शन"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"स्वयं-फिरणारी स्क्रीन"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"गडद रंग"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"टॅबलेट फिरवताना अभिमुखता स्वयंचलितपणे स्विच करा"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"फोन फिरवताना अभिमुखता स्वयंचलितपणे स्विच करा"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"टॅबलेट फिरवताना अभिमुखता स्वयंचलितपणे स्विच करा"</string>
@@ -979,23 +1018,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"उपलब्ध प्रकाशासाठी उज्ज्वलता स्तर अनुकूल करा. हे वैशिष्ट्य चालू असताना, आपण तरीही उज्ज्वलता तात्पुरती समायोजित करू शकता."</string>
     <string name="night_display_title" msgid="2626451512200357686">"रात्रीचा प्रकाश"</string>
     <string name="night_display_text" msgid="1837277457033025056">"रात्रीचा प्रकाश आपल्या स्क्रीनला पिवळसर तपकिरी रंगछटा देतो. यामुळे मंद प्रकाशात आपली स्क्रीन पाहणे किंवा वाचणे सोपे होते आणि आपल्याला झोप येण्यात मदत होऊ शकते."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"अनुसूची"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"स्थिती"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"स्वयंचलितपणे चालू करा"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"कधीही नाही"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"सानुकूल वेळापत्रक"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"सूर्यास्त ते सूर्योदय"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"शेड्यूल"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"काहीही नाही"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"कस्टम वेळी चालू होते"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"सूर्योदय ते सूर्यास्तादरम्यान चालू होते"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"प्रारंभ वेळ"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"समाप्ती वेळ"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"स्थिती"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"तीव्रता"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"बंद. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"कधीही स्वयंचलितपणे चालू होणार नाही."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g> वाजता स्वयंचलितपणे चालू होईल."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"सूर्यास्ताच्या वेळी स्वयंचलितपणे चालू होईल."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"चालू. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"कधीही स्वयंचलितपणे बंद होणार नाही."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g> वाजता स्वयंचलितपणे बंद होईल."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"सूर्योदयाच्या वेळी स्वयंचलितपणे बंद होईल."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"बंद / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"आपोआप कधीही चालू होणार नाही"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g> वाजता आपोआप चालू होईल"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"सूर्यास्ताच्या वेळी आपोआप चालू होईल"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"चालू / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"आपोआप कधीही बंद होणार नाही"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g> वाजता आपोआप बंद होईल"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"सूर्योदयाच्या वेळी आपोआप बंद होईल"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"निष्क्रिय"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"स्क्रीन बंद होते"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"निष्क्रियतेच्या <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> नंतर"</string>
@@ -1019,8 +1057,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"सेटिंग्ज"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"स्वयंचलित चकाकी"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"सक्रिय करण्‍यासाठी लिफ्‍ट"</string>
-    <string name="doze_title" msgid="2259176504273878294">"अँबियन्ट प्रदर्शन"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"अँबियन्ट डिसप्ले"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"नेहमी चालू"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"नवीन सूचना"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"कधी दाखवायचे"</string>
+    <string name="doze_title" msgid="2375510714460456687">"नवीन सूचना"</string>
     <string name="doze_summary" msgid="3846219936142814032">"सूचना प्राप्त केल्यावर स्क्रीन सक्रिय करा"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"नेहमी चालू"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"वेळ, सूचना चिन्‍हे आणि इतर माहिती दाखवा"</string>
     <string name="title_font_size" msgid="4405544325522105222">"फॉन्ट आकार"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"मजकूर आणखी मोठा किंवा आणखी लहान करा"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"सिम कार्ड लॉक सेटिंग्ज"</string>
@@ -1272,6 +1316,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN रिक्त असू शकत नाही."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC फील्ड 3 अंकी असणे आवश्यक आहे."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC फील्ड 2 किंवा 3 अंकी असणे आवश्यक आहे."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"%s प्रकारचे APN जोडण्‍याची अनुमती वाहक देत नाही."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"डीफॉल्ट APN सेटिंग्ज पुनर्संचयित करत आहे."</string>
     <string name="menu_restore" msgid="8260067415075573273">"डीफॉल्टवर रीसेट करा"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"डीफॉल्ट APN सेटिंग्ज रीसेट करणे पूर्ण झाले."</string>
@@ -1301,6 +1346,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD कार्ड मिटवा"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"अंतर्गत USB संचयनावरील सर्व डेटा मिटवा, जसे की संगीत किंवा फोटो"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD कार्डवरील सर्व डेटा मिटवा, जसे की संगीत किंवा फोटो"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM मिटवा"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"फोनवरील सर्व eSIM मिटवा. यामुळे आपला मोबाइल सेवा प्लॅन रद्द होणार नाही."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"टॅबलेटवरील सर्व eSIM मिटवा. यामुळे आपला मोबाइल सेवा प्लॅन रद्द होणार नाही."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"टॅबलेट रीसेट करा"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"फोन रीसेट करा"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"आपली सर्व वैयक्तिक माहिती आणि डाउनलोड केलेले अॅप्स मिटवायचे? आपण ही क्रिया पूर्ववत करू शकत नाही!"</string>
@@ -1323,26 +1371,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"डेटा बचतकर्ता चालू असताना टिथर करू शकत नाही किंवा पोर्टेबल हॉटस्पॉटचा वापर करू शकत नाही"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB टेदरिंग"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB कनेक्ट केली, टेदरवर तपासा"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"टिथर केले"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USB संचयन वापरात असताना टेदर करू शकत नाही"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB कनेक्ट केले नाही"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"चालू करण्यासाठी कनेक्ट करा"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB टेदरिंग त्रुटी"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"फोनचे इंटरनेट कनेक्शन USBने शेअर करा"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"टॅबलेटचे इंटरनेट कनेक्शन USBने शेअर करा"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ब्लूटुथ टेदरिंग"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"या टॅबलेटचे इंटरनेट कनेक्शन ब्लूटुथ द्वारे शेअर करत आहे"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"या फोनचे इंटरनेट कनेक्शन ब्लूटुथ द्वारे शेअर करत आहे"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"या टॅबलेटचे इंटरनेट कनेक्शन ब्लूटुथ द्वारे 1 डिव्हाइसवर शेअर करत आहे"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"या फोनचे इंटरनेट कनेक्शन ब्लूटुथ द्वारे 1 डिव्हाइसवर शेअर करत आहे"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"या टॅबलेटचे इंटरनेट कनेक्शन ब्लूटुथ द्वारे <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> डिव्हाइसवर शेअर करत आहे"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"या फोनचे इंटरनेट कनेक्शन ब्लूटुथ द्वारे <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> डिव्हाइसवर शेअर करत आहे"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"टॅबलेटचे इंटरनेट कनेक्शन ब्लुटूथने शेअर करा"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"फोनचे इंटरनेट कनेक्शन ब्लुटूथने शेअर करा"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"या <xliff:g id="DEVICE_NAME">%1$d</xliff:g>चे इंटरनेट कनेक्शन ब्लूटुथ द्वारे शेअर करत आहे"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"या टॅबलेटचे इंटरनेट कनेक्शन ब्लूटुथ द्वारे शेअर करत नाही"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"या फोनचे इंटरनेट कनेक्शन ब्लूटुथ द्वारे शेअर करत नाही"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"टेदर केले नाही"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> पेक्षा अधिक डिव्हाइसेसवर टेदर करू शकत नाही."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> टेदर करणे रद्द करेल."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"आपल्या मोबाइल डेटा कनेक्शनद्वारे इतर डिव्हाइसेसना इंटरनेट प्रदान करण्यासाठी हॉटस्पॉट आणि टिथरिंग वापरा."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"तुमच्या मोबाइल डेटा कनेक्शनने इतर डिव्हाइसना इंटरनेट देण्यासाठी हॉटस्पॉट आणि टेदरिंगचा वापर करा. आशय जवळपासच्या डिव्हाइससोबत शेअर करण्यासाठी अ‍ॅप्स हॉटस्‍पॉट तयार देखील करू शकतात."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"मदत"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"मोबाइल नेटवर्क"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"मोबाईल योजना"</string>
@@ -1375,7 +1412,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"स्थान मोड"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"स्थान निर्धारित करण्‍यासाठी GPS, वाय‑फाय, ब्लूटुथ किंवा मोबाइल नेटवर्क वापरा"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"स्थान निर्धारित करण्‍यासाठी वाय‑फाय, ब्लूटुथ किंवा मोबाइल नेटवर्क वापरा"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"स्थान निर्धारित करण्यासाठी GPS चा वापर करा"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"स्थान निर्धारित करण्यासाठी GPS आणि डिव्हाइस सेन्सर वापरा"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"स्कॅन करत आहे"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"वाय-फाय स्कॅन करणे"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"सिस्टीम अ‍ॅप्‍स आणि सेवांना कधीही वाय-फाय नेटवर्क शोधण्‍याची अनुमती देउन स्थान सुधारित करा."</string>
@@ -1420,8 +1457,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"आपल्याकडे डेटा कनेक्शन नाही. ही माहिती आता पाहण्यासाठी, इंटरनेटशी कनेक्ट केलेल्या कोणत्याही संगणकावरून %s वर जा."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"लोड करत आहे..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"आपला संकेतशब्द निवडा"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"फिंगरप्रिंट वापरण्यासाठी पासवर्ड सेट करा"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"आपला नमुना निवडा"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"फिंगरप्रिंट वापरण्यासाठी पॅटर्न सेट करा"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"आपला पिन निवडा"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"फिंगरप्रिंट वापरण्यासाठी पिन सेट करा"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"आपल्या संकेतशब्दाची पुष्टी करा"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"आपल्या नमुन्याची पुष्टी करा"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"आपल्या पिन ची पुष्टी करा"</string>
@@ -1490,6 +1530,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"अ‍ॅप सेटिंग्ज"</string>
     <string name="install_applications" msgid="4872012136210802181">"अज्ञात स्त्रोत"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"सर्व अॅप स्त्रोतांना अनुमती द्या"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"अलीकडे उघडलेले अ‍ॅप्स"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"सगळे <xliff:g id="COUNT">%1$d</xliff:g> अ‍ॅप्स पहा"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g>पूर्वी"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"आपले टॅबलेट आणि वैयक्तिक डेटा अज्ञात अनुप्रयोगांद्वारे आक्रमणांपासून अधिक असुरक्षित असतात. या स्रोताकडील अ‍ॅप्स स्थापित करून, आपण सहमत आहात की त्यांच्या वापराच्या परिणामी होणार्‍या आपल्या टॅबलेटच्या कोणत्याही नुकसानासाठी किंवा डेटाच्या हानीसाठी आपण जबाबदार आहात."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"आपला फोन आणि वैयक्तिक डेटा अज्ञात अनुप्रयोगांद्वारे आक्रमणांपासून अधिक असुरक्षित असतात. या स्रोताकडील अ‍ॅप्स स्थापित करून, आपण सहमत आहात की त्यांच्या वापराच्या परिणामी होणार्‍या आपल्या फोनच्या कोणत्याही नुकसानासाठी किंवा डेटाच्या हानीसाठी आपण जबाबदार आहात."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"प्रगत सेटिंग्ज"</string>
@@ -1658,6 +1701,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"सिस्टम सेवा थांबवायची?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"आपण ही सेवा थांबविल्यास, आपण तीचा पॉवर बंद करून पुन्हा चालू करेपर्यंत आपल्या टॅब्लेटची काही वैशिष्ट्ये योग्यरितीने कार्य करणे थांबवू शकतात."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"आपण ही सेवा थांबविल्यास, आपण तीचा पॉवर बंद करून पुन्हा चालू करेपर्यंत आपल्या टॅब्लेटची काही वैशिष्ट्ये योग्यरितीने कार्य करणे थांबवू शकतात."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"भाषा, इनपुट आणि जेश्चर"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"भाषा आणि इनपुट"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"भाषा आणि इनपुट"</string>
     <string name="input_assistance" msgid="7577795275222555487">"इनपुट सहाय्य"</string>
@@ -1872,6 +1919,10 @@
       <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="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <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="print_settings_title" msgid="3685449667822217816">"मुद्रण सेवा"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"कोणत्याही सेवा स्थापित केल्या नाहीत"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"कोणतेही प्रिंटर आढळले नाहीत"</string>
@@ -1938,6 +1989,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"तपशील वापरा"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"पॉवर वापर समायोजित करा"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"समाविष्ट पॅकेज"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"अ‍ॅप्स बॅटरी संपवत आहेत"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"डिव्हाइस सक्रिय ठेवते"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"डिव्हाइसला बॅकग्राउंडमध्‍ये सक्रिय ठेवते"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"स्थानाशी संबंधित माहिती वारंवार मागत आहे"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> अ‍ॅप्स विचित्र प्रकारे काम करत आहेत"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"अ‍ॅप बंद करायचे का?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"<xliff:g id="APP">%1$s</xliff:g> अॅपमुळे तुमचा फोन सतत सक्रिय रहात असल्‍यामुळे तुमच्‍या फोनची बॅटरी जास्‍त वेळ राहू शकत नाही.\n\nही समस्या सोडवण्यासाठी, तुम्ही अ‍ॅप जबरदस्तीने थांबवू शकता.\n\nहे होत राहिल्यास, तुम्हाला बॅटरीचे कार्यप्रदर्शन सुधारण्यासाठी इंस्टॉल केलेले अ‍ॅप काढण्याची आवश्यकता भासू शकते."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"<xliff:g id="APP">%1$s</xliff:g> अॅपमुळे तुमचे टॅबलेट सतत सक्रिय रहात असल्‍यामुळे तुमच्‍या टॅबलेटची बॅटरी जास्‍त वेळ राहू शकत नाही.\n\nही समस्या सोडवण्यासाठी, तुम्ही अ‍ॅप जबरदस्तीने थांबवू शकता.\n\nहे होत राहिल्यास, तुम्हाला बॅटरीचे कार्यप्रदर्शन सुधारण्यासाठी इंस्टॉल केलेले अ‍ॅप काढण्याची आवश्यकता भासू शकते."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"<xliff:g id="APP">%1$s</xliff:g> अॅपमुळे तुमचे डिव्हाइस सतत सक्रिय रहात असल्‍यामुळे तुमच्‍या डिव्हाइसची बॅटरी जास्‍त वेळ राहू शकत नाही.\n\nही समस्या सोडवण्यासाठी, तुम्ही अ‍ॅप जबरदस्तीने थांबवू शकता.\n\nहे होत राहिल्यास तुम्हाला बॅटरीचे कार्यप्रदर्शन सुधारण्यासाठी इंस्टॉल केलेले अ‍ॅप काढण्याची आवश्यकता भासू शकते."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"अ‍ॅप बंद करा"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"बॅकग्राउंडला होत असलेला वापर बंद करायचा का?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"<xliff:g id="APP">%1$s</xliff:g> अॅप तुमचा फोन सतत सक्रिय ठेवत असल्‍यामुळे तुमच्‍या फोनची बॅटरी जास्‍त वेळ राहू शकत नाही.\n\nही समस्या नजरेत आणण्यासाठी, तुमचा फोन हा अॅप बॅकग्राउंडमध्‍ये चालू राहण्‍यापासून प्रतिबंधित करू शकतो."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"<xliff:g id="APP">%1$s</xliff:g> अॅप तुमचे टॅबलेट सतत सक्रिय ठेवत असल्‍यामुळे तुमच्‍या टॅबलेटची बॅटरी जास्‍त वेळ राहू शकत नाही.\n\nही समस्या नजरेत आणण्यासाठी, तुमचे टॅबलेट हा अॅप बॅकग्राउंडमध्‍ये चालू राहण्‍यापासून प्रतिबंधित करू शकते."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"<xliff:g id="APP">%1$s</xliff:g> अॅप तुमचे डिव्‍हाइस सतत सक्रिय ठेवत असल्‍यामुळे तुमच्‍या डिव्‍हाइसची बॅटरी जास्‍त वेळ राहू शकत नाही.\n\nही समस्या नजरेत आणण्यासाठी, तुमचे डिव्‍हाइस हा अॅप बॅकग्राउंडमध्‍ये चालू राहण्‍यापासून प्रतिबंधित करू शकते."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"बंद करा"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"स्थान बंद करायचे का?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"तुम्‍ही अॅप वापरत नसताना <xliff:g id="APP">%1$s</xliff:g> तुमच्‍या स्‍थानाची सतत विनंती करत असल्‍यामुळे तुमच्‍या फोनची बॅटरी जास्‍त वेळ राहू शकत नाही. \n\nही समस्या सोडवण्यासाठी, तुम्ही या अ‍ॅपसाठी स्‍थानाशी संबंधित माहिती बंद करून ठेवू शकता."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"तुम्‍ही अॅप वापरत नसताना <xliff:g id="APP">%1$s</xliff:g> तुमच्‍या स्‍थानाची सतत विनंती करत असल्‍यामुळे तुमच्‍या टॅबलेटची बॅटरी जास्‍त वेळ राहू शकत नाही. \n\nही समस्या सोडवण्यासाठी, तुम्ही या अ‍ॅपसाठी स्‍थानाशी संबंधित माहिती देणे बंद करून ठेवू शकता."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"तुम्‍ही अॅप वापरत नसताना <xliff:g id="APP">%1$s</xliff:g> तुमच्‍या स्‍थानाची सतत विनंती करत असल्‍यामुळे तुमच्‍या डिव्‍हाइसची बॅटरी जास्‍त वेळ राहू शकत नाही. \n\nही समस्या सोडवण्यासाठी, तुम्ही या अ‍ॅपसाठी स्‍थानाशी संबंधित माहिती बंद करून ठेवू शकता."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"बंद करा"</string>
     <string name="power_screen" msgid="3023346080675904613">"स्क्रीन"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"फ्लॅशलाइट"</string>
     <string name="power_camera" msgid="4976286950934622605">"कॅमेरा"</string>
@@ -1952,7 +2023,7 @@
     <string name="power_apps" msgid="2043554781293951327">"अॅप्स"</string>
     <string name="power_service" msgid="1599661212370831780">"सेवा"</string>
     <string name="power_system" msgid="8290455327965307383">"प्रणाली"</string>
-    <string name="power_user" msgid="1889728099253018005">"वापरकर्ता"</string>
+    <string name="power_user" msgid="3706143225319881667">"इतर वापरकर्ते"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU एकूण"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU अग्रस्थान"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"सक्रिय ठेवा"</string>
@@ -2004,6 +2075,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"जास्त प्रमाणात पॉवर वापर"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>साठी वापरले"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"<xliff:g id="TIME">^1</xliff:g>साठी सक्रिय आहे"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"स्क्रीनचा वापर <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ने <xliff:g id="PERCENT">%1$s</xliff:g> वापरले"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"एकूण बॅटरीचे <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2563,7 +2635,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"पिन बदला"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"सूचना दर्शवा"</string>
     <string name="help_label" msgid="6886837949306318591">"मदत आणि अभिप्राय"</string>
-    <string name="support_summary" msgid="8276116616493882830">"मदत लेख, फोन आणि चॅट समर्थन"</string>
+    <string name="support_summary" msgid="2705726826263742491">"मदत लेख, फोन आणि चॅट, सुरूवात करत आहे"</string>
     <string name="user_account_title" msgid="1127193807312271167">"सामग्रीसाठी खाते"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"फोटो आयडी"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"अत्याधिक धोके"</string>
@@ -2653,9 +2725,12 @@
       <item quantity="other">%d लपविलेले आयटम दर्शवा</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"नेटवर्क आणि इंटरनेट"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"वाय-फाय, मोबाइल, डेटा वापर, हॉटस्पॉट"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"मोबाइल"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"डेटा वापर"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"हॉटस्पॉट"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"कनेक्‍ट केलेले डिव्‍हाइसेस"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"ब्लूटुथ, कास्‍ट, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"ब्लूटूथ, कास्ट"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"अॅप्स आणि सूचना"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"परवानग्या, डीफॉल्ट अ‍ॅप्स"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"वापरकर्ते आणि खाती"</string>
@@ -2708,6 +2783,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"जेश्चर"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"देय द्या, टॅप करा, पेमेंट"</string>
     <string name="keywords_backup" msgid="470070289135403022">"बॅकअप, बॅक अप"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"जेश्चर, कोपरा, बाजू, सक्रिय कोपरा, दाबणे, पकड, साहाय्य, साहाय्यक, स्क्विझी, स्क्विझी, स्क्विझी, स्क्विझी, ok google, Google साहाय्यक"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"जेश्चर, सक्रिय करणे, सूचना, स्क्रीन, डिस्प्ले, स्क्रीन बंद, स्क्रीन चालू, दाबणे, कोपरा, झोपला, झोपणे, पकड"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"जेश्चर, शांतता, स्नूझ, अलार्म, येणारे कॉल, शांत, डिसप्ले, लॉकस्क्रीन, दाबा, पकड, कोपरा, थांबा"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"वाय-फाय NFC टॅग सेट अप"</string>
     <string name="write_tag" msgid="8571858602896222537">"लिहा"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"लिहिण्यासाठी एक टॅग टॅप करा..."</string>
@@ -2790,7 +2868,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"प्रोफाईल सूचना अजिबात दर्शवू नका"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"आपले डिव्हाइस लॉक केले असताना, प्रोफाईल सूचना कशा दर्शविल्या जाव्यात असे आपण इच्छिता?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"प्रोफाईल सूचना"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"सूचना"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"सूचना"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"अॅप सूचना"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"सूचना प्रकार"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"महत्त्व"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"अॅपला ठरवू द्या"</string>
@@ -2805,6 +2884,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"तातडीचे"</string>
     <string name="allow_sound" msgid="1820188704793497324">"ध्वनीला अनुमती द्या"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"ध्वनी, कंपन करू नका किंवा वर्तमान स्क्रीनवर दृश्यामध्ये या सूचना दर्शवू नका."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"कमी महत्त्व"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"मध्यम महत्त्व"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"सर्वाधिक महत्व"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"त्वरित महत्त्व"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"सूचना सहाय्यक"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"सूचना प्रवेश"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"कार्य प्रोफाइल सूचनांचा अॅक्‍सेस ब्‍लॉक आहे"</string>
@@ -2832,8 +2915,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"चित्रा मध्‍ये चित्र"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"चित्रामध्‍ये चित्राची अनुमती द्या"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"अ‍ॅप खुले असताना किंवा आपण ते सोडल्यानंतर या अ‍ॅपला चित्रामध्ये चित्र विंडो तयार करण्याची अनुमती द्या (उदाहरणार्थ, व्हिडिओ पाहणे सुरू ठेवणे). ही विंडो आपण वापरत असलेल्या इतर अ‍ॅप्सच्या वर प्रदर्शित होते."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"होय"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"नाही"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"व्यत्यय आणू नका प्रवेश"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"कोणत्याही स्थापित केलेल्या अॅप्सने व्यत्यय आणू नका प्रवेशाची विनंती केली नाही"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"अॅप्स लोड करीत आहे..."</string>
@@ -2964,11 +3045,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"हे कार्य प्रोफाईल याद्वारे व्यवस्थापित केले आहे:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> द्वारे व्यवस्थापित"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रायोगिक)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"डिव्हाइस फिरविणे"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"स्क्रीनची सामग्री फिरवा"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"पोर्ट्रेट दृश्यामध्ये रहा"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"भूदृश्य दृश्‍यामध्ये रहा"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"वर्तमान अभिमुखतेमध्ये रहा"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"सुरक्षित प्रारंभ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"सुरु ठेवा"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"सुरू होण्यापूर्वी आपला पिन आवश्यक करून आपण हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही. \n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइसवरील डेटाचे संरक्षण करण्यात मदत होते. आपले डिव्हाइस सुरू करण्यासाठी पिन हवा?"</string>
@@ -2976,7 +3052,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"सुरू होण्यापूर्वी आपला संकेतशब्द आवश्यक करून आपण हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही. \n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइसवरील डेटाचे संरक्षण करण्यात मदत होते. आपले डिव्हाइस सुरू करण्यासाठी संकेतशब्द हवा?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"आपले डिव्हाइस अनलॉक करण्यासाठी आपले फिंगरप्रिंट वापरण्याव्यतिरिक्त, सुरू होण्यापूर्वी आपला पिन आवश्यक करून आपण हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही.\n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइसवरील डेटाचे संरक्षण करण्यात मदत होते. आपले डिव्हाइस सुरू करण्यासाठी पिन हवा?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"आपले डिव्हाइस अनलॉक करण्यासाठी आपले फिंगरप्रिंट वापरण्याव्यतिरिक्त, सुरू होण्यापूर्वी आपला नमुना आवश्यक करून आपण हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही.\n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइसवरील डेटाचे संरक्षण करण्यात मदत होते. आपले डिव्हाइस सुरू करण्यासाठी नमुना हवा?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"आपले डिव्हाइस अनलॉक करण्यासाठी आपले फिंगरप्रिंट वापरण्याव्यतिरिक्त, सुरू होण्यापूर्वी आपला संकेतशब्द आवश्यक करून आपण हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही.\n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइसवरील डेटाचे संरक्षण करण्यात मदत होते. आपले डिव्हाइस सुरू करण्यासाठी संकेतशब्द हवा?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"आपले डिव्‍हाइस अनलॉक करण्‍यासाठी आपले फिंगरप्रिंट वापरण्‍याव्यतिरिक्त, ते प्रारंभ होण्‍यापूर्वी आपण आपला संकेतशब्‍द आवश्‍यक करून हे डिव्‍हाइस अधिक सुरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, तो कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही.\n\nहे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइसवरील डेटाचे संरक्षण करण्यात मदत करते. आपले डिव्हाइस सुरू करण्यासाठी संकेतशब्द आवश्‍यक आहे का?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"होय"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"नाही"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"पिन आवश्यक?"</string>
@@ -3094,6 +3170,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"वापरासंबंधी सूचना"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"पूर्ण डिव्हाइस वापर दाखवा"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"अॅपचा वापर दाखवा"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"जास्त वापर"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> अॅप अस्वाभाविकपणे काम करत आहे</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> अॅप्‍स अस्वाभाविकपणे काम करत आहेत</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">बॅटरी संपवणारे अ‍ॅप</item>
+      <item quantity="other">बॅटरी संपवणारे अ‍ॅप्स</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ऑप्टिमाइझ न केलेले"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ऑप्टिमाइझ न केलेले"</string>
     <string name="high_power_off" msgid="3393904131961263278">"बॅटरी वापर ऑप्टिमाइझ करीत आहे"</string>
@@ -3186,8 +3271,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"इतर अ‍ॅप्सच्या वर प्रदर्शित करा"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> पैकी <xliff:g id="COUNT_0">%1$d</xliff:g> अ‍ॅप्सना इतर अ‍ॅप्सच्या वर प्रदर्शित होण्याची अनुमती"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"परवानगी असलेले अ‍ॅप्स"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"होय"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"नाही"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"परवानगी आहे"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"परवानगी नाही"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"अज्ञात स्रोत अ‍ॅप्स स्थापित करा"</string>
     <string name="write_settings" msgid="4797457275727195681">"सिस्टम सेटिंग्ज सुधारित करा"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"सिस्टीम सेटिंग्ज सुधारित करा लिहा"</string>
@@ -3277,6 +3362,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"स्क्रीनची रंगछटा पिवळसर तपकिरी आहे. यामुळे आपल्याला झोप येण्यात मदत होईल."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"सूचना"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"आणखी +<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <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="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <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="suggestion_remove" msgid="904627293892092439">"काढा"</string>
     <string name="color_temperature" msgid="2070126836910615605">"छान रंगाचे तापमान"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"आणखी छान प्रदर्शन रंग वापरा"</string>
@@ -3295,8 +3389,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> डेटा चेतावणी"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> डेटा चेतावणी / <xliff:g id="ID_2">%2$s</xliff:g> डेटा मर्यादा"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"बिलिंग चक्र"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"प्रत्येक महिन्याच्या <xliff:g id="ID_1">%1$s</xliff:g> रोजी मासिक चक्र प्रारंभ होते"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"<xliff:g id="ID_1">%1$s</xliff:g> पासून मासिक प्रारंभ"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"दरमहा <xliff:g id="ID_1">%1$s</xliff:g> रोजी"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"नेटवर्क प्रतिबंध"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> निर्बंध</item>
@@ -3316,7 +3409,7 @@
       <item quantity="other">डेटा बचतकर्ता चालू असताना <xliff:g id="COUNT">%1$d</xliff:g> अनुप्रयोगांना अनिर्बंध डेटा वापरण्याची अनुमती दिली</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"डेटा बचतकर्ता"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"अनिर्बंध डेटा प्रवेश"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"अनिर्बंधित डेटा"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"पार्श्वभूमी डेटा बंद केला आहे"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"चालू"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"बंद"</string>
@@ -3380,8 +3473,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"लॉक स्क्रीन सूचना नियंत्रित करा"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"सूचना सामग्री दर्शवा किंवा लपवा"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"सर्व"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"सहाय्य"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"साहाय्य आणि टिपा"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"सर्वात लहान रुंदी"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"स्थापित केलेल्या कोणत्याही अॅप्सनी प्रीमियम SMS प्रवेशाची विनंती केली नाही"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"प्रीमियम SMS मुळे आपल्याला कदाचित शुल्क द्यावे लागू शकेल आणि आपल्या कॅरियर बिलिंग मध्ये जोडले जाईल. आपण अॅपसाठी परवानगी सक्षम केल्यास, तो अॅप वापरून आपण प्रीमियम SMS पाठविण्यात सक्षम असाल."</string>
@@ -3446,28 +3538,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"स्वयंचलित"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"व्यक्तिचलित"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"आता स्थान मोकळे करा"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"जेश्चर"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"जेश्चर शॉर्टकट"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"आपला फोन नियंत्रित करण्यासाठी जलद जेश्चर"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"आपले टॅबलेट नियंत्रित करण्यासाठी जलद जेश्चर"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"आपले डिव्हाइस नियंत्रित करण्यासाठी जलद जेश्चर"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"कॅमेर्‍यावर जा"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"कॅमेरा द्रुतपणे उघडण्यासाठी, पॉवर बटण दोनदा दाबा. कोणत्याही स्क्रीन वरून कार्य करते."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"कॅमेरा पटकन उघडा"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"कॅमेरा चालू करण्यासाठी पॉवर बटण दोनदा दाबा"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"कॅमेरा फ्लिप करा"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"अधिक जलद सेल्फी घ्या"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"सेल्फी मोडसाठी फोन दोनदा फिरवा"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"सेल्फी मोडसाठी टॅबलेट दोनदा फिरवा"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"सेल्फी मोडसाठी डिव्हाइस दोनदा फिरवा"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"फोन तपासण्‍यासाठी दोनदा-टॅप करा"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"टॅब्लेट तपासण्‍यासाठी दोनदा-टॅप करा"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"डिव्हाइस तपासण्‍यासाठी दोनदा-टॅप करा"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"आपल्या सूचना द्रुतपणे तपासण्यासाठी, आपली स्क्रीन दोनदा-टॅप करा."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"वेळ, सूचना आयकन आणि इतर माहिती तपासण्यासाठी तुमच्या स्क्रीनवर दोनदा टॅप करा."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"स्क्रीन बंद असताना सूचना तपासा"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"फोन तपासण्‍यासाठी तो उचला"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"टॅब्लेट तपासण्‍यासाठी तो उचला"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"डिव्हाइस तपासण्‍यासाठी ते उचला"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"आपल्या सूचना द्रुतपणे तपासण्यासाठी, आपला फोन उचला."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"आपल्या सूचना द्रुतपणे तपासण्यासाठी, आपला टॅब्लेट उचला."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"आपल्या सूचना द्रुतपणे तपासण्यासाठी, आपले डिव्हाइस उचला."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"वेळ, सूचना आयकन आणि इतर माहिती तपासण्यासाठी, तुमचा फोन उचला."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"वेळ, सूचना आयकन आणि इतर माहिती तपासण्यासाठी, तुमचा टॅबलेट उचला."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"वेळ, सूचना आयकन आणि इतर माहिती तपासण्यासाठी, तुमचे डिव्हाइस उचला."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"स्क्रीन बंद असताना सूचना तपासा"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"सूचनांसाठी फिंगरप्रिंट स्वाइप करा"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"आपल्या सूचना तपासण्यासाठी, आपल्या फोनच्या पाठीमागे फिंगरप्रिंट सेन्सरवर खाली स्वाइप करा."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"आपल्या सूचना तपासण्यासाठी, आपल्या टॅबलेटच्या मागे फिंगरप्रिंट सेन्सरवर खाली स्वाइप करा."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"आपल्या सूचना तपासण्यासाठी, आपल्या डिव्हाइसच्या मागे फिंगरप्रिंट सेन्सरवर खाली स्वाइप करा."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"सूचना पटकन पहा"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"फिंगरप्रिंट सेंसरवर खालच्या बाजूस स्वाइप करा"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"कॅमेरा उघडण्‍यासाठी उचला"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"कॅमेरा स्‍वयंचलितपणे उघडण्‍यासाठी, तुमचा फोन फोटो घेण्याच्या (लँडस्केप किंवा पोर्ट्रेट) स्थितीत वर धरा. तुमचा फोन स्लीप मोड किंवा लॉक केलेला असताना हे काम करते."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"फोन स्‍लीप मोड किंवा लॉक केलेला असताना फोटो घ्‍या"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"सहाय्यता जेश्चर"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"संवेदनशीलता"</string>
@@ -3571,6 +3676,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"आपल्याला हे इन्स्टंट अ‍ॅप काढायचे आहे का?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"गेम"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ऑडिओ फायली"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"वापरलेली जागा"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> वापरकर्त्‍यासाठी विस्‍थापित)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> वापरकर्त्‍यासाठी अक्षम केले)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"स्वयं-भरण सेवा"</string>
@@ -3584,5 +3690,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"इन्सटंट अॅप"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"संचय व्यवस्थापक बंद करायचा?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"चित्रपट आणि टीव्ही अॅप्स"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"वापरलेली जागा"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"वाहक तरतूद माहिती"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"वाहक तरतूद ट्रिगर करा"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"नवीन आणि रोमांचक असे काय आहे?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"टॉप 5 वैशिष्ट्ये पहा"</string>
 </resources>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 45beac6..cca58e6 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Bagus"</item>
     <item msgid="8986346415847956850">"Sangat baik"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Sentiasa"</item>
-    <item msgid="844721238536786870">"Hanya apabila dipalamkan"</item>
-    <item msgid="1986753720941888596">"Jangan sekali-kali"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Sentiasa"</item>
-    <item msgid="7433294150916905997">"Hanya apabila dipasang"</item>
-    <item msgid="1390404486722375028">"Jangan sekali-kali"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 hari terakhir"</item>
     <item msgid="6600989128423965319">"Ttpkn kitar penggunaan..."</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index a909a75..e5fb662 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Anda kini pemaju!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Tidak perlu, anda sudah pun menjadi pembangun."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Sila dayakan pilihan pembangun terlebih dahulu."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Wayarles &amp; rangkaian"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Sambungan"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Peranti"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE Diperuntukkan"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Panggilan Video Diperuntukkan"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Panggilan Wi-Fi Diperuntukkan"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Kehadiran Diperuntukkan"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Kuasa Radio Mudah Alih"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Lihat Buku Alamat SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Lihat Nombor Dailan Tetap"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Imbas untuk mengesan peranti"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Namakan semula peranti ini"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Namakan semula"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Putuskan sambungan?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tindakan ini akan menamatkan sambungan anda dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Putuskan sambungan peranti?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Telefon anda akan diputuskan sambungannya daripada <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Tablet anda akan diputuskan sambungannya daripada <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Peranti anda akan diputuskan sambungan daripada <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Putuskan sambungan"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Anda tidak mempunyai kebenaran untuk menukar tetapan Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Gandingkan peranti baharu"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kelihatan kepada peranti yang berhampiran semasa tetapan Bluetooth dibuka."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Alamat Bluetooth telefon: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Alamat Bluetooth tablet: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Alamat Bluetooth peranti: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Putuskan sambungan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Penyiaran"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Lumpuhkan profil?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Permintaan menjadi pasangan Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Permintaan pasangan"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Sentuh untuk berpasangan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Tunjukkan fail yang diterima"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Fail yang diterima"</string>
     <string name="device_picker" msgid="4978696506172252813">"Pilih peranti Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> mahu menghidupkan Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> mahu mematikan Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ingin mengakses mesej anda. Berikan akses kepada %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Permintaan akses SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> mahu mengakses kad SIM anda. Pemberian akses kepada kad SIM akan melumpuhkan sambungan data pada peranti anda untuk tempoh sambungan itu. Berikan akses kepada <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Kelihatan kepada peranti lain sebagai \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\'"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Peranti anda"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Gandingkan peranti baharu"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Tarikh &amp; masa"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pilih zon masa"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Akaun"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokasi"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Akaun"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Keselamatan &amp; Lokasi"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Keselamatan &amp; lokasi"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Penyulitan &amp; bukti kelayakan"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon disulitkan"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Peranti disulitkan"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Buka kunci dengan cap jari"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Gunakan cap jari anda"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Hanya sentuh penderia cap jari untuk membuka kunci telefon anda, membenarkan pembelian atau mengelog masuk ke apl. Berhati-hati tentang cap jari yang anda tambahkan. Satu cap jari yang ditambahkan dapat melakukan mana-mana perkara ini.\n\nPerhatian: Cap jari anda mungkin kurang selamat berbading corak atau PIN yang kukuh."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Hanya sentuh penderia cap jari untuk membenarkan pembelian atau log masuk ke apl. Berhati-hati tentang cap jari yang anda tambahkan. Satu cap jari yang ditambahkan akan dapat melakukan mana-mana perkara ini.\n\nPerhatian: Anda tidak boleh menggunakan cap jari untuk membuka kunci peranti ini. Untuk mengetahui maklumat lanjut, hubungi pentadbir organisasi anda."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Hanya sentuh penderia cap jari untuk membuka kunci telefon anda, membenarkan pembelian atau mengelog masuk ke apl. Berhati-hati tentang cap jari yang anda tambahkan. Satu cap jari yang ditambahkan dapat melakukan mana-mana perkara ini.\n\nPerhatian: Cap jari anda mungkin kurang selamat berbading corak atau PIN yang kukuh."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Batal"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Teruskan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Langkau"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Tambahkan cap jari"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Ciri perlindungan peranti tidak akan diaktifkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan tablet ini jika hilang, dicuri atau dipadamkan."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Ciri perlindungan peranti tidak akan diaktifkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan peranti ini jika hilang, dicuri atau dipadamkan."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Ciri perlindungan peranti tidak akan diaktifkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan telefon ini jika hilang, dicuri atau dipadamkan."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Ciri perlindungan peranti tidak akan diaktifkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan tablet ini jika tablet tersebut hilang atau dicuri."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Ciri perlindungan peranti tidak akan diaktifkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan peranti ini jika peranti tersebut hilang atau dicuri."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Ciri perlindungan peranti tidak akan diaktifkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan telefon ini jika telefon tersebut hilang atau dicuri."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Seterusnya"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Ciri perlindungan peranti tidak akan dihidupkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan tablet ini jika tablet hilang, dicuri atau ditetapkan semula."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Ciri perlindungan peranti tidak akan dihidupkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan peranti ini jika peranti hilang, dicuri atau ditetapkan semula."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Ciri perlindungan peranti tidak akan dihidupkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan telefon ini jika telefon hilang, dicuri atau ditetapkan semula."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Ciri perlindungan peranti tidak akan dihidupkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan tablet ini jika tablet hilang atau dicuri."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Ciri perlindungan peranti tidak akan dihidupkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan peranti ini jika peranti hilang atau dicuri."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Ciri perlindungan peranti tidak akan dihidupkan. Anda tidak akan dapat menghalang orang lain daripada menggunakan telefon ini jika telefon hilang atau dicuri."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Langkau juga"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Kembali"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Cari penderia"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Cari penderia cap jari di bahagian belakang telefon anda."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Sentuh penderia"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Penderia terletak di bahagian belakang telefon anda. Gunakan jari telunjuk."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustrasi yang memaparkan peranti dan lokasi penderia cap jari"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nama"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Padam"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Mari mulakan"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Sentuh penderia"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Letakkan jari anda pada penderia, kemudian angkat jari itu selepas anda merasa getaran"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Teruskan"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Gerakkan jari anda sedikit untuk menambahkan bahagian lain cap jari anda"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Cap jari ditambahkan!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Apabila anda melihat ikon ini, anda boleh menggunakan cap jari untuk pengenalan atau membenarkan pembelian."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Sentuh sahaja penderia cap jari untuk membangunkan dan membuka kunci peranti anda."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Apabila anda melihat ikon ini, anda boleh mengizinkan pembelian atau mengelog masuk ke apl."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Angkat jari, kemudian sentuh lagi"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Angkat jari berulang kali untuk menambahkan beberapa bahagian cap jari anda"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Cap jari ditambahkan"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Apabila anda melihat ikon ini, gunakan cap jari anda untuk pengenalan atau untuk membenarkan pembelian."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Langkau persediaan cap jari?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Anda telah memilih untuk menggunakan cap jari sebagai satu cara untuk membuka kunci telefon anda. Jika anda melangkaui sekarang, anda perlu menyediakannya kemudian. Persediaan hanya mengambil sedikit masa."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Sediakan kunci skrin"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Selesai"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Op, itu bukan penderia"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Gunakan penderia cap jari pada peranti anda."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Sntuh penderia di bhg blkg tel. Gnakan jari telunjuk."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Pendaftaran tidak selesai"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Had masa pendaftaran cap jari dicapai. Cuba lagi."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Pendaftaran cap jari tidak berjaya. Cuba lagi atau gunakan jari yang lain."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Halang orang lain daripada menggunakan peranti ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Halang orang lain daripada menggunakan telefon ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Pilih kaedah kunci skrin sandaran anda"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Pilihan kunci skrin"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Pilihan kunci skrin"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Kunci skrin"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Serta-merta selepas tidur"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> selepas tidur"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Tukar corak buka kunci"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Tukar PIN buka kunci"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Tkr kta lluan bka knci"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Cuba lagi. Percubaan <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> daripada <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Percubaan terakhir"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Jika anda masukkan corak kerja yang salah pada percubaan ini, profil kerja anda dan data yang berkaitan akan dialih keluar daripada peranti ini."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Jika anda masukkan PIN kerja yang salah pada percubaan ini, profil kerja anda dan data yang berkaitan akan dialih keluar daripada peranti ini."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Jika anda masukkan kata laluan kerja yang salah pada percubaan ini, profil kerja anda dan data yang berkaitan akan dialih keluar daripada peranti ini."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Terlalu banyak percubaan salah. Profil kerja anda dan data yang berkaitan akan dialih keluar daripada peranti ini."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Tolak"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Cuba lagi. Percubaan <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> daripada <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Data anda akan dipadamkan"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Jika anda memasukkan corak yang salah pada percubaan seterusnya, data peranti ini akan dipadamkan"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Jika anda memasukkan PIN yang salah pada percubaan seterusnya, data peranti ini akan dipadamkan"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Jika anda memasukkan kata laluan yang salah pada percubaan seterusnya, data peranti ini akan dipadamkan"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Jika anda memasukkan corak yang salah pada percubaan seterusnya, pengguna ini akan dipadamkan"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Jika anda memasukkan PIN yang salah pada percubaan seterusnya, pengguna ini akan dipadamkan"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Jika anda memasukkan kata laluan yang salah pada percubaan seterusnya, pengguna ini akan dipadamkan"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Jika anda memasukkan corak yang salah pada percubaan seterusnya, profil kerja anda dan data profil itu akan dipadamkan"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Jika anda memasukkan PIN yang salah pada percubaan seterusnya, profil kerja anda dan data profil itu akan dipadamkan"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Jika anda memasukkan kata laluan yang salah pada percubaan seterusnya, profil kerja anda dan data profil itu akan dipadamkan"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Terlalu banyak percubaan yang salah. Data peranti ini akan dipadamkan."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Terlalu banyak percubaan yang salah. Pengguna ini akan dipadamkan."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Terlalu banyak percubaan yang salah. Profil kerja ini dan data profil itu akan dipadamkan."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ketepikan"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Mestilah sekurang-kurangnya <xliff:g id="COUNT">%d</xliff:g> aksara"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN mestilah sekurang-kurangnya <xliff:g id="COUNT">%d</xliff:g> digit"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Teruskan"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth Lanjutan"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Apabila Bluetooth dihidupkan, peranti anda boleh berkomunikasi dengan peranti Bluetooth lain yang berhampiran."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Untuk meningkatkan ketepatan lokasi, apl sistem dan perkhidmatan masih dapat mengesan peranti Bluetooth. Anda boleh menukarnya dalam <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tetapan pengimbasan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Tidak dapat bersambung. Cuba lagi."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Butiran peranti"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Alamat Bluetooth peranti: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Lupakan peranti?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Telefon anda tidak akan digandingkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> lagi"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Tablet anda tidak akan digandingkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> lagi"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Peranti anda tidak akan digandingkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> lagi"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Lupakan peranti"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Sambung ke..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan dari media audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan dari audio bebas tangan."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Jangan berikan"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Jangan sahkan"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Tiada sijil yang ditentukan. Sambungan anda tidak akan menjadi sambungan peribadi."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Nama rangkaian terlalu panjang."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Perlu nyatakan domain."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tersedia"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tersedia)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 rangkaian</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi Lanjutan"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfigurasikan Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Alamat MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Alamat IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Tapisan subrangkaian"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Lupakan kumpulan ini?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Liputan Wi-Fi mudah alih"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Tempat liputan Wi-Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Gunakan sambungan mudah alih utk menyediakan rangkaian Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Tidak berkongsi sambungan Internet tablet ini melalui tempat liputan"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Tidak berkongsi sambungan Internet telefon ini melalui tempat liputan"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Tidak berkongsi sambungan Internet atau kandungan dengan peranti lain"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Berkongsi sambungan Internet tablet ini melalui tempat liputan"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Berkongsi sambungan Internet telefon ini melalui tempat liputan"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Apl berkongsi kandungan. Untuk berkongsi sambungan Internet, matikan dan hidupkan tempat liputan."</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nama Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Menghidupkan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Peranti lain boleh bersambung ke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Kata laluan Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Jalur AP"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Gunakan tempat liputan untuk membuat rangkaian Wi-Fi bagi peranti anda yang lain. Tempat liputan menyediakan Internet menggunakan sambungan data mudah alih anda. Caj data mudah alih tambahan mungkin dikenakan."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Apl boleh membuat tempat liputan untuk berkongsi kandungan dengan peranti berdekatan."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Menghidupkan tempat liputan..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Mematikan tempat liputan..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktif"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Apabila panggilan Wi-Fi dihidupkan, telefon anda boleh menghalakan panggilan melalui rangkaian Wi-Fi atau rangkaian pembawa anda, bergantung pada pilihan anda dan isyarat yang lebih kuat. Sebelum menghidupkan ciri ini, semak dengan pembawa anda berkenaan bayaran dan butiran lain."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Kemas Kini Alamat Kecemasan"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Alamat yang digunakan oleh perkhidmatan kecemasan sebagai lokasi anda jika anda membuat panggilan 911 menggunakan Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Paparan"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Tiada hasil carian"</string>
     <string name="display_settings" msgid="7965901687241669598">"Paparan"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Skrin autoputar"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Warna terang"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Menukar orientasi secara automatik apabila memutarkan tablet"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Tukar orientasi secara automatik apabila memutarkan telefon"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Menukar orientasi secara automatik apabila memutarkan tablet"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimumkan tahap kecerahan untuk cahaya tersedia. Apabila dihidupkan, anda dapat melaraskan kecerahan utk sementara."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Cahaya Malam"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Cahaya Malam memberi seri warna kuning jingga pada skrin anda. Ini memudahkan lagi anda melihat skrin atau membaca dalam cahaya malap dan mungkin dapat membantu anda tidur dengan lebih mudah."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Jadual"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Hidupkan secara automatik"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Jangan sekali-kali"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Jadual tersuai"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Matahari trbenam hingga terbit"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Jadual"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Tiada"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Dihidupkan pada waktu tersuai"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Dihidupkan dari matahari terbenam hingga terbit"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Masa mula"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Masa tamat"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Keamatan"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Mati. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Tidak akan dihidupkan secara automatik."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Akan dihidupkan secara automatik pada <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Akan dihidupkan secara automatik pada waktu matahari terbenam."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Hidup. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Tidak akan dimatikan secara automatik."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Akan dimatikan secara automatik pada <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Akan dimatikan secara automatik pada waktu matahari terbit."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Mati / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Tidak akan dihidupkan secara automatik"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Akan dihidupkan secara automatik pada <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Akan dihidupkan secara automatik pada waktu matahari terbenam"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Hidup / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Tidak akan dimatikan secara automatik"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Akan dimatikan secara automatik pada <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Akan dimatikan secara automatik pada waktu matahari terbit"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Tidur"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skrin dimatikan"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tanpa aktiviti"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Tetapan"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan automatik"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Angkat untuk bangunkan"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Paparan ambien"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Paparan ambien"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Sentiasa hidup"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Pemberitahuan baharu"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Waktu untuk tunjukkan"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Pemberitahuan baharu"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktifkan skrin apabila anda menerima pemberitahuan"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Sentiasa hidup"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Tunjukkan masa, ikon pemberitahuan dan maklumat lain"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Saiz fon"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Besarkan atau kecilkan teks"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Tetapan kunci kad SIM"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN tidak boleh kosong."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Medan MCC mestilah 3 digit."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Medan MNC mestilah 2 atau 3 digit."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Pembawa tidak membenarkan penambahan APN jenis %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Memulihkan tetapan lalai APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Tetapkan semula kepada lalai"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Penetapan semula tetapan lalai APN selesai."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Padam kad SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Padamkan semua data pada storan USB dalaman, seperti muzik atau foto"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Padamkan semua data pada kad SD, seperti muzik atau foto"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Padamkan eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Padamkan semua eSIM pada telefon. Tindakan ini tidak membatalkan pelan perkhidmatan mudah alih anda."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Padamkan semua eSIM pada tablet. Tindakan ini tidak membatalkan pelan perkhidmatan mudah alih anda."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tetapkan semula tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Tetapkan semula telefon"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Padamkan semua maklumat peribadi anda dan aplikasi yang dimuat turun? Anda tidak boleh membuat asal tindakan ini!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Tidak boleh menambat atau menggunakan tempat liputan mudah alih semasa Penjimat Data dihidupkan"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Penambatan USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB disambungkan, semak untuk menambat"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Ditambatkan"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Tidak boleh menambat apabila storan USB sedang digunakan"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB tidak disambungkan"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Sambung untuk menghidupkan"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Ralat penambatan USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Kongsi sambungan Internet telefon melalui USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Kongsi sambungan Internet tablet melalui USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Penambatan Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Berkongsi sambungan Internet tablet melalui Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Berkongsi sambungan Internet telefon melalui Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Berkongsi sambungan Internet tablet ke 1 peranti melalui Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Berkongsi sambungan Internet telefon ke 1 peranti melalui Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Berkongsi sambungan Internet tablet ke <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> peranti melalui Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Berkongsi sambungan Internet telefon ke <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> peranti melalui Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Kongsi sambungan Internet tablet melalui Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Kongsi sambungan Internet telefon melalui Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Tidak berkongsi sambungan Internet <xliff:g id="DEVICE_NAME">%1$d</xliff:g> melalui Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Tidak berkongsi sambungan Internet tablet melalui Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Tidak berkongsi sambungan Internet telefon melalui Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Tidak tertambat"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Tidak boleh menambat pada lebih daripada <xliff:g id="MAXCONNECTION">%1$d</xliff:g> peranti."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dinyahtambat."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Gunakan tempat liputan dan penambatan untuk menyediakan Internet kepada peranti lain melalui sambungan data mudah alih anda."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Gunakan tempat liputan dan penambatan untuk menyediakan Internet kepada peranti lain melalui sambungan data mudah alih anda. Apl juga boleh membuat tempat liputan untuk berkongsi kandungan dengan peranti berdekatan."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Bantuan"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Rangkaian mudah alih"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Pelan mudah alih"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mod lokasi"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Gunakan GPS, Wi-Fi, Bluetooth atau rangkaian mudah alih untuk menentukan lokasi"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Gunakan Wi-Fi, Bluetooth atau rangkaian mudah alih untuk menentukan lokasi"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Gunakan GPS untuk menentukan lokasi"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Gunakan GPS dan penderia peranti untuk menentukan lokasi"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Mengimbas"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Pengimbasan Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Tingkatkan lokasi dengan membenarkan apl sistem dan perkhidmatan mengesan rangkaian Wi-Fi pada bila-bila masa."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Anda tidak mempunyai sambungan data. Untuk melihat maklumat ini sekarang, pergi ke %s dari sebarang komputer yang disambungkan ke Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Memuatkan..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Pilih kata laluan anda"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Ttpkn kta lluan utk gnakan cp jari"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Pilih corak anda"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Ttpkn corak utk gnakan cp jari"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Pilih PIN anda"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Ttpkn PIN utk gunakan cap jari"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Sahkan kata laluan anda"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Sahkan corak anda"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Sahkan PIN anda"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Tetapan aplikasi"</string>
     <string name="install_applications" msgid="4872012136210802181">"Sumber tidak diketahui"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Benarkan semua sumber apl"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Apl yang dibuka baru-baru ini"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Lihat kesemua <xliff:g id="COUNT">%1$d</xliff:g> apl"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> yang lalu"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tablet dan data peribadi anda lebih mudah diserang oleh apl yang tidak diketahui. Dengan memasang apl daripada sumber ini, anda bersetuju bahawa anda bertanggungjawab terhadap sebarang kerosakan pada tablet anda atau kehilangan data akibat penggunaan apl tersebut."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefon dan data peribadi anda lebih mudah diserang oleh apl yang tidak diketahui. Dengan memasang apl daripada sumber ini, anda bersetuju bahawa anda bertanggungjawab terhadap sebarang kerosakan pada telefon anda atau kehilangan data akibat penggunaan apl tersebut."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Tetapan terperinci"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Hentikan perkhidmatan sistem?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Jika anda menghentikan perkhidmatan ini, beberapa ciri-ciri tablet anda boleh berhenti berfungsi dengan betul sehingga anda mematikannya dan kemudian menghidupkannya semula."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Jika anda menghentikan perkhidmatan ini, beberapa ciri telefon anda boleh berhenti berfungsi dengan betul sehingga anda mematikannya dan kemudian menghidupkannya semula."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Bahasa, masukan &amp; gerak isyarat"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Bahasa &amp; input"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Bahasa &amp; input"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Bantuan input"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> perkhidmatan cetak dihidupkan</item>
       <item quantity="one">1 perkhidmatan cetak dihidupkan</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tugas cetak</item>
+      <item quantity="one">1 tugas cetak</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Perkhidmatan cetak"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Tiada perkhidmatan dipasangkan"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Tiada pencetak ditemui"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Butiran penggunaan"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Laraskan penggunaan kuasa"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pakej yang disertakan"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apl yang menyusutkan kuasa bateri"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Memastikan peranti sentiasa berjaga"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Membangkitkan peranti dalam latar belakang"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Kerap meminta lokasi"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apl bergelagat tak normal"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Hentikan apl?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Telefon anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP">%1$s</xliff:g> membuatkan telefon anda sentiasa berjaga.\n\nUntuk cuba menyelesaikan isu ini, anda boleh menghenti paksa apl itu.\n\nJika perkara ini kerap berlaku, anda mungkin perlu menyahpasang apl tersebut untuk meningkatkan prestasi bateri."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Tablet anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP">%1$s</xliff:g> membuatkan tablet anda sentiasa berjaga.\n\nUntuk cuba menyelesaikan isu ini, anda boleh menghenti paksa apl itu.\n\nJika perkara ini kerap berlaku, anda mungkin perlu menyahpasang apl tersebut untuk meningkatkan prestasi bateri."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Peranti anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP">%1$s</xliff:g> membuatkan peranti anda sentiasa berjaga.\n\nUntuk cuba menyelesaikan isu ini, anda boleh menghenti paksa apl itu.\n\nJika perkara ini kerap berlaku, anda mungkin perlu menyahpasang apl tersebut untuk meningkatkan prestasi bateri."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Hentikan apl"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Matikan penggunaan latar belakang?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Telefon anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP">%1$s</xliff:g> asyik membangkitkan telefon.\n\nUntuk menyelesaikan isu ini, telefon anda boleh menghalang apl ini daripada berjalan di latar belakang."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Tablet anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP">%1$s</xliff:g> asyik membangkitkan tablet.\n\nUntuk menyelesaikan isu ini, tablet anda boleh menghalang apl ini daripada berjalan di latar belakang."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Peranti anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP">%1$s</xliff:g> asyik membangkitkan peranti.\n\nUntuk menyelesaikan isu ini, peranti anda boleh menghalang apl ini daripada berjalan di latar belakang."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Matikan"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Matikan lokasi?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Telefon anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP">%1$s</xliff:g> asyik meminta lokasi apabila anda tidak menggunakan apl itu.\n\nUntuk menyelesaikan isu ini, anda boleh mematikan lokasi untuk apl ini."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Tablet anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP">%1$s</xliff:g> asyik meminta lokasi apabila anda tidak menggunakan apl itu.\n\nUntuk menyelesaikan isu ini, anda boleh mematikan lokasi untuk apl ini."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Peranti anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP">%1$s</xliff:g> asyik meminta lokasi apabila anda tidak menggunakan apl itu.\n\nUntuk menyelesaikan isu ini, anda boleh mematikan lokasi untuk apl ini."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Matikan"</string>
     <string name="power_screen" msgid="3023346080675904613">"Skrin"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lampu suluh"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Apl"</string>
     <string name="power_service" msgid="1599661212370831780">"Perkhidmatan"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistem"</string>
-    <string name="power_user" msgid="1889728099253018005">"Pengguna"</string>
+    <string name="power_user" msgid="3706143225319881667">"Pengguna lain"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Jumlah CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Latar depan CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Kekal berjaga"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Penggunaan kuasa terlebih kira"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Digunakan selama <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktif selama <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Penggunaan skrin <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> digunakan oleh <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> daripada keseluruhan bateri"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Tukar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Tunjukkan pemberitahuan"</string>
     <string name="help_label" msgid="6886837949306318591">"Bantuan &amp; m/balas"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Artikel bantuan, sokongan telefon &amp; sembang"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Artikel bantuan, telefon &amp; sembang, bermula"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Akaun untuk kandungan"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID Berfoto"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ancaman melampau"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Tunjukkan %d item yang tersembunyi</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rangkaian &amp; Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mudah alih, penggunaan data, tempat liputan"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mudah alih"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"penggunaan data"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"tempat liputan"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Peranti yang disambungkan"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Hantar"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apl &amp; pemberitahuan"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Kebenaran, apl lalai"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Pengguna &amp; akaun"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gerak isyarat"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"bayar, ketik, bayaran"</string>
     <string name="keywords_backup" msgid="470070289135403022">"sandaran, sandarkan"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gerak isyarat, sisi, tepi, tepi aktiif, picit, genggam, bantu, pembantu, mudah digenggam, ok google, google assistant"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gerak isyarat, bangkit, pemberitahuan, skrin, paparan, skrin dimatikan, skrin dihidupkan, picit, tepi, tidur, genggam"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gerak isyarat, senyapkan, tunda, penggera, panggilan masuk, senyap, paparan, skrin kunci, picit, gengam, sisi, henti"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Sediakan Teg NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Tulis"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Ketik teg untuk menulis..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Jangan tunjukkan pemberitahuan kerja sama sekali"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Apabila peranti anda dikunci, bagaimanakah pemberitahuan profil harus dipaparkan?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Pemberitahuan profil"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Pemberitahuan"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Pemberitahuan"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Pemberitahuan apl"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategori pemberitahuan"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Kepentingan"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Biarkan apl yang menentukan"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Segera"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Benarkan bunyi"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Jangan berbunyi, bergetar atau mengintai pemberitahuan ini sehingga kelihatan pada skrin semasa."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Kepentingan rendah"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Kepentingan sederhana"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Kepentingan tinggi"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Kepentingan segera"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Pembantu pemberitahuan"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Akses pemberitahuan"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Akses ke pemberitahuan profil kerja disekat"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Gambar dalam gambar"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Benarkan gambar dalam gambar"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Benarkan apl ini membuat tetingkap gambar dalam gambar semasa apl ini dibuka atau setelah anda meninggalkan apl (contohnya, untuk meneruskan tontonan video). Tetingkap ini dipaparkan di sebelah atas apl lain yang anda gunakan."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Ya"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Tidak"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Akses Jangan Ganggu"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Tiada sebarang apl yang terpasang meminta akses Jangan Ganggu"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Memuatkan apl..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Profil kerja ini diurus oleh:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Diurus oleh <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Percubaan)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Putaran peranti"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Putar kandungan skrin"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Kekal dalam paparan potret"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Kekal dalam paparan landskap"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Kekal dalam orientasi semasa"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Permulaan selamat"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Teruskan"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Anda boleh melindungi peranti ini selanjutnya dengan meminta PIN sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan. \n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta PIN untuk memulakan peranti anda?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Anda boleh melindungi peranti ini selanjutnya dengan meminta kata laluan sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan. \n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta kata laluan untuk memulakan peranti anda?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Di samping penggunaan cap jari untuk membuka peranti, anda boleh melindungi peranti ini selanjutnya dengan meminta PIN sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan.\n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta PIN untuk memulakan peranti anda?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Di samping penggunaan cap jari untuk membuka peranti, anda boleh melindungi peranti ini selanjutnya dengan meminta corak sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan.\n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta corak untuk memulakan peranti anda?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Di samping penggunaan cap jari untuk membuka peranti, anda boleh melindungi peranti ini selanjutnya dengan meminta kata laluan sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan.\n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta kata laluan untuk memulakan peranti anda&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Selain menggunakan cap jari untuk membuka peranti, anda boleh melindungi peranti ini selanjutnya dengan meminta kata laluan sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan termasuk penggera sebelum dimulakan.\n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta kata laluan untuk memulakan peranti anda?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ya"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Tidak"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Memerlukan PIN?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Makluman penggunaan"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Tunjukkan penggunaan peranti penuh"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Tunjukkan penggunaan apl"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Penggunaan tinggi"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apl bergelagat luar biasa</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> bergelagat luar biasa</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Apl menyusutkan kuasa bateri</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> menyusutkan kuasa bateri</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Tidak dioptimumkan"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Tidak dioptimumkan"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Mengoptimumkan penggunaan bateri"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Paparkan di atas apl lain"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> daripada <xliff:g id="COUNT_1">%2$d</xliff:g> apl dibenarkan untuk dipaparkan di atas apl lain"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Apl dengan kebenaran"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Ya"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Tidak"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Dibenarkan"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Tidak dibenarkan"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"pasang apl sumber tidak diketahui"</string>
     <string name="write_settings" msgid="4797457275727195681">"Ubah suai tetapan sistem"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"tulis mengubah suai tetapan sistem"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Warna skrin ialah kuning jingga. Ini dapat membantu anda tidur."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Cadangan"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> lagi"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> cadangan</item>
+      <item quantity="one">1 cadangan</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> cadangan</item>
+      <item quantity="one">+1 cadangan</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Alih keluar"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Suhu warna sejuk"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gunakan warna paparan yang lebih sejuk"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Amaran data <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Amaran data <xliff:g id="ID_1">%1$s</xliff:g>/Had data <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Kitaran pengebilan"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Kitaran bulanan bermula pada <xliff:g id="ID_1">%1$s</xliff:g> setiap bulan"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Bulanan, bermula pada <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Setiap bulan pada hari ke-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Sekatan rangkaian"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> sekatan</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 apl dibenarkan menggunakan data tanpa had apabila Penjimat Data dihidupkan</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Penjimat data"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Akses data tanpa had"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Data tanpa had"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Data latar belakang dimatikan"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Hidup"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Mati"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kawal pemberitahuan skrin kunci"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Tunjukkan atau sembunyikan kandungan pemberitahuan"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Semua"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Sokongan"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Sokongan &amp; petua"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Lebar terkecil"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Tiada apl terpasang yang telah meminta akses SMS Premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS Premium bukan percuma dan cajnya akan ditambahkan pada bil pembawa anda. Jika anda mendayakan kebenaran untuk apl, anda akan dapat menghantar SMS premium menggunakan apl itu."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatik"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Kosongkan ruang sekarang"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gerak isyarat"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Pintasan gerak isyarat"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gerak isyarat pantas untuk mengawal telefon anda"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gerak isyarat pantas untuk mengawal tablet anda"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gerak isyarat pantas untuk mengawal peranti anda"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Langkau ke kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Untuk membuka kamera dengan cepat, tekan butang kuasa dua kali. Berfungsi daripada sebarang skrin."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Buka kamera dengan cepat"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Tekan butang kuasa dua kali untuk membuka kamera"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Balikkan kamera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Ambil potret diri dengan lebih pantas"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Pusing telefon dua kali untuk memasuki mod potret diri"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Pusing tablet dua kali untuk memasuki mod potret diri"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Pusing peranti dua kali untuk memasuki mod potret diri"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Ketik dua kali untuk menyemak telefon"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Ketik dua kali untuk menyemak tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Ketik dua kali untuk menyemak peranti"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Untuk menyemak pemberitahuan anda dengan pantas, ketik dua kali pada skrin anda."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Untuk menyemak masa, ikon pemberitahuan dan maklumat lain, ketik dua kali pada skrin anda."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Semak pemberitahuan apabila skrin dimatikan"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Angkat untuk menyemak telefon"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Angkat untuk menyemak tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Angkat untuk menyemak peranti"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Untuk menyemak pemberitahuan dengan pantas, angkat telefon anda."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Untuk menyemak pemberitahuan dengan pantas, angkat tablet anda."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Untuk menyemak pemberitahuan dengan pantas, angkat peranti anda."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Untuk menyemak masa, ikon pemberitahuan dan maklumat lain, angkat telefon anda."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Untuk menyemak masa, ikon pemberitahuan dan maklumat lain, angkat tablet anda."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Untuk menyemak masa, ikon pemberitahuan dan maklumat lain, angkat peranti anda."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Semak pemberitahuan apabila skrin dimatikan"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Leret cap jari untuk pemberitahuan"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Untuk menyemak pemberitahuan, leret ke bawah pada penderia cap jari di bahagian belakang telefon anda."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Untuk menyemak pemberitahuan, leret ke bawah pada penderia cap jari di bahagian belakang tablet anda."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Untuk menyemak pemberitahuan, leret ke bawah pada penderia cap jari di bahagian belakang peranti anda."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Lihat pemberitahuan dengan cepat"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Leret ke bawah pada penderia cap jari"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Angkat untuk membuka kamera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Untuk membuka kamera secara automatik, angkat telefon anda pada kedudukan mengambil gambar (landskap atau potret). Berfungsi apabila telefon tidur atau dikunci."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Ambil foto apabila telefon tidur atau dikunci"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gerak isyarat bantu"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Kepekaan"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Adakah anda mahu mengalih keluar apl segera ini?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Permainan"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Fail audio"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Ruang yang digunakan"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(dinyahpasang untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(dilumpuhkan untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Perkhidmatan autolengkap"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Apl segera"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Matikan pengurus storan?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Apl Filem &amp; TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Ruang yang digunakan"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Maklumat Peruntukan Pembawa"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Cetus Peruntukan Pembawa"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Apakah yang baharu dan menarik?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Lihatlah 5 ciri teratas"</string>
 </resources>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index 6afd139..7a8f67a 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"ကောင်းသည်"</item>
     <item msgid="8986346415847956850">"အလွန်ကောင်းသည်"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"အမြဲတမ်း"</item>
-    <item msgid="844721238536786870">"ကြိုးဖြင့်ဆက်ထားသည့်အခါသာ"</item>
-    <item msgid="1986753720941888596">"ဘယ်တော့မှ"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"အမြဲတမ်း"</item>
-    <item msgid="7433294150916905997">"ကြိုးဖြင့်ဆက်ထားသည့်အခါသာ"</item>
-    <item msgid="1390404486722375028">"ဘယ်တော့မှ"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"နောက်ဆုံး ရက် ၃၀"</item>
     <item msgid="6600989128423965319">"သုံးစွဲမှု စက်ဝန်း သတ်မှတ်ရန်..."</item>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 510003c..cfac1dd 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"သင်ဟာ ယခု တည်ဆောက်သူတစ်ယောက် ဖြစ်နေပါပြီ!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"မလိုတော့ပါ။ သင်သည် တည်ဆောက်သူတစ်ယောက် ဖြစ်နေပြီ ဖြစ်သည်။"</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"တီထွင်သူများရွေးစရာကို ဦးစွာဖွင့်ပါ။"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"ကြိုးမဲ့ &amp; ကွန်ရက်များ"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"အဆက်အသွယ်များ"</string>
     <string name="header_category_device" msgid="4544026001618307754">"ကိရိယာ"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ထောက်ပံ့ထားသည်"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ဗီဒီယိုခေါ်ဆိုမှု ပံ့ပိုးထားပါသည်"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi ဖြင့် ခေါ်ဆိုမှု ပံ့ပိုးထားပါသည်"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/လက်ရှိ ထောက်ပံ့ပေးခြင်း"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"မိုဘိုင်း ရေဒီယိုစွမ်းအား"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM ထဲရှိ လိပ်စာ စာအုပ်ကိုကြည့်ပါ"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်အားကြည့်မည်"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"စက်များကိုရှာဖွေရန် စကင်ပြုလုပ်နေသည်"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"ဤစက်ကို အမည်ပြောင်းရန်"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"အမည်ပြောင်းရန်"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ချိတ်ဆက်ခြင်းရပ်တန့်မလား?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">":&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;နှင့်ချိတ်ဆက်မှုများကို ပြီးဆုံးစေပါမည်"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"စက်ပစ္စည်းကို ချိတ်ဆက်မှုဖြုတ်လိုပါသလား။"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"သင့်ဖုန်းသည် <xliff:g id="DEVICE_NAME">%1$s</xliff:g> နှင့် ချိတ်ဆက်မှု ပြုတ်သွားပါလိမ့်မည်။"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"သင့်တက်ဘလက်သည် <xliff:g id="DEVICE_NAME">%1$s</xliff:g> နှင့် ချိတ်ဆက်မှု ပြုတ်သွားပါလိမ့်မည်။"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"သင့်စက်ပစ္စည်းသည် <xliff:g id="DEVICE_NAME">%1$s</xliff:g> နှင့် ချိတ်ဆက်မှု ပြုတ်သွားပါလိမ့်မည်။"</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"ဆက်သွယ်မှု ဖြတ်ရန်"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"ဘလူးတုသ် ဆက်တင်များကို ပြောင်းလဲရန် သင့်ဆီမှာ ခွင့်ပြုချက် မရှိပါ။"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"ဘလူးတုသ်ကိရိယာအသစ်ကို တွဲချိတ်ရန်"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"ဘလူးတုသ် ဖွင့်ထားလျှင် <xliff:g id="DEVICE_NAME">%1$s</xliff:g> အား အနီးရှိ စက်ကိရိယာများမှ မြင်နိုင်၏။"</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"ဖုန်း၏ ဘလူးတုသ်လိပ်စာ- <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"တက်ဘလက်၏ ဘလူးတုသ်လိပ်စာ- <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"စက်ပစ္စည်း၏ ဘလူးတုသ်လိပ်စာ- <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ကို အဆက်ဖြတ်ရမလား?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ထုတ်လွှင့်ခြင်း"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ကိုယ်ရေးအချက်အလက်အား ဖျောက်မည်လား"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"ဘလူးတုသ်တွဲချိတ်ရန် တောင်းခံသည်"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"တွဲချိတ်ရန် တောင်းခံသည်"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ဖြင့်အတူတွဲချိတ်ရန် တို့ပါ။"</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"ရရှိသောဖိုင်များကို ပြရန်"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"လက်ခံရရှိထားသော ဖိုင်များ"</string>
     <string name="device_picker" msgid="4978696506172252813">"ဘလူးတုသ် စက်ကိရိယာကို ရွေးပါ"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> က ဘလူးတုသ် ဖွင့်လိုသည်"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> က ဘလူးတုသ် ပိတ်လိုသည်"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s သည် သင်၏ စာများကို ရယူအသုံးပြုလိုသည်။ %2$s ကို အသုံးပြုခွင့် ပေးမည်လား?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM ကဒ် သုံးခွင့် တောင်းဆိုမှု"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> သည် သင့် SIM ကဒ်အား ဝင်ရောက်သုံးလို၏။ SIM ကဒ်အား ဝင်ရောက်သုံးခွင့်ပြုပါက ချိတ်ဆက်နေစဉ်ကာလအတွင်း သင့် စက်ကိရိယာ၏ ဒေတာချိတ်ဆက်မှုအား ပိတ်ထားလိမ့်မည်။ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> အား ဝင်ရောက်သုံးခွင့်ပြုရန်"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"အခြားစက်ပစ္စည်းများက \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' အဖြစ် မြင်တွေ့ရပါလိမ့်မည်"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"သင်၏ စက်ပစ္စည်းများ"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"စက်ပစ္စည်းအသစ်ကို တွဲချိတ်ရန်"</string>
     <string name="date_and_time" msgid="9062980487860757694">"ရက်စွဲနှင့် အချိန်"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"အချိန်ဇုန်အား ရွေးချယ်ခြင်း"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"အကောင့်များ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"တည်နေရာ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"အကောင့်များ"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"လုံခြုံရေးနှင့် တည်နေရာ"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"အသွင်ဝှက်ခြင်းနှင့် အထောက်အထားများ"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ဖုန်းကို အသွင်ဝှက်ထားသည်"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"စက်ပစ္စည်းကို အသွင်ဝှက်ထားသည်"</string>
@@ -354,40 +367,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"လက်ဗွေရာသုံး၍ ဖွင့်ပါ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"သင့်လက်ဗွေကို သုံးပါ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"သင့်ဖုန်းကိုလော့ခ်ဖွင့်ရန်၊ ဝယ်ယူမှုများကို အတည်ပြုရန် သို့မဟုတ် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ရန် လက်ဗွေအာရုံခံကိရိယာကိုသာ ထိလိုက်ပါ။ မည်သူ၏ လက်ဗွေအားထည့်သွင်းထားမည်ဆိုသည်ကို သတိပြုပါ။ လက်ဗွေတစ်ခုထည့်လိုက်လျှင်ပင် ဤအရာများအားလုံးကို လုပ်ဆောင်နိုင်မည် ဖြစ်သည်။\n\nမှတ်ချက်− သင့်လက်ဗွေသည် ခိုင်မာသည့်ပုံစံ သို့မဟုတ် ပင်နံပါတ် တစ်ခုထက် လုံခြုံမှု ပိုနည်းနိုင်သည်။"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"ဝယ်ယူမှုများကို အတည်ပြုရန် သို့မဟုတ် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ရန် လက်ဗွေအာရုံခံကိရိယာကိုသာ ထိလိုက်ပါ။ မည်သူ၏ လက်ဗွေအားထည့်သွင်းထားမည်ဆိုသည်ကို သတိပြုပါ။ လက်ဗွေတစ်ခုထည့်လိုက်လျှင်ပင် ဤအရာများအားလုံးကို လုပ်ဆောင်နိုင်မည် ဖြစ်သည်။\n\nမှတ်ချက်- ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန် သင့်လက်ဗွေကို အသုံးမပြုနိုင်ပါ။ အသေးစိတ်အချက်များအတွက် သင့်အဖွဲ့အစည်း၏ စီမံသူကို ဆက်သွယ်ပါ။"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"သင့်ဖုန်းကိုလော့ခ်ဖွင့်ရန်၊ ဝယ်ယူမှုများကို အတည်ပြုရန် သို့မဟုတ် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ရန် လက်ဗွေအာရုံခံကိရိယာကိုသာ ထိလိုက်ပါ။ မည်သူ၏ လက်ဗွေအားထည့်သွင်းထားမည်ဆိုသည်ကို သတိပြုပါ။ လက်ဗွေတစ်ခုထည့်လိုက်လျှင်ပင် ဤအရာများအားလုံးကို လုပ်ဆောင်နိုင်မည် ဖြစ်သည်။\n\nမှတ်ချက်− သင့်လက်ဗွေသည် ခိုင်မာသည့်ပုံစံ သို့မဟုတ် ပင်နံပါတ် တစ်ခုထက် လုံခြုံမှု ပိုနည်းနိုင်သည်။"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"သင့်ဖုန်းကို လော့ခ်ဖွင့်ရန် သို့မဟုတ် ဝယ်ယူမှုများကို ခွင့်ပြုပေးရန် သင့်လက်ဗွေကို အသုံးပြုပါ။\n\nမှတ်ချက်- ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန် သင့်လက်ဗွေကို အသုံးမပြုနိုင်ပါ။ အသေးစိတ်အချက်များအတွက် သင့်အဖွဲ့အစည်း၏ စီမံခန့်ခွဲသူကို ဆက်သွယ်ပါ။"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"သင့်ဖုန်းကို လော့ခ်ဖွင့်ရန် သို့မဟုတ် ဝယ်ယူမှုများကို ခွင့်ပြုပေးရန် သင့်လက်ဗွေကို အသုံးပြုပါ။\n\nမှတ်ချက်- သင့်လက်ဗွေသည် ခိုင်မာသည့်ပုံစံ သို့မဟုတ် ပင်နံပါတ် တို့လောက် လုံခြုံမှုမရှိပါ။"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"မလုပ်တော့"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ဆက်လုပ်ရန်"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"ကျော်ပါ"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"လက်ဗွေထည့်သွင်းပါ"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"စက်ပစ္စည်းကာကွယ်သည့်ဝန်ဆောင်မှုများကို အသုံးပြုရန် ဖွင့်မည် မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင်၊ အခိုးခံရလျှင် သို့မဟုတ် ဒေတာများကိုဖျက်လိုက်လျှင် ဤတက်ဘလက်ကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည် မဟုတ်ပါ။"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"စက်ပစ္စည်းကာကွယ်သည့်ဝန်ဆောင်မှုများကို အသုံးပြုရန် ဖွင့်မည် မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင်၊ အခိုးခံရလျှင် သို့မဟုတ် ဒေတာများကိုဖျက်လိုက်လျှင် ဤစက်ပစ္စည်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည် မဟုတ်ပါ။"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"စက်ပစ္စည်းကာကွယ်သည့်ဝန်ဆောင်မှုများကို အသုံးပြုရန် ဖွင့်မည် မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင်၊ အခိုးခံရလျှင် သို့မဟုတ် ဖုန်းဒေတာများကိုဖျက်လိုက်လျှင် ဤဖုန်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည် မဟုတ်ပါ။"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"စက်ပစ္စည်းကာကွယ်သည့်ဝန်ဆောင်မှုများကို အသုံးပြုရန် ဖွင့်မည် မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင် သို့မဟုတ် အခိုးခံရလျှင် ဤတက်ဘလက်ကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည် မဟုတ်ပါ။"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"စက်ပစ္စည်းကာကွယ်သည့်ဝန်ဆောင်မှုများကို အသုံးပြုရန် ဖွင့်မည် မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင် သို့မဟုတ် အခိုးခံရလျှင် ဤစက်ပစ္စည်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည် မဟုတ်ပါ။"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"စက်ပစ္စည်းကာကွယ်သည့်ဝန်ဆောင်မှုများကို အသုံးပြုရန် ဖွင့်မည် မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင် သို့မဟုတ် အခိုးခံရလျှင် ဤဖုန်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည် မဟုတ်ပါ။"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"ရှေ့သို့"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"စက်ပစ္စည်းကာကွယ်ရန် ဝန်ဆောင်မှုများ ပွင့်မည်မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင်၊ ခိုးခံရလျှင် သို့မဟုတ် ပြင်ဆင်သတ်မှတ်ခံရလျှင် ဤတက်ဘလက်ကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည်မဟုတ်ပါ။"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"စက်ပစ္စည်းကာကွယ်ရန် ဝန်ဆောင်မှုများ ပွင့်မည်မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင်၊ ခိုးခံရလျှင် သို့မဟုတ် ပြင်ဆင်သတ်မှတ်ခံရလျှင် ဤစက်ပစ္စည်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည်မဟုတ်ပါ။"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"စက်ပစ္စည်းကာကွယ်ရန် ဝန်ဆောင်မှုများ ပွင့်မည်မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင်၊ ခိုးခံရလျှင် သို့မဟုတ် ပြင်ဆင်သတ်မှတ်ခံရလျှင် ဤဖုန်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည်မဟုတ်ပါ။"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"စက်ပစ္စည်းကာကွယ်ရန် ဝန်ဆောင်မှုများ ပွင့်မည်မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင် သို့မဟုတ် အခိုးခံရလျှင် ဤတက်ဘလက်ကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည်မဟုတ်ပါ။"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"စက်ပစ္စည်းကာကွယ်ရန် ဝန်ဆောင်မှုများ ပွင့်မည်မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင် သို့မဟုတ် အခိုးခံရလျှင် ဤစက်ပစ္စည်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည်မဟုတ်ပါ။"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"စက်ပစ္စည်းကာကွယ်ရန် ဝန်ဆောင်မှုများ ပွင့်မည်မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင် သို့မဟုတ် အခိုးခံရလျှင် ဤဖုန်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည်မဟုတ်ပါ။"</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"မည်သို့ပင်ဖြစ်စေ ကျော်ပါ"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"နောက်သို့ သွားပါ"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"အာရုံခံကိရိယာ ရှာရန်"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"လက်ဗွေရာ အာရုံခံကိရိယာအား သင့်ဖုန်း၏ကျောဘက်တွင် နေရာချပါ။"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"အာရုံခံကိရိယာကို ထိပါ"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"၎င်းသည် သင့်ဖုန်း၏ ကျောဘက်တွင်ရှိပါသည်။ လက်ညှိုးကို အသုံးပြုပါ။"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"စက်ကိရိယာနှင့် လက်ဗွေရာအာရုံခံစက် ကိုတည်နေရာနှင့်အတူသရုပ်ဖော်ပုံ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"အမည်"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"အိုကေ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ဖျက်ရန်"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"စတင်ကြစို့"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"အာရုံခံကိရိယာကို ထိပါ"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"သင့်လက်ချောင်းကို အာရုံခံကိရိယာ ပေါ်သို့ တင်ပေးလိုက်ကာ တုန်ခါမှုကို ခံစားရချိန်တွင် မ’ယူလိုက်ပါ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ဆက်လုပ်ပါ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"သင့်လက်ဗွေရဲ့  အပိုင်း အမျိုးမျိုးကို ထည့်ပေးရန် သင့်လက်ချောင်းကို မသိမသာ ရွေ့လျားပေးပါ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"လက်ဗွေကို ထည့်ပြီးပါပြီ။"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ဤသင်္ကေတကို တွေ့လျှင် သင်သည် လက်ဗွေကို သက်သေခံအထောက်အထားအဖြစ် အသုံးပြုနိုင်သည် သို့မဟုတ် ဝယ်ယူခြင်းကို ခွင့်ပြုနိုင်ပါသည်။"</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"သင်၏ ကိရိယာကို နှိုးပေးရန် နှင့် သော့ဖွင့်ရန် လက်ဗွေ အာရုံခံ ကိရိယာကို ထိလိုက်ရုံပါပဲ။"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"ဤသင်္ကေတကိုတွေ့လျှင် ဝယ်ယူမှုများကို သင်က ခွင့်ပြုပေးနိုင်သည် သို့မဟုတ် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်နိုင်သည်။"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"မြှောက်ပါ ထို့နောက် ပြန်ထိပါ"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"လက်ဗွေ၏ အစိတ်အပိုင်းအမျိုးမျိုးကို ထည့်ရန်အတွက် သင့်လက်ချောင်းကို အကြိမ်တိုင်းမြှောက်ပေးပါ"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"လက်ဗွေကို ထည့်ပြီးပါပြီ"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"ဤသင်္ကေတကို မြင်ပါက အထောက်အထားတင်ပြရန် သို့မဟုတ် ဝယ်ယူမှုများကို အတည်ပြုရန် သင့်လက်ဗွေကို အသုံးပြုပါ။"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"လက်ဗွေရာ သတ်မှတ်မှုကို ကျော်မလား"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"သင့်လက်ဗွေဖြင့် သင့်ဖုန်းကို သော့ဖွင့်ရန် နည်းလမ်းတစ်ခုအဖြစ် ရွေးချယ်ခဲ့သည်။ အကယ်၍ယခုကျော်သွားလျှင်၊ ၎င်းကိုနောက်နှောင်တွင် သတ်မှတ်ရပါလိမ့်မည်။ သတ်မှတ်ခြင်းသည် မိနစ်အနည်းငယ်သာ ကြာပါသည်။"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ဖုန်းဖန်သားပြင် သော့စနစ် သတ်မှတ်ပါ"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"ပြီးပါပြီ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"အိုး။ ဒါ အာရုံခံကိရိယာမဟုတ်ဘူး"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"သင့်ရဲ့ စက်ကိရိယာပေါ်တွင် လက်ဗွေအာရုံခံစက်ကိုအသုံးပြုပါ။"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"သင့်ဖုန်း ကျောဘက်ရှိ အာရုံခံကိရိယာကို ထိပါ။ လက်ညှိုးကို အသုံးပြုပါ။"</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"စာရင်းသွင်းမှု မပြီးစီးခဲ့ပါ"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"လက်ဗွေ ပေးသွင်းမှု ကန့်သတ်ချိန် ကုန်သွားပြီ။ ထပ်စမ်းကြည့်ပါ။"</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"လက်ဗွေ ပေးသွင်းမှု အလုပ်မဖြစ်ခဲ့ပါ။ အခြား လက်ချောင်းကို သုံးရန် ထပ်စမ်းကြည်ပါ။"</string>
@@ -449,6 +460,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"စက်ပစ္စည်းကာကွယ်ခြင်း ဝန်ဆောင်မှုများကိုဖွင့်ခြင်းအားဖြင့် ဤစက်ပစ္စည်းကို သင့်ခွင့်ပြုချက်မရဘဲ မည်သူမျှအသုံးပြု၍မရအောင် ကာကွယ်ပါ။ သင်အသုံးပြုလိုသည့် မျက်နှာပြင်လော့ခ်ချမှုကို ရွေးချယ်ပါ။"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"စက်ပစ္စည်းကာကွယ်ခြင်း ဝန်ဆောင်မှုများကိုဖွင့်ခြင်းအားဖြင့် ဤဖုန်းကို သင့်ခွင့်ပြုချက်မရဘဲ မည်သူမျှအသုံးပြု၍မရအောင် ကာကွယ်ပါ။ သင်အသုံးပြုလိုသည့် မျက်နှာပြင်လော့ခ်ချမှုကို ရွေးချယ်ပါ။"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"သင့်ရဲ့အရန်သင့်သိမ်းဆည်းမျက်နှာပြင်သော့ခတ်တဲ့နည်းလမ်းကိုရွေးချယ်ပါ"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"မျက်နှာပြင် လော့ခ်ချရန် ရွေးချယ်စရာများ"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"မျက်နှာပြင် လော့ခ်ချရန် ရွေးချယ်စရာများ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ဖန်သားပြင် လော့ခ်ချခြင်း"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / ပိတ်သွားလျှင်သွားချင်း"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> ပိတ်ထားပြီးနောက်"</string>
@@ -519,13 +532,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"သော့ဖွင့်ရန်ပုံဖော်မှုအား ပြောင်းမည်"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ပင်နံပါတ်ပြောင်းမည်"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ဖွင့်ရန်စကားဝှက်အား ပြောင်းမည်"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"ထပ်စမ်းကြည့်ပါ။ <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> အတွင်းမှ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ခေါက်ကြိုးပမ်းမှု ဖြစ်သည်။"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"နောက်ဆုံးအကြိမ် စမ်းခြင်းဖြစ်သည်"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"ဤကြိုးပမ်းမှုတွင် မမှန်ကန်သည့်အလုပ်သုံး ပုံစံအား သင်ထည့်သွင်းခဲ့မည်ဆိုလျှင်၊ သင့်စက်ပစ္စည်းမှ သင့်အလုပ်ပရိုဖိုင်နှင့် ဆက်စပ်ဒေတာများကို ဖယ်ရှားသွားပါမည်။"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"ဤကြိုးပမ်းမှုတွင် မမှန်ကန်သည့်အလုပ်သုံး ပင်နံပါတ်အား သင်ထည့်သွင်းခဲ့မည်ဆိုလျှင်၊ သင့်စက်ပစ္စည်းမှ သင့်အလုပ်ပရိုဖိုင်နှင့် ဆက်စပ်ဒေတာများကို ဖယ်ရှားသွားပါမည်။"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"ဤကြိုးပမ်းမှုတွင် မမှန်ကန်သည့်အလုပ်သုံး စကားဝှက်အား သင်ထည့်သွင်းခဲ့မည်ဆိုလျှင်၊ သင့်စက်ပစ္စည်းမှ သင့်အလုပ်ပရိုဖိုင်နှင့် ဆက်စပ်ဒေတာများကို ဖယ်ရှားသွားပါမည်။"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"မှားယွင်းသည့် ကြိုးပမ်းမှု အလွန်များနေပါပြီ။ ဤစက်ပစ္စည်းမှ သင့်အလုပ်ပရိုဖိုင်နှင့် ဆက်စပ်ဒေတာများကို ဖယ်ရှားသွားပါမည်။"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ပယ်ရန်"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"ထပ်စမ်းကြည့်ပါ။ စုစုပေါင်း <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> ကြိမ်အနက်မှ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ကြိမ် ကြိုးပမ်းမှုဖြစ်သည်။"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"သင်၏ဒေတာများ ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"ပုံစံအမှားဖြင့် နောက်တစ်ကြိမ်ကြိုးပမ်းပါက ဤစက်ပစ္စည်းရှိ ဒေတာများ ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"PIN နံပါတ် အမှားဖြင့် နောက်တစ်ကြိမ် ကြိုးပမ်းပါက ဤစက်ပစ္စည်းရှိ ဒေတာများ ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"စကားဝှက်အမှားဖြင့် နောက်တစ်ကြိမ်ကြိုးပမ်းပါက ဤစက်ပစ္စည်းရှိ ဒေတာများ ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"ပုံစံအမှားဖြင့် နောက်တစ်ကြိမ်ကြိုးပမ်းပါက ဤအသုံးပြုသူအကောင့် ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"PIN နံပါတ် အမှားဖြင့် နောက်တစ်ကြိမ် ကြိုးပမ်းပါက ဤအသုံးပြုသူအကောင့် ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"စကားဝှက်အမှားဖြင့် နောက်တစ်ကြိမ်ကြိုးပမ်းပါက ဤအသုံးပြုသူအကောင့် ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"ပုံစံအမှားဖြင့် နောက်တစ်ကြိမ်ကြိုးပမ်းပါက သင်၏အလုပ်ပရိုဖိုင်နှင့် ၎င်း၏ ဒေတာများ ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"PIN နံပါတ် အမှားဖြင့် နောက်တစ်ကြိမ် ကြိုးပမ်းပါက သင်၏အလုပ်ပရိုဖိုင်နှင့် ၎င်း၏ဒေတာများ ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"စကားဝှက်အမှားဖြင့် နောက်တစ်ကြိမ်ကြိုးပမ်းပါက သင်၏အလုပ်ပရိုဖိုင်နှင့် ၎င်း၏ ဒေတာများ ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"မှားယွင်းစွာကြိုးပမ်းထားသော အကြိမ်ရေများနေပါပြီ။ ဤစက်ပစ္စည်းရှိ ဒေတာများပျက်သွားပါလိမ့်မည်။"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"မှားယွင်းစွာကြိုးပမ်းထားသော အကြိမ်ရေများနေပါပြီ။ ဤအသုံးပြုသူအကောင့် ပျက်သွားပါလိမ့်မည်။"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"မှားယွင်းစွာကြိုးပမ်းထားသော အကြိမ်ရေများနေပါပြီ။ ဤအလုပ်ပရိုဖိုင်နှင့် ၎င်း၏ ဒေတာများ ပျက်သွားပါလိမ့်မည်။"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"ပယ်ရန်"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"အနည်းဆုံး အက္ခရာ <xliff:g id="COUNT">%d</xliff:g> လုံး ရှိရမည်"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"ပင်နံပါတ်သည် အနည်းဆုံး ဂဏန်း <xliff:g id="COUNT">%d</xliff:g> လုံးရှိရမည်"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ဆက်လုပ်ရန်"</string>
@@ -626,6 +647,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"အဆင့်မြင့် ဘလူးတုသ်"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ဘလူးတုသ်ကို ဖွင့်ထားလျှင်၊ သင်၏ ကိရိယာသည် အနီးရှိ အခြား ဘလူးတုသ် ကိရိယာများဖြင့် ဆက်သွယ်နိုင်သည်။"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"တည်နေရာမှန်ကန်မှု တိုးတက်စေရန် စနစ်အက်ပ်များနှင့် ဝန်ဆောင်မှုများသည် ဘလူးတုသ် စက်ပစ္စည်းများကို ရှာဖွေနိုင်ပါသေးသည်။ ၎င်းကို <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ရှာဖွေမှု ဆက်တင်များ<xliff:g id="LINK_END_1">LINK_END</xliff:g> တွင်ပြောင်းလဲနိုင်ပါသည်။"</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"ချိတ်ဆက်မရပါ။ ထပ်လုပ်ကြည့်ပါ။"</string>
+    <string name="device_details_title" msgid="6576953269221085300">"စက်ပစ္စည်း အချက်အလက်အသေးစိတ်များ"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"စက်ပစ္စည်း၏ ဘလူးတုသ်လိပ်စာ- <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"စက်ပစ္စည်းကို ဖျက်လိုပါသလား။"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"သင့်ဖုန်းသည် <xliff:g id="DEVICE_NAME">%1$s</xliff:g> နှင့် တွဲချိတ်နေတော့မည် မဟုတ်ပါ"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"သင့်တက်ဘလက်သည် <xliff:g id="DEVICE_NAME">%1$s</xliff:g> နှင့် တွဲချိတ်နေတော့မည် မဟုတ်ပါ"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"သင့်စက်ပစ္စည်းသည် <xliff:g id="DEVICE_NAME">%1$s</xliff:g> နှင့် တွဲချိတ်နေတော့မည် မဟုတ်ပါ"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"စက်ပစ္စည်းကို ဖျက်ရန်"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ကိုချိတ်ဆက်ရန်"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"မီဒီယာအသံမှ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>အား ချိတ်ဆက်မှုရပ်ဆိုင်းမည်"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"လက်လွတ်ပြောဆိုမှုမှ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>အား ချိတ်ဆက်မှုရပ်ဆိုင်းမည်"</string>
@@ -778,6 +807,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"မပေးထားပါ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"အတည်မပြုပါ"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"အသိမှတ်ပြုလက်မှတ် မသတ်မှတ်ထားပါ။ သင့်ချိတ်ဆက်မှု တသီးတသန့်ဖြစ်မည် မဟုတ်ပါ။"</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"ကွန်ရက်အမည် ရှည်လွန်းပါသည်။"</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"ဒိုမိန်းတစ်ခု သတ်မှတ်ပေးရပါမည်။"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPSရရှိုနိုင်သည်"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPSရရှိုနိုင်သည်)"</string>
@@ -809,7 +839,6 @@
       <item quantity="one">ကွန်ရက် ၁ ခု</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"အဆင့်မြင့် Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"ကြိုးမဲ့ကွန်ရက်ကို စီဖွဲ့ပါ"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC လိပ်စာ"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"အိုင်ပီလိပ်စာ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet ကွင်းဆက်နံပါတ်"</string>
@@ -846,9 +875,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ဤအုပ်စုကိုမေ့ပစ်မည်လား?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ခရီးဆောင် Wi-Fi  ဟော့စပေါ့"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"ကြိုးမဲ့ ဟော့စပေါ့"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Wi-Fi ကွန်ရက်ပံ့ပိုးပေးရန် မိုဘိုင်းချိတ်ဆက်မှုကို သုံးပါ"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"ဤတက်ဘလက်၏ အင်တာနက်ချိတ်ဆက်မှုကို ဟော့စပေါ့ဖြင့် မျှဝေနေခြင်း မရှိပါ"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"ဤဖုန်း၏ အင်တာနက်ချိတ်ဆက်မှုကို ဟော့စပေါ့ဖြင့် မျှဝေနေခြင်း မရှိပါ"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"အင်တာနက် သို့မဟုတ် ပါဝင်သည့်အကြောင်းအရာများကို အခြားစက်ပစ္စည်းများနှင့် မျှဝေထားခြင်းမရှိပါ"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ဤတက်ဘလက်၏ အင်တာနက်ကို ဟော့စပေါ့မှ တစ်ဆင့် မျှဝေနေပါသည်"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ဤဖုန်း၏ အင်တာနက်ကို ဟော့စပေါ့မှ တစ်ဆင့် မျှဝေနေပါသည်"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"အက်ပ်သည် ပါဝင်သည့်အကြောင်းအရာများကို မျှဝေနေပါသည်။ အင်တာနက်ကို မျှဝေရန် ဟော့စပေါ့ကို ပိတ်ပြီး ပြန်ဖွင့်ပါ"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi အမည်"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ကို ဖွင့်နေပါသည်..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"အခြားစက်ပစ္စည်းများက <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> နှင့် ချိတ်ဆက်နိုင်ပါသည်"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi‑Fi စကားဝှက်"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP လိုင်း"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"သင်၏ အခြားစက်ပစ္စည်းများအတွက် Wi‑Fi ကွန်ရက်ကို ဖွင့်ပေးရန် ဟော့စပေါ့ကို အသုံးပြုပါ။ ဟော့စပေါ့က သင်၏ မိုဘိုင်းဒေတာဆက်သွယ်မှုကို အသုံးပြုပြီး အင်တာနက်ကို ဖန်တီးပေးနိုင်ပါသည်။ မိုဘိုင်းဒေတာသုံးစွဲခ ပိုကုန်ကျနိုင်ပါသည်။"</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ပါဝင်သည့်အကြောင်းအရာများကို အနီးတစ်ဝိုက်ရှိ စက်ပစ္စည်းများနှင့် မျှဝေရန်အတွက် အက်ပ်များက ဟော့စပေါ့တစ်ခု ဖွင့်နိုင်ပါသည်။"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"ဟော့စပေါ့ ဖွင့်နေသည် …"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"ဟော့စပေါ့ ပိတ်နေသည် …"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ပွင့်နေသည်"</string>
@@ -895,6 +932,7 @@
     <item msgid="6200207341126893791">"၁"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"သင့်ရွေးချယ်မှု သိုမ့ဟုတ်  စစ်ဂနယ် အားရှိမှုပေါ် မူတည်လျှက်၊ ဝိုင်ဖိုင်ခေါ်ဆိုမှု ဖွင့်ထားပါက၊ သင့်ဖုန်းသည် ဝိုင်ဖိုင်ကွန်ယက်များ သို့မဟုတ် သင့် မိုဘိုင်းဝန်ဆောင်မှုဌာန၏ ကွန်ယက်မှတဆင့် ခေါ်ဆိုမှုများအား ပေးပို့နိုင်သည်။ ဤလုပ်ဆောင်နိုင်ချက်အား မဖွင့်မီ၊ ကျသင့်ငွေနှင့် အခြားအသေးစိတ်များအတွက် သင့် မိုဘိုင်းဝန်ဆောင်မှုဌာနအား မေးမြန်းပါ။"</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"အရေးပေါ်လိပ်စာကို အပ်ဒိတ်လုပ်ပါ"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"WiFi ကို အသုံးပြု၍ ၉၁၁ သို့ ဖုန်းခေါ်ဆိုသည့်အခါ သင့်တည်နေရာအဖြစ် အရေးပေါ်ဝန်ဆောင်မှုများမှ အသုံးပြုသည့် လိပ်စာ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ဖန်သားပြင်"</string>
@@ -952,6 +990,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"ရလဒ် တစ်ခုမျှ မရှိပါ"</string>
     <string name="display_settings" msgid="7965901687241669598">"ဖန်သားပြင်"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"မျက်နှာပြင်ကို အော်တိုလှည့်ရန်"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"တောက်ပသော အရောင်များ"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"တက်ဘလက်ကိုလှည့်လျှင် အနေအထားအားအလိုအလျောက်ပြောင်းရန်"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ဖုန်းကိုလှည့်သည့်အခါတွင် အနေအထားအား အလိုအလျောက်ပြောင်းရန်"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"တက်ဘလက်ကိုလှည့်လျှင် အနေအထားအားအလိုအလျောက်ပြောင်းရန်"</string>
@@ -979,23 +1018,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"လက်ရှိအလင်းရောင်အလိုက် တောက်ပမှုကိုထိန်းညှိပေးသည်။ သင်သည်တောက်ပမှုကို ယာယီဆက်လက် ချိန်နိုင်ပါသေးသည်။"</string>
     <string name="night_display_title" msgid="2626451512200357686">"ညအလင်းရောင်"</string>
     <string name="night_display_text" msgid="1837277457033025056">"\"ညအလင်းရောင်\" သည် သင့်ဖန်သားပြင်ကို ပယင်းရောင်သန်းစေပါသည်။ ၎င်းက မီးမှိန်အောက်တွင် သင့်ဖန်သားပြင်ကို ကြည့်ရှုရာ၌ သို့မဟုတ် ဖတ်ရှုရာ၌ ပို၍လွယ်ကူစေပြီး သင့်ကို ပို၍ လွယ်ကူစွာ အိပ်ပျော်သွားစေနိုင်ပါသည်။"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"အချိန်ဇယား"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"အခြေအနေ"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"အလိုအလျောက် ဖွင့်ပါ"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"ဘယ်တော့မှ"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"မိမိစိတ်ကြိုက် အစီအစဉ်ချခြင်း"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"နေဝင်ချိန်မှ နေထွက်ချိန်"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"အချိန်ဇယား"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"သုံးမထားပါ"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"သတ်မှတ်ချိန်တွင် ဖွင့်ရန်"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"နေဝင်ချိန်မှ နေထွက်ချိန်ထိ ဖွင့်ရန်"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"စတင်ချိန်"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"ပြီးဆုံးချိန်"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"အခြေအနေ"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"တောက်ပမှု"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"ပိတ်ထားသည်။ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"ဘယ်တော့မှ အလိုအလျောက်ဖွင့်မည်မဟုတ်ပါ။"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g> တွင် အလိုအလျောက် ဖွင့်လိမ့်မည်။"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"နေဝင်ချိန်တွင် အလိုအလျောက်ဖွင့်ပါမည်။"</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"ဖွင့်ထားသည်။ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"ဘယ်တော့မှ အလိုအလျောက်ပိတ်မည်မဟုတ်ပါ။"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g> တွင် အလိုအလျောက် ပိတ်ပါမည်။"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"နေထွက်ချိန်တွင် အလိုအလျောက်ပိတ်ပါမည်။"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"ပိတ်ထားသည် / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"မည်သည့်အခါမျှ အလိုအလျောက် ပွင့်မည် မဟုတ်ပါ"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g> တွင် အလိုအလျောက် ပွင့်ပါမည်"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"နေဝင်ချိန်တွင် အလိုအလျောက် ပွင့်ပါမည်"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"ဖွင့်ထားသည် / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"မည်သည့်အခါမျှ အလိုအလျောက် ပိတ်မည် မဟုတ်ပါ"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g> တွင် အလိုအလျောက် ပိတ်ပါမည်"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"နေထွက်ချိန်တွင် အလိုအလျောက် ပိတ်ပါမည်"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"ပိတ်ထားရန်"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"မျက်နှာပြင်ကို ပိတ်ထားသည်"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>ကြာ အသုံးပြုမှု မရှိခြင်း"</string>
@@ -1019,8 +1057,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"ဆက်တင်များ"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"အလိုအလျောက်အလင်းချိန်ခြင်း။"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"နှိုးပေးဖို့ မ’ယူရန်"</string>
-    <string name="doze_title" msgid="2259176504273878294">"ဝန်းကျင်ကို ပြကွက်"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"ဝန်းကျင်ကို ပြကွက်"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"အမြဲတမ်း ဖွင့်ထားရန်"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"အကြောင်းကြားချက်အသစ်များ"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ပြသရမည့်အချိန်"</string>
+    <string name="doze_title" msgid="2375510714460456687">"အကြောင်းကြားချက်အသစ်များ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"အကြောင်းကြားချက်များ သင်လက်ခံရရှိချိန်တွင် ဖန်သားပြင်ကို ဖွင့်ခိုင်းပါ"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"အမြဲတမ်း ဖွင့်ထားရန်"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"အချိန်၊ အကြောင်းကြားချက်သင်္ကေတများနှင့် အခြားအချက်အလက်များကို ပြသပါ"</string>
     <string name="title_font_size" msgid="4405544325522105222">"စာလုံးအရွယ်အစား"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"စာလုံးကို ပိုကြီးအောင် သို့မဟုတ် ပိုသေးအောင်ပြုလုပ်ပါ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"ဆင်းမ်ကဒ် လော့ခ်ဆက်တင်များ"</string>
@@ -1272,6 +1316,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APNမှာ ကွက်လပ်ဖြစ်မနေစေရပါ"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MNC အကွက်မှာ ဂဏန်း (၃)လုံးဖြစ်ရမည်"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC အကွက်မှာ ဂဏန်း (၂)လုံး သို့မဟုတ် (၃)လုံးဖြစ်ရမည်"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"ဝန်ဆောင်မှုပေးသူသည် %s အမျိုးအစား APNs များကို ထည့်သွင်းခွင့်မပြုပါ။"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"မူရင်း APNဆက်တင်များကိုပြန်လည်ရယူစေမည်"</string>
     <string name="menu_restore" msgid="8260067415075573273">"စနစ်အား မူလစက်ရုံအခြအေနေထံ ပြန်လည်သတ်မှတ်ရန်"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN ၏မူရင်းအပြင်အဆင်များကို အစသို့ပြန်လည်စတင်မှုအား ပြီးဆုံးပါပြီ"</string>
@@ -1301,6 +1346,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SDကတ်အား ဖျက်ရန်"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"USBသိုလှောင်မှုထဲမှ သီချင်းနှင့် ဓါတ်ပုံကဲ့သို့ စက်တွင်းဒေတာအားလုံးအားဖျက်မည်"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SDကဒ်ထဲရှိ သီချင်းသို့မဟုတ် ဓါတ်ပုံကဲ့သို့ ဒေတာအားလုံးအား ဖျက်ရန်"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM များကို ဖျက်ရန်"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"ဖုန်းထဲရှိ eSIMs အားလုံးကို ဖျက်လိုက်ပါ။ ဤသို့ပြုလုပ်ခြင်းဖြင့် သင်၏ မိုဘိုင်းဝန်ဆောင်မှု အစီအစဉ်ကို ဖျက်သိမ်းလိမ့်မည်မဟုတ်ပါ။"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"တက်ဘလက်ထဲရှိ eSIMs အားလုံးကို ဖျက်လိုက်ပါ။ ၎င်းသည် သင်၏ မိုဘိုင်းဝန်ဆောင်မှု အစီအစဉ်ကို ပယ်ဖျက်လိုက်မည်မဟုတ်ပါ။"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"တက်ဘလက်ကို အစမှပြန်လည်စတင်စေရန်"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ဖုန်းကို အစမှပြန်လည်စတင်စေရန်"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"သင့်ကိုယ်ပိုင်အချက်အလက်များနှင့် ဒေါင်းလုပ်ပြုလုပ်ထားသောအပလီကေးရှင်းများကို ဖျက်မည်လား? ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်၍မရပါ!"</string>
@@ -1323,26 +1371,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ဒေတာချွေတာမှုစနစ် ဖွင့်ထားစဉ်တွင် ထုတ်လွှင့်၍မရပါ သို့မဟုတ် ရွှေ့ပြောင်းဟော့စပေါ့ကို အသုံးပြု၍မရပါ"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB သုံး၍ချိတ်ဆက်ခြင်း"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB ချိတ်ဆက်ထားပြီး၊ တဆင့်လွှင့်နိုင်ရန် စစ်ဆေးပါ"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"တဆင့်ပြန်လည်ချိတ်ဆက်မှု"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USBသိုလှောင်မှုကိရိယာကို အသုံးပြုနေချိန်တွင် တဆင့်လွှင့်နိုင်ခြင်း မပြုလုပ်နိုင်ပါ"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USBအား ချိတ်ဆက်မထားပါ"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"ဖွင့်ပေးရန် ချိတ်ဆက်ပါ"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB သုံး၍ချိတ်ဆက်ခြင်း အမှား"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"ဖုန်း၏ အင်တာနက်ကို USB မှတစ်ဆင့် မျှဝေရန်"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"တက်ဘလက်၏ အင်တာနက်ကို USB မှတစ်ဆင့် မျှဝေရန်"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ဘလူးတုသ်သုံးချိတ်ဆက်ခြင်း"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"ဤတက်ဘလက်၏ အင်တာနက်ကို ဘလူးတုသ်မှတစ်ဆင့် မျှဝေပါသည်"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"ဤဖုန်း၏ အင်တာနက်ကို ဘလူးတုသ်မှတစ်ဆင့် မျှဝေပါသည်"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"ဤတက်ဘလက်၏အင်တာနက်ကို စက် ၁ ခုသို့ဘလူးတုသ်မှတစ်ဆင့်မျှဝေနေသည်"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"ဤဖုန်း၏အင်တာနက်ကို စက် ၁ ခုသို့ ဘလူးတုသ်မှတစ်ဆင့် မျှဝေနေသည်"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"ဤတက်ဘလက်၏အင်တာနက်ကို စက် <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ခုသို့ ဘလူးတုသ်မှတစ်ဆင့်မျှဝေနေသည်"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"ဤဖုန်း၏ အင်တာနက်ကို စက် <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ခုသို့ ဘလူးတုသ်မှတစ်ဆင့် မျှဝေနေသည်"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"တက်ဘလက်၏ အင်တာနက်ကို ဘလူးတုသ်မှတစ်ဆင့် မျှဝေရန်"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"ဖုန်း၏ အင်တာနက်ကို ဘလူးတုသ်မှတစ်ဆင့် မျှဝေရန်"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"ဤ <xliff:g id="DEVICE_NAME">%1$d</xliff:g> ၏အင်တာနက်ကို ဘလူးတုသ်မှတစ်ဆင့် မျှဝေနေသည်"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"ဤတက်ဘလက်၏အင်တာနက်ကို ဘလူးတုသ်ဖြင့်မျှဝေခြင်းမရှိပါ"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"ဤဖုန်း၏အင်တာနက်ကို ဘလူးတုသ်ဖြင့်မျှဝေနေခြင်းမရှိပါ"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"တဆင့်ပြန်လည်ချိတ်ဆက်မထားပါ"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> စက်လုံးထက် ပို၍တဆင့်ပြန်လည်ချိတ်ဆက်မရပါ"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> သည် ချိတ်ဆက်မှု ပြတ်တောက်မည်"</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"သင်၏ မိုဘိုင်းဒေတာ ချိတ်ဆက်မှု မှတစ်ဆင့် အခြားသော စက်ပစ္စည်းများသို့ အင်တာနက် အသုံးပြုခွင့် ပေးလိုလျှင် ဟောစပေါ့နှင့် မိုဘိုင်းဖုန်းကို မိုဒမ်အဖြစ်အသုံးပြုခြင်းစနစ်ကို သုံးပါ။"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"သင်၏ မိုဘိုင်းဒေတာ ချိတ်ဆက်မှုမှတစ်ဆင့် အခြားသော စက်ပစ္စည်းများသို့ အင်တာနက် အသုံးပြုခွင့် ပေးလိုလျှင် ဟောစပေါ့နှင့် မိုဘိုင်းဖုန်းကို မိုဒမ်အဖြစ်အသုံးပြုခြင်းစနစ်ကို သုံးပါ။ ပါဝင်သည့်အကြောင်းအရာများကို အနီးတစ်ဝိုက်ရှိ စက်ပစ္စည်းများနှင့် မျှဝေရန်အတွက်လည်း အက်ပ်များက ဟော့စပေါ့တစ်ခု ဖွင့်နိုင်ပါသည်။"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"အကူအညီ"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"မိုဘိုင်းကွန်ရက်"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"မိုဘိုင်းလ်အစီအစဉ်"</string>
@@ -1375,7 +1412,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"တည်နေရာပြစနစ်"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"တည်နေရာကို ဆုံးဖြတ်ရန် GPS၊ Wi-Fi၊ ဘလူးတုသ် သို့မဟုတ် မိုဘိုင်းကွန်ရက်များကို အသုံးပြုပါ"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"တည်နေရာကို ဆုံးဖြတ်ရန် Wi-Fi၊ ဘလူးတုသ် သို့မဟုတ် မိုဘိုင်းကွန်ရက်များကို အသုံးပြုပါ"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"တည်နေရာကို သိရှိရန် GPS ကို သုံးပါ။"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"တည်နေရာကို ဆုံးဖြတ်ရန် GPS နှင့် စက်ပစ္စည်း၏ အာရုံခံကိရိယာများကို သုံးပါ"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"ကြည့်ရှုနေပါသည်"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi ရှာဖွေနေသည်"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"စနစ်၏ အက်ပ်များနှင့် ဝန်ဆောင်မှုများအား Wi-Fi စက်ပစ္စည်းများကို အချိန်မရွေး ရှာဖွေခွင့်ပေးခြင်းဖြင့် တည်နေရာရှာဖွေခြင်းကို ပို၍ကောင်းမွန်စေမည်။"</string>
@@ -1420,8 +1457,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"သင့်တွင်ဒေတာဆက်သွယ်မှုမရှိပါ။ ဤကြောင်းကြားချက်ကိုကြည့်ရန်အတွက် အင်တာနက်ဆက်သွယ်မှုရှိသည့် မည်သည့်ကွန်ပြုတာမှမဆို %sထံသွားပါ။"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ဖွင့်နေဆဲ…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"သင့်စကားဝှက်ကိုရွေးချယ်ပါ"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"လက်ဗွေကို အသုံးပြုနိုင်ရန် စကားဝှက်သတ်မှတ်ပါ"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"သင့်ပုံစံအား ရွေးပါ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"လက်ဗွေကို အသုံးပြုနိုင်ရန် ပုံစံသတ်မှတ်ပါ"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"သင့်ပင်နံပါတ်အား ရွေးပါ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"လက်ဗွေကို အသုံးပြုနိုင်ရန် ပင်နံပါတ်သတ်မှတ်ပါ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"သင့်စကားဝှက်ကို အတည်ပြုပါ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"သင့်ပုံဖော်မှုကို အတည်ပြုပါ"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"ပင်နံပါတ်ကို  အတည်ပြုပါ"</string>
@@ -1490,6 +1530,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"အပ်ပလီကေးရှင်းဆက်တင်များ"</string>
     <string name="install_applications" msgid="4872012136210802181">"မူရင်းမသိရသော အရင်းအမြစ်များ"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"အက်ပ်ရင်းမြစ်များ ခွင့်ပြုရန်"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"မကြာသေးမီက ဖွင့်ထားသော အက်ပ်များ"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"အက်ပ် <xliff:g id="COUNT">%1$d</xliff:g> ခုလုံးကို ကြည့်ရန်"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"ပြီးခဲ့သည့် <xliff:g id="TIME">^1</xliff:g> က"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"သင်၏တက်ဘလက်နှင့် ကိုယ်ရေးကိုယ်တာ အချက်အလက်များသည် အမျိုးအမည် မသိသောအက်ပ်များ၏ တိုက်ခိုက်ခြင်းကို ပိုမိုခံရနိုင်ပါသည်။ ဤနေရာမှ ရယူထားသည့် အက်ပ်များကို ထည့်သွင်းအသုံးပြုခြင်းဖြင့် ဖြစ်ပေါ်လာနိုင်သော ဖုန်းပျက်စီးမှု သို့မဟုတ် ဒေတာဆုံးရှုံးမှုများအတွက် သင့်ထံ၌သာ တာဝန်ရှိကြောင်းကို သင်က သဘောတူရာရောက်ပါသည်။"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"သင်၏ဖုန်းနှင့် ကိုယ်ရေးကိုယ်တာ အချက်အလက်များသည် အမျိုးအမည် မသိသောအက်ပ်များ၏ တိုက်ခိုက်ခြင်းကို ပိုမိုခံရနိုင်ပါသည်။ ဤနေရာမှ ရယူထားသည့် အက်ပ်များကို ထည့်သွင်းအသုံးပြုခြင်းဖြင့် ဖြစ်ပေါ်လာနိုင်သော ဖုန်းပျက်စီးမှု သို့မဟုတ် ဒေတာဆုံးရှုံးမှုများအတွက် သင့်ထံ၌သာ တာဝန်ရှိကြောင်းကို သင်က သဘောတူရာရောက်ပါသည်။"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"အဆင့်မြင့်အပြင်အဆင်များ"</string>
@@ -1658,6 +1701,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"စနစ်၏ဝန်ဆောင်မှုကို ရပ်ဆိုင်းမည်လား?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"အကယ်၍ ဤဆားဗစ်ကိုရပ်ဆိုင်းလျှင် သင့်တက်ဘလက်ထဲမှတချို့လုပ်ဆောင်ချက်များမှာ ပါဝါပိတ်ကာ ပြန်လည်ဖွင့်သည့်အထိ အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"အကယ်၍ဤဝန်ဆောင်မှုကိုရပ်ဆိုင်းလျှင် သင့်ဖုန်း၏အချို့သောလုပ်ဆောင်ချက်များမှာ ပါဝါပိတ်ပြီး နောက်တခါပြန်လည်ဖွင့်သည့်အထိ ကောင်းစွာအလုပ်လုပ်မည်မဟုတ်ပါ"</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"ဘာသာစကားများ၊ စာရိုက်စနစ်များနှင့် ဟန်ပန်အမူအယာများ"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"ဘာသာစကားနှင့် စာရိုက်စနစ်"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ဘာသာစကားနှင့် စာရိုက်စနစ်"</string>
     <string name="input_assistance" msgid="7577795275222555487">"စာရိုက်ခြင်း အထောက်အကူပြုစနစ်"</string>
@@ -1872,6 +1919,10 @@
       <item quantity="other">ပုံနှိပ်ဝန်ဆောင်မှု <xliff:g id="COUNT">%1$d</xliff:g> ခုကို ဖွင့်ထားသည်</item>
       <item quantity="one">ပုံနှိပ်ဝန်ဆောင်မှု ၁ ခုကို ဖွင့်ထားသည်</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other">ပုံနှိပ်ရန်ဖိုင် <xliff:g id="COUNT">%1$d</xliff:g> ခု</item>
+      <item quantity="one">ပုံနှိပ်ရန်ဖိုင် ၁ ခု</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"ပုံနှိပ်ဝန်ဆောင်မှုများ"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"မည်သည့်ဆားဗစ်မှမရှိပါ"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"စာထုတ်စက် တစ်ခုမှ မတွေ့ရှိပါ"</string>
@@ -1938,6 +1989,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"အသေးစိတ် အသုံးပြုခြင်း"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"ပါဝါအသုံးပြုမှုအား ချိန်တွယ်ခြင်း"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"ပါဝင်သော ဆော့ဝဲလ်များ"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"အက်ပ်များက ဓာတ်ခဲကို အားကုန်စေပါသည်"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"စက်ပစ္စည်းကို ပွင့်နေစေသည်"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"စက်ပစ္စည်းကို နောက်ခံ၌ ပွင့်နေစေသည်"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"တည်နေရာကို မကြာခဏတောင်းဆိုနေသည်"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"အက်ပ် <xliff:g id="NUMBER">%1$d</xliff:g> ခုသည် ပုံမှန်အလုပ်မလုပ်ပါ"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"အက်ပ်ကို ရပ်ဆိုင်းလိုပါသလား။"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"<xliff:g id="APP">%1$s</xliff:g> က သင်၏ဖုန်းကို အမြဲပွင့်နေစေသောကြောင့် သင့်ဖုန်းသည် ဓာတ်ခဲအားကို ပုံမှန်စီမံခန့်ခွဲနိုင်ခြင်း မရှိပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် ၎င်းအက်ပ်ကို အဓမ္မရပ်ဆိုင်းကြည့်နိုင်သည်။\n\nပြဿနာ ဆက်ရှိနေပါက သင်၏ ဓာတ်ခဲစွမ်းဆောင်ရည်ကို တိုးမြှင့်ရန်အတွက် အက်ပ်ကို ဖယ်ရှားရန်လိုပါသည်။"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"<xliff:g id="APP">%1$s</xliff:g> က သင်၏တက်ဘလက်ကို အမြဲပွင့်နေစေသောကြောင့် သင့်တက်ဘလက်သည် ဓာတ်ခဲအားကို ပုံမှန် စီမံခန့်ခွဲနိုင်ခြင်း မရှိပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် ၎င်းအက်ပ်ကို အဓမ္မရပ်ဆိုင်းကြည့်နိုင်သည်။\n\nပြဿနာ ဆက်ရှိနေပါက သင်၏ ဓာတ်ခဲစွမ်းဆောင်ရည်ကို တိုးမြှင့်ရန်အတွက် အက်ပ်ကို ဖယ်ရှားရန်လိုပါသည်။"</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"<xliff:g id="APP">%1$s</xliff:g> က သင်၏စက်ပစ္စည်းကို အမြဲပွင့်နေစေသောကြောင့် သင့်စက်ပစ္စည်းသည် ဓာတ်ခဲအားကို ပုံမှန်စီမံခန့်ခွဲနိုင်ခြင်း မရှိပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် ၎င်းအက်ပ်ကို အဓမ္မရပ်ဆိုင်းကြည့်နိုင်သည်။\n\nပြဿနာ ဆက်ရှိနေပါက သင်၏ ဓာတ်ခဲစွမ်းဆောင်ရည်ကို တိုးမြှင့်ရန်အတွက် အက်ပ်ကို ဖယ်ရှားရန်လိုပါသည်။"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"အက်ပ်ကို ရပ်ဆိုင်းရန်"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"နောက်ခံ၌အသုံးပြုခြင်းကို ပိတ်လိုပါသလား။"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"<xliff:g id="APP">%1$s</xliff:g> က သင်၏ဖုန်းကို အမြဲပွင့်နေစေသောကြောင့် သင့်ဖုန်းသည် ဓာတ်ခဲအားကို ပုံမှန်စီမံခန့်ခွဲနိုင်ခြင်း မရှိပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန်အတွက် သင့်ဖုန်းသည် ဤအက်ပ်အား နောက်ခံ၌ ပွင့်နေခြင်းမရှိအောင် တားဆီးနိုင်ပါသည်။"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"<xliff:g id="APP">%1$s</xliff:g> က သင်၏တက်ဘလက်ကို အမြဲပွင့်နေစေသောကြောင့် သင့်တက်ဘလက်သည် ဓာတ်ခဲအားကို ပုံမှန်စီမံခန့်ခွဲနိုင်ခြင်း မရှိပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန်အတွက် သင့်တက်ဘလက်သည် ဤအက်ပ်အား နောက်ခံ၌ ပွင့်နေခြင်းမရှိအောင် တားဆီးနိုင်ပါသည်။"</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"<xliff:g id="APP">%1$s</xliff:g> က သင်၏ စက်ပစ္စည်းကို အမြဲပွင့်နေစေသောကြောင့် သင်၏ စက်ပစ္စည်းသည် ဓာတ်ခဲအားကို ပုံမှန်စီမံခန့်ခွဲနိုင်ခြင်း မရှိပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန်အတွက် သင့်စက်ပစ္စည်းသည် ဤအက်ပ်အား နောက်ခံ၌ ပွင့်နေခြင်းမရှိအောင် တားဆီးနိုင်ပါသည်။"</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"ပိတ်ရန်"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"တည်နေရာကို ပိတ်လိုပါသလား။"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"<xliff:g id="APP">%1$s</xliff:g> က ၎င်းကို အသုံးမပြုဘဲထားချိန်တွင် သင်၏တည်နေရာကို အမြဲတမ်းတောင်းခံနေသောကြောင့် သင့်ဖုန်းသည် ဓာတ်ခဲအားကို ပုံမှန် စီမံခန့်ခွဲနိုင်ခြင်းမရှိပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် ဤအက်ပ်အတွက် တည်နေရာဝန်ဆောင်မှုကို ပိတ်ထားနိုင်ပါသည်။"</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"<xliff:g id="APP">%1$s</xliff:g> က ၎င်းကို အသုံးမပြုဘဲထားချိန်တွင် သင်၏တည်နေရာကို အမြဲတမ်းတောင်းခံနေသောကြောင့် သင့်တက်ဘလက်သည် ဓာတ်ခဲအားကို ပုံမှန် စီမံခန့်ခွဲနိုင်ခြင်းမရှိပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် ဤအက်ပ်အတွက် တည်နေရာဝန်ဆောင်မှုကို ပိတ်ထားနိုင်ပါသည်။"</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"<xliff:g id="APP">%1$s</xliff:g> က ၎င်းကို အသုံးမပြုဘဲထားချိန်တွင် သင်၏တည်နေရာကို အမြဲတမ်းတောင်းခံနေသောကြောင့် သင့်စက်ပစ္စည်းသည် ဓာတ်ခဲအားကို ပုံမှန် စီမံခန့်ခွဲနိုင်ခြင်းမရှိပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် ဤအက်ပ်အတွက် တည်နေရာဝန်ဆောင်မှုကို ပိတ်ထားနိုင်ပါသည်။"</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"ပိတ်ရန်"</string>
     <string name="power_screen" msgid="3023346080675904613">"မှန်သားမျက်နှာပြင်"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"ဖလက်ရှမီး"</string>
     <string name="power_camera" msgid="4976286950934622605">"ကင်မရာ"</string>
@@ -1952,7 +2023,7 @@
     <string name="power_apps" msgid="2043554781293951327">"အက်ပ်များ"</string>
     <string name="power_service" msgid="1599661212370831780">"ဝန်ဆောင်မှုများ"</string>
     <string name="power_system" msgid="8290455327965307383">"စနစ်"</string>
-    <string name="power_user" msgid="1889728099253018005">"အသုံးပြုသူ"</string>
+    <string name="power_user" msgid="3706143225319881667">"အခြားအသုံးပြုသူများ"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"စုစုပေါင်းCPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPUအနီးမြင်ကွင်း"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ဖွင့်လျှက်ထားရှိရန်"</string>
@@ -2004,6 +2075,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"အပိုရေတွက်မှု စွမ်းရည် အသုံးပြုမှု"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> ကြာ သုံးထားသည်"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"အလုပ်လုပ်နေသည်မှာ <xliff:g id="TIME">^1</xliff:g> ကြာပါပြီ"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"မျက်နှာပြင်အသုံးပြုချိန် <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> ကို <xliff:g id="APP">%2$s</xliff:g> က အသုံးပြုထားသည်"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"စုစုပေါင်း ဘက်ထရီ၏<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2563,7 +2635,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"ပင်နံပါတ်ပြောင်းရန်"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"သတိပေးချက်များပြပါ"</string>
     <string name="help_label" msgid="6886837949306318591">"အကူအညီနှင့် အကြံပြုချက်"</string>
-    <string name="support_summary" msgid="8276116616493882830">"အကူအညီဆောင်းပါးများ၊ ဖုန်းနှင့် ချတ်ကူညီပံ့ပိုးမှု"</string>
+    <string name="support_summary" msgid="2705726826263742491">"အကူအညီ ဆောင်းပါးများ၊ ဖုန်းနှင့် ချတ်၊ စတင်ရန်"</string>
     <string name="user_account_title" msgid="1127193807312271167">"မာတိကာ အကောင့်"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ဓာတ်ပုံ အမှတ်သညာ"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"လွန်ကဲ အန္တရာယ်များ"</string>
@@ -2653,9 +2725,12 @@
       <item quantity="one">ဖျောက်ထားသည့် %d ခုကို ပြပါ</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ကွန်ရက်နှင့် အင်တာနက်"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi၊ မိုဘိုင်း၊ ဒေတာအသုံးပြုမှု၊ ဟော့စပေါ့"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"မိုဘိုင်း"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"‌‌ဒေတာသုံးစွဲမှု"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ဟော့စပေါ့"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ချိတ်ဆက်ထားသော စက်များ"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"ဘလူးတုသ်၊ ကာစ်၊ NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"ဘလူးတုသ်၊ ကာစ်"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"အက်ပ်နှင့်အကြောင်းကြားချက်များ"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ခွင့်ပြုချက်များ၊ မူရင်းအက်ပ်များ"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"အသုံးပြုသူနှင့် အကောင့်များ"</string>
@@ -2708,6 +2783,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"လှုပ်ရှားမှုဟန်"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ပေးချေမှု၊ တို့ခြင်း၊ ငွေပေးချေခြင်းများ"</string>
     <string name="keywords_backup" msgid="470070289135403022">"မိတ္တူ၊ မိတ္တူကူးပါ"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"ဟန်၊ အစွန်း၊ ဘက်၊ လှုပ်ရှားနေသော အစွန်း၊ ဖျစ်ညှစ်၊ ဆုပ်ကိုင်၊ ကူညီ၊ အကူ၊ ဖျစ်ညှစ်ခြင်း၊ ဖျစ်ညှစ်ခြင်း၊ ဖျစ်ညှစ်ခံ၊ ok google၊ google assistant"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"ဟန်၊ နိုးထ၊ အကြောင်းကြားချက်များ၊ ဖန်သားပြင်၊ မျက်နှာပြင်ပြသမှု၊ မျက်နှာပြင်ပိတ်၊ မျက်နှာပြင်ပွင့်၊ ဖျစ်ညှစ်၊ အစွန်း၊ အိပ်နေ၊ အိပ်စက်၊ ဆုပ်ကိုင်"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"ဟန်၊ အသံတိတ်၊ ငိုက်မြည်း၊ နှိုးစက်၊ အဝင်ခေါ်ဆိုမှု၊ အသံတိုး၊ မျက်နှာပြင်ပြသမှု၊ လော့ခ်ချထားချိန် မျက်နှာပြင်၊ ဖျစ်ညှစ်၊ ဆုပ်ကိုင်၊ အစွန်း၊ ရပ်တန့်"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ကြိုးမဲ့ NFC တဲဂ်ကို စဖွင့်သတ်မှတ်ရန်"</string>
     <string name="write_tag" msgid="8571858602896222537">"ရေးရန်"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ရေးရန် တဲဂ် တစ်ခုကို ပုပ်ပါ..."</string>
@@ -2790,7 +2868,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"အလုပ်အကြောင်းကြားချက်များ အားလုံးကို မပြပါနှင့်"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"သင့်စက်ပစ္စည်းသော့ခတ်ထားလျှင်၊ ပရိုဖိုင်သတိပေးချက်များ ဘယ်လိုပြစေလိုပါသလဲ။"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"ပရိုဖိုင်သတိပေးချက်များ"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"အကြောင်းကြားချက်များ"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"အကြောင်းကြားချက်များ"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"အက်ပ်အသိပေးချက်များ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"အသိပေးချက် အမျိုးအစား"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"အရေးပါမှု"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"အက်ပ်ကို ဆုံးဖြတ်ခွင့်ပေးပါ"</string>
@@ -2805,6 +2884,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"အရေးပေါ်"</string>
     <string name="allow_sound" msgid="1820188704793497324">"အသံကို ခွင့်ပြုရန်"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"အသံပြုခြင်း၊ တုန်ခါခြင်း၊ သို့မဟုတ် လက်ရှိမျက်နှာပြင်တွင် ဤသတိပေးချက်များကို ပြခြင်းများ မပြုလုပ်ပါနှင့်။"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"အနည်းငယ်သာ အရေးပါသည်"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"သိပ်အရေးမကြီးပါ"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"အလွန်အရေးပါသည်"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"အလွန့်အလွန် အရေးပါသည်"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"သတိပေးချက် အကူအညီ"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"အကြောင်းကြားချက် ရယူခြင်း"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"အလုပ်ပရိုဖိုင် အကြောင်းကြားချက်များသို့ ဝင်ရောက်ခြင်းကို ပိတ်ထားသည်"</string>
@@ -2832,8 +2915,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"တစ်ခုပေါ်တစ်ခု ထပ်၍ ဖွင့်ခြင်း"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"တစ်ခုပေါ်တစ်ခု ထပ်၍ ခွင့်ပြုရန်"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"အက်ပ်ပွင့်နေစဉ် သို့မဟုတ် သင်ထွက်လိုက်ချိန်တွင် ဤအက်ပ်အား တစ်ခုပေါ် တစ်ခုထပ်၍ဖွင့်ခွင့်ပြုပါ (ဥပမာ၊  ဗီဒီယိုဆက်ကြည့်ရန်)။ ဤဝင်းဒိုးသည် သင်သုံးနေသော အခြားအက်များ၏ အပေါ်တွင် ပြသပါလိမ့်မည်။"</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Yes"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"No"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"မနှောင့်ယှက်ရ\" ကိုအသုံးပြုခြင်း"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"မနှောက်ယှက်ရန် အသုံးပြုခြင်းအတွက် မည်သည့်ထည့်သွင်းထားသည့် အပ်ဖ်မှ တောင်းဆိုမှုမရှိပါ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"အက်ပ်များကို တင်နေ..."</string>
@@ -2964,11 +3045,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ဤအလုပ်ပရိုဖိုင်အား စီမံခန့်ခွဲသည်မှာ-"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> မှ စီမံသည်။"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(စမ်းသပ်ရေး)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"စက်ပစ္စည်းကို လှည့်ခြင်း"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"မျက်နှာပြင် အကြောင်းအရာ လှည့်ပြရန်"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"ထောင်လိုက်ထားရန်"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ဘေးတိုက် မြင်ကွင်း ထဲမှာ ရှိနေရန်"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"လက်ရှိ လှည့်ထားမှုအတိုင်း ရှိနေရန်"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"လုံခြုံသည့် အစပြုခြင်း"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ဆက်လုပ်ရန်"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"ဤစက်ပစ္စည်းအား စဖွင့်နိုင်ရန်အတွက် ပင်နံပါတ်သတ်မှတ်ထားခြင်းဖြင့် ထပ်လောင်းကာကွယ်မှု ပြုလုပ်နိုင်ပါသည်။ စက်ပစ္စည်းကို မဖွင့်မီ နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းသည် ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းကို စဖွင့်နိုင်ရန်အတွက် ပင်နံပါတ်သတ်မှတ်ထားလိုပါသလား။"</string>
@@ -2976,7 +3052,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ဤစက်ပစ္စည်းအား စဖွင့်နိုင်ရန်အတွက် စကားဝှက်သတ်မှတ်ထားခြင်းဖြင့် ထပ်လောင်းကာကွယ်မှု ပြုလုပ်နိုင်ပါသည်။ စက်ပစ္စည်းကို မဖွင့်မီ နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းသည် ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းကို စဖွင့်နိုင်ရန်အတွက် စကားဝှက်သတ်မှတ်ထားလိုပါသလား။"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"သင်၏ လက်ဗွေရာကို အသုံးပြုခြင်းအပြင် ဤစက်ပစ္စည်းအား စဖွင့်နိုင်ရန်အတွက် ပင်နံပါတ်သတ်မှတ်ထားခြင်းဖြင့် ထပ်လောင်းကာကွယ်မှု ပြုလုပ်နိုင်ပါသည်။ စက်ပစ္စည်းကို မဖွင့်မီ နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းသည် ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းကို စဖွင့်နိုင်ရန်အတွက် ပင်နံပါတ်သတ်မှတ်ထားလိုပါသလား။"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"သင်၏ လက်ဗွေရာကို အသုံးပြုခြင်းအပြင် ဤစက်ပစ္စည်းအား စဖွင့်နိုင်ရန်အတွက် ပုံစံသတ်မှတ်ထားခြင်းဖြင့် ထပ်လောင်းကာကွယ်မှု ပြုလုပ်နိုင်ပါသည်။ စက်ပစ္စည်းကို မဖွင့်မီ နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းသည် ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းကို စဖွင့်နိုင်ရန်အတွက် ပုံစံသတ်မှတ်ထားလိုပါသလား။"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"သင်၏ လက်ဗွေရာကို အသုံးပြုခြင်းအပြင် ဤစက်ပစ္စည်းအား စဖွင့်နိုင်ရန်အတွက် စကားဝှက်သတ်မှတ်ထားခြင်းဖြင့် ထပ်လောင်းကာကွယ်မှု ပြုလုပ်နိုင်ပါသည်။ စက်ပစ္စည်းကို မဖွင့်မီ နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းသည် ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းကို စဖွင့်နိုင်ရန်အတွက် စကားဝှက်သတ်မှတ်ထားလိုပါသလား။"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"သင်၏စက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန် လက်ဗွေရာကို သုံးခြင်းအပြင် စက်ကို စဖွင့်ဖွင့်ချင်း စကားဝှက်ထည့်ရန် သတ်မှတ်ထားခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသေးသည်။ စက်ပစ္စည်းကို မဖွင့်မချင်း နှိုးစက်များအပြင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းသည် ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းကို စဖွင့်ဖွင့်ချင်း စကားဝှက်ထည့်ရန် သတ်မှတ်ထားလိုပါသလား။"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Yes"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN လိုပါသလား?"</string>
@@ -3094,6 +3170,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"သုံးစွဲမှုသတိပေးချက်များ"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"စက်ပစ္စည်း အသုံးပြုမှု အပြည့်အစုံကို ပြရန်"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"အက်ပ်အသုံးပြုမှုကို ပြရန်"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"ပါဝါအသုံပြုမှု မြင့်သည်"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other">ပုံမှန်မဟုတ်သည့်အက်ပ် <xliff:g id="NUMBER">%2$d</xliff:g> ခု</item>
+      <item quantity="one">ပုံမှန်မဟုတ်သည့်အက်ပ် <xliff:g id="APP">%1$s</xliff:g> ခု</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">အက်ပ်များက ဓာတ်ခဲကို အားကုန်စေပါသည်</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> က ဓာတ်ခဲကို အားကုန်စေပါသည်</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"မလုပ်ရသေးပါ"</string>
     <string name="high_power_on" msgid="6216293998227583810">"သင့်မြတ်အောင် မလုပ်ရသေး"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ဘက်ထရီ အသုံးပြုမှု သင့်မြတ်အောင် လုပ်နေ"</string>
@@ -3186,8 +3271,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"အခြားအက်ပ်များပေါ်မှ ပြသခြင်း"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"အက်ပ် <xliff:g id="COUNT_1">%2$d</xliff:g> ခုအနက်မှ <xliff:g id="COUNT_0">%1$d</xliff:g> ခုသည် အခြားအက်ပ်များပေါ်တွင် ပြသခွင့်ပြုသည်"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"ခွင့်ပြုချက်များဖြင့် အပ်ဖ်များ"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Yes"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"No"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"ခွင့်ပြုထားသည်"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"ခွင့်ပြုမထားပါ"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"မူရင်းမသိ အရင်းအမြစ် အက်ပ်များ ထည့်သွင်း"</string>
     <string name="write_settings" msgid="4797457275727195681">"စနစ်ဆက်တင်များ ပြန်ပြင်ခြင်း"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"စနစ်ချိန်ညှိချက်များကို ရေးသားပြုပြင်မည်"</string>
@@ -3277,6 +3362,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"ဖန်သားပြင်ကို ပယင်းရောင်သန်းထားသည်။ ၎င်းက သင့်ကို အိပ်ပျော်သွားစေရန် အထောက်အကူပေးနိုင်ပါသည်။"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"အကြံပြုချက်များ"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"နောက်ထပ် +<xliff:g id="ID_1">%1$d</xliff:g> ခု"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other">အကြံပြုချက် <xliff:g id="COUNT">%1$d</xliff:g> ခု</item>
+      <item quantity="one">အကြံပြုချက် ၁ ခု</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">အကြံပြုချက် +<xliff:g id="COUNT">%1$d</xliff:g> ခု</item>
+      <item quantity="one">အကြံပြုချက် +၁ ခု</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"ဖယ်ရှားပါ"</string>
     <string name="color_temperature" msgid="2070126836910615605">"အေးသည့် အရောင်အပူချိန်"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ပိုအေးသည့် မျက်နှာပြင် အရောင်များကိုအသုံးပြုရန်"</string>
@@ -3295,8 +3389,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> ဒေတာသတိပေးချက်"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> ဒေတာသတိပေးချက် / <xliff:g id="ID_2">%2$s</xliff:g> ဒေတာကန့်သတ်ချက်"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"ငွေတောင်းခံမှု ကာလ"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"လစဉ် <xliff:g id="ID_1">%1$s</xliff:g> ရက်နေ့တွင် လည်ပတ်မှုစတင်သည်"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"လစဉ် <xliff:g id="ID_1">%1$s</xliff:g> ရက်နေ့မှစ၍"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"လစဉ် <xliff:g id="ID_1">%1$s</xliff:g> နေ့တွင်"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"ကွန်ရက် ကန့်သတ်ချက်များ"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other">ကန့်သတ်ချက် <xliff:g id="COUNT">%1$d</xliff:g> ခု</item>
@@ -3316,7 +3409,7 @@
       <item quantity="one">ဒေတာချွေတာမှုဖွင့်ထားချိန်တွင် ကန့်သတ်မှုမရှိသည့်ဒေတာကို အသုံးပြုရန် အက်ပ်၁ ခုကိုခွင့်ပြုထားသည်</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"ဒေတာချွေတာမှုစနစ်"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"ဒေတာကန့်သတ်မှု မရှိခြင်း"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"ကန့်သတ်မထားသည့် ဒေတာ"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"နောက်ခံဒေတာကို ပိတ်ထားသည်"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"ဖွင့်ပါ"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"ပိတ်ထားသည်"</string>
@@ -3380,8 +3473,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"လော့ခ်မျက်နှာပြင် အကြောင်းကြားချက်များကို ထိန်းချုပ်ပါ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"အကြောင်းကြားချက်ပါ အကြောင်းအရာများကို ပြပါ သို့မဟုတ် ဝှက်ပါ"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"အားလုံး"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"ပံ့ပိုးမှု"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"အကူအညီနှင့် နည်းလမ်းများ"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"အသေးဆုံး အကျယ်"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ထည့်သွင်းထားသည့် မည်သည့်အက်ပ်တစ်ခုမျှ ပရီမီယံ SMS အသုံးပြုခွင့်တောင်းဆိုမှု မရှိပါ။"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ပရီမီယံ SMS သည်ငွေကြေးကုန်ကျနိုင်ပြီး သင့်ဖုန်းဝန်​ဆောင်မှုပေးသူ၏ ငွေတောင်းခံလွှာသို့ ပေါင်း၍ ထည့်သွင်းပါမည်။ အက်ပ်တစ်ခုကို သင်ခွင့်ပြုလိုက်လျှင် ၎င်းအက်ပ်ကိုအသုံးပြုပြီး ပရီမီယံ SMS ပို့နိုင်မည်ဖြစ်သည်။"</string>
@@ -3446,28 +3538,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"အလိုအလျောက်"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ကိုယ်တိုင်ထည့်သွင်းခြင်း"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"ယခုနေရာလွတ်ပြုလုပ်ပါ"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"အမူအရာ"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"လက်ဟန် ဖြတ်လမ်းလင့်ခ်"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"သင့်ဖုန်းကို ထိန်းချုပ်နိုင်ရန်အတွက် လျင်မြန်သည့်အမူအယာများ"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"သင့်တက်ဘလက်ကို ထိန်းချုပ်ရန်အတွက် အမြန်သုံးလက်ဟန်များ"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"သင့်ဖုန်းကို ထိန်းချုပ်ရန်အတွက် အမြန်သုံးလက်ဟန်များ"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"ကင်မရာသို့ အမြန်သွားရန်"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"ကင်မရာကို အမြန်ဖွင့်ရန် ဖွင့်ပိတ်ခလုတ်ကို နှစ်ချက်နှိပ်ပါ။ ဖန်သားပြင်၏ မည်သည့်နေရာမှမဆို အမြန်ဖွင့်နိုင်ပါသည်။"</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"ကင်မရာကို အမြန်ဖွင့်ရန်"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"ကင်မရာကို ဖွင့်ရန်အတွက် ဖွင့်ပိတ်ခလုတ်ကို နှစ်ကြိမ်နှိပ်ပါ"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ကင်မရာပြောင်းရန်"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"ဆယ်ဖီအမြန်ရိုက်ရန်"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"ဆယ်ဖီမုဒ်အတွက် ဖုန်းကို နှစ်ကြိမ်လှည့်ပါ"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"ဆယ်ဖီမုဒ်အတွက် တက်ဘလက်ကို နှစ်ကြိမ်လှည့်ပါ"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"ဆယ်ဖီမုဒ်အတွက် စက်ပစ္စည်းကို နှစ်ကြိမ်လှည့်ပါ"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"ဖုန်းကို စစ်ဆေးကြည့်ရန် နှစ်ချက်တို့ပါ"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"တက်ဘလက်ကို စစ်ဆေးကြည့်ရန် နှစ်ချက်တို့ပါ"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"စက်ပစ္စည်းကို စစ်ဆေးကြည့်ရန် နှစ်ချက်တို့ပါ"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"အသိပေးအကြောင်းကြားချက်များကို အမြန်စစ်ဆေးရန် ဖန်သားပြင်ကို နှစ်ချက်တို့ထိပါ။"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"အချိန်၊ အကြောင်းကြားချက်သင်္ကေတများနှင့် အခြားအချက်အလက်များကို စစ်ဆေးရန် သင့်မျက်နှာပြင်ကို နှစ်ကြိမ်ဆက်တိုက်တို့ပါ။"</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"ဖန်သားပြင်ပိတ်ထားစဉ် အကြောင်းကြားချက်များကို စစ်ဆေးရန်"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ဖုန်းကိုစစ်ရန် ကောက်ယူပါ"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"တက်ဘလက်ကို စစ်ဆေးကြည့်ရန် မ လိုက်ပါ"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"စက်ပစ္စည်းကို စစ်ဆေးကြည့်ရန် မ လိုက်ပါ"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"အသိပေးအကြောင်းကြားချက်များကို အမြန်စစ်ဆေးရန် ဖုန်းကို ကောက်ယူလိုက်ပါ။"</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"အသိပေးအကြောင်းကြားချက်များကို အမြန်စစ်ဆေးရန် တက်ဘလက်ကို ကောက်ယူလိုက်ပါ။"</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"အသိပေးအကြောင်းကြားချက်များကို အမြန်စစ်ဆေးရန် ကိရိယာကို ကောက်ယူလိုက်ပါ။"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"အချိန်၊ အကြောင်းကြားချက်သင်္ကေတများနှင့် အခြားအချက်အလက်များကို စစ်ဆေးရန် သင့်ဖုန်းကို ရွေးချယ်ပါ။"</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"အချိန်၊ အကြောင်းကြားချက်သင်္ကေတများနှင့် အခြားအချက်အလက်များကို စစ်ဆေးရန် သင့်တက်ဘလက်ကို ရွေးချယ်ပါ။"</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"အချိန်၊ အကြောင်းကြားချက်သင်္ကေတများနှင့် အခြားအချက်အလက်များကို စစ်ဆေးရန် သင့်စက်ပစ္စည်းကို ရွေးချယ်ပါ။"</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"ဖန်သားပြင်ပိတ်ထားစဉ် အကြောင်းကြားချက်များကို စစ်ဆေးရန်"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"သတိပေးချက်အတွက် လက်ဗွေပွတ်ဆွဲပါ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"အကြောင်းကြားချက်များကို ကြည့်ရန် ဖုန်း၏ နောက်ကျောဘက်ရှိ လက်ဗွေ အာရုံခံကိရိယာပေါ်တွင် အောက်သို့ ပွတ်ဆွဲပါ။"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"အကြောင်းကြားချက်များကို ကြည့်ရန် တက်ဘလက်၏ နောက်ကျောဘက်ရှိ လက်ဗွေ အာရုံခံကိရိယာပေါ်တွင် အောက်သို့ ပွတ်ဆွဲပါ။"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"အကြောင်းကြားချက်များကို ကြည့်ရန် ကိရိယာ၏ နောက်ကျောဘက်ရှိ လက်ဗွေ အာရုံခံကိရိယာပေါ်တွင် အောက်သို့ ပွတ်ဆွဲပါ။"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"အကြောင်းကြားချက်များကို အမြန်ကြည့်ရန်"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"လက်ဗွေ အာရုံခံကိရိယာပေါ်တွင် အောက်သို့ ပွတ်ဆွဲပါ"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"ကင်မရာကိုဖွင့်ရန် မြှောက်လိုက်ပါ"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"ကင်မရာကို  အလိုအလျောက်ဖွင့်ရန် သင်၏ဖုန်းကို ဓာတ်ပုံရိုက်ယူမည့့််အနေအထား (အလျားလိုက် သို့မဟုတ် ထောင်လိုက်) အဖြစ်သို့  မြှောက်လိုက်ပါ။ သင့်ဖုန်းကို ပိတ်ထားချိန် သို့မဟုတ် လော့ခ်ချထားချိန်တို့တွင် အသုံးပြုနိုင်သည်။"</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"ဖုန်းနားနေသောအချိန် သို့မဟုတ် လော့ခ်ကျနေချိန်တွင် ဓာတ်ပုံရိုက်ရန်"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"ဟန်ကို အထောက်အကူပေးရန်"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"အထိအတွေ့ အာရုံခံနိုင်မှု"</string>
@@ -3571,6 +3676,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"ဤချက်ချင်းသုံးအက်ပ်ကို ဖယ်ရှားလိုပါသလား။"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"ဂိမ်းများ"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"အသံဖိုင်များ"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"သိုလှောင်ခန်း အသုံးပြုမှု"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(အသုံးပြုသူ <xliff:g id="USER">%s</xliff:g> အတွက် ဖြုတ်ထားသည်)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(အသုံးပြုသူ <xliff:g id="USER">%s</xliff:g> အတွက် ပိတ်ထားသည်)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"အော်တိုဖြည့် ဝန်ဆောင်မှု"</string>
@@ -3584,5 +3690,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"ချက်ခြင်းသုံး အက်ပ်"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"သိုလှောင်ခန်း စီမံခန့်ခွဲမှုစနစ်ကို ပိတ်လိုပါသလား။"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"ရုပ်ရှင်နှင့် TV အက်ပ်များ"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"သိုလှောင်ခန်း အသုံးပြုမှု"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"ဝန်ဆောင်မှုပေးသူက ပေးထားသည့် အချက်အလက်များ"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"မည်သည့်အရာက အသစ်ဖြစ်ပြီး စိတ်လှုပ်ရှားဖွယ်ကောင်းပါသနည်း။"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ထိပ်တန်း ဝန်ဆောင်မှု ၅ မျိုးကို ကြည့်ရန်"</string>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 1dab99f..b92038b 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Bra"</item>
     <item msgid="8986346415847956850">"Utmerket"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Alltid"</item>
-    <item msgid="844721238536786870">"Bare når tilkoblet strøm"</item>
-    <item msgid="1986753720941888596">"Aldri"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Alltid"</item>
-    <item msgid="7433294150916905997">"Bare når tilkoblet strøm"</item>
-    <item msgid="1390404486722375028">"Aldri"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"De siste 30 dagene"</item>
     <item msgid="6600989128423965319">"Angi brukssyklus"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 57e9e46..49002e0 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Du er nå utvikler!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Det trengs ikke, du er allerede utvikler."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Slå på utvikleralternativer først."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Trådløst og nettverk"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Tilkoblinger"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Enhet"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE-tildelt"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Identitetshåndtering aktiv for videoanrop"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Identitetshåndtering aktiv for Wi-Fi-anrop"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presence er klargjort"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Strømforsyning for mobilradio"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Se adressebok for SIM-kort"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Vis faste numre"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Søk etter enheter"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Gi denne enheten nytt navn"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Gi nytt navn"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vil du koble fra?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Dette vil avslutte tilkoblingen til:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Koble fra enhet?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Telefonen din kobles fra <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Nettbrettet ditt kobles fra <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Enheten din kobles fra <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Koble fra"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Du har ikke tillatelse til å endre Bluetooth-innstillingene."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Koble til en ny enhet"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> er synlig for enheter i nærheten mens Bluetooth-innstillingene er åpne."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Telefonens Bluetooth-adresse: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Nettbrettets Bluetooth-adresse: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Enhetens Bluetooth-adresse: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vil du koble fra <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Kringkasting"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vil du deaktivere profilen?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Forespørsel om Bluetooth-sammenkobling"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Paringsforespørsel"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Trykk for å koble sammen med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Vis mottatte filer"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Mottatte filer"</string>
     <string name="device_picker" msgid="4978696506172252813">"Velg Bluetooth-enhet"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker å slå på Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker å slå av Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ønsker adgang til meldingene dine. Vil du gi %2$s tilgang?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Forespørsel om tilgang til SIM-kort"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vil ha tilgang til SIM-kortet ditt. Hvis du gir tilgang til SIM-kortet, slås datatilkoblingen på enheten av så lenge tillatelsen varer. Gi tilgang til <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Synlig som «<xliff:g id="DEVICE_NAME">^1</xliff:g>» for andre enheter"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Enhetene dine"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Koble til en ny enhet"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dato og klokkeslett"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Velg tidssone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Kontoer"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Posisjon"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Kontoer"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Sikkerhet og posisjon"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Sikkerhet og posisjon"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Kryptering og legitimasjon"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefonen er kryptert"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Enheten er kryptert"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Lås opp med fingeravtrykk"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Bruk fingeravtrykket ditt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"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 nemlig utføre disse handlingene.\n\nMerk: Fingeravtrykket ditt kan være mindre sikkert enn et sterkt mønster eller en sterk PIN-kode."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Bare trykk på fingeravtrykkssensoren for å autorisere kjøp eller logge på apper. Tenk over hvilke fingeravtrykk du legger til. Alle avtrykkene du legger til, kan gjøre alt dette.\n\nMerk: Du kan ikke bruke fingeravtrykket ditt til å låse opp denne enheten. For mer informasjon, kontakt administratoren for organisasjonen din."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"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 fingeravtrykk som legges til, kan utføre disse handlingene.\n\nMerk: Fingeravtrykket ditt kan være mindre sikkert enn et sterkt mønster eller en sterk PIN-kode."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Avbryt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Fortsett"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Hopp over"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Legg til fingeravtrykk"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funksjonene for enhetsbeskyttelse blir ikke aktivert. Du kan ikke hindre andre i å bruke dette nettbrettet hvis du mister det, hvis det blir stjålet, eller hvis innholdet blir slettet."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funksjonene for enhetsbeskyttelse blir ikke aktivert. Du kan ikke hindre andre i å bruke denne enheten hvis du mister den, hvis den blir stjålet, eller hvis innholdet blir slettet."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funksjonene for enhetsbeskyttelse blir ikke aktivert. Du kan ikke hindre andre i å bruke denne telefonen hvis du mister den, hvis den blir stjålet, eller hvis innholdet blir slettet."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funksjonene for enhetsbeskyttelse blir ikke aktivert. Du kan ikke hindre andre i å bruke dette nettbrettet hvis du mister det, eller hvis det blir stjålet."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funksjonene for enhetsbeskyttelse blir ikke aktivert. Du kan ikke hindre andre i å bruke denne enheten hvis du mister den, eller hvis den blir stjålet."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funksjonene for enhetsbeskyttelse blir ikke aktivert. Du kan ikke hindre andre i å bruke denne telefonen hvis du mister den, eller hvis den blir stjålet."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Neste"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funksjoner for enhetsbeskyttelse blir ikke slått på. Du kommer ikke til å kunne forhindre at andre bruker dette nettbrettet hvis du mister det eller det blir stjålet eller tilbakestilt."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funksjoner for enhetsbeskyttelse blir ikke slått på. Du kommer ikke til å kunne forhindre at andre bruker denne enheten hvis du mister den eller den blir stjålet eller tilbakestilt."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funksjoner for enhetsbeskyttelse blir ikke slått på. Du kommer ikke til å kunne forhindre at andre bruker denne telefonen hvis du mister den eller den blir stjålet eller tilbakestilt."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Funksjoner for enhetsbeskyttelse blir ikke slått på. Du kommer ikke til å kunne forhindre at andre bruker dette nettbrettet hvis det blir stjålet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Funksjoner for enhetsbeskyttelse blir ikke slått på. Du kommer ikke til å kunne forhindre at andre bruker denne enheten hvis den blir stjålet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Funksjoner for enhetsbeskyttelse blir ikke slått på. Du kommer ikke til å kunne forhindre at andre bruker denne telefonen hvis den blir stjålet."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Hopp over likevel"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Gå tilbake"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Finn sensoren"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Finn fingeravtrykksensoren på baksiden av telefonen."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Berør sensoren"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Den er på baksiden av telefonen. Bruk pekefingeren din."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustrasjon med enheten og plasseringen av fingeravtrykksensoren"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Navn"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Slett"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Kom i gang"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Berør sensoren"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Plassér fingeren på sensoren, og løft den når du kjenner en vibrasjon"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Fortsett"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Flytt fingeren litt for å registrere de ulike delene av fingeravtrykket ditt"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingeravtrykk lagt til!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Når du ser dette ikonet, kan du bruke fingeravtrykket ditt som identifikasjon eller til å godkjenne kjøp."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Bare trykk på fingeravtrykksensoren for å vekke og låse opp enheten din."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Når du ser dette ikonet, kan du også autorisere kjøp eller logge på apper."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Løft fingeren og berør igjen"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Løft fingeren din gjentatte ganger for å legge til de forskjellige delene av fingeravtrykket ditt"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Fingeravtrykk lagt til"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Når du ser dette ikonet, kan du bruke fingeravtrykket ditt for å identifisere deg eller godkjenne kjøp."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Vil du hoppe over fingeravtrykk-konfig.?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Du har valgt å bruke fingeravtrykket ditt som én måte å låse opp telefonen din på. Hvis du hopper over konfigureringen nå, må du fullføre den senere. Konfigureringen tar bare et par minutter."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Konfigurer skjermlås"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Ferdig"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ops, det er ikke sensoren"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Bruk fingeravtrykksensoren på enheten."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Berør sensoren på baksiden av telefonen. Bruk pekefingeren."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registrering er ikke fullført"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Tidsgrensen for registrering av fingeravtrykk er nådd. Prøv på nytt."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Registrering av fingeravtrykket mislyktes. Prøv på nytt, eller bruk en annen finger."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Hindre at andre bruker denne enheten uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Hindre at andre bruker denne telefonen uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Velg reservemetode for skjermlås"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Alternativer for skjermlås"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Alternativer for skjermlås"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skjermlås"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / umiddelbart etter hvilemodus"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> etter hvilemodus"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Endre opplåsingsmønster"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Endre PIN-koden for opplåsning"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Endre passord for opplåsning"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Prøv på nytt. Forsøk <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> av <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Siste forsøk"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Hvis du skriver inn feil mønster på dette forsøket, fjernes jobbprofilen og tilknyttede data fra enheten."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Hvis du skriver inn feil PIN-kode på dette forsøket, fjernes jobbprofilen og tilknyttede data fra enheten."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Hvis du skriver inn feil passord på dette forsøket, fjernes jobbprofilen og tilknyttede data fra enheten."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"For mange mislykkede forsøk. Jobbprofilen og tilknyttede data fjernes fra enheten."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Avvis"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Prøv på nytt. Forsøk <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> av <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Dataene dine blir slettet"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Hvis du oppgir feil mønster på neste forsøk, slettes dataene på denne enheten"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Hvis du skriver inn feil PIN-kode på neste forsøk, slettes dataene på denne enheten"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Hvis du skriver inn feil passord på neste forsøk, slettes dataene på denne enheten"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Hvis du oppgir feil mønster på neste forsøk, slettes denne brukeren"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Hvis du skriver inn feil PIN-kode på neste forsøk, slettes denne brukeren"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Hvis du skriver inn feil passord på neste forsøk, slettes denne brukeren"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Hvis du oppgir feil mønster på neste forsøk, slettes jobbprofilen din og tilknyttede data"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Hvis du skriver inn feil PIN-kode på neste forsøk, slettes jobbprofilen din og tilknyttede data"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Hvis du skriver inn feil passord på neste forsøk, slettes jobbprofilen din og tilknyttede data"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"For mange mislykkede forsøk. Dataene på denne enheten blir slettet."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"For mange mislykkede forsøk. Denne brukeren blir slettet."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"For mange mislykkede forsøk. Denne jobbprofilen og tilknyttede data blir slettet."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Avvis"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Må være minst <xliff:g id="COUNT">%d</xliff:g> tegn"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN-koden må være minst <xliff:g id="COUNT">%d</xliff:g> sifre"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsett"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Avansert Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Når Bluetooth er slått på, kan enheten kommunisere med andre Bluetooth-enheter i nærheten."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"For å forbedre posisjonsnøyaktigheten kan systemapper og -tjenester fortsatt oppdage Bluetooth-enheter. Du kan endre dette i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>innstillingene for skanning<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Kunne ikke koble til. Prøv på nytt."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Enhetsdetaljer"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Enhetens Bluetooth-adresse: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Vil du glemme enheten?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Telefonen din kommer ikke lenger til å være koblet sammen med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Nettbrettet ditt kommer ikke lenger til å være koblet sammen med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Enheten din kommer ikke lenger til å være koblet sammen med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Glem enheten"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Koble til…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra medielyd."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra håndfrilyd."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ikke oppgi"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ikke godkjenn"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Ingen sertifikater er spesifisert. Tilkoblingen din blir ikke privat."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Nettverksnavnet er for langt."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Du må angi et domene."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tilgjengelig"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tilgjengelig)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 nettverk</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Avanserte Wi-Fi-innst."</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfigurer Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-adresse"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-adresse"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Nettverksmaske"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vil du glemme denne gruppen?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Flyttbar Wi-Fi-sone"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi-sone"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Bruk mobiltilkoblingen for å gi Wi-Fi-dekning"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Deler ikke nettbrettets Internett-tilkobling via Wi-Fi-sone"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Deler ikke telefonens Internett-tilkobling via Wi-Fi-sone"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Deler ikke Internett eller innhold med andre enheter"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Deler nettbrettets Internett-tilkobling via Wi-Fi-sone"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Deler telefonens Internett-tilkobling via Wi-Fi-sone"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Appen deler innhold. Slå Wi-Fi-sone av og på for å dele Internett-tilkobling."</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi-Fi-navn"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Slår på <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Andre enheter kan koble til <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-passord"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-bånd"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Bruk Wi-Fi-soner for å opprette Wi-Fi-nettverk for de andre enhetene dine. Wi-Fi-soner gir Internett-tilgang ved hjelp av mobildatatilkoblingen din."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Du kan bruke apper til å opprette Wi-Fi-soner for deling av innhold med enheter i nærheten."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Slår på Wi-Fi-sone …"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Slår av trådløs sone …"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> er aktiv"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Når Wi-Fi-ringing er slått på, kan telefonen din dirigere telefonsamtaler via Wi-Fi-nettverk eller operatørens nettverk, avhengig av hva du har angitt i innstillingene og hvilket signal som er sterkest. Før du slår på denne funksjonen, er det viktig å sjekke gebyrer og andre detaljer med med operatøren din."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Oppdater nødadressen"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Adressen nødetatene bruker som posisjonen din når du ringer et nødnummer via Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skjerm"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Ingen resultater"</string>
     <string name="display_settings" msgid="7965901687241669598">"Skjerm"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotér skjermen automatisk"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Levende farger"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Bytt retning automatisk når nettbrettet roteres"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Bytt orientering automatisk når telefonen blir snudd"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Bytt retning automatisk når nettbrettet roteres"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimaliser lysstyrken etter omgivelsene. Når denne funksjonen er på, kan du fremdeles justere lysstyrken midlertidig."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Nattlys"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Nattlys gir skjermen en ravgul nyanse. Dette gjør det mer komfortabelt å se på skjermen eller lese ved svakt lys, og det kan gjøre det enklere å sovne."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Planlegg"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Slå på automatisk"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Aldri"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Tilpasset tidsplan"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Solnedgang til soloppgang"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Planlegg"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ingen"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Slås på på et egendefinert tidspunkt"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Slås på fra solnedgang til soloppgang"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Starttid"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Sluttid"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensitet"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Av. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Blir aldri slått på automatisk."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Blir slått på automatisk klokken <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Blir slått på automatisk ved solnedgang."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"På. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Blir aldri slått av automatisk."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Blir slått av automatisk klokken <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Blir slått av automatisk ved soloppgang."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Av / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Blir aldri slått på automatisk"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Blir slått på automatisk klokken <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Blir slått på automatisk ved solnedgang"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"På / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Blir aldri slått av automatisk"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Blir slått av automatisk klokken <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Blir slått av automatisk ved soloppgang"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Hvilemodus"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skjermen slås av"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Innstillinger"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aktiver enheten med løftebevegelser"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Omgivelsesskjerm"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Passiv skjerm"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Alltid på"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nye varsler"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Når det skal vises"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nye varsler"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Skjermen slås på når du mottar varsler"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Alltid på"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Vis klokkeslett, varselikoner og annen informasjon"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Gjør teksten større eller mindre"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Innstillinger for SIM-kort-lås"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN kan ikke være tomt."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC-feltet må bestå av tre siffer."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC-feltet må bestå av to eller tre siffer."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operatøren tillater ikke å legge til APN-er av typen %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Gjenoppretter standard APN-innstillinger."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Tilbakestill til standardvalg"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Tilbakestilling av standard APN-innstillinger er fullført."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Tøm SD-kort"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Slett alle data på intern USB-lagring, som for eksempel musikk eller bilder"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Slett alle data fra SD-kortet, som musikk og bilder"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Tøm e-SIM-kort"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Tøm alle e-SIM-kortene i telefonen. Dette avslutter ikke mobilabonnementet ditt."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Tøm alle e-SIM-kortene i nettbrettet. Dette avslutter ikke mobilabonnementet ditt."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tilbakestill nettbrettet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Tilbakestill telefonen"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Vil du slette den personlige informasjonen din og nedlastede apper? Du kan ikke angre denne handlingen."</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Kan ikke bruke internettdeling eller flyttbare Wi-Fi-soner mens Datasparing er på"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-internettdeling"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB-tilkoblet, velg for nettdeling"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Tilknyttet"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Kan ikke tilknyttes når USB-lagring er i bruk"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB er ikke tilkoblet"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Koble til for å slå på"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Feil med USB-internettdeling"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Del telefonens Internett-tilkobling via USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Del nettbrettets Internett-tilkobling via USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-internettdeling"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Deler nettbrettets nettilkobling via Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Deler telefonens nettilkobling via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Deler nettbrettets nettilkobling med én enhet via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Deler telefonens nettilkobling med én enhet via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Deler nettbrettets nettilkobling med <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> enheter via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Deler telefonens nettilkobling med <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> enheter via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Del nettbrettets Internett-tilkobling via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Del telefonens Internett-tilkobling via Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Deler Internett-tilkoblingen til <xliff:g id="DEVICE_NAME">%1$d</xliff:g> via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Deler ikke nettbrettets tilkobling via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Deler ikke telefonens nettilkobling via Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Ikke tilknyttet"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Kan ikke knytte til mer enn <xliff:g id="MAXCONNECTION">%1$d</xliff:g> enheter."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Bruk Wi-Fi-soner og internettdeling for å gi andre enheter Internett-tilgang via telefonens mobildataforbindelse."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Bruk Wi-Fi-soner og internettdeling for å gi andre enheter Internett-tilgang via mobildataforbindelsen din. Du kan også bruke apper til å opprette Wi-Fi-soner for deling av innhold med enheter i nærheten."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjelp"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobilnettverk"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilabonnement"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Posisjonsmodus"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Bruk GPS, Wi-Fi, Bluetooth eller mobilnettverk til å fastslå posisjonen"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Bruk Wi-Fi, Bluetooth eller mobilnettverk til å fastslå posisjonen"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Bruk GPS til å fastslå posisjonen din"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Bruk GPS og enhetssensorer for å finne posisjonen"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Søker"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi-skanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Gjør posisjonsangivelse mer nøyaktig ved å la systemapper og -tjenester oppdage Wi-Fi-nettverk når som helst."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Du har ingen datatilkobling. Hvis du vil se denne informasjonen nå, kan du gå til %s fra en datamaskin som er koblet til Internett."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laster inn …"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Velg passord"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Angi passord for å bruke fingeravtrykk"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Velg mønster"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Angi mønster for å bruke fingeravtrykk"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Velg PIN-kode"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Angi PIN for å bruke fingeravtrykk"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Bekreft passordet ditt"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bekreft mønsteret"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bekreft PIN-koden"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Innstillinger for app"</string>
     <string name="install_applications" msgid="4872012136210802181">"Ukjente kilder"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Tillat alle appkilder"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Nylig åpnede apper"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Se alle de <xliff:g id="COUNT">%1$d</xliff:g> appene"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"for <xliff:g id="TIME">^1</xliff:g> siden"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Nettbrettet ditt og personopplysningene dine er mer sårbare for angrep hvis du bruker ukjente apper. Ved å installere apper fra denne kilden godtar du at du selv er ansvarlig for enhver skade på nettbrettet eller tap av data som kan oppstå, fra bruk av slike apper."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefonen din og personopplysningene dine er mer sårbare for angrep hvis du bruker ukjente apper. Ved å installere apper fra denne kilden godtar du at du selv er ansvarlig for enhver skade på telefonen eller tap av data som kan oppstå, fra bruk av slike apper."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Avanserte innstillinger"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Vil du stoppe systemtjenesten?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Hvis du stopper denne tjenesten, kan noen av funksjonene i nettbrettet slutte å virke slik de skal inntil du slår det av og deretter på igjen."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Hvis du stopper denne tjenesten, kan noen av funksjonene i telefonen din slutte å virke slik de skal inntil du slår den av og deretter på igjen."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Språk, inndata og bevegelser"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Språk og inndata"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Språk og inndata"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Inndatahjelp"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> utskriftstjenester er på</item>
       <item quantity="one">1 utskriftstjeneste er på</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> utskriftsjobber</item>
+      <item quantity="one">1 utskriftsjobb</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Utskriftstjenester"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Ingen tjenester er installert"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Fant ingen skrivere"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Bruksdetaljer"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Juster strømforbruk"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pakker"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apper som tapper batteriet"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Holder enheten aktiv"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Vekker enheten i bakgrunnen"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Forespør posisjon ofte"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apper fungerer ikke som de skal"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Vil du stoppe appen?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Telefonen din får ikke styrt batteriet som normalt fordi <xliff:g id="APP">%1$s</xliff:g> holder telefonen aktiv.\n\nFor å prøve å løse dette problemet kan du tvinge appen til å avslutte.\n\nHvis dette fortsetter å skje, må du kanskje avinstallere appen for å få bedre batteriytelse."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Nettbrettet ditt får ikke styrt batteriet som normalt fordi <xliff:g id="APP">%1$s</xliff:g> holder nettbrettet aktivt.\n\nFor å prøve å løse dette problemet kan du tvinge appen til å avslutte.\n\nHvis dette fortsetter å skje, må du kanskje avinstallere appen for å få bedre batteriytelse."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Enheten din får ikke styrt batteriet som normalt fordi <xliff:g id="APP">%1$s</xliff:g> holder enheten aktiv.\n\nFor å prøve å løse dette problemet kan du tvinge appen til å avslutte.\n\nHvis dette fortsetter å skje, må du kanskje avinstallere appen for å få bedre batteriytelse."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Stopp appen"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Vil du slå av bakgrunnsbruk?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Telefonen din får ikke styrt batteriet som normalt fordi <xliff:g id="APP">%1$s</xliff:g> stadig vekker telefonen.\n\nFor å løse dette problemet kan telefonen forhindre at denne appen kjører i bakgrunnen."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Nettbrettet ditt får ikke styrt batteriet som normalt fordi <xliff:g id="APP">%1$s</xliff:g> stadig vekker nettbrettet.\n\nFor å løse dette problemet kan nettbrettet forhindre at denne appen kjører i bakgrunnen."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Enheten din får ikke styrt batteriet som normalt fordi <xliff:g id="APP">%1$s</xliff:g> stadig vekker enheten.\n\nFor å løse dette problemet kan enheten forhindre at denne appen kjører i bakgrunnen."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Slå av"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Vil du slå av posisjon?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Telefonen din får ikke styrt batteriet som normalt fordi <xliff:g id="APP">%1$s</xliff:g> stadig ber om posisjonen din når du ikke bruker appen.\n\nFor å løse dette problemet kan du slå av posisjon for denne appen."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Nettbrettet ditt får ikke styrt batteriet som normalt fordi <xliff:g id="APP">%1$s</xliff:g> stadig ber om posisjonen din når du ikke bruker appen.\n\nFor å løse dette problemet kan du slå av posisjon for denne appen."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Enheten din får ikke styrt batteriet som normalt fordi <xliff:g id="APP">%1$s</xliff:g> stadig ber om posisjonen din når du ikke bruker appen.\n\nFor å løse dette problemet kan du slå av posisjon for denne appen."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Slå av"</string>
     <string name="power_screen" msgid="3023346080675904613">"Skjerm"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lommelykt"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Apper"</string>
     <string name="power_service" msgid="1599661212370831780">"Tjenester"</string>
     <string name="power_system" msgid="8290455327965307383">"System"</string>
-    <string name="power_user" msgid="1889728099253018005">"Bruker"</string>
+    <string name="power_user" msgid="3706143225319881667">"Andre brukere"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Prosessor totalt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Prosessor i forgrunnen"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Behold aktiv"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Overberegnet strømforbruk"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Brukt i <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktiv i <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Skjermbruk <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> brukt av <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> av total batteribruk"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Endre PIN-koden"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Vis varsler"</string>
     <string name="help_label" msgid="6886837949306318591">"Hjelp og tilbakemelding"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Hjelpeartikler, telefon- og chattestøtte"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Hjelpeartikler, telefon og chat, kom i gang"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Konto for innhold"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ekstreme trusler"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Vis %d skjult element</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Nettverk og Internett"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobil, databruk, Wi-Fi-sone"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobil"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"databruk"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"Wi-Fi-sone"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Tilkoblede enheter"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apper og varsler"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Tillatelser, standardapper"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Brukere og kontoer"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"bevegelse"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"betal, trykk på, betalinger"</string>
     <string name="keywords_backup" msgid="470070289135403022">"sikkerhetskopi, sikkerhetskopiér"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"bevegelse, kant, side, aktiv kant, klem sammen, grep, assistanse, assistent, squeezy, squeezie, squeezey, squeezee, ok google, google-assistent"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"bevegelse, vekke, varsler, skjerm, display, skjerm av, skjerm på, klem sammen, kant, hviler, hvilemodus, grep"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"bevegelse, demp, slumre, alarm, innkommende anrop, stille, skjerm, låseskjerm, klem sammen, grep, kant, stopp"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfigurer NFC-tag for Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Trykk på en brikke for å skrive"</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Ikke vis jobbvarsler i det hele tatt"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Hvordan vil du at profilvarsler skal vises når enheten er låst?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profilvarsler"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Varsler"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Varsler"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Appvarsler"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Varselkategori"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Viktighet"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"La appen bestemme"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Haster"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Tillat lyd"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Disse varslene vises ikke kjapt på skjermen – verken med vibrering eller lyd."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Lav viktighet"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Middels viktighet"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Høy viktighet"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Svært høy viktighet"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Varselassistent"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Varseltilgang"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Tilgang til varsler fra jobbprofilen er blokkert"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Bilde-i-bilde"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Tillat bilde-i-bilde"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"La denne appen opprette et bilde-i-bilde-vindu mens appen er åpen eller etter at du har gått ut av den (for eksempel for å fortsette å se en video). Dette vinduet vises over andre apper du bruker."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Ja"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Nei"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"«Ikke forstyrr»-tilgang"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ingen installerte apper har bedt om «Ikke forstyrr»-tilgang"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Laster inn apper …"</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Denne arbeidsprofilen administreres av:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Administrert av <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentell)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Enhetsrotering"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Rotér innholdet på skjermen"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Behold stående visning"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Behold liggende visning"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Behold gjeldende visningsretning"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Trygg oppstart"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Fortsett"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Du kan beskytte denne enheten ved å be om PIN-koden din ved oppstart. Inntil enheten er låst opp, kan den ikke motta oppringninger, meldinger eller varsler – inkludert alarmer. \n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve PIN-kode for å starte enheten?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Du kan beskytte denne enheten ved å kreve et passord ved oppstart. Inntil enheten er låst opp, kan den ikke motta oppringninger, meldinger eller varsler – inkludert alarmer. \n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve passord for å starte enheten?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"I tillegg til å bruke fingeravtrykket ditt til å låse opp enheten kan du sikre den enda mer ved å be om PIN-koden din ved oppstart. Inntil enheten er låst opp, kan den ikke motta anrop, SMS eller varsler – inkludert alarmer.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve PIN-kode for å starte enheten?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"I tillegg til å bruke fingeravtrykket ditt til å låse opp enheten kan du sikre den enda mer ved å be om mønsteret ditt ved oppstart. Inntil enheten er låst, opp kan den ikke motta anrop, SMS eller varsler – inkludert alarmer.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve mønster for å starte enheten?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"I tillegg til å bruke fingeravtrykket ditt til å låse opp enheten kan du sikre den enda mer ved å be om passordet ditt ved oppstart. Inntil enheten er låst opp, kan den ikke motta anrop, SMS eller varsler – inkludert alarmer.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve passord for å starte enheten?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"I tillegg til å bruke fingeravtrykket ditt til å låse opp enheten kan du sikre den enda mer ved å be om passord ved oppstart. Enheten kan ikke motta anrop, SMS eller varsler – inkludert alarmer – før den har startet opp.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve passord for å starte enheten?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ja"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nei"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Vil du kreve PIN-kode?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Bruksvarsler"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Vis fullstendig enhetsbruk"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Vis appbruk"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Høy bruk"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apper oppfører seg unormalt</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> oppfører seg unormalt</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Apper som tapper batteriet</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> tapper batteriet</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Ikke optimalisert"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Ikke optimalisert"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimaliserer batteribruken"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Vis over andre apper"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> av <xliff:g id="COUNT_1">%2$d</xliff:g> apper kan vises over andre apper"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Apper med tillatelse"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Ja"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Nei"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Tillatt"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Ikke tillatt"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"installer apper fra ukjente kilder"</string>
     <string name="write_settings" msgid="4797457275727195681">"Endre systeminnstillingene"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"skriv/endre systeminnstillinger"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Skjermen din har en ravgul nyanse. Dette kan gjøre det enklere å sovne."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Forslag"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> til"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> forslag</item>
+      <item quantity="one">1 forslag</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> forslag</item>
+      <item quantity="one">+1 forslag</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Fjern"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Kald fargetemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Bruk kaldere skjermfarger"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Advarsel for databruk: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Advarsel for databruk: <xliff:g id="ID_1">%1$s</xliff:g> / datagrense: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Faktureringssyklus"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Den månedlige faktureringssyklusen starter den <xliff:g id="ID_1">%1$s</xliff:g>. dagen i måneden"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Månedlig, den <xliff:g id="ID_1">%1$s</xliff:g>. hver måned"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Månedlig den <xliff:g id="ID_1">%1$s</xliff:g>."</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Nettverksbegrensninger"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> begrensninger</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 app kan bruke ubegrenset med data når Datasparing er på</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Datasparing"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Ubegrenset datatilgang"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Ubegrenset datatilgang"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Bakgrunnsdata er slått av"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"På"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Av"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrollér låseskjermvarsler"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Vis eller skjul varselinnhold"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Alle"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Brukerstøtte"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Brukerstøtte og tips"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Minst bredde"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ingen installerte apper har bedt om tilgang til premium-SMS."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium-SMS kan koste penger og legges til telefonregningen din. Hvis du slår på tillatelse for en app, kan du sende premium-SMS via den appen."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatisk"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuelle innstillinger"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Frigjør lagringsplass nå"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Bevegelser"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Bevegelsessnarveier"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Hurtigbevegelser for å kontrollere telefonen din"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Hurtigbevegelser for å kontrollere nettbrettet ditt"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Hurtigbevegelser for å kontrollere enheten din"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Åpne kameraet raskt"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Trykk på av/på-knappen to ganger for å åpne kameraet raskt. Dette fungerer fra alle skjermbilder."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Rask åpning av kameraet"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Trykk på av/på-knappen to ganger for å åpne kameraet"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Vend kameraet"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Ta selfier raskere"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Vri telefonen to ganger for selfie-modus"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Vri nettbrettet to ganger for selfie-modus"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Vri enheten to ganger for selfie-modus"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dobbelttrykk for å sjekke telefonen"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dobbelttrykk for å sjekke nettbrettet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dobbelttrykk for å sjekke enheten"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"For å sjekke varslene dine raskt, dobbelttrykk på skjermen."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Dobbelttrykk på skjermen for å sjekke klokkeslett, varselikoner og annen informasjon."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Sjekk varsler når skjermen er slått av"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Løft for å sjekke telefonen"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Løft for å sjekke nettbrettet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Løft for å sjekke enheten"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Løft telefonen for å sjekke varsler raskt."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"For å sjekke varslene dine raskt, løft nettbrettet ditt."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"For å sjekke varslene dine raskt, løft enheten din."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Ta opp telefonen for å sjekke tidspunkt, varselikoner og annen informasjon."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ta opp nettbrettet for å sjekke tidspunkt, varselikoner og annen informasjon."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ta opp enheten for å sjekke tidspunkt, varselikoner og annen informasjon."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Sjekk varsler når skjermen er slått av"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Varsler med fingeravtrykksensor"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Sjekk varsler ved å sveipe ned på fingeravtrykksensoren på baksiden av telefonen."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Sjekk varsler ved å sveipe ned på fingeravtrykksensoren på baksiden av nettbrettet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Sjekk varsler ved å sveipe ned på fingeravtrykksensoren på baksiden av enheten."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Se varsler raskt"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Sveip ned på fingeravtrykkssensoren"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Løft for å åpne kameraet"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"For å åpne kameraet automatisk, løft telefonen din opp til en fotograferingsposisjon (liggende eller stående format). Dette fungerer når telefonen din er låst eller i hvilemodus."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Ta bilder når telefonen er låst eller i hvilemodus"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Assistansebevegelse"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensivitet"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Vil du fjerne denne instant-appen?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Spill"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Lydfiler"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Lagringsplass brukt"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(avinstallert for brukeren <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(slått av for brukeren <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Autofylltjeneste"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Instant-app"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Vil du slå av lagringsadministratoren?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Film- og TV-apper"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Lagringsplass brukt"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Informasjon om operatørhåndtering"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Utløs operatørhåndtering"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Hva er nytt og spennende?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Sjekk ut de 5 mest populære funksjonene"</string>
 </resources>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index bc56170..a234d9f 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"राम्रो"</item>
     <item msgid="8986346415847956850">"उत्कृष्ट"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"सधैं"</item>
-    <item msgid="844721238536786870">"प्लग इन भएपछि मात्र"</item>
-    <item msgid="1986753720941888596">"कहिल्यै पनि होइन"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"सधैँ"</item>
-    <item msgid="7433294150916905997">"केवल प्लग गरेको बेलामा मात्र"</item>
-    <item msgid="1390404486722375028">"कहिल्यै पनि होइन"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"अन्तिम ३० दिन"</item>
     <item msgid="6600989128423965319">"प्रयोग चक्र सेट..."</item>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index f17e817..f4d9ea0 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"तपाईं अब एउटा विकासकर्ता हुनुहुन्छ!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"आवश्यक छैन, तपाईं आफैँ नै एउटा विकासकर्ता हुनुहुन्छ।"</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"कृपया पहिले विकासकर्ताका विकल्पहरूलाई सक्षम पार्नुहोस्"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"ताररहित र सञ्जालहरू"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"जडानहरू"</string>
     <string name="header_category_device" msgid="4544026001618307754">"उपकरण"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE को प्रावधानीकरणलाई सक्रिय गरिएको छ"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"भिडियो कलिङ सम्बन्धी प्रावधानलाई सक्रिय गरिएको छ"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi कलिङ सम्बन्धी प्रावधानलाई सक्रिय गरिएको छ"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presence Provisioned"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"मोबाइल रेडियोको पावर"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM को ठेगाना पुस्तिका हेर्नुहोस्"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"स्थिर डायल गर्ने नम्बरहरू हेर्नुहोस्"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"उपकरणहरूको लागि स्क्यान गर्नुहोस्"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"यस उपकरण पुन:नामाकरण गर्नुहोस्"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"पुनःनामाकरण गर्नुहोस्"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"विच्छेदन गर्ने हो?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"&lt;br&gt; &lt;b&gt;: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>का साथ जडान समाप्त गर्दछ &lt;/ b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"यन्त्र विच्छेद गर्ने हो?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"तपाईंको फोन <xliff:g id="DEVICE_NAME">%1$s</xliff:g> बाट विच्छेद हुनेछ।"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"तपाईंको ट्याब्लेट <xliff:g id="DEVICE_NAME">%1$s</xliff:g> बाट विच्छेद हुनेछ।"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"तपाईंको यन्त्र <xliff:g id="DEVICE_NAME">%1$s</xliff:g> बाट विच्छेद हुनेछ।"</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"विच्छेद गर्नुहोस्"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"तपाईं सँग ब्लुटुथ सेटिङ्हरू परिवर्तन गर्न अनुमति छैन।"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"नयाँ यन्त्रलाई जोडा बनाउनुहोस्"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"ब्लुटुथ सेटिङहरू खुला हुँदा <xliff:g id="DEVICE_NAME">%1$s</xliff:g> लाई नजिकैका उपकरणहरू देख्न सक्नेछन्।"</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"फोनको ब्लुटुथ ठेगाना: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"ट्याब्लेटको ब्लुटुथ ठेगाना: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"यन्त्रको ब्लुटुथ ठेगाना: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>विच्छेद गर्नुहुन्छ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"प्रसारण"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"प्रोफाइल असक्षम पार्ने हो?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"ब्लुटुथ जोडा मिलाउन अनुरोध"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"जोडी पार्ने अनुरोध"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>सँग जोड्न ट्याप गर्नुहोस्।"</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"प्राप्त गरिएका फाइलहरू देखाउनुहोस्"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"प्राप्त गरिएका फाइलहरू"</string>
     <string name="device_picker" msgid="4978696506172252813">"ब्लुटुथ उपकरण छान्नुहोस्"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लुटुथ सक्रिय गर्न चाहन्छ"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लुटुथ निष्क्रिय पार्न चाहन्छ"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s तपाईँको सन्देशमा पहुँच चाहन्छ। %2$s मा पहुँच दिने हो?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM पहुँच अनुरोध"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ले तपाईँको SIM कार्ड पहुँच गर्न चाहन्छ। यन्त्रमा SIM कार्ड पहुँच प्रदान गर्दा जडान अवधिको समयमा तपाईँको डेटा जडान निष्क्रिय हुनेछ। <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> लाई पहुँच प्रदान गर्नुहोस्"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"अन्य यन्त्रहरूमा <xliff:g id="DEVICE_NAME">^1</xliff:g> को रूपमा देख्न सकिन्छ"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"तपाईंका यन्त्रहरू"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"नयाँ यन्त्रलाई जोडा बनाउनुहोस्"</string>
     <string name="date_and_time" msgid="9062980487860757694">"मिति र समय"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"समय क्षेत्र चयन गर्नुहोस्"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"खाताहरू"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"स्थान"</string>
     <string name="account_settings_title" msgid="626177544686329806">"खाताहरू"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"सुरक्षा तथा स्थान"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"सुरक्षा र स्थान"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"इन्क्रिप्सन र प्रमाणहरू"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"फोन इन्क्रिप्ट गरिएको छ"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"यन्त्रलाई इन्क्रिप्ट गरिएको छ"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"फिंगरप्रिन्टमार्फत अनलक"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"आफ्नो फिंगरप्रिन्टको प्रयोग गर्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"आफ्नो फोन अनलक गर्न, खरिदहरूका लागि अनुमति दिन वा अनुप्रयोगहरूमा साइन इन गर्न फिंगरप्रिन्ट सेन्सरलाई केवल छुनुहोस्। तपाईं कसका फिंगरप्रिन्टहरू थप्दै हुनुहुन्छ भन्ने कुरामा सावधान रहनुहोस्। थपिएको एउटै फिंगरप्रिन्टले यी मध्ये कुनै कुरा गर्न सक्छ।\n\nतपाईंको फिंगरप्रिन्ट कुनै बलियो ढाँचा वा PIN भन्दा कम सुरक्षित हुन सक्छ।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"खरिदहरूका लागि अनुमति दिन वा अनुप्रयोगहरूमा साइन इन गर्न फिंगरप्रिन्ट सेन्सरलाई केवल छुनुहोस्। तपाईं कसका फिंगरप्रिन्टहरू थप्दै हुनुहुन्छ भन्ने कुरामा सावधान रहनुहोस्। थपिएको एउटै फिंगरप्रिन्टले यी मध्ये कुनै कुरा गर्न सक्छ।\n\nटिपोट: तपाईं यो यन्त्र अनलक गर्न आफ्नो फिंगरप्रिन्टको प्रयोग गर्न सक्नुहुन्न। थप जानकारीका लागि आफ्नो संगठनको प्रशासकलाई सम्पर्क गर्नुहोस्।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"आफ्नो फोन अनलक गर्न, खरिदहरूका लागि अनुमति दिन वा अनुप्रयोगहरूमा साइन इन गर्न फिंगरप्रिन्ट सेन्सरलाई केवल छुनुहोस्। तपाईं कसका फिंगरप्रिन्टहरू थप्दै हुनुहुन्छ भन्ने कुरामा सावधान रहनुहोस्। थपिएको एउटै फिंगरप्रिन्टले यी मध्ये कुनै कुरा गर्न सक्छ।\n\nटिपोट: तपाईंको फिंगरप्रिन्ट कुनै बलियो ढाँचा वा PIN भन्दा कम सुरक्षित हुन सक्छ।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"तपाईंको फोन अनलक वा खरिदहरूको अनुमोदन गर्न आफ्ना फिंगरप्रिन्टहरूको प्रयोग गर्नुहोस्।\n\nटिपोट: तपाईं यो यन्त्र अनलक गर्न आफ्नो फिंगरप्रिन्टको प्रयोग गर्न सक्नुहुन्न। थप जानकारीका लागि आफ्नो संगठनको प्रशासकलाई सम्पर्क गर्नुहोस्।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"तपाईंको फोन अनलक वा खरिदहरूको अनुमोदन गर्न आफ्नो फिंगरप्रिन्ट प्रयोग गर्नुहोस्।\n\nटिपोट: तपाईंको फिंगरप्रिन्ट भरपर्दो ढाँचा वा PIN भन्दा कम सुरक्षित हुनसक्छ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"रद्द गर्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"जारी राख्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"छाड्नुहोस्"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"फिंगरप्रिन्ट थप्नुहोस्"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"यन्त्र सुरक्षा विशेषताहरू सक्रिय हुने छैनन्। यदि यो ट्याब्लेट हरायो, चोरी भयो वा हटाइयो भने तपाईं यसको प्रयोग गर्नबाट अरूलाई रोक्न सक्षम हुनु हुनेछैन।"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"यन्त्र सुरक्षा विशेषताहरू सक्रिय हुने छैनन्। यदि यो यन्त्र हरायो, चोरी भयो वा हटाइयो भने तपाईं यसको प्रयोग गर्नबाट अरूलाई रोक्न सक्षम हुनु हुनेछैन।"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"यन्त्र सुरक्षा विशेषताहरू सक्रिय हुने छैनन्। यदि यो फोन हरायो, चोरी भयो वा हटाइयो भने तपाईं यसको प्रयोग गर्नबाट अरूलाई रोक्न सक्षम हुनु हुनेछैन।"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"यन्त्र सुरक्षा विशेषताहरू सक्रिय हुने छैनन्। यदि यो ट्याब्लेट हरायो वा चोरी भयो भने तपाईं यसको प्रयोग गर्नबाट अरूलाई रोक्न सक्षम हुनु हुनेछैन।"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"यन्त्र सुरक्षा विशेषताहरू सक्रिय हुने छैनन्। यदि यो यन्त्र हरायो वा चोरी भयो भने तपाईं यसको प्रयोग गर्नबाट अरूलाई रोक्न सक्षम हुनु हुनेछैन।"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"यन्त्र सुरक्षा विशेषताहरू सक्रिय हुने छैनन्। यदि यो फोन हरायो वा चोरी भयो भने तपाईं यसको प्रयोग गर्नबाट अरूलाई रोक्न सक्षम हुनु हुनेछैन।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"अर्को"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"यन्त्रको सुरक्षासम्बन्धी सुविधाहरू सक्रिय गरिने छैनन्। तपाईं यो ट्याब्लेट हराएको वा चोरी भएको वा रिसेट भएको अवस्थामा अरूलाई यो चलाउनबाट रोक्न सक्नुहुने छैन।"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"यन्त्रको सुरक्षासम्बन्धी सुविधाहरू सक्रिय गरिने छैनन्। तपाईं यो यन्त्र हराएको वा चोरी भएको वा रिसेट भएको अवस्थामा अरूलाई यो चलाउनबाट रोक्न सक्नुहुने छैन।"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"यन्त्रको सुरक्षासम्बन्धी सुविधाहरू सक्रिय गरिने छैनन्। तपाईं यो फोन हराएको वा चोरी भएको वा रिसेट भएको अवस्थामा अरूलाई यो चलाउनबाट रोक्न सक्नुहुने छैन।"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"यन्त्रको सुरक्षासम्बन्धी सुविधाहरू सक्रिय गरिने छैनन्। तपाईं यो ट्याब्लेट हराएको वा चोरी भएको अवस्थामा अरूलाई यो चलाउनबाट रोक्न सक्नुहुने छैन।"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"यन्त्रको सुरक्षासम्बन्धी सुविधाहरू सक्रिय गरिने छैनन्। तपाईं यो यन्त्र हराएको वा चोरी भएको अवस्थामा अरूलाई यो चलाउनबाट रोक्न सक्नुहुने छैन।"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"यन्त्रको सुरक्षासम्बन्धी सुविधाहरू सक्रिय गरिने छैनन्। तपाईं यो फोन हराएको वा चोरी भएको अवस्थामा अरूलाई यो चलाउनबाट रोक्न सक्नुहुने छैन।"</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"जसरी पनि छाड्नुहोस्"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"पछाडि फिर्ता जानुहोस्"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"सेन्सर खोज्नुहोस्"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"तपाईँको फोनको पछाडि तर्फ औठाछाप सेन्सरको स्थान निर्धारण गर्नुहोस्।"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"सेन्सरमा छुनुहोस्"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"यो तपाईंको फोनको पछाडिको भागमा छ। आफ्नो चोर औंला प्रयोग गर्नुहोस्‌।"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"यन्त्र साथ चित्रण र फिंगरप्रिन्ट सेन्सर स्थान"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"नाम"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ठीक छ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"मेटाउनुहोस्"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"सुरु गरौँ"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"सेन्सरमा छुनुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"सेन्सरमा आफ्नो औंला राख्नुहोस्  र तपाईंले भाइब्रेसन महसुस गरेपछि उठाउनुहोस्"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"छोइराख्नुहोस्"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"तपाईंको फिंगरप्रिन्टको सबै फरक भागहरु थप्न आफ्नो औंला बिस्तारै सार्नुहोस्"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"फिंगरप्रिन्ट थपियो!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"तपाईं यस आइकनलाई देख्नुहुने समय तपाईं पहिचानको लागि वा एक खरिदलाई अधिकार दिनको निम्ति आफ्नो फिंगरप्रिन्ट प्रयोग गर्न सक्नुहुन्छ।"</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"जगाउन र तपाईँको यन्त्रलाई अनलक गर्न फिंगरप्रिन्ट सेन्सरमा छुनुहोस्।"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"तपाईंले यो आइकन देख्नुभो भने तपाईं खरिदहरूलाई अनुमति दिन वा अनुप्रयोगहरूमा साइन इन गर्न पनि सक्नुहुन्छ।"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"औंला उठाई फेरि छुनुहोस्"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"तपाईंको फिंगरप्रिन्टका फरक-फरक भागहरू थप्न आफ्नो औंलालाई उठाउँदै राख्दै गर्नुहोस्"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"फिंगरप्रिन्ट थपियो"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"तपाईंले यस आइकनलाई देख्नुहुँदा पहिचान वा खरिदहरूको अनुमोदन गर्न आफ्नो फिंगरप्रिन्ट प्रयोग गर्नुहोस्‌।"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फिंगरप्रिन्ट सेटअप छोड्न चाहनुहुन्छ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"तपाईँले आफ्नो फोन अनलक गर्ने एक तरिका रूपमा फिंगरप्रिन्ट छान्‍नुभएको छ। यदि तपाईँले अहिले छोड्नु भएमा पछि पुन: सेटअप गर्न पर्नेछ। सेटअप गर्न मात्र केहि मिनेट लाग्‍नेछ।"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"स्क्रिन लक सेटअप गर्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"सम्पन्न भयो"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"आच्यौं, त्यो सेन्सर होइन नि त"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"तपाईँको यन्त्रमा फिंगरप्रिन्ट सेन्सर प्रयोग गर्नुहोस्।"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"तपाईंको फोनको पछाडि भागमा रहेको सेन्सरमा छुनुहोस्। चोर औंला प्रयोग गर्नुहोस्‌।"</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"दर्ता पूर्ण भएको थिएन"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"फिंगरप्रिन्ट दर्ताको समय सीमा पुग्यो। पुन: प्रयास गर्नुहोस्।"</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"फिंगरप्रिन्ट दर्ताले काम गरेन। पुन: प्रयास गर्नुहोस् वा अरू औँलाको प्रयोग गर्नुहोस्।"</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"यन्त्र सुरक्षा विशेषताहरू सक्रिय गरेर तपाईंको अनुमति बिना यो यन्त्र प्रयोग गर्नबाट रोक्नुहोस्। तपाईंले प्रयोग गर्न चाहेको स्क्रिन लक रोज्नुहोस्।"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"यन्त्र सुरक्षा विशेषताहरू सक्रिय गरेर तपाईंको अनुमति बिना यो फोन प्रयोग गर्नबाट रोक्नुहोस्। तपाईंले प्रयोग गर्न चाहेको स्क्रिन लक रोज्नुहोस्।"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"तपाईँको ब्याकअप स्क्रिन लक विधि छनौंट गर्नुहोस्"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"स्क्रिन लकका विकल्पहरू"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"स्क्रिन लकका विकल्पहरू"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"स्क्रिन लक"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / सुते लगत्तै"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> सुतेपछि"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"अनलक ढाँचा बदल्नुहोस्"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"अनलक PIN परिवर्तन गर्नुहोस्"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"अनलक पासवर्ड परिवर्तन गर्नुहोस्"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"फेरि प्रयास गर्नुहोस्। प्रयास <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> को <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"अन्तिम प्रयास"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"तपाईंले यो प्रयासमा गलत कार्य ढाँचा प्रविष्ट गर्नुभयो भने, तपाईंको कार्य प्रोफाइल र सम्बन्धित डेटा यो यन्त्रबाट हटाइनेछ।"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"तपाईंले यो प्रयासमा गलत कार्य PIN प्रविष्ट गर्नुभयो भने, तपाईंको कार्य प्रोफाइल र सम्बन्धित डेटा यो यन्त्रबाट हटाइनेछ।"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"तपाईंले यो प्रयासमा गलत कार्य पासवर्ड प्रविष्ट गर्नुभयो भने, तपाईंको कार्य प्रोफाइल र सम्बन्धित डेटा यो यन्त्रबाट हटाइनेछ।"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"धेरै पकट गलत प्रयास गरियो। तपाईंको कार्य प्रोफाइल र सम्बन्धित डेटा यो यन्त्रबाट हटाइनेछ।"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"खारेज गर्नुहोस्"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"फेरि प्रयास गर्नुहोस्। <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> मध्ये <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> प्रयास"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"तपाईंको डेटालाई मेटाइनेछ"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"तपाईंले अर्को प्रयासमा गलत ढाँचा प्रविष्ट गर्नुभयो भने यो यन्त्रका डेटालाई मेटाइनेछ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"तपाईंले अर्को प्रयासमा गलत PIN प्रविष्ट गर्नुभयो भने यो यन्त्रको डेटालाई मेटाइनेछ"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"तपाईंले अर्को प्रयासमा गलत पासवर्ड प्रविष्ट गर्नुभयो भने यो यन्त्रका डेटालाई मेटाइनेछ।"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"तपाईंले अर्को प्रयासमा गलत ढाँचा प्रविष्ट गर्नुभयो भने यो प्रयोगकर्ताको डेटालाई मेटाइनेछ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"तपाईंले अर्को प्रयासमा गलत PIN प्रविष्ट गर्नुभयो भने यो प्रयोगकर्ताको डेटालाई मेटाइनेछ"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"तपाईंले अर्को प्रयासमा गलत पासवर्ड प्रविष्ट गर्नुभयो भने यो प्रयोगकर्तालाई मेटाइनेछ"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"तपाईंले अर्को प्रयासमा गलत ढाँचा प्रविष्ट गर्नुभयो भने तपाईंको कार्य प्रोफाइल र यसको डेटालाई मेटाइनेछ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"तपाईंले अर्को प्रयासमा गलत PIN प्रविष्ट गर्नुभयो भने तपाईंको कार्य प्रोफाइल र यसको डेटालाई मेटाइनेछ"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"तपाईंले अर्को प्रयासमा गलत पासवर्ड प्रविष्ट गर्नुभयो भने तपाईंको कार्य प्रोफाइल र यसको डेटालाई मेटाइनेछ"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"धेरै पकट गलत प्रयास गरियो। यो यन्त्रका डेटालाई मेटाइनेछ।"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"धेरै पकट गलत प्रयास गरियो। यो प्रयोगकर्तालाई मेटाइनेछ"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"धेरै पकट गलत प्रयास गरियो। यो कार्य प्रोफाइल र यसको डेटालाई मेटाइनेछ।"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"खारेज गर्नुहोस्"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"कम्तीमा पनि <xliff:g id="COUNT">%d</xliff:g> वटा वर्ण हुनु अनिवार्य छ"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN कम्तीमा पनि <xliff:g id="COUNT">%d</xliff:g> अङ्कको हुनु अनिवार्य छ"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"जारी राख्नुहोस्"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"जटिल ब्लुटुथ"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ब्लुटुथ खोलेको बेला तपाईँको उपकरणले नजिकैका अन्य ब्लुटुथ उपकरणहरूसँग संचार गर्न सक्छन्।"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"स्थान पहिचान सामर्थ्यतामा सुधार गर्न, प्रणाली अनुप्रयोगहरू र सेवाहरूले अझै पनि ब्लुटुथ यन्त्रहरूलाई पहिचान गर्न सक्छन्। तपाईँले यसलाई  <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g> स्क्यानिङ सेटिङहरू <xliff:g id="LINK_END_1">LINK_END</xliff:g> मा परिवर्तन गर्न सक्नुहुन्छ।"</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"जडान गर्न सकिएन। फेरि प्रयास गर्नुहोस्।"</string>
+    <string name="device_details_title" msgid="6576953269221085300">"यन्त्रसम्बन्धी विवरणहरू"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"यन्त्रको ब्लुटुथ ठेगाना: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"यन्त्रलाई बिर्सने हो?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"तपाईंको यन्त्रलाई अब उप्रान्त <xliff:g id="DEVICE_NAME">%1$s</xliff:g> सँग जोडा बनाइने छैन।"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"तपाईंको ट्याब्लेटलाई अब उप्रान्त <xliff:g id="DEVICE_NAME">%1$s</xliff:g> सँग जोडा बनाइने छैन"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"तपाईंको यन्त्रलाई अब उप्रान्त <xliff:g id="DEVICE_NAME">%1$s</xliff:g> सँग जोडा बनाइने छैन"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"यन्त्रलाई बिर्सनुहोस्"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"सँग जडान गर्नुहोस् ..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> मिडिया अडियोबाट जडान हटाइने छ।"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ह्यान्ड फ्रि अडियोबाट विच्छेन गरिने छ।"</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"प्रदान नगर्नुहोस्"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"प्रमाणित नगर्नुहोस्"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"कुनै प्रमाणपत्र निर्दिष्ट गरिएको छैन। तपाईंको जडान निजी हुनेछैन।"</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"नेटवर्कको नाम धेरै लामो भयो।"</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"डोमेन निर्दिष्ट गर्नुपर्छ"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्ध छ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्ध)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">१ नेटवर्क</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"जटिल Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wi-Fi कन्फिगर गर्नुहोस्"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"म्याक ठेगाना"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP ठेगाना"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"सबनेट मास्क"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"यो समूह बिर्सनुभयो?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"पोर्टेबल Wi-Fi हटस्पट"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi हटस्पट"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Wi-Fi नेटवर्क प्रदान गर्न मोबाइल जडान प्रयोग गर्नुहोस्"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"हटस्पट मार्फत यो ट्याब्लेटको इन्टरनेट जडान आदान-प्रदान गरिरहेको छैन"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"हटस्पट मार्फत यो फोनको इन्टरनेट जडान आदान-प्रदान गरिरहेको छैन"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"अन्य यन्त्रहरूसँग इन्टरनेट वा सामग्री आदान-प्रदान गरिरहेको छैन"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"हटस्पटमार्फत यो ट्याब्लेटको इन्टरनेट जडान साझा गर्दै"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"हटस्पटमार्फत यो फोनको इन्टरनेट जडान साझा गर्दै"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"अनुप्रयोगले सामग्री आदान-प्रदान गर्दैछ। इन्टरनेट जडान साझा गर्न हटस्पट निष्क्रिय पार्नुहोस्, त्यसपछि फेरि  गर्नुहोस्‌"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi को नाम"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> सक्रिय गर्दै..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"अन्य यन्त्रहरू <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> मा जडान गर्न सक्छन्"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi को पासवर्ड"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP ब्यान्ड"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"आफ्ना अन्य यन्त्रहरूका लागि Wi‑Fi नेटवर्क सिर्जना गर्न हटस्पट प्रयोग गर्नुहोस्। हटस्पटले तपाईंको मोबाइल डेटा जडान प्रयोग गरेर इन्टरनेट प्रदान गर्दछ। अतिरिक्त मोबाइल डेटा शुल्क लागू हुनसक्छ।"</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"अनुप्रयोगहरूले नजिकैका यन्त्रहरूसँग सामग्री आदान-प्रदान गर्न एउटा हटस्पट सिर्जना गर्न सक्छन्।"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"हटस्पट खुल्दै..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"हटस्पट बन्द गरिँदै..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> सक्रिय छ"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"१"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi कलिङ सक्रिय हुँदा तपाईँको प्राथमिकता र कुन संकेत बलियो छ भन्ने आधारमा तपाईँको फोनले कलहरूलाई Wi-Fi नेटवर्हकरू वा तपाईँको वाहकको नेटवर्कमार्फत पठाउन सक्छ। यो सुविधा सक्रिय पार्न अघि शुल्क र अन्य विवरणको बारेमा तपाईँको वाहकसँग जाँच गर्नुहोस्।"</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"आपतकालीन ठेगानालाई अद्यावधिक गर्नुहोस्"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"तपाईँले WiFi को प्रयोग गरी कुनै ९११ सम्बन्धी कल गर्दा आपतकालीन सेवाहरूले तपाईँको स्थानको रूपमा प्रयोग गर्ने ठेगाना"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"प्रदर्शन"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"कुनै परिणाम फेला पारिएन"</string>
     <string name="display_settings" msgid="7965901687241669598">"प्रदर्शन"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"स्वतःघुम्ने स्क्रिन"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"जीवन्त रङहरू"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ट्याब्लेट घुमाउँदा स्वचालित रूपमा अभिमुखिकरण स्विच गर्नुहोस्"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"फोन घुमाउँदा स्वचालित रूपमा अभिमुखिकरण स्विच गर्नुहोस्"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"ट्याब्लेट घुमाउँदा अभिमुखिकरण स्वचालित तवरले बदल्नुहोस्"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"उपलब्ध प्रकाशमा चमकको स्तर अनुकूल बनाउनुहोस्। यो सुविधा सक्रिय गरिसकेपछि पनि तपाईं अस्थायी रूपमा चमकलाई समायोजन गर्न सक्नुहुन्छ।"</string>
     <string name="night_display_title" msgid="2626451512200357686">"रात्रिको प्रकाश"</string>
     <string name="night_display_text" msgid="1837277457033025056">"रात्रिको प्रकाशले तपाईँको यन्त्रको स्क्रिनलाई हल्का एम्बर रङको बनाउँछ। यसले मधुरो प्रकाशमा यन्त्रको स्क्रिन हेर्न र पढ्न सजिलो बनाउँछ र तपाईँलाई अझ सजिलैसँग निदाउन मद्दत गर्न सक्छ।"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"समय निर्धारण गर्नुहोस्"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"वस्तुस्थिति"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"स्वतः सक्रिय पार्नुहोस्"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"कहिले पनि होइन"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"आफू अनुकूल समय सहितको कार्यतालिका"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"सूर्यास्तदेखि सूर्योदयसम्म"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"समय निर्धारण गर्नुहोस्"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"कुनै पनि होइन"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"आफू अनुकूल समयमा सक्रिय गर्छ"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"सूर्यास्तदेखि सूर्योदयसम्म सक्रिय गर्छ"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"सुरु समय"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"समय समाप्ति"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"स्थिति"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"तीव्रता"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"निष्क्रिय। <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"कहिल्यै पनि स्वतः सक्रिय हुनेछैन।"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g> मा स्वतः सक्रिय हुनेछ।"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"सूर्यास्तको बेला स्वतः सक्रिय हुनेछ।"</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"सक्रिय। <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"कहिल्यै पनि स्वतः निष्क्रिय हुने छैन।"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g> मा स्वतः निष्क्रिय हुनेछ।"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"सूर्योदयको बेला स्वतः निष्क्रिय हुनेछ।"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"निष्क्रिय / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"कहिले पनि स्वतः सक्रिय हुने छैन"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g> मा स्वतः सक्रिय हुनेछ"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"सूर्यास्तको बेला स्वतः सक्रिय हुनेछ"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"सक्रिय / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"कहिल्यै पनि स्वतः निष्क्रिय हुनेछैन"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g> मा स्वतः निष्क्रिय हुनेछ"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"सूर्योदयको बेला स्वतः निष्क्रिय हुनेछ"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"निष्क्रिय"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"स्क्रिन बन्द हुन्छ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> निष्क्रियता पछि"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"सेटिङहरू"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"स्वचालित उज्यालोपना"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"चालु गर्न उठाउनुहोस्"</string>
-    <string name="doze_title" msgid="2259176504273878294">"परिवेश प्रदर्शन"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"एम्बियन्ट प्रदर्शन"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"सधैँ सक्रिय"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"नयाँ सूचनाहरू"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"देखाउने समय"</string>
+    <string name="doze_title" msgid="2375510714460456687">"नयाँ सूचनाहरू"</string>
     <string name="doze_summary" msgid="3846219936142814032">"सूचनाहरू प्राप्त हुँदा स्क्रिनलाई सक्रिय गर्नुहोस्"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"सधैँ सक्रिय"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"समय, सूचनाका आइकनहरू र अन्य जानकारीहरू देखाउनुहोस्"</string>
     <string name="title_font_size" msgid="4405544325522105222">"फन्ट आकार"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"पाठ सन्देश अझ ठूलो वा सानो पार्नुहोस्"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM कार्ड लक सेटिङहरू"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN खाली हुन सक्तैन।"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC क्षेत्र कम से कम ३ अङ्कको हुनु पर्छ।"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC क्षेत्रमा २ वा ३ अंकहरू हुनुपर्दछ"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"सेवा प्रदायकले %s प्रकारका APN हरू थप्ने अनुमति दिँदैन।"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"पूर्वनिर्धारित APN सेटिङहरू पुनःप्राप्त गर्दै।"</string>
     <string name="menu_restore" msgid="8260067415075573273">"पूर्वनिर्धारितमा पुनःसेट गर्नुहोस्"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"पूर्वनिर्धारित APN सेटिङहरू पुनःसेट पुरा भयो।"</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD कार्ड मेटाउनुहोस्"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"आन्तरिक USB भण्डारणमा सबै डेटा मेटाउनुहोस्, जस्तै संगीत वा फोटाहरू"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD कार्डबाट सबै डाटाहरू जस्तै संगीत वा फोटाहरू मेटाउनुहोस्"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM हरूलाई मेटाउनुहोस्"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"उक्त फोनमा भएका सबै eSIM हरूलाई मेटाउनुहोस्। यस कार्यले तपाईंको मोबाइल सेवाको योजना रद्द गर्नेछैन।"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"उक्त ट्याब्लेटमा भएका सबै eSIM हरूलाई मेटाउनुहोस्। यस कार्यले तपाईंको मोबाइल सेवाको योजना रद्द गर्नेछैन।"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ट्याब्लेट पुनःसेट गर्नुहोस्"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"फोन पुनःसेट गर्नुहोस्"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"तपाईंका सबै व्यक्तिगत जानकारी र डाउनलोड गरिएका अनुप्रयोगहरू मेट्ने हो? तपाईं यो कार्य अनडू गर्न सक्नुहुन्न!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"डेटा सेभर अन हुँदा टेदरिङ वा पोर्टेबल हटस्पटहरूको प्रयोग गर्न सक्दैन"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB टेदर गर्दै"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB जडान भएको छ, टेदर गर्न जाँच गर्नुहोस्"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"टेदर भएको"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USB भण्डारण प्रयोगमा हुँदा टेदर गर्न सक्दैन"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB जडित छैन"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"खोल्नको लागि जडान गर्नुहोस्"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB टेथर गर्न त्रुटि"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"USB मार्फत फोनको इन्टरनेट जडान साझा गर्नुहोस्‌"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"USB मार्फत ट्याब्लेटको इन्टरनेट जडान साझा गर्नुहोस्‌"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ब्लुटुथ टेथर गर्दै"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"ब्लुटुथ मार्फत यो ट्याब्लेटको इन्टरनेट जडान आदान-प्रदान गरिँदै"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"ब्लुटुथ मार्फत यो फोनको इन्टरनेट जडान आदान-प्रदान गरिँदै"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"ब्लुटुथ मार्फत १ यन्त्रसँग यो ट्याब्लेटको इन्टरनेट जडान आदान-प्रदान गरिँदै"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"ब्लुटुथ मार्फत १ यन्त्रसँग यो फोनको इन्टरनेट जडान आदान-प्रदान गरिँदै"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"ब्लुटुथ मार्फत <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> यन्त्रहरूसँग यो ट्याब्लेटको इन्टरनेट जडान आदान-प्रदान गरिँदै"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"ब्लुटुथ मार्फत <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> यन्त्रहरूसँग यो फोनको इन्टरनेट जडान आदान-प्रदान गरिँदै"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"ब्लुटुथमार्फत ट्याब्लेटको इन्टरनेट जडान आदान-प्रदान गर्नुहोस्‌"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"ब्लुटुथमार्फत फोनको इन्टरनेट जडान आदान-प्रदान गर्नुहोस्‌"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"ब्लुटुथ मार्फत यो <xliff:g id="DEVICE_NAME">%1$d</xliff:g> को इन्टरनेट जडान आदान-प्रदान गरिँदै"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"ब्लुटुथ मार्फत यो ट्याब्लेटको इन्टरनेट जडान आदान-प्रदान गरिरहेको छैन"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"ब्लुटुथ मार्फत यो फोनको इन्टरनेट जडान आदान-प्रदान गरिरहेको छैन"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"टेदर गरिएको छैन"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> उपकरणहरूभन्दा बढीसँग टेदर गर्न सक्दैन।"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> अनटेथर गरिने छ।"</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"आफ्नो मोबाइल डेटा जडान मार्फत अन्य यन्त्रहरूमा इन्टरनेट उपलब्ध गराउन हटस्पट र टेदरिङ प्रयोग गर्नुहोस्।"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"आफ्नो मोबाइल डेटा जडान मार्फत अन्य यन्त्रहरूमा इन्टरनेट उपलब्ध गराउन हटस्पट र टेदरिङ प्रयोग गर्नुहोस्। नजिकैका यन्त्रहरूसँग सामग्री आदान-प्रदान गर्न अनुप्रयोगहरूले एउटा हटस्पट  सिर्जना गर्न पनि सक्छन्।"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"मद्दत"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"मोबाइल नेटवर्क"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"मोबाईल योजना"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"स्थान मोड"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"स्थान निर्धारण गर्न GPS, Wi-Fi, ब्लुटुथ वा मोबाइल नेटवर्कहरूको प्रयोग गर्नुहोस्"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"स्थान निर्धारण गर्न Wi-Fi, ब्लुटुथ वा मोबाइल नेटवर्कहरूको प्रयोग गर्नुहोस्"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"स्थान निर्धारण गर्न GPS प्रयोग गर्नुहोस्"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"स्थान निर्धारण गर्नका लागि GPS र यन्त्र सेन्सर प्रयोग गर्नुहोस्"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"स्क्यान गर्दै"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi स्क्यान हुँदै"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"प्रणाली अनुप्रयोगहरू र सेवाहरूलाई कुनै पनि समयमा Wi-Fi हरू पहिचान गर्न अनुमति दिएर स्थानको पहिचान सामर्थ्यतामा सुधार गर्नुहोस्।"</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"तपाईंसँग डेटा जडान छैन। यो जानकारी अब हेर्नको लागि इन्टरनेटमा जडित कुनै पनि कम्प्युटरबाट %s मा जानुहोस्।"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"लोड हुँदै..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"तपाईंको पासवर्ड छनौट गर्नुहोस्"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"फिंगरप्रिन्ट प्रयोग गर्न पासवर्ड सेट गर्नुहोस्"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"तपाईँको ढाँचा छान्नुहोस्"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"फिंगरप्रिन्ट प्रयोग गर्न ढाँचा सेट गर्नुहोस्"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"तपाईँको PIN छान्नुहोस्"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"फिंगरप्रिन्ट प्रयोग गर्न PIN सेट गर्नुहोस्"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"तपाईँको पासवर्ड निश्चित गर्नुहोस्"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"तपाईँको ढाँचा निश्चित गर्नुहोस्"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"तपाईँको PIN को पुष्टि गर्नुहोस्"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"अनुप्रयोग सेटिङहरू"</string>
     <string name="install_applications" msgid="4872012136210802181">"अज्ञात स्रोतहरू"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"सबै अनुप्रयोग स्रोतहरू अनुमति"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"हालै खोलिएका अनुप्रयोगहरू"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"सबै <xliff:g id="COUNT">%1$d</xliff:g> अनुप्रयोगहरू हेर्नुहोस्"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> पहिले"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"तपाईंको ट्याब्लेट र व्यक्तिगत डेटा अज्ञात अनुप्रयोगहरूबाट हुने आक्रमणमा पर्न सक्ने जोखिम अझ बढी हुन्छ। यो स्रोतबाट प्राप्त हुने अनुप्रयोगहरूको स्थापना गरेर, तिनीहरूको प्रयोगबाट तपाईंको ट्याब्लेटमा हुनसक्ने क्षति वा डेटाको नोक्सानीको जिम्मेवार तपाईं आफैँ हुनुहुन्छ भन्ने कुरामा तपाईं सहमत हुनुहुन्छ।"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"तपाईंको फोन र व्यक्तिगत डेटा अज्ञात अनुप्रयोगहरूबाट हुने आक्रमणमा पर्न सक्ने जोखिम अझ बढी हुन्छ। यो स्रोतबाट प्राप्त हुने अनुप्रयोगहरूको स्थापना गरेर, तिनीहरूको प्रयोगबाट तपाईंको फोनमा हुनसक्ने क्षति वा डेटाको नोक्सानीको जिम्मेवार तपाईं आफैँ हुनुहुन्छ भन्ने कुरामा तपाईं सहमत हुनुहुन्छ।"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"जटिल सेटिङहरू"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"प्रणाली सेवा रोक्नुहोस्?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"यदि तपाईं यो सेवा रोक्नुहुन्छ भने तपाईंको ट्याब्लेटका केही सुविधाहरूले तपाईंले पावर बन्द गरेर फेरि नखोलेसम्म काम नगर्न सक्दछ।"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"यदि तपाईँले यस सेवालाई बन्द गर्नु भएको खण्डमा तपाईँको फोनका केही सुविधाहरू सही तवरले काम गर्न बन्द गर्न सक्छन् तबसम्म तपाईँले फेरि यसलाई पावर बन्द गरी फेरि सुरु गर्नु हुन्न।"</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"भाषा, इनपुट र इसाराहरू"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"भाषा र इनपुट"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"भाषा र इनपुट"</string>
     <string name="input_assistance" msgid="7577795275222555487">"इनपुट सम्बन्धी सहायता"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> वटा छाप्ने सेवा खुला छन्</item>
       <item quantity="one">१ वटा छाप्ने सेवा खुला छ</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> छपाइ कार्यहरू</item>
+      <item quantity="one">१ छपाइ कार्य</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"प्रिन्ट सेवाहरु"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"कुनै पनि सेवाहरू स्थापित छैनन्"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"कुनै प्रिन्टरहरु भेटाईएन"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"विवरणहरू प्रयोग गर्नुहोस्"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"उर्जा प्रयोग मिलाउनुहोस्"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"सम्मिलित प्याकेजहरू"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ब्याट्री खपत गर्ने अनुप्रयोगहरू"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"यन्त्रलाई सक्रिय राख्दै"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"पृष्ठभूमिमा यन्त्रलाई सक्रिय गर्दै"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"बारम्बार स्थानसम्बन्धी जानकारी प्राप्त गर्ने अनुरोध गर्दैछ"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> अनुप्रयोगहरूले असामान्य व्यवहार देखाउँदैछन्"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"अनुप्रयोगलाई रोक्ने हो?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको फोनलाई निरन्तर सक्रिय अवस्थामा राख्ने भएकाले तपाईंको यन्त्रले सामान्य ढंगले ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई जबरजस्ती रोक्न सक्नुहुन्छ।\n\nयो समस्या बाराम्बार भइरहेमा तपाईंले ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको ट्याब्लेटलाई निरन्तर सक्रिय अवस्थामा राख्ने भएकाले तपाईंको यन्त्रले सामान्य ढंगले ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई जबरजस्ती रोक्न सक्नुहुन्छ।\n\nयो समस्या बाराम्बार भइरहेमा तपाईंले ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।"</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको यन्त्रलाई निरन्तर सक्रिय अवस्थामा राख्ने भएकाले तपाईंको यन्त्रले सामान्य ढंगले ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई जबरजस्ती रोक्न सक्नुहुन्छ।\n\nयो समस्या बाराम्बार भइरहेमा तपाईंले ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"अनुप्रयोगलाई रोक्नुहोस्"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"पृष्ठभूमिको प्रयोगलाई निष्क्रिय पार्ने हो?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको फोनलाई बरम्बार सक्रिय अवस्थामा राख्ने भएकाले तपाईंको फोनले सामान्य ढंगले ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्न तपाईंको फोनले यस अनुप्रयोगलाई पृष्ठभूमिमा चल्नबाट रोक्नसक्छ।"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको ट्याब्लेटलाई बरम्बार सक्रिय अवस्थामा राख्ने भएकाले तपाईंको ट्याब्लेटले सामान्य ढंगले ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्न तपाईंको ट्याब्लेटले यस अनुप्रयोगलाई पृष्ठभूमिमा चल्नबाट रोक्नसक्छ।"</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको यन्त्रलाई बरम्बार सक्रिय अवस्थामा राख्ने भएकाले तपाईंको यन्त्रले सामान्य ढंगले ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्न तपाईंको यन्त्रले यस अनुप्रयोगलाई पृष्ठभूमिमा चल्नबाट रोक्नसक्छ।"</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"निष्क्रिय पार्नुहोस्"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"स्थानसम्बन्धी जानकारीलाई निष्क्रिय पार्ने हो?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंले उक्त अनुप्रायोग प्रयोग नगरिरहनुभएको बेलामा पनि स्थानसम्बन्धी जानकारी प्राप्त गर्न बरम्बार अनुरोध गर्ने भएकाले तपाईंको फोनले सामान्य ढंगले ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्न तपाईं यस फोनको स्थानसम्बन्धी जानकारीलाई निष्क्रिय पार्न सक्नुहुन्छ।"</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंले उक्त अनुप्रायोग प्रयोग नगरिरहनुभएको बेलामा पनि स्थानसम्बन्धी जानकारी प्राप्त गर्न बरम्बार अनुरोध गर्ने भएकाले तपाईंको ट्याब्लेटले सामान्य ढंगले ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्न तपाईं यस ट्याब्लेटको स्थानसम्बन्धी जानकारीलाई निष्क्रिय पार्न सक्नुहुन्छ।"</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंले उक्त अनुप्रायोग प्रयोग नगरिरहनुभएको बेलामा पनि स्थानसम्बन्धी जानकारी प्राप्त गर्न बरम्बार अनुरोध गर्ने भएकाले तपाईंको यन्त्रले सामान्य ढंगले ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्न तपाईं यस यन्त्रको स्थानसम्बन्धी जानारीलाई निष्क्रिय पार्न सक्नुहुन्छ।"</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"निष्क्रिय पार्नुहोस्"</string>
     <string name="power_screen" msgid="3023346080675904613">"स्क्रिन"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"फ्ल्यासलाइट"</string>
     <string name="power_camera" msgid="4976286950934622605">"क्यामेरा"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"अनुप्रयोगहरू"</string>
     <string name="power_service" msgid="1599661212370831780">"सेवाहरू"</string>
     <string name="power_system" msgid="8290455327965307383">"प्रणाली"</string>
-    <string name="power_user" msgid="1889728099253018005">"प्रयोगकर्ता"</string>
+    <string name="power_user" msgid="3706143225319881667">"अन्य प्रयोगकर्ताहरू"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU कुल"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU अग्रभूमि"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"जागा रहनुहोस्"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"बढी गिन्ती गरिएको उर्जा प्रयोग"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> का लागि प्रयोग गरियो"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"<xliff:g id="TIME">^1</xliff:g> को लागि सक्रिय थियो"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"स्क्रिन प्रयोग गरेको समय <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ले प्रयोग गरेको <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"समग्र ब्याट्रीको <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN फेर्नुहोस्"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"सूचनाहरू देखाउनुहोस्"</string>
     <string name="help_label" msgid="6886837949306318591">"मद्दत र प्रतिक्रिया"</string>
-    <string name="support_summary" msgid="8276116616493882830">"मद्दत सम्बन्धी लेखहरू, फोन र च्याट सम्बन्धी सहायता"</string>
+    <string name="support_summary" msgid="2705726826263742491">"मद्दतसम्बन्धी लेखहरू, फोन, कुराकानी र सुरूवात गर्नेसम्बन्धी सहायता"</string>
     <string name="user_account_title" msgid="1127193807312271167">"सामग्रीको लागि खाता"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"तस्बिर ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"चरम धम्की"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">लुकाइएको %d वस्तु देखाउनुहोस्</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"नेटवर्क र इन्टरनेट"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, मोबाइल, डेटाको प्रयोग, हटस्पट"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"मोबाइल"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"डेटाको प्रयोग"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"हटस्पट"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"जडान गरिएका यन्त्रहरू"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"ब्लुटुथ, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"ब्लुटुथ, कास्ट गर्ने सुविधा"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"अनुप्रयोग सम्बन्धी &amp; सूचनाहरू"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"अनुमतिहरू, पूर्वनिर्धारित अनुप्रयोगहरू"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"प्रयोगकर्ता र खाताहरू"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"इसारा"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"भुक्तानी गर्नुहोस्, ट्याप गर्नुहोस्, भुक्तानी"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ब्याकअप, ब्याकअप गर्नुहोस्"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"इसारा, किनारा, छेउ, सक्रिय किनारा, थिच्नु, पकड, सहयोग, सहायक, थिच्न मिल्ने, स्क्विजि, स्क्विजि, स्क्विजि, ok google, google सहायक"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"इसारा, सक्रिय , सूचनाहरू, स्क्रिन, प्रदर्शन,बन्द स्क्रिन, खुला स्क्रिन, थिच्नु, किनारा, शयन अवस्था, निष्क्रिय, पकड"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"इसारा, मौन, स्नुज, अलार्म, आगमन कल, शान्त, प्रदर्शन, लकस्क्रिन, थिच्नु, पकड, किनारा, रोक्नु"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ट्याग सेट गर्नुहोस्"</string>
     <string name="write_tag" msgid="8571858602896222537">"लेख्नुहोस्"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"लेख्न ट्याग छुनुहोस्..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"कुनै पनि कार्य सम्बन्धी सूचनाहरू नदेखाउनुहोस्"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"तपाईंको यन्त्र लक हुँदा, तपाईं प्रोफाइल सूचनाहरू कसरी देखाउन चाहनुहुन्छ?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"प्रोफाइल सूचनाहरू"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"सूचनाहरू"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"सूचनाहरू"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"अनुप्रयोग सूचनाहरू"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"सूचनाको प्रकार"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"महत्त्व"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"अनुप्रयोगलाई निर्णय गर्न दिनुहोस्"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"जरुरी"</string>
     <string name="allow_sound" msgid="1820188704793497324">"ध्वनिलाई अनुमति दिनुहोस्"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"ध्वनि, कम्पन नगर्नुहोस् वा हालको स्क्रिनमा यी सूचनाहरूलाई दृश्यमा नचियाउनुहोस्।"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"न्यून महत्त्वको सूचना"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"सामान्य महत्वको सूचना"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"उच्च महत्त्वको सूचना"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"जरूरी महत्त्वको सूचना"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"सूचना सहायक"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"सूचना पहुँच"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"कार्य प्रोफाइलमाथिका पहुँच सम्बन्धी सूचनाहरूलाई बन्द गरिएको छ"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"तस्बिरमा तस्बिर"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"तस्बिरभित्रको तस्बिरलाई अनुमति दिनुहोस्"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"यो अनुप्रयोग खुला रहेको बेलामा वा तपाईंले यसलाई छाड्नुभएपछि (उदाहरणका लागि, भिडियो हेर्ने कार्य जारी राख्नको लागि) यस अनुप्रयोगलाई कुनै तस्बिरभित्रको तस्बिर विन्डो सिर्जना गर्न अनुमति दिनुहोस्। यो विन्डो तपाईंले प्रयोग गरिरहनुभएका अन्य अनुप्रयोगहरूको माथिपट्टि देखिन्छ।"</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"हो"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"होइन"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"पहुँचमा बाधा नपुर्‍यानुहोस्"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"कुनै पनि स्थापित अनुप्रयोगहरू द्वारा पहुँचमा बाधा नपुर्‍यानुहोस् को माग गरेका छैनन्"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"अनुप्रयोगहरू लोड हुँदै..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"यो कार्य प्रोफाइल निम्नद्वारा व्यवस्थित गरिन्छ:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> द्वारा व्यवस्थापन गरिएको"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रयोगात्मक)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"यन्त्र घुमाउने सुविधा"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"पर्दाको सामग्रीहरु घुमाउनुहोस्"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"चित्र दृष्टिकोणमा रहनुहोस्"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"परिदृश्य दृष्टिकोणमा रहनुहोस्"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"वर्तमान अभिमुखिकरणमा रहनुहोस्"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"स्टार्ट-अप सुरक्षित गर्नुहोस्"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"जारी राख्नुहोस्"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"यो यन्त्र खुल्नुअघि आफ्नो PIN चाहिने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसमा फोन उठाउन, सन्देश प्राप्त गर्न, वा अलार्म प्रयोग गर्ने लगायत सूचनाहरू प्राप्त गर्न सकिँदैन।\n\nयसले हराएका र चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्दछ। आफ्नो यन्त्र खोल्न PIN चाहिने बनाउने हो?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"यो यन्त्र खुल्नुअघि आफ्नो पासवर्ड चाहिने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसमा फोन उठाउन, सन्देश प्राप्त गर्न, वा अलार्म प्रयोग गर्ने लगायत सूचनाहरू प्राप्त गर्न सकिँदैन।\n\nयसले हराएका र चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्दछ। आफ्नो यन्त्र खोल्न पासवर्ड चाहिने बनाउने हो?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"आफ्नो यन्त्रलाई अनलक गर्नका लागि फिंगरप्रिन्ट प्रयोग गर्नुका साथसाथै, यो यन्त्र खुल्नुअघि आफ्नो PIN चाहिने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसमा फोन उठाउन, सन्देश प्राप्त गर्न, वा अलार्म प्रयोग गर्ने लगायत सूचनाहरू प्राप्त गर्न सकिँदैन।\n\nयसले हराएका र चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्दछ। आफ्नो यन्त्र खोल्न PIN चाहिने बनाउने हो?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"आफ्नो यन्त्रलाई अनलक गर्नका लागि फिंगरप्रिन्ट प्रयोग गर्नुका साथसाथै, यो यन्त्र खुल्नुअघि आफ्नो ढाँचा कोर्नु पर्ने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसमा फोन उठाउन, सन्देश प्राप्त गर्न, वा अलार्म प्रयोग गर्ने लगायत सूचनाहरू प्राप्त गर्न सकिँदैन।\n\nयसले हराएका र चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्दछ। आफ्नो यन्त्र खोल्न ढाँचा कोर्नु पर्ने बनाउने हो?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"आफ्नो यन्त्रलाई अनलक गर्नका लागि फिंगरप्रिन्ट प्रयोग गर्नुका साथसाथै, यो यन्त्र खुल्नुअघि आफ्नो पासवर्ड चाहिने बनाएर तपाईं यस यन्त्रलाई  थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसमा फोन उठाउन, सन्देश प्राप्त गर्न, वा अलार्म प्रयोग गर्ने लगायत सूचनाहरू प्राप्त गर्न सकिँदैन।\n\n यसले हराएका र चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्दछ। आफ्नो यन्त्र खोल्न पासवर्ड चाहिने बनाउने हो&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"आफ्नो यन्त्रलाई अनलक गर्नका लागि फिंगरप्रिन्ट प्रयोग गर्नुका साथसाथै, यो यन्त्र खुल्नुअघि आफ्नो पासवर्ड चाहिने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यन्त्रले कल, सन्देश वा अलार्म लगायताका सूचनाहरू प्राप्त गर्न सक्दैन।\n\nयसले हराएका वा चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्दछ। आफ्नो यन्त्रलाई खोल्नको लागि पासवर्ड चाहिने बनाउने हो?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"हो"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"होइन"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN आवश्यक छ?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"ब्याट्रीको प्रयोग सम्बन्धी अलर्ट"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"यन्त्रको पूर्ण प्रयोग देखाउनुहोस्"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"अनुप्रयोगको प्रयोग देखाउनुहोस्"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"ब्याट्रीको उच्च प्रयोग"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> अनुप्रयोगहरूले असामान्य व्यवहार देखाउँदैछन्</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> ले असामान्य व्यवहार देखाउँदैछ</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">अनुप्रयोगहरूले ब्याट्री खपत गर्दैछन्</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> ले ब्याट्री खपत गर्दैछ</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"आफू अनुकूल भएको छैन"</string>
     <string name="high_power_on" msgid="6216293998227583810">"आफू अनुकूल नगरिएको"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ब्याट्री प्रयोग आफू अनुकूल गर्दै"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"अन्य एपहरूको माथिपट्टि देखाउनु"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> मध्ये <xliff:g id="COUNT_0">%1$d</xliff:g> एपहरूलाई अन्य एपको माथिपट्टि देखिने अनुमति दिइएको छ"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"अनुमतिसहित अनुप्रयोगहरू"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"हो"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"होइन"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"अनुमति छ"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"अनुमति छैन"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"अज्ञात स्रोतहरूबाट प्राप्त हुने अनुप्रयोगहरू स्थापना गर्नुहोस्‌"</string>
     <string name="write_settings" msgid="4797457275727195681">"प्रणाली सेटिङहरू परिमार्जन"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"परिमार्जन प्रणाली सेटिङहरू लेख्नुहोस्"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"स्क्रिनलाई हल्का एम्बर रङको बनाइएको छ। यसले तपाईँलाई निदाउन मद्दत गर्न सक्छ।"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"सुझावहरू"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"थप +<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> सुझावहरू</item>
+      <item quantity="one">१ सुझाव</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> सुझावहरू</item>
+      <item quantity="one">+१ सुझाव</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"हटाउनुहोस्"</string>
     <string name="color_temperature" msgid="2070126836910615605">"सुन्दर रंगको तापमान"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"अझ सुन्दर प्रदर्शनको रंगहरू प्रयोग गर्नुहोस्"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> डेटा चेतावनी"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> डेटा चेतावनी / <xliff:g id="ID_2">%2$s</xliff:g> डेटा सीमा"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"बिलिङ चक्र"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"मासिक चक्र हरेक महिनाको <xliff:g id="ID_1">%1$s</xliff:g> मा सुरु हुन्छ"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"मासिक सुरूवात <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"प्रत्येक महिनाको <xliff:g id="ID_1">%1$s</xliff:g> गते"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"नेटवर्कका सीमाहरू"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> वटा बन्देजहरू</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">डेटा सेभर अन हुँदा १ अनुप्रयोगलाई असीमित डेटाको प्रयोग गर्न अनुमति दिइयो</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"डेटा सेभर"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"असीमित डेटाको पहुँच"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"असीमित डेटा"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"पृष्ठभूमिको डेटालाई निष्क्रिय पारियो"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"सक्रिय गर्नुहोस्"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"निष्क्रिय गर्नुहोस्"</string>
@@ -3382,8 +3474,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"लक स्क्रिनका सूचनाहरूलाई नियन्त्रण गर्नु"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"सूचना सम्बन्धी सामग्री देखाउनुहोस् वा लुकाउनुहोस्"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"सबै"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"समर्थन"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"सहायता र सुझावहरू"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"सबैभन्दा सानो चौडाइ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"स्थापना गरिएका कुनै पनि अनुप्रयोगहरूले प्रिमियम SMS माथि पहुँचका लागि अनुरोध गरेका छैनन्"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"प्रिमियम SMS सक्रिय गर्नाले तपाईंलाई पैसा लाग्न सक्छ र उक्त रकम तपाईंको वाहकलाई तिर्नु पर्ने बिलमा जोडिनेछ। यदि तपाईं अनुप्रयोगको लागि अनुमति सक्रिय गर्नुहुन्छ भने तपाईं त्यस अनुप्रयोगको प्रयोग गरेर प्रिमियम SMS पठाउन सक्नुहुनेछ।"</string>
@@ -3448,28 +3539,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"स्वतः"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"म्यानुअल"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"अहिले नै ठाउँ खाली गर्नुहोस्"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"इसाराहरू"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"इसाराका सर्टकटहरू"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"फोनलाई नियन्त्रण गर्ने द्रुत इसाराहरू"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"आफ्नो ट्याब्लेटलाई नियन्त्रण गर्ने द्रुत इसाराहरू"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"आफ्नो यन्त्रलाई नियन्त्रण गर्ने द्रुत इसाराहरू"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"क्यामेरा खोलिहाल्नुहोस्"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"द्रुत रूपमा क्यामेरा खोल्न पावर बटनलाई दुई पटक थिच्नुहोस्। जुनसुकै स्क्रिन मार्फत यो सुविधाको प्रयोग गर्न सकिन्छ।"</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"चाँडै क्यामेरा खोल्नुहोस्"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"क्यामेरा खोल्न पावर बटनमा दुई पटक थिच्नुहोस्"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"क्यामेरा फ्लिप गर्ने"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"अझ छिटो सेल्फी लिनुहोस्‌"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"सेल्फी मोडका लागि Double-twist फोन"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"सेल्फी मोडका लागि Double-twist ट्याब्लेट"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"सेल्फी मोडका लागि Double-twist यन्त्र"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"फोनको जाँच गर्न डबल-ट्याप गर्नुहोस्"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ट्याब्लेटको जाँच गर्न डबल-ट्याप गर्नुहोस्"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"यन्त्रको जाँच गर्न डबल-ट्याप गर्नुहोस्"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"द्रुत रूपमा आफ्ना सूचनाहरू जाँच्न आफ्नो यन्त्रको स्क्रिनमा डबल-ट्याप गर्नुहोस्।"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"समय, सूचनाका आइकनहरू र अन्य जानकारी जाँच्न आफ्नो यन्त्रको स्क्रिनमा डबल ट्याप गर्नुहोस्।"</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"स्क्रिन निष्क्रिय हुँदा सूचनाहरूको जाँच गर्नुहोस्"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"फोनको जाँच गर्न उठाउनुहोस्"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ट्याब्लेटको जाँच गर्न उठाउनुहोस्"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"यन्त्रको जाँच गर्न उठाउनुहोस्"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"द्रुत रूपमा आफ्ना सूचनाहरू जाँच्न आफ्नो फोन उठाउनुहोस्।"</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"द्रुत रूपमा आफ्ना सूचनाहरू जाँच्न आफ्नो ट्याब्लेट उठाउनुहोस्।"</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"द्रुत रूपमा आफ्ना सूचनाहरू जाँच्न आफ्नो यन्त्र उठाउनुहोस्।"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"समय, सूचनाका आइकनहरू र अन्य जानकारी जाँच्न आफ्नो फोन उठाउनुहोस्।"</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"समय, सूचना आइकनहरू र अन्य जानकारी जाँच्न आफ्नो ट्याब्लेट उठाउनुहोस्।"</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"समय, सूचना आइकनहरू र अन्य जानकारी जाँच्न आफ्नो यन्त्र उठाउनुहोस्।"</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"स्क्रिन निष्क्रिय हुँदा सूचनाहरूको जाँच गर्नुहोस्"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"सूचनाहरू प्राप्त गर्न फिंगरप्रिन्ट स्वाइप गर्नुहोस्"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"अफ्ना सूचनाहरूको जाँच गर्न आफ्नो फोनको पछाडिको भागमा रहेको फिंगरप्रिन्ट सेन्सरमा तलतिर स्वाइप गर्नुहोस्।"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"अफ्ना सूचनाहरूको जाँच गर्न आफ्नो ट्याब्लेटको पछाडिको भागमा रहेको फिंगरप्रिन्ट सेन्सरमा तलतिर स्वाइप गर्नुहोस्।"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"अफ्ना सूचनाहरूको जाँच गर्न आफ्नो यन्त्रको पछाडिको भागमा रहेको फिंगरप्रिन्ट सेन्सरमा तलतिर स्वाइप गर्नुहोस्।"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"सूचनाहरू छिट्टै हेर्नुहोस्"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"सुचनाहरूका लागि फिंगरप्रिन्ट सेन्सरमा तलतिर स्वाइप गर्नुहोस्"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"क्यामेरा खोल्न फोनलाई तस्बिर खिच्ने स्थितिसम्म उचाल्नुहोस्"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"क्यामेरालाई स्वतः खोल्न आफ्नो फोनलाई तस्बिर खिच्न सकिने अवस्था (ल्यान्डस्केप वा पोर्ट्रेट) मा  उचाल्नुहोस्। यसले तपाईंको फोन शयन मोडमा वा लक भएको बेलामा पनि काम गर्छ।"</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"फोन शयन अवस्थामा भएको वा लक गरिएको बेला तस्बिरहरू खिच्नुहोस्"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"सहायतामूलक इसारा"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"संवेदनशीलता"</string>
@@ -3573,6 +3677,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"तपाईं यो तात्कालिक अनुप्रयोगलाई हटाउन चाहनुहुन्छ?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"खेलहरू"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"अडियो फाइलहरू"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"प्रयोग गरेको ठाउँ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(प्रयोगकर्ता <xliff:g id="USER">%s</xliff:g> को लागि स्थापना रद्द गरियो)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(प्रयोगकर्ता <xliff:g id="USER">%s</xliff:g> को लागि असक्षम पारियो)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"स्वतः भरण सेवा"</string>
@@ -3586,5 +3691,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"तात्कालिक अनुप्रयोग"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"भण्डारण व्यवस्थापक निष्क्रिय पार्ने हो?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"चलचित्र तथा TV अनुप्रयोगहरू"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"प्रयोग गरेको ठाउँ"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"सेवा प्रदायकको प्रावधान सम्बन्धी जानकारी"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"सेवा प्रदायकको प्रावधानलाई ट्रिगर गर्नुहोस्"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"सेटिङहरूको गृहपृष्ठमा नयाँ र रोमाञ्चक के छ?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"शीर्ष ५ सुविधाहरू हेर्नुहोस्"</string>
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 133809b..f71a6ad 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Goed"</item>
     <item msgid="8986346415847956850">"Uitstekend"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Altijd"</item>
-    <item msgid="844721238536786870">"Alleen tijdens laden"</item>
-    <item msgid="1986753720941888596">"Nooit"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Altijd"</item>
-    <item msgid="7433294150916905997">"Alleen tijdens laden"</item>
-    <item msgid="1390404486722375028">"Nooit"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Afgelopen 30 dagen"</item>
     <item msgid="6600989128423965319">"Gebruikscyclus instellen…"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f439003..7eca188 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Je bent nu ontwikkelaar!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Niet nodig, je bent al ontwikkelaar."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Schakel eerst de opties voor ontwikkelaars in."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Draadloos en netwerken"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Verbindingen"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Apparaat"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE-registratie"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videogesprekken geregistreerd"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi-gesprekken geregistreerd"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/aanwezigheid geregistreerd"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Mobiel radiovermogen"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Adresboek op simkaart weergeven"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Vaste nummers weergeven"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Zoeken naar apparaten"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"De naam van dit apparaat wijzigen"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Naam wijzigen"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ontkoppelen?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Hierdoor wordt je verbinding met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; verbroken"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Apparaat loskoppelen?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"De verbinding tussen je telefoon en <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt verbroken."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"De verbinding tussen je tablet en <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt verbroken."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"De verbinding tussen je apparaat en <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt verbroken."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Koppel los"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Je hebt geen toestemming om de Bluetooth-instellingen te wijzigen."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Nieuw apparaat koppelen"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is zichtbaar voor apparaten in de buurt wanneer het venster \'Bluetooth-instellingen\' is geopend."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Bluetooth-adres van je telefoon: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Bluetooth-adres van je tablet: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth-adres van je apparaat: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ontkoppelen?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Uitzending"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profiel uitschakelen?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth-koppelingsverzoek"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Koppelingsverzoek"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Tik om te koppelen met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Ontvangen bestanden weergeven"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Ontvangen bestanden"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth-apparaat kiezen"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth inschakelen"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil Bluetooth uitschakelen"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wil toegang tot je berichten. Toegang geven aan %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Toegangsverzoek voor simkaart"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wil toegang tot je simkaart. Als je toegang tot de simkaart verleent, wordt de gegevensverbinding op je apparaat uitgeschakeld voor de duur van de verbinding. Toegang verlenen aan <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Zichtbaar als <xliff:g id="DEVICE_NAME">^1</xliff:g> voor andere apparaten"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Je apparaten"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Nieuw apparaat koppelen"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum en tijd"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Een tijdzone kiezen"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Accounts"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Locatie"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Beveiliging en locatie"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Beveiliging en locatie"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Versleuteling en gegevens"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefoon versleuteld"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Apparaat versleuteld"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Ontgrendelen met vingerafdruk"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Je vingerafdruk gebruiken"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Raak de vingerafdruksensor aan om je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps. Deze dingen kunnen worden gedaan met alle vingerafdrukken die zijn toegevoegd aan je telefoon, dus wees voorzichtig met wie je toevoegt.\n\nOpmerking: Je vingerafdruk is mogelijk minder veilig dan een sterk patroon of sterke pincode."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Raak de vingerafdruksensor aan om aankopen te autoriseren of in te loggen bij apps. Deze dingen kunnen worden gedaan met alle vingerafdrukken die zijn toegevoegd aan je apparaat, dus wees voorzichtig met wie je toevoegt.\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="3635924459027832861">"Raak de vingerafdruksensor aan om je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps. Deze dingen kunnen worden gedaan met alle vingerafdrukken die zijn toegevoegd aan je telefoon, dus wees voorzichtig met wie je toevoegt.\n\nOpmerking: Je vingerafdruk is mogelijk minder veilig dan een sterk patroon of sterke pincode."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Annuleren"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Doorgaan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Overslaan"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Vingerafdruk toevoegen"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"De functies voor apparaatbescherming worden niet geactiveerd. Je kunt niet voorkomen dat anderen deze tablet gebruiken in geval van verlies of diefstal of als de tablet wordt gewist."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"De functies voor apparaatbescherming worden niet geactiveerd. Je kunt niet voorkomen dat anderen dit apparaat gebruiken in geval van verlies of diefstal of als het apparaat wordt gewist."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"De beschermingsfuncties voor dit apparaat worden niet geactiveerd. Je kunt niet voorkomen dat anderen deze telefoon gebruiken in geval van diefstal of verlies of als de telefoon wordt gewist."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"De functies voor apparaatbescherming worden niet geactiveerd. Je kunt niet voorkomen dat anderen deze tablet gebruiken in geval van verlies of diefstal."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"De functies voor apparaatbescherming worden niet geactiveerd. Je kunt niet voorkomen dat anderen dit apparaat gebruiken in geval van verlies of diefstal."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"De functies voor apparaatbescherming worden niet geactiveerd. Je kunt niet voorkomen dat anderen deze telefoon gebruiken in geval van verlies of diefstal."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Volgende"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"De apparaatbeschermingsfuncties worden niet ingeschakeld. Je kunt niet voorkomen dat anderen deze tablet gebruiken als je deze verliest, als de tablet wordt gestolen of als deze wordt gereset."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"De apparaatbeschermingsfuncties worden niet ingeschakeld. Je kunt niet voorkomen dat anderen dit apparaat gebruiken als je het verliest, als het wordt gestolen of als het wordt gereset."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"De apparaatbeschermingsfuncties worden niet ingeschakeld. Je kunt niet voorkomen dat anderen deze telefoon gebruiken als je deze verliest, als de telefoon wordt gestolen of als deze wordt gereset."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"De apparaatbeschermingsfuncties worden niet ingeschakeld. Je kunt niet voorkomen dat anderen deze tablet gebruiken als je deze verliest of als deze wordt gestolen."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"De apparaatbeschermingsfuncties worden niet ingeschakeld. Je kunt niet voorkomen dat anderen dit apparaat gebruiken als je het verliest of als het wordt gestolen."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"De apparaatbeschermingsfuncties worden niet ingeschakeld. Je kunt niet voorkomen dat anderen deze telefoon gebruiken als je deze verliest of als deze wordt gestolen."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Toch overslaan"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Terug"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"De sensor zoeken"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Zoek de vingerafdruksensor op de achterkant van je telefoon."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"De sensor aanraken"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"De sensor bevindt zich aan de achterkant van je telefoon. Gebruik je wijsvinger."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustratie met apparaat en locatie van vingerafdruksensor"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Naam"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Verwijderen"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Aan de slag"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"De sensor aanraken"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Plaats je vinger op de sensor en til deze op nadat je een trilling hebt gevoeld"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Blijf aanraken"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Beweeg je vinger enigszins om alle delen van je vingerafdruk toe te voegen"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Gelukt!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Wanneer je dit pictogram ziet, kun je je vingerafdruk gebruiken voor identificatie of om een aankoop goed te keuren."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Raak de vingerafdruksensor aan om je apparaat te activeren en te ontgrendelen."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Wanneer dit pictogram wordt weergegeven, kun je ook aankopen autoriseren of inloggen bij apps."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Optillen en opnieuw aanraken"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Raak de sensor meerdere keren aan om de verschillende delen van je vingerafdruk toe te voegen"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Vingerafdruk toegevoegd"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Wanneer je dit pictogram ziet, kun je je vingerafdruk gebruiken voor identificatie of om een aankoop goed te keuren."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Instellen van vingerafdruk overslaan?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Je hebt ervoor gekozen je vingerafdruk te gebruiken als manier om je telefoon te ontgrendelen. Als je dit nu overslaat, moet je het later instellen. Het instellen neemt ongeveer een minuut in beslag."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Schermvergrendeling instellen"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Gereed"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Dat is niet de sensor"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Gebruik de vingerafdruksensor op je apparaat."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Raak de sensor achter op je telefoon aan. Gebruik je wijsvinger."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registratie is niet voltooid"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Tijdlimiet voor vingerafdrukregistratie is bereikt. Probeer het opnieuw."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Vingerafdrukregistratie is mislukt. Probeer het opnieuw of gebruik een andere vinger."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen dit apparaat zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen deze telefoon zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Kies je back-upmethode voor schermvergrendeling"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Schermvergrendelingsopties"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Schermvergrendelingsopties"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Schermvergrendeling"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/direct na slaapstand"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> na slaapstand"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Ontgrendelingspatroon wijzigen"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Pincode voor ontgrendelen wijzigen"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ontgrendelingswachtwoord wijzigen"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Probeer het opnieuw. Poging <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> van <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Laatste poging"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Als je bij deze poging een onjuist patroon voor je werkprofiel opgeeft, worden je werkprofiel en bijbehorende gegevens verwijderd van dit apparaat."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Als je bij deze poging een onjuiste pincode voor je werkprofiel opgeeft, worden je werkprofiel en bijbehorende gegevens verwijderd van dit apparaat."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Als je bij deze poging een onjuist wachtwoord voor je werkprofiel opgeeft, worden je werkprofiel en bijbehorende gegevens verwijderd van dit apparaat."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Te veel onjuiste pogingen. Je werkprofiel en bijbehorende gegevens worden verwijderd van dit apparaat."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Sluiten"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Probeer het opnieuw. Poging <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> van <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Je gegevens worden verwijderd"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Als je bij de volgende poging een onjuist patroon opgeeft, worden de gegevens van dit apparaat verwijderd"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Als je bij de volgende poging een onjuiste pincode opgeeft, worden de gegevens van dit apparaat verwijderd"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Als je bij de volgende poging een onjuist wachtwoord opgeeft, worden de gegevens van dit apparaat verwijderd"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Als je bij de volgende poging een onjuist patroon opgeeft, wordt deze gebruiker verwijderd"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Als je bij de volgende poging een onjuiste pincode opgeeft, wordt deze gebruiker verwijderd"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Als je bij de volgende poging een onjuist wachtwoord opgeeft, wordt deze gebruiker verwijderd"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Als je bij de volgende poging een onjuist patroon opgeeft, worden je werkprofiel en de bijbehorende gegevens verwijderd"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Als je bij de volgende poging een onjuiste pincode opgeeft, worden je werkprofiel en de bijbehorende gegevens verwijderd"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Als je bij de volgende poging een onjuist wachtwoord opgeeft, worden je werkprofiel en de bijbehorende gegevens verwijderd"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Te veel onjuiste pogingen. De gegevens van dit apparaat worden verwijderd."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Te veel onjuiste pogingen. Deze gebruiker worden verwijderd."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Te veel onjuiste pogingen. Dit werkprofiel en de bijbehorende gegevens worden verwijderd."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Sluiten"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Moet ten minste <xliff:g id="COUNT">%d</xliff:g> tekens zijn"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Pincode moet ten minste <xliff:g id="COUNT">%d</xliff:g> cijfers zijn"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Doorgaan"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Geavanceerde Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Als Bluetooth is ingeschakeld, kan je apparaat communiceren met andere Bluetooth-apparaten in de buurt."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Systeem-apps en -services kunnen nog steeds Bluetooth-apparaten detecteren om de nauwkeurigheid van locaties te verbeteren. Je kunt dit wijzigen in de <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>instellingen voor scannen<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Kan geen verbinding maken. Probeer het opnieuw."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Apparaatgegevens"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Bluetooth-adres van je apparaat: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Apparaat vergeten?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Je telefoon is niet langer gekoppeld aan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Je tablet is niet langer gekoppeld aan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Je apparaat is niet langer gekoppeld aan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Apparaat vergeten"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Verbinding maken met…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt ontkoppeld van audio van medium."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt ontkoppeld van handsfree audio."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Niet leveren"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Niet valideren"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Geen certificaat opgegeven. Je verbinding is niet privé."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Netwerknaam is te lang."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Je moet een domein opgeven."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS beschikbaar"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS beschikbaar)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 netwerk</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Geavanceerde wifi-instellingen"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wifi configureren"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-adres"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-adres"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnetmasker"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Deze groep vergeten?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Draagbare wifi-hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wifi-hotspot"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Mobiele verbinding gebruiken om wifi-netwerk te leveren"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Internetverbinding van deze tablet niet gedeeld via hotspot"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Internetverbinding van deze telefoon niet gedeeld via hotspot"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Internet of content wordt niet gedeeld met andere apparaten"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internetverbinding van deze tablet delen via hotspot"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internetverbinding van deze telefoon delen via hotspot"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"App deelt content. Als je je internetverbinding wilt delen, schakel je de hotspot uit en weer in."</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wifi-naam"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> inschakelen..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Andere apparaten kunnen verbinding maken met <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wifi-wachtwoord"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Frequentieband voor toegangspunt"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Gebruik een hotspot om een wifi-netwerk te maken voor je andere apparaten. De hotspot biedt internet via je mobiele dataverbinding. Er kunnen extra kosten voor mobiele data van toepassing zijn."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Apps kunnen hotspots maken om content te delen met apparaten in de buurt."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Hotspot inschakelen…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot uitschakelen…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> is actief"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wanneer bellen via wifi is ingeschakeld, kan je telefoon oproepen doorschakelen via wifi-netwerken of het netwerk van je provider, afhankelijk van je voorkeur en welk signaal sterker is. Voordat je deze functie inschakelt, neem je contact met je provider op over de kosten en andere details."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Noodadres updaten"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Adres dat door noodhulpdiensten als je locatie wordt gebruikt als je het noodnummer belt via wifi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Weergave"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Geen resultaten"</string>
     <string name="display_settings" msgid="7965901687241669598">"Weergave"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Scherm autom. draaien"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Levendige kleuren"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Stand automatisch wijzigen als tablet wordt gedraaid"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Stand automatisch wijzigen als telefoon wordt gedraaid"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Stand automatisch wijzigen als tablet wordt gedraaid"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Helderheidsniveau optimaliseren voor het beschikbare licht. Als deze functie is ingeschakeld, kun je de helderheid alsnog tijdelijk aanpassen."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Nachtverlichting"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Met Nachtverlichting krijgt je scherm een oranje tint. Zo kun je het scherm beter zien bij weinig licht en val je gemakkelijker in slaap."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Planning"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Automatisch inschakelen"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nooit"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Aangepaste planning"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Zonsondergang tot zonsopgang"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Planning"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Geen"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Schakelt op aangepaste tijd in"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Zonsondergang tot zonsopgang aan"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Begintijd"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Eindtijd"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensiteit"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Uit. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Wordt nooit automatisch ingeschakeld."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Wordt automatisch ingeschakeld om <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Wordt automatisch ingeschakeld bij zonsondergang."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Aan. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Wordt nooit automatisch uitgeschakeld."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Wordt automatisch uitgeschakeld om <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Wordt automatisch uitgeschakeld bij zonsopgang."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Uit / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Wordt nooit automatisch ingeschakeld"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Wordt automatisch ingeschakeld om <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Wordt automatisch ingeschakeld bij zonsondergang"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Aan / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Wordt nooit automatisch uitgeschakeld"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Wordt automatisch uitgeschakeld om <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Wordt automatisch uitgeschakeld bij zonsopgang"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Slaapstand"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Scherm wordt uitgeschakeld"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Instellingen"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische helderheid"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Optillen om te activeren"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Actieve display"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Actieve display"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Altijd aan"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nieuwe meldingen"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Wanneer weergeven"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nieuwe meldingen"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Scherm activeren wanneer je meldingen ontvangt"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Altijd aan"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Tijd, meldingspictogrammen en andere informatie weergeven"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Lettergrootte"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Tekst groter of kleiner maken"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Instellingen simkaartvergrendeling"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"De APN mag niet leeg zijn."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC-veld moet 3 cijfers bevatten."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC-veld moet 2 of 3 cijfers bevatten."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"De provider staat het toevoegen van APN\'s van het type %s niet toe."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Standaard-APN-instellingen herstellen."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Standaardinstellingen herstellen"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Herstellen van standaard-APN-instellingen voltooid."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD-kaart wissen"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Alle gegevens in de interne USB-opslag wissen, zoals muziek en foto\'s"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Alle gegevens op de SD-kaart wissen, zoals muziek en foto\'s"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"E-simkaarten wissen"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Alle e-simkaarten op de telefoon wissen. Hierdoor wordt je mobiele abonnement niet opgezegd."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Alle e-simkaarten op de tablet wissen. Hierdoor wordt je mobiele abonnement niet opgezegd."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tablet resetten"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefoon resetten"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Al je persoonlijke gegevens en gedownloade apps verwijderen? Je kunt deze actie niet ongedaan maken."</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Kan niet tetheren of draagbare hotspots gebruiken terwijl Databesparing is ingeschakeld"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-tethering"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB-verbinding, aanvinken om te tetheren"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Getetherd"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Kan niet tetheren wanneer USB-opslag wordt gebruikt"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB niet verbonden"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Maak verbinding om in te schakelen"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Fout met USB-tethering"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Internetverbinding van telefoon delen via USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Internetverbinding van tablet delen via USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-tethering"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Internetverbinding van deze tablet delen via Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Internetverbinding van deze telefoon delen via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Internetverbinding van deze tablet delen met 1 apparaat via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Internetverbinding van deze telefoon delen met 1 apparaat via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Internetverbinding van deze tablet delen met <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> apparaten via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Internetverbinding van deze telefoon delen met <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> apparaten via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Internetverbinding van deze tablet delen via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Internetverbinding van deze telefoon delen via Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Internetverbinding van deze <xliff:g id="DEVICE_NAME">%1$d</xliff:g> delen via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Internetverbinding van deze tablet niet gedeeld via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Internetverbinding van deze telefoon niet gedeeld via Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Niet getetherd"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Kan niet meer dan <xliff:g id="MAXCONNECTION">%1$d</xliff:g> apparaten tetheren."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Tethering van <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt opgeheven."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Gebruik hotspot en tethering om internet aan andere apparaten te leveren via je mobiele internetverbinding."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Gebruik hotspot en tethering om internet aan andere apparaten te leveren via je mobiele dataverbinding. Apps kunnen ook hotspots maken om content te delen met apparaten in de buurt."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobiel netwerk"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiel abonnement"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Locatiemodus"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Gps, wifi, Bluetooth of mobiele netwerken gebruiken om locatie te bepalen"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Wifi, Bluetooth of mobiele netwerken gebruiken om locatie te bepalen"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"gps gebruiken om locatie te bepalen"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Gps en sensoren van je apparaat gebruiken om de locatie te bepalen"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scannen"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wifi-scannen"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Locatie verbeteren door systeem-apps en services toe te staan altijd wifi-netwerken te detecteren."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Je hebt geen gegevensverbinding. Als je deze informatie nu wilt weergeven, ga je op een computer met internetverbinding naar %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laden..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Je wachtwoord kiezen"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Stel wachtwoord in voor gebruik van vingerafdruk"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Je patroon kiezen"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Stel patroon in voor gebruik van vingerafdruk"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Je pincode kiezen"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Stel pincode in voor gebruik van vingerafdruk"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Je wachtwoord bevestigen"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Je patroon bevestigen"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bevestig de pincode"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"App-instellingen"</string>
     <string name="install_applications" msgid="4872012136210802181">"Onbekende bronnen"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Alle appbronnen toestaan"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Recent geopende apps"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Alle <xliff:g id="COUNT">%1$d</xliff:g> apps bekijken"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> geleden"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Je tablet en persoonlijke gegevens zijn gevoelig voor aanvallen door onbekende apps. Als je apps van deze bron installeert, ga je ermee akkoord dat je verantwoordelijk bent voor eventuele schade aan je tablet of verlies van gegevens als gevolg van het gebruik van deze apps."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Je telefoon en persoonlijke gegevens zijn gevoelig voor aanvallen door onbekende apps. Als je apps van deze bron installeert, ga je ermee akkoord dat je verantwoordelijk bent voor eventuele schade aan je telefoon of verlies van gegevens als gevolg van het gebruik van deze apps."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Geavanceerde instellingen"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Systeemservice stoppen?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Als je deze service stopt, werken bepaalde functies van je telefoon mogelijk pas weer correct nadat je de tablet hebt uitgeschakeld en weer ingeschakeld."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Als je deze service stopt, werken bepaalde functies van je telefoon mogelijk pas weer correct nadat je de telefoon hebt uitgeschakeld en weer ingeschakeld."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Talen, invoer en gebaren"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Talen en invoer"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Talen en invoer"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Hulp bij invoer"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> afdrukservices ingeschakeld</item>
       <item quantity="one">1 afdrukservice ingeschakeld</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> afdruktaken</item>
+      <item quantity="one">1 afdruktaak</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Afdrukservices"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Geen services geïnstalleerd"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Geen printers gevonden"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Gebruiksdetails"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Energieverbruik aanpassen"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Bijgeleverde pakketten"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps met hoog batterijgebruik"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Houdt apparaat ingeschakeld"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Schakelt apparaat in op de achtergrond"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Vraagt regelmatig om locatie"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps veroorzaken problemen"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"App stoppen?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Je telefoon kan de batterij niet normaal beheren omdat <xliff:g id="APP">%1$s</xliff:g> je telefoon ingeschakeld houdt.\n\nAls je dit probleem wilt verhelpen, kun je de app geforceerd stoppen.\n\nAls dit probleem zich blijft voordoen, moet je mogelijk de app verwijderen om de batterijprestaties te verbeteren."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Je tablet kan de batterij niet normaal beheren omdat <xliff:g id="APP">%1$s</xliff:g> je tablet ingeschakeld houdt.\n\nAls je dit probleem wilt verhelpen, kun je de app geforceerd stoppen.\n\nAls dit probleem zich blijft voordoen, moet je mogelijk de app verwijderen om de batterijprestaties te verbeteren."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Je apparaat kan de batterij niet normaal beheren omdat <xliff:g id="APP">%1$s</xliff:g> je apparaat ingeschakeld houdt.\n\nAls je dit probleem wilt verhelpen, kun je de app geforceerd stoppen.\n\nAls dit probleem zich blijft voordoen, moet je mogelijk de app verwijderen om de batterijprestaties te verbeteren."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"App stoppen"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Achtergrondgebruik uitschakelen?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Je telefoon kan de batterij niet normaal beheren omdat <xliff:g id="APP">%1$s</xliff:g> je telefoon blijft inschakelen.\n\nAls je dit probleem wilt verhelpen, kun je je telefoon instellen om te voorkomen dat deze app op de achtergrond wordt uitgevoerd."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Je tablet kan de batterij niet normaal beheren omdat <xliff:g id="APP">%1$s</xliff:g> je tablet blijft inschakelen.\n\nAls je dit probleem wilt verhelpen, kun je je tablet instellen om te voorkomen dat deze app op de achtergrond wordt uitgevoerd."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Je apparaat kan de batterij niet normaal beheren omdat <xliff:g id="APP">%1$s</xliff:g> je apparaat blijft inschakelen.\n\nAls je dit probleem wilt verhelpen, kun je je apparaat instellen om te voorkomen dat deze app op de achtergrond wordt uitgevoerd."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Uitschakelen"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Locatie uitschakelen?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Je telefoon kan de batterij niet normaal beheren omdat <xliff:g id="APP">%1$s</xliff:g> je locatie blijft opvragen wanneer je de app niet gebruikt.\n\nAls je dit probleem wilt verhelpen, kun je locatie uitschakelen voor deze app."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Je tablet kan de batterij niet normaal beheren omdat <xliff:g id="APP">%1$s</xliff:g> je locatie blijft opvragen wanneer je de app niet gebruikt.\n\nAls je dit probleem wilt verhelpen, kun je locatie uitschakelen voor deze app."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Je apparaat kan de batterij niet normaal beheren omdat <xliff:g id="APP">%1$s</xliff:g> je locatie blijft opvragen wanneer je de app niet gebruikt.\n\nAls je dit probleem wilt verhelpen, kun je locatie uitschakelen voor deze app."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Uitschakelen"</string>
     <string name="power_screen" msgid="3023346080675904613">"Scherm"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Zaklamp"</string>
     <string name="power_camera" msgid="4976286950934622605">"Camera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
     <string name="power_service" msgid="1599661212370831780">"Services"</string>
     <string name="power_system" msgid="8290455327965307383">"Systeem"</string>
-    <string name="power_user" msgid="1889728099253018005">"Gebruiker"</string>
+    <string name="power_user" msgid="3706143225319881667">"Andere gebruikers"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU-totaal"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU op voorgrond"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ingeschakeld houden"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Te hoog berekend stroomgebruik"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> gebruikt"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Actief gedurende <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Schermgebruik <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> gebruikt door <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> van batterij"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Pincode wijzigen"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Meldingen weergeven"</string>
     <string name="help_label" msgid="6886837949306318591">"Help en feedback"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Help-artikelen, telefonische en chatondersteuning"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Help-artikelen, telefonische en chatondersteuning, aan de slag"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Account voor content"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Groot gevaar"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">%d verborgen item weergeven</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Netwerk en internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"wifi, mobiel, datagebruik, hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobiel"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datagebruik"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Verbonden apparaten"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, casten, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, casten"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps en meldingen"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Rechten, standaard-apps"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Gebruikers en accounts"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gebaar"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"betalen, tikken, betalingen"</string>
     <string name="keywords_backup" msgid="470070289135403022">"back-up, back-up maken, back-uppen"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gebaar, rand, zijkant, actieve zijkant, knijpen, vastpakken, hulp, assistent, squeezy, squeezie, squeezey, squeezee, ok google, google assistent"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gebaar, inschakelen, meldingen, scherm, display, scherm uit, scherm aan, knijpen, rand, slaapstand, slaap, vastpakken"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gebaar, op stil zetten, geluid uit, snoozen, alarm, inkomende oproep, stil, display, scherm, vergrendelingsscherm, knijpen, vastpakken, rand, stoppen"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wifi NFC-tag instellen"</string>
     <string name="write_tag" msgid="8571858602896222537">"Schrijven"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tik op een tag om te schrijven..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Helemaal geen werkmeldingen weergeven"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Hoe moeten profielmeldingen worden weergegeven wanneer je apparaat is vergrendeld?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profielmeldingen"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Meldingen"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Meldingen"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"App-meldingen"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Meldingscategorie"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Belang"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Laat de app beslissen"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgent"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Geluid toestaan"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Geen geluid laten horen, niet trillen en deze meldingen niet weergeven op het huidige scherm."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Klein belang"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Gemiddeld belang"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Groot belang"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgent belang"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Meldingsassistent"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Toegang tot meldingen"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Toegang tot werkprofielmeldingen is geblokkeerd"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Beeld-in-beeld"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Beeld-in-beeld toestaan"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Geef deze app toestemming om een beeld-in-beeldvenster te maken als de app open is of als je de app verlaat (bijvoorbeeld om een video te blijven kijken). Dit venster wordt weergegeven vóór andere apps die je gebruikt."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Ja"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Nee"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Toegang tot \'Niet storen\'"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Er zijn geen geïnstalleerde apps die toegang tot \'Niet storen\' hebben aangevraagd"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Apps laden..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Dit werkprofiel wordt beheerd door:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Beheerd door <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimenteel)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Apparaatrotatie"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"De content van het scherm draaien"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"In staande stand blijven"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"In liggende stand blijven"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"In huidige stand blijven"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Beveiligd opstarten"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Doorgaan"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Je kunt dit apparaat verder beveiligen door in te stellen dat je pincode moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten of meldingen (waaronder alarmen) ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een pincode vereist is om het apparaat te starten?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Je kunt dit apparaat verder beveiligen door het wachtwoord ook te vereisen voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten en meldingen (waaronder alarmen) ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beveiligd. Wil je instellen dat een wachtwoord vereist is om het apparaat te starten?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Naast het gebruik van je vingerafdruk om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je pincode moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten of meldingen (waaronder alarmen) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een pincode vereist is om het apparaat te starten?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Naast het gebruik van je vingerafdruk om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je patroon moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten of meldingen (waaronder alarmen) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een patroon vereist is om het apparaat te starten?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Naast het gebruik van je vingerafdruk om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je wachtwoord moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten of meldingen (waaronder alarmen) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een wachtwoord vereist is om het apparaat te starten?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Naast het gebruik van je vingerafdruk om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je wachtwoord moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten of meldingen (waaronder alarmen) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wachtwoord vereisen om je apparaat op te starten?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ja"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nee"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Pincode vereisen?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Gebruiksmeldingen"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Volledig apparaatgebruik weergeven"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"App-gebruik weergeven"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Intensief gebruik"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> vertonen abnormaal gedrag</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> vertoont abnormaal gedrag</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other"> apps met hoog batterijgebruik</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> met hoog batterijverbruik</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Niet geoptimaliseerd"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Niet geoptimaliseerd"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Accuverbruik optimaliseren"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Weergeven vóór andere apps"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> van <xliff:g id="COUNT_1">%2$d</xliff:g> apps mogen worden weergegeven vóór andere apps"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Apps met toestemming"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Ja"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Nee"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Toegestaan"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Niet toegestaan"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"apps installeren via onbekende bronnen"</string>
     <string name="write_settings" msgid="4797457275727195681">"Systeeminstellingen aanpassen"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"schrijven aanpassen systeeminstellingen"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Het scherm heeft een oranje tint. Hierdoor val je mogelijk beter in slaap."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggesties"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> meer"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> suggesties</item>
+      <item quantity="one">1 suggestie</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> suggesties</item>
+      <item quantity="one">+1 suggestie</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Verwijderen"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Koele kleurtemperatuur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Koelere weergavekleuren gebruiken"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> datawaarschuwing"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> datawaarschuwing / <xliff:g id="ID_2">%2$s</xliff:g> datalimiet"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Betalingscyclus"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"De maandelijkse cyclus start op de <xliff:g id="ID_1">%1$s</xliff:g>e van elke maand"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Maandelijks vanaf <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Maandelijks op dag <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Netwerkbeperkingen"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> beperkingen</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 app mag onbeperkt data gebruiken terwijl Databesparing is ingeschakeld</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Databesparing"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Onbeperkte datatoegang"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Onbeperkte gegevens"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Achtergrondgegevens zijn uitgeschakeld"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Aan"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Uit"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Meldingen voor vergrendelingsscherm beheren"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Content van meldingen weergeven of verbergen"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Alle"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Ondersteuning"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Ondersteuning &amp; tips"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Kleinste breedte"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Er zijn geen geïnstalleerde apps die premium sms-toegang hebben aangevraagd"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium sms\'jes kunnen je geld kosten en worden toegevoegd aan de facturen van je provider. Als je rechten aan een app verleent, kun je premium sms\'jes verzenden met die app."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatisch"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Handmatig"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Nu ruimte vrijmaken"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gebaren"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Snelkoppelingsgebaren"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Snelle gebaren om je telefoon te bedienen"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Snelle gebaren om je tablet te bedienen"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Snelle gebaren om je apparaat te bedienen"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Naar camera schakelen"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Als je de camera snel wilt openen, tik je twee keer op de aan/uit-knop. Werkt vanuit elk scherm."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Camera snel openen"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Twee keer op de aan/uit-knop drukken om de camera te openen"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Schakelen tussen camera\'s"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Sneller selfies maken"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Telefoon twee keer draaien voor selfiemodus"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Tablet twee keer draaien voor selfiemodus"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Apparaat twee keer draaien voor selfiemodus"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dubbeltikken om telefoon te checken"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dubbeltikken om tablet te checken"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dubbeltikken om apparaat te checken"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Als je je meldingen snel wilt checken, dubbeltik je op het scherm."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Dubbeltik op je scherm om de tijd, meldingspictogrammen en andere informatie te bekijken."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Meldingen controleren wanneer scherm uit is"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Oppakken om telefoon te checken"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Oppakken om tablet te checken"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Oppakken om apparaat te checken"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Als je je meldingen snel wilt checken, pak je je telefoon op."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Als je je meldingen snel wilt checken, pak je je tablet op."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Als je je meldingen snel wilt checken, pak je je apparaat op."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Pak je telefoon op om de tijd, meldingspictogrammen en andere informatie te bekijken."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Pak je tablet op om de tijd, meldingspictogrammen en andere informatie te bekijken."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Pak je apparaat op om de tijd, meldingspictogrammen en andere informatie te bekijken."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Meldingen controleren wanneer scherm uit is"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Over vingerafdruksensor vegen voor meldingen"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Als je je meldingen wilt bekijken, veeg je omlaag over de vingerafdruksensor achter op je telefoon."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Als je je meldingen wilt bekijken, veeg je omlaag over de vingerafdruksensor achter op je tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Als je je meldingen wilt bekijken, veeg je omlaag over de vingerafdruksensor achter op je apparaat."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Snel meldingen bekijken"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Omlaag vegen over de vingerafdruksensor"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Optillen om camera te openen"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Als je de camera automatisch wilt openen, houd je je telefoon vast alsof je een foto wilt maken (liggende of staande apparaatstand). Dit werkt wanneer je telefoon in de slaapstand staat of is vergrendeld."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Maak foto\'s in de slaapstand of met vergrendelde telefoon"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gebaar voor assistent-app"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Gevoeligheid"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Wil je deze instant-app verwijderen?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Games"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audiobestanden"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Gebruikte ruimte"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(verwijderd voor gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(uitgezet voor gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Service voor automatisch aanvullen"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Instant-app"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Opslagbeheer uitschakelen?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Film- en tv-apps"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Gebruikte ruimte"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Gegevens voor providerregistratie"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Providerregistratie activeren"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Wat is er nieuw en interessant?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"De vijf belangrijkste functies controleren"</string>
 </resources>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index 9764754..bc69218 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"ਵਧੀਆ"</item>
     <item msgid="8986346415847956850">"ਸ਼ਾਨਦਾਰ"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"ਹਮੇਸ਼ਾਂ"</item>
-    <item msgid="844721238536786870">"ਕੇਵਲ ਉਦੋਂ ਜਦੋਂ ਪਲਗ ਇਨ ਕੀਤਾ ਹੋਵੇ"</item>
-    <item msgid="1986753720941888596">"ਕਦੇ ਵੀ ਨਹੀਂ"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"ਹਮੇਸ਼ਾਂ"</item>
-    <item msgid="7433294150916905997">"ਕੇਵਲ ਉਦੋਂ ਜਦੋਂ ਪਲਗ ਇਨ ਕੀਤਾ ਹੋਵੇ"</item>
-    <item msgid="1390404486722375028">"ਕਦੇ ਵੀ ਨਹੀਂ"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"ਪਿਛਲੇ 30 ਦਿਨ"</item>
     <item msgid="6600989128423965319">"ਵਰਤੋਂ ਸਾਈਕਲ ਸੈੱਟ ਕਰੋ..."</item>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 9915927..fb93feb 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ਹੁਣ ਤੁਸੀਂ ਇੱਕ ਵਿਕਾਸਕਾਰ ਹੋ!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"ਕੋਈ ਲੋੜ ਨਹੀਂ, ਤੁਸੀਂ ਪਹਿਲਾਂ ਹੀ ਇੱਕ ਵਿਕਾਸਕਾਰ ਹੋ।"</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"ਕਿਰਪਾ ਕਰਕੇ ਪਹਿਲਾਂ ਵਿਕਾਸਕਾਰ ਚੋਣਾਂ ਨੂੰ ਯੋਗ ਬਣਾਓ।"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"ਵਾਇਰਲੈੱਸ ਅਤੇ ਨੈੱਟਵਰਕ"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"ਕਨੈਕਸ਼ਨ"</string>
     <string name="header_category_device" msgid="4544026001618307754">"ਡੀਵਾਈਸ:"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ਪ੍ਰੋਵਿਨਜਨਡ"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ਵੀਡੀਓ ਕਾਲਿੰਗ ਦੀ ਪ੍ਰੋਵੀਜ਼ਨ ਕੀਤੀ ਗਈ"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi ਕਾਲਿੰਗ ਦੀ ਪ੍ਰੋਵੀਜ਼ਨ ਕੀਤੀ ਗਈ"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/ਮੌਜੂਦਗੀ ਦੀ ਵਿਵਸਥਾ ਚਾਲੂ ਕੀਤੀ"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"ਮੋਬਾਈਲ ਰੇਡੀਓ ਪਾਵਰ"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"ਸਿਮ ਪਤਾ ਬੁੱਕ ਵੇਖੋ"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ਫਿਕਸਡ ਡਾਇਲਿੰਗ ਨੰਬਰ ਦੇਖੋ"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"ਡਿਵਾਈਸਾਂ ਲਈ ਸਕੈਨ ਕਰੋ"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ਕੀ ਡਿਸਕਨੈਕਟ ਕਰਨਾ ਹੈ?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ਇਹ ਇਸ ਨਾਲ ਤੁਹਾਡੇ ਕਨੈਕਸ਼ਨ ਨੂੰ ਖ਼ਤਮ ਕਰ ਦੇਵੇਗਾ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"ਕੀ ਡੀਵਾਈਸ ਡਿਸਕਨੈਕਟ ਕਰਨੀ ਹੈ?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"ਤੁਹਾਡਾ ਫ਼ੋਨ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਤੋਂ ਡਿਸਕਨੈਕਟ ਹੋ ਜਾਵੇਗਾ।"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਤੋਂ ਡਿਸਕਨੈਕਟ ਹੋ ਜਾਵੇਗਾ।"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਤੋਂ ਡਿਸਕਨੈਕਟ ਹੋ ਜਾਵੇਗੀ।"</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"ਡਿਸਕਨੈਕਟ ਕਰੋ"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"ਤੁਹਾਨੂੰ Bluetooth ਸੈਟਿੰਗਾਂ ਬਦਲਣ ਦੀ ਅਨੁਮਤੀ ਨਹੀਂ ਹੈ।"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"ਨਵੀਂ ਡੀਵਾਈਸ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੇੜਲੀਆਂ ਡਿਵਾਈਸਾਂ ਲਈ ਦਿਖਣਯੋਗ ਹੁੰਦਾ ਹੈ ਜਦੋਂ Bluetooth ਸੈਟਿੰਗਾਂ ਖੁੱਲ੍ਹੀਆਂ ਹੁੰਦੀਆਂ ਹਨ।"</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"ਫ਼ੋਨ ਦਾ ਬਲੂਟੁੱਥ ਪਤਾ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"ਟੈਬਲੈੱਟ ਦਾ ਬਲੂਟੁੱਥ ਪਤਾ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"ਡੀਵਾਈਸ ਦਾ ਬਲੂਟੁੱਥ ਪਤਾ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"ਕੀ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਡਿਸਕਨੈਕਟ ਕਰਨਾ ਹੈ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ਪ੍ਰਸਾਰਨ"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ਕੀ ਪ੍ਰੋਫਾਈਲ ਅਸਮਰੱਥ ਬਣਾਉਣੀ ਹੈ?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth ਪੇਅਰਿੰਗ ਬੇਨਤੀ"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"ਪੇਅਰਿੰਗ ਬੇਨਤੀ"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਜੋੜਾ ਬਣਾਉਣ ਲਈ ਟੈਪ ਕਰੋ।"</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"ਪ੍ਰਾਪਤ ਕੀਤੀਆਂ ਫਾਈਲਾਂ ਦਿਖਾਓ"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"ਪ੍ਰਾਪਤ ਕੀਤੀਆਂ ਫ਼ਾਈਲਾਂ"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth ਡੀਵਾਈਸ ਚੁਣੋ"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਬਲੂਟੁੱਥ ਨੂੰ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ਤੁਹਾਡੇ ਸੁਨੇਹਿਆਂ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ। ਕੀ %2$s ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰਨੀ ਹੈ?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"ਸਿਮ ਐਕਸੈਸ ਬੇਨਤੀ"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ਤੁਹਾਡੇ ਸਿਮ ਕਾਰਡ ਦੀ ਐਕਸੈਸ ਕਰਨਾ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ। ਸਿਮ ਕਾਰਡ ਦੀ ਐਕਸੈਸ ਦੇਣਾ ਕਨੈਕਸ਼ਨ ਦੀ ਸਮਾਂ ਮਿਆਦ ਦੇ ਲਈ ਤੁਹਾਡੀ ਡੀਵਾਈਸ \'ਤੇ ਕਨੈਕਟਿਵਿਟੀ ਨੂੰ ਅਸਮਰਥਿਤ ਕਰ ਦੇਵੇਗਾ। <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> ਨੂੰ ਐਕਸੈਸ ਦਿਓ"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"ਹੋਰਾਂ ਡੀਵਾਈਸਾਂ ਲਈ <xliff:g id="DEVICE_NAME">^1</xliff:g> ਵਜੋਂ ਦਿਖਣਯੋਗ ਹੈ"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ਤੁਹਾਡੀਆਂ ਡੀਵਾਈਸਾਂ"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ਨਵੀਂ ਡੀਵਾਈਸ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
     <string name="date_and_time" msgid="9062980487860757694">"ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ਸਮਾਂ ਜ਼ੋਨ ਚੁਣੋ"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ਖਾਤੇ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ਟਿਕਾਣਾ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ਖਾਤੇ"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"ਸੁਰੱਖਿਆ ਅਤੇ ਟਿਕਾਣਾ"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਅਤੇ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਗਿਆ"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"ਡੀਵਾਈਸ ਇਨਕ੍ਰਿਪਟ ਕੀਤੀ ਗਈ"</string>
@@ -354,40 +367,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਅਨਲੌਕ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"ਆਪਣੇ ਫੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖ਼ਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਲਈ ਸਿਰਫ਼ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੰਵੇਦਕ ਨੂੰ ਸਪਰਸ਼ ਕਰੋ। ਇਸ ਬਾਰੇ ਸਾਵਧਾਨ ਰਹੋ ਕਿ ਤੁਸੀਂ ਕਿਸ ਵਿਅਕਤੀ ਦੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰ ਰਹੇ ਹੋ। ਇੱਥੋਂ ਤੱਕ ਕਿ ਸ਼ਾਮਲ ਕੀਤੇ ਗਏ ਇੱਕ ਪ੍ਰਿੰਟ ਨਾਲ ਇਹਨਾਂ ਚੀਜ਼ਾਂ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਚੀਜ਼ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।\n\nਨੋਟ ਕਰੋ: ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਇੱਕ ਮਜ਼ਬੂਤ ਪੈਟਰਨ ਜਾਂ PIN ਤੋਂ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਲਈ ਸਿਰਫ਼ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ। ਇਸ ਬਾਰੇ ਸਾਵਧਾਨ ਰਹੋ ਕਿ ਤੁਸੀਂ ਕਿੰਨ੍ਹਾਂ ਦੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰ ਰਹੇ ਹੋ। ਇੱਥੋਂ ਤੱਕ ਕਿ ਸ਼ਾਮਲ ਕੀਤੇ ਗਏ ਇੱਕ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਚੀਜ਼ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।\n\nਨੋਟ ਕਰੋ: ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ। ਹੋਰ ਜ਼ਿਆਦਾ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਸੰਗਠਨ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਲਈ ਸਿਰਫ਼ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ। ਇਸ ਬਾਰੇ ਸਾਵਧਾਨ ਰਹੋ ਕਿ ਤੁਸੀਂ ਕਿੰਨ੍ਹਾਂ ਦੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰ ਰਹੇ ਹੋ। ਇੱਥੋਂ ਤੱਕ ਕਿ ਸ਼ਾਮਲ ਕੀਤੇ ਗਏ ਇੱਕ ਪ੍ਰਿੰਟ ਨਾਲ ਵੀ ਇਹਨਾਂ ਚੀਜ਼ਾਂ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਚੀਜ਼ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।\n\nਨੋਟ ਕਰੋ: ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਕਿਸੇ ਮਜ਼ਬੂਤ ਪੈਟਰਨ ਜਾਂ PIN ਤੋਂ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਜਾਂ ਖਰੀਦਾਂ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰੋ। \n\nਨੋਟ ਕਰੋ: ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕਦੇ। ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਸੰਗਠਨ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਜਾਂ ਖਰੀਦਾਂ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰੋ। \n\n ਨੋਟ ਕਰੋ: ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਇੱਕ ਮਜ਼ਬੂਤ ਪੈਟਰਨ ਜਾਂ PIN ਤੋਂ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ਰੱਦ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ਜਾਰੀ ਰੱਖੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"ਛੱਡੋ"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਰਗਰਮ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਗੁੰਮ ਹੋ ਜਾਂਦਾ, ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਜਾਂ ਇਸ ਦਾ ਡੈਟਾ ਸਾਫ਼ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸ ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਰਗਰਮ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਗੁੰਮ ਹੋ ਜਾਂਦੀ, ਚੋਰੀ ਹੋ ਜਾਂਦੀ ਜਾਂ ਇਸ ਦਾ ਡੈਟਾ ਸਾਫ਼ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਰਗਰਮ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਫੋਨ ਗੁੰਮ ਹੋ ਜਾਂਦਾ, ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਜਾਂ ਇਸ ਦਾ ਡੈਟਾ ਸਾਫ਼ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸ ਫੋਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਰਗਰਮ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸ ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਰਗਰਮ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਂਦੀ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਰਗਰਮ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਫੋਨ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸ ਫੋਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਗੇ।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"ਅੱਗੇ"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਗੁੰਮ ਹੋ ਜਾਂਦਾ ਹੈ, ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਜਾਂ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਂਗੇ।"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਗੁੰਮ, ਚੋਰੀ ਹੋ ਜਾਂਦੀ ਹੈ ਜਾਂ ਰੀਸੈੱਟ ਕੀਤੀ ਜਾਂਦੀ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਂਗੇ।"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਫ਼ੋਨ ਗੁੰਮ, ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਜਾਂ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਂਗੇ।"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਂਗੇ।"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਂਦੀ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਂਗੇ।"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਜੇਕਰ ਤੁਹਾਡਾ ਫ਼ੋਨ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਹੋਰਾਂ ਨੂੰ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਅਸਮਰੱਥ ਹੋੋਵੋਂਗੇ।"</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"ਫੇਰ ਵੀ ਛੱਡੋ"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"ਵਾਪਸ ਜਾਓ"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ਸੰਵੇਦਕ ਲੱਭੋ"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ਆਪਣੇ ਫੋਨ ਦੇ ਪਿੱਛੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੰਵੇਦਕ ਦਾ ਪਤਾ ਲਗਾਓ।"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"ਸੈਂਸਰ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"ਇਹ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਹੈ। ਆਪਣੀ ਪਹਿਲੀ ਉਂਗਲ ਦੀ ਵਰਤੋਂ ਕਰੋ।"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ਡੀਵਾਈਸ ਵਾਲੀ ਤਸਵੀਰ ਅਤੇ ਫ਼ਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਸਥਾਨ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"ਨਾਮ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ਠੀਕ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ਮਿਟਾਓ"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"ਚੱਲੋ ਸ਼ੁਰੂ ਕਰੀਏ"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"ਸੈਂਸਰ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਸੰਵੇਦਕ ’ਤੇ ਰੱਖੋ ਅਤੇ ਇੱਕ ਕੰਪਨ ਮਹਿਸੂਸ ਹੋਣ ਤੋਂ ਬਾਅਦ ਚੁੱਕ ਲਵੋ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"ਜਾਰੀ ਰੱਖੋ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੇ ਸਾਰੇ ਵੱਖ-ਵੱਖ ਹਿੱਸੇ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਥੋੜ੍ਹਾ ਜਿਹਾ ਸਰਕਾਓ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ਜਦੋਂ ਵੀ ਤੁਸੀਂ ਇਹ ਚਿੰਨ੍ਹ ਦੇਖਦੇ ਹੋ, ਤਾਂ ਤੁਸੀਂ ਪਛਾਣ ਲਈ ਜਾਂ ਕਿਸੇ ਖ਼ਰੀਦ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਲਈ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤ ਸਕਦੇ ਹੋ।"</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਸਕਿਰਿਆ ਅਤੇ ਅਨਲੌਕ ਕਰਨ ਲਈ ਕੇਵਲ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੰਵੇਦਕ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ।"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"ਜਦੋਂ ਤੁਹਾਨੂੰ ਇਹ ਚਿੰਨ੍ਹ ਵਿਖਾਈ ਦੇਵੇ, ਤਾਂ ਤੁਸੀਂ ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਵੀ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"ਚੁੱਕੋ, ਫਿਰ ਦੁਬਾਰਾ ਸਪੱਰਸ਼ ਕਰੋ"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੇ ਵੱਖ-ਵੱਖ ਭਾਗਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਰੱਖਣਾ-ਚੁੱਕਣਾ ਜਾਰੀ ਰੱਖੋ"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"ਜਦ ਤੁਹਾਨੂੰ ਇਹ ਪ੍ਰਤੀਕ ਦਿਖਾਈ ਦਿੰਦਾ ਹੈ, ਤਾਂ ਪਛਾਣ ਕਰਨ ਜਾਂ ਖਰੀਦਾਂ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰੋ।"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ਕੀ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਟਅਪ ਛੱਡਣਾ ਹੈ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਦਾ ਇੱਕ ਤਰੀਕਾ ਆਪਣੇ ਉਂਗਲਾਂ ਦੇ ਨਿਸ਼ਾਨ ਦਾ ਉਪਯੋਗ ਕਰਨਾ ਚੁਣਿਆ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਹੁਣੇ ਇਸਨੂੰ ਛੱਡਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਨੂੰ ਇਹ ਬਾਅਦ ਵਿੱਚ ਸਥਾਪਿਤ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਸੈੱਟਅੱਪ ਸਿਰਫ਼ ਇੱਕ ਮਿੰਟ ਲੈਂਦਾ ਹੈ।"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ਸਕ੍ਰੀਨ ਲੌਕ ਸੈੱਟਅੱਪ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"ਹੋ ਗਿਆ"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ਓਹੋ, ਉਹ ਸੈਂਸਰ ਨਹੀਂ ਹੈ"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"ਆਪਣੀ ਡੀਵਾਈਸ \'ਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਦਾ ਉਪਯੋਗ ਕਰੋ।"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"ਫ਼ੋਨ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਸੈਂਸਰ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ। ਪਹਿਲੀ ਉਂਗਲ ਵਰਤੋ।"</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"ਦਾਖਲਾ ਪੂਰਾ ਨਾ ਕੀਤਾ ਗਿਆ"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਦਾਖ਼ਲੇ ਦੀ ਸਮਾਂ ਸੀਮਾ ਪੂਰੀ ਹੋ ਗਈ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਦਾਖ਼ਲੇ ਨੇ ਕੰਮ ਨਹੀਂ ਕੀਤਾ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜਾਂ ਕੋਈ ਵੱਖਰੀ ਉਂਗਲ ਉਪਯੋਗ ਕਰੋ।"</string>
@@ -449,6 +460,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲੌਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਫੋਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲੌਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"ਆਪਣੀ ਬੈੱਕਅੱਪ ਸਕ੍ਰੀਨ ਲੌਕ ਵਿਧੀ ਚੁਣੋ"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"ਸਕ੍ਰੀਨ ਲੌਕ ਵਿਕਲਪ"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"ਸਕ੍ਰੀਨ ਲੌਕ ਵਿਕਲਪ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ਸਕ੍ਰੀਨ ਲੌਕ"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / ਸਲੀਪ ਤੋਂ ਤੁਰੰਤ ਬਾਅਦ"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"ਸਲੀਪ ਮੋਡ ਤੋਂ ਬਾਅਦ <xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g>"</string>
@@ -519,13 +532,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ਅਨਲੌਕ ਪੈਟਰਨ ਬਦਲੋ"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ਅਨਲੌਕ PIN ਬਦਲੋ"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ਅਨਲੌਕ ਪਾਸਵਰਡ ਬਦਲੋ"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> ਕੋਸ਼ਿਸ਼ਾਂ।"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"ਆਖਰੀ ਕੋਸ਼ਿਸ਼"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਇੱਕ ਗ਼ਲਤ ਕੰਮ ਪੈਟਰਨ ਦਾਖਲ ਕੀਤਾ, ਤਾਂ ਤੁਹਾਡੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਸਬੰਧਿਤ ਡੈਟੇ ਨੂੰ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਇੱਕ ਗ਼ਲਤ ਕੰਮ PIN ਦਾਖਲ ਕੀਤਾ, ਤਾਂ ਤੁਹਾਡੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਸਬੰਧਿਤ ਡੈਟੇ ਨੂੰ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਇੱਕ ਗ਼ਲਤ ਕੰਮ ਪਾਸਵਰਡ ਦਾਖਲ ਕੀਤਾ, ਤਾਂ ਤੁਹਾਡੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਸਬੰਧਿਤ ਡੈਟੇ ਨੂੰ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"ਬਹੁਤ ਜ਼ਿਆਦਾ ਗ਼ਲਤ ਕੋਸ਼ਿਸ਼ਾਂ। ਤੁਹਾਡੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਸਬੰਧਿਤ ਡੈਟੇ ਨੂੰ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ਖ਼ਾਰਜ ਕਰੋ"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ਕੋਸ਼ਿਸ਼।"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"ਤੁਹਾਡਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪੈਟਰਨ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਡੀਵਾਈਸ ਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ PIN ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਡੀਵਾਈਸ ਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਡੀਵਾਈਸ ਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪੈਟਰਨ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ PIN ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪੈਟਰਨ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਇਸਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ PIN ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਇਸਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਇਸਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"ਬਹੁਤ ਸਾਰੀਆਂ ਗਲਤ ਕੋਸ਼ਿਸ਼ਾਂ। ਇਸ ਡੀਵਾਈਸ ਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ।"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"ਬਹੁਤ ਸਾਰੀਆਂ ਗਲਤ ਕੋਸ਼ਿਸ਼ਾਂ। ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਮਿਟਾਇਆ ਜਾਵੇਗਾ।"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"ਬਹੁਤ ਸਾਰੀਆਂ ਗਲਤ ਕੋਸ਼ਿਸ਼ਾਂ। ਇਹ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਇਸਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ।"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"ਖਾਰਜ ਕਰੋ"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"ਘੱਟੋ-ਘੱਟ <xliff:g id="COUNT">%d</xliff:g> ਅੱਖਰ-ਚਿੰਨ੍ਹਾਂ ਦਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN ਵਿੱਚ ਘੱਟੋ-ਘੱਟ <xliff:g id="COUNT">%d</xliff:g> ਅੰਕਾਂ ਦਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ਜਾਰੀ ਰੱਖੋ"</string>
@@ -626,6 +647,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"ਉੱਨਤ Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ਜਦੋਂ Bluetooth ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਹੋਰਾਂ ਨੇੜਲੀਆਂ Bluetooth ਡੀਵਾਈਸਾਂ ਨਾਲ ਸੰਚਾਰ ਕਰ ਸਕਦੀ ਹੈ।"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸ਼ੁੱਧਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ, ਸਿਸਟਮ ਐਪਸ ਅਤੇ ਸੇਵਾਵਾਂ Bluetooth ਡਿਵਾਈਸਾਂ ਨੂੰ ਤਦ ਵੀ ਖੋਜ ਸਕਦੀਆਂ ਹਨ। ਤੁਸੀਂ ਇਸਨੂੰ <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ਸਕੈਨਿੰਗ ਸੈਟਿੰਗਾਂ<xliff:g id="LINK_END_1">LINK_END</xliff:g> ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+    <string name="device_details_title" msgid="6576953269221085300">"ਡੀਵਾਈਸ ਦੇ ਵੇਰਵੇ"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"ਡੀਵਾਈਸ ਦਾ ਬਲੂਟੁੱਥ ਪਤਾ: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"ਡੀਵਾਈਸ ਨੂੰ ਅਣਜੋੜਾਬੱਧ ਕਰੀਏ?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਹੁਣ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਜੋੜਾਬੱਧ ਨਹੀਂ ਰਹੇਗਾ"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਹੁਣ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਜੋੜਾਬੱਧ ਨਹੀਂ ਰਹੇਗਾ"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਹੁਣ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਜੋੜਾਬੱਧ ਨਹੀਂ ਰਹੇਗੀ"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"ਡੀਵਾਈਸ ਨੂੰ ਅਣਜੋੜਾਬੱਧ ਕਰੋ"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ਇਸ ਨਾਲ ਕਨੈਕਟ ਕਰੋ…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਮੀਡੀਆ ਔਡੀਓ ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਜਾਏਗਾ।"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਹੈਂਡਸਫ੍ਰੀ ਔਡੀਓ ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਜਾਏਗਾ।"</string>
@@ -778,6 +807,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"ਮੁਹੱਈਆ ਨਾ ਕਰੋ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"ਪ੍ਰਮਾਣਿਤ ਨਾ ਕਰੋ"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"ਕੋਈ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਨਿਰਧਾਰਤ ਨਹੀਂ ਕੀਤਾ ਗਿਆ। ਤੁਹਾਡਾ ਕਨੈਕਸ਼ਨ ਨਿੱਜੀ ਨਹੀਂ ਰਹੇਗਾ।"</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"ਨੈੱਟਵਰਕ ਦਾ ਨਾਮ ਬਹੁਤ ਹੀ ਵੱਡਾ ਹੈ।"</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"ਇੱਕ ਡੋਮੇਨ ਨਿਰਧਾਰਤ ਕਰਨਾ ਲਾਜ਼ਮੀ ਹੈ।"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ਉਪਲਬਧ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ਉਪਲਬਧ)"</string>
@@ -809,7 +839,6 @@
       <item quantity="other">%d ਨੈੱਟਵਰਕ</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"ਉੱਨਤ Wi‑Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wi-Fi ਦਾ ਸੰਰੂਪਣ ਕਰੋ"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC ਪਤਾ"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP ਪਤਾ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"ਸਬਨੈੱਟ ਮਾਸਕ"</string>
@@ -846,9 +875,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ਕੀ ਇਹ ਸਮੂਹ ਛੱਡਣਾ ਹੈ?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ਪੋਰਟੇਬਲ Wi‑Fi ਹੌਟਸਪੌਟ"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi ਹੌਟਸਪੌਟ"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Wi‑Fi ਨੈੱਟਵਰਕ ਮੁਹੱਈਆ ਕਰਵਾਉਣ ਲਈ ਮੋਬਾਈਲ ਕਨੈਕਸ਼ਨ ਵਰਤੋ"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"ਇਸ ਟੈਬਲੈੱਟ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਹੌਟਸਪੌਟ ਰਾਹੀਂ ਸਾਂਝਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"ਇਸ ਫ਼ੋਨ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਹੌਟਸਪੌਟ ਰਾਹੀਂ ਸਾਂਝਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"ਦੂਜੀਆਂ ਡੀਵਾਈਸਾਂ ਨਾਲ ਇੰਟਰਨੈੱਟ ਜਾਂ ਸਮੱਗਰੀ ਸਾਂਝੀ ਨਹੀਂ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ਇਸ ਟੈਬਲੈੱਟ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਹੌਟਸਪੌਟ ਰਾਹੀਂ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ਇਸ ਫ਼ੋਨ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਹੌਟਸਪੌਟ ਰਾਹੀਂ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ਐਪ ਸਮੱਗਰੀ ਸਾਂਝਾ ਕਰ ਰਹੀ ਹੈ। ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਸਾਂਝਾ ਕਰਨ ਲਈ, ਹੌਟਸਪੌਟ ਨੂੰ ਬੰਦ ਕਰਕੇ, ਫਿਰ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi ਦਾ ਨਾਮ"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"ਹੋਰ ਡੀਵਾਈਸਾਂ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋ ਸਕਦੀਆਂ ਹਨ"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi ਪਾਸਵਰਡ"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP ਬੈਂਡ"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ਆਪਣੀਆਂ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਇੱਕ Wi-Fi ਨੈੱਟਵਰਕ ਬਣਾਉਣ ਲਈ ਹੌਟਸਪੌਟ ਦੀ ਵਰਤੋਂ ਕਰੋ। ਹੌਟਸਪੌਟ ਤੁਹਾਡੇ ਮੋਬਾਈਲ ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਇੰਟਰਨੈੱਟ ਮੁਹੱਈਆ ਕਰਦਾ ਹੈ। ਵਧੀਕ ਮੋਬਾਈਲ ਡੈਟਾ ਚਾਰਜ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ਨੇੜਲੀ ਡੀਵਾਈਸਾਂ ਨਾਲ ਸਮੱਗਰੀ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਐਪਾਂ ਇੱਕ ਹੌਟਸਪੌਟ ਬਣਾ ਸਕਦੀਆਂ ਹਨ।"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"ਹੌਟਸਪੌਟ ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"ਹੌਟਸਪੌਟ ਬੰਦ ਕਰ ਰਿਹਾ ਹੈ…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ਕਿਰਿਆਸ਼ੀਲ ਹੈ"</string>
@@ -895,6 +932,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ਜਦੋਂ Wi-Fi ਕਾਲਿੰਗ ਚਾਲੂ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਤੁਹਾਡਾ ਫੋਨ ਤੁਹਾਡੀ ਤਰਜੀਹ ਅਤੇ ਕਿਹੜਾ ਸਿਗਨਲ ਵੱਧ ਮਜ਼ਬੂਤ ਹੈ, ਦੇ ਆਧਾਰ ਤੇ Wi-Fi ਨੈੱਟਵਰਕਾਂ ਜਾਂ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਦੇ ਨੈੱਟਵਰਕ ਰਾਹੀਆਂ ਕਾਲਾਂ ਰੂਟ ਕਰ ਸਕਦਾ ਹੈ। ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਚਾਲੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ, ਫੀਸ ਅਤੇ ਹੋਰ ਵੇਰਵਿਆਂ ਲਈ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"ਐਮਰਜੈਂਸੀ ਪਤਾ ਅੱਪਡੇਟ ਕਰੋ"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"ਤੁਹਾਡੇ ਵੱਲੋਂ WiFi ਦੀ ਵਰਤੋਂ ਨਾਲ 911 ਨੂੰ ਕਾਲ ਕਰਨ \'ਤੇ ਐਮਰਜੈਂਸੀ ਸੇਵਾਵਾਂ ਦੁਆਰਾ ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਵਜੋਂ ਵਰਤਿਆ ਜਾਣ ਵਾਲਾ ਪਤਾ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ਡਿਸਪਲੇ"</string>
@@ -952,6 +990,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"ਕੋਈ ਨਤੀਜੇ ਨਹੀਂ"</string>
     <string name="display_settings" msgid="7965901687241669598">"ਡਿਸਪਲੇ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ਸਕ੍ਰੀਨ ਆਪਣੇ-ਆਪ ਘੁੰਮਾਓ"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"ਭੜਕੀਲੇ ਰੰਗ"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ਟੈਬਲੇਟ ਨੂੰ ਰੋਟੇਟ ਕਰਨ ਵੇਲੇ ਆਟੋਮੈਟਿਕਲੀ ਅਨੁਕੂਲਨ ਸਵਿਚ ਕਰੋ"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ਫੋਨ ਨੂੰ ਰੋਟੇਟ ਕਰਨ ਵੇਲੇ ਆਟੋਮੈਟਿਕਲੀ ਅਨੁਕੂਲਨ ਸਵਿਚ ਕਰੋ"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"ਟੈਬਲੇਟ ਨੂੰ ਰੋਟੇਟ ਕਰਨ ਵੇਲੇ ਆਟੋਮੈਟਿਕਲੀ ਅਨੁਕੂਲਨ ਸਵਿਚ ਕਰੋ"</string>
@@ -979,23 +1018,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"ਉਪਲਬਧ ਲਾਈਟ ਲਈ ਚਮਕ ਦੇ ਪੱਧਰ ਨੂੰ ਸੁਯੋਗ ਬਣਾਓ। ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਦੇ ਚਾਲੂ ਹੋਣ \'ਤੇ ਵੀ ਤੁਸੀਂ ਚਮਕ ਨੂੰ ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="night_display_title" msgid="2626451512200357686">"ਰਾਤਰੀ ਲਾਈਟ"</string>
     <string name="night_display_text" msgid="1837277457033025056">"ਰਾਤਰੀ ਲਾਈਟ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਭੂਰੇ ਪੀਲੇ ਰੰਗ ਦੀ ਭਾਹ ਦਿੰਦੀ ਹੈ। ਇਸ ਨਾਲ ਮੱਧਮ ਰੌਸ਼ਨੀ ਵਿੱਚ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਵੇਖਣਾ ਜਾਂ ਪੜ੍ਹਨਾ ਵਧੇਰੇ ਆਸਾਨ ਹੋ ਜਾਂਦਾ ਹੈ ਅਤੇ ਤੁਹਾਨੂੰ ਵਧੇਰੇ ਆਸਾਨੀ ਨਾਲ ਸੌਣ ਵਿੱਚ ਮਦਦ ਮਿਲ ਸਕਦੀ ਹੈ।"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"ਸਮਾਂ ਨਿਯਤ ਕਰੋ"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"ਅਵਸਥਾ"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"ਕਦੇ ਵੀ ਨਹੀਂ"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਕਾਰਜ-ਕ੍ਰਮ"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"ਸੂਰਜ ਛਿਪਣ ਤੋਂ ਸੂਰਜ ਚੜ੍ਹਨ ਤੱਕ"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"ਸਮਾਂ-ਸੂਚੀ"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"ਕੋਈ ਨਹੀਂ"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਸਮੇਂ \'ਤੇ ਚਾਲੂ ਹੋ ਜਾਂਦੀ ਹੈ"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"ਸੂਰਜ ਡੁੱਬਣ ਤੋਂ ਲੈਕੇ ਸੂਰਜ ਚੜ੍ਹਨ ਤੱਕ ਚਾਲੂ ਰਹਿੰਦੀ ਹੈ"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"ਸਮਾਪਤੀ ਸਮਾਂ"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"ਅਵਸਥਾ"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"ਤੀਬਰਤਾ"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"ਬੰਦ। <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"ਆਪਣੇ ਆਪ ਕਦੇ ਵੀ ਚਾਲੂ ਨਹੀਂ ਹੋਵੇਗੀ।"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g> ਵਜੇ ਆਪਣੇ ਆਪ ਚਾਲੂ ਹੋ ਜਾਵੇਗੀ।"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"ਸੂਰਜ ਡੁੱਬਣ ਸਮੇਂ ਆਪਣੇ ਆਪ ਚਾਲੂ ਹੋ ਜਾਵੇਗੀ।"</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"ਚਾਲੂ। <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"ਆਪਣੇ ਆਪ ਕਦੇ ਵੀ ਬੰਦ ਨਹੀਂ ਹੋਵੇਗੀ।"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g> ਵਜੇ ਆਪਣੇ ਆਪ ਬੰਦ ਹੋ ਜਾਵੇਗੀ।"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"ਸੂਰਜ ਚੜ੍ਹਨ ਸਮੇਂ ਆਪਣੇ ਆਪ ਬੰਦ ਹੋ ਜਾਵੇਗੀ।"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"ਬੰਦ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"ਆਪਣੇ ਆਪ ਕਦੇ ਵੀ ਚਾਲੂ ਨਹੀਂ ਹੋਵੇਗੀ"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g> ਵਜੇ ਆਪਣੇ ਆਪ ਚਾਲੂ ਹੋ ਜਾਵੇਗੀ"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"ਸੂਰਜ ਡੁੱਬਣ ਸਮੇਂ ਆਪਣੇ ਆਪ ਚਾਲੂ ਹੋ ਜਾਵੇਗੀ"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"ਚਾਲੂ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"ਆਪਣੇ ਆਪ ਕਦੇ ਵੀ ਬੰਦ ਨਹੀਂ ਹੋਵੇਗੀ"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g> ਵਜੇ ਆਪਣੇ ਆਪ ਬੰਦ ਹੋ ਜਾਵੇਗੀ"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"ਸੂਰਜ ਚੜ੍ਹਨ ਸਮੇਂ ਆਪਣੇ ਆਪ ਬੰਦ ਹੋ ਜਾਵੇਗੀ"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"ਸਲੀਪ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"ਸਕ੍ਰੀਨ ਬੰਦ ਹੈ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ਦੀ ਕਿਰਿਆਹੀਣਤਾ ਤੋਂ ਬਾਅਦ"</string>
@@ -1019,8 +1057,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ਸਵੈਚਲਿਤ ਚਮਕ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ਸਕਿਰਿਆ ਕਰਨ ਲਈ ਚੁੱਕੋ"</string>
-    <string name="doze_title" msgid="2259176504273878294">"ਤੱਕਣੀਯੋਗ ਡਿਸਪਲੇ"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"ਤੱਕਣੀਯੋਗ ਡਿਸਪਲੇ"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"ਹਮੇਸ਼ਾ ਚਾਲੂ"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"ਨਵੀਆਂ ਸੁਚਨਾਵਾਂ"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ਦਿਖਾਉਣ ਦਾ ਸਮਾਂ"</string>
+    <string name="doze_title" msgid="2375510714460456687">"ਨਵੀਆਂ ਸੁਚਨਾਵਾਂ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ਜਦ ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਹੋਣ ਤਾਂ ਸਕ੍ਰੀਨ ਨੂੰ ਸਜੀਵ ਕਰੋ"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"ਹਮੇਸ਼ਾ ਚਾਲੂ"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"ਸਮਾਂ, ਸੂਚਨਾ ਪ੍ਰਤੀਕ, ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ਫੌਂਟ ਦਾ ਆਕਾਰ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ਲਿਖਤ ਨੂੰ ਵੱਡਾ ਜਾਂ ਛੋਟਾ ਕਰੋ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM ਕਾਰਡ ਲੌਕ ਸੈਟਿੰਗਾਂ"</string>
@@ -1272,6 +1316,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN ਨੂੰ ਖਾਲੀ ਨਹੀਂ ਛੱਡਿਆ ਜਾ ਸਕਦਾ।"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC ਖੇਤਰ 3 ਅੰਕਾਂ ਦਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ।"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC ਖੇਤਰ 2 ਜਾਂ 3 ਅੰਕਾਂ ਦਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ।"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"ਕੈਰੀਅਰ %s ਕਿਸਮ ਦੇ APNs ਨੂੰ ਸ਼ਾਮਲ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਦਿੰਦਾ।"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"ਪੂਰਵ-ਨਿਰਧਾਰਤ APN ਸੈਟਿੰਗਾਂ ਰੀਸਟੋਰ ਕਰ ਰਿਹਾ ਹੈ।"</string>
     <string name="menu_restore" msgid="8260067415075573273">"ਡਿਫੌਲਟਸ ਤੇ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ਪੂਰਵ-ਨਿਰਧਾਰਤ APN ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰਨਾ ਪੂਰਾ ਹੋਇਆ।"</string>
@@ -1301,6 +1346,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD ਕਾਰਡ ਮਿਟਾਓ"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"ਅੰਦਰੂਨੀ USB ਸਟੋਰੇਜ ਤੇ ਸਾਰਾ ਡੈਟਾ ਮਿਟਾਓ, ਜਿਵੇਂ ਸੰਗੀਤ ਜਾਂ ਫ਼ੋਟੋਆਂ"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD ਕਾਰਡ ਦਾ ਸਾਰਾ ਡੈਟਾ ਮਿਟਾਓ, ਜਿਵੇਂ ਸੰਗੀਤ ਜਾਂ ਫ਼ੋਟੋਆਂ"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIMs ਨੂੰ ਮਿਟਾਓ"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"ਫ਼ੋਨ ਵਿੱਚੋਂ ਸਾਰੇ eSIMs ਨੂੰ ਮਿਟਾਓ। ਅਜਿਹਾ ਕਰਨਾ ਤੁਹਾਡੀ ਮੋਬਾਈਲ ਸੇਵਾ ਯੋਜਨਾ ਨੂੰ ਰੱਦ ਨਹੀਂ ਕਰੇਗਾ।"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"ਟੈਬਲੈੱਟ ਵਿੱਚੋਂ ਸਾਰੇ eSIMs ਨੂੰ ਮਿਟਾਓ। ਇਹ ਤੁਹਾਡੀ ਮੋਬਾਈਲ ਸੇਵਾ ਯੋਜਨਾ ਨੂੰ ਰੱਦ ਨਹੀਂ ਕਰੇਗਾ।"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ਟੈਬਲੇਟ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ਫੋਨ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"ਕੀ ਆਪਣੀ ਸਾਰੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਅਤੇ ਡਾਊਨਲੋਡ ਕੀਤੇ ਐਪਸ ਮਿਟਾਉਣੇ ਹਨ? ਤੁਸੀਂ ਇਹ ਕਿਰਿਆ ਅਨਡੂ ਨਹੀਂ ਕਰ ਸਕਦੇ!"</string>
@@ -1323,26 +1371,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ਡੈਟਾ ਸੇਵਰ ਚਾਲੂ ਹੋਣ \'ਤੇ ਟੈਦਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਜਾਂ ਪੋਰਟੇਬਲ ਹੌਟਸਪੌਟ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB ਟੈਦਰਿੰਗ"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB ਕਨੈਕਟ ਕੀਤਾ, ਟੈਦਰ ਕਰਨ ਲਈ ਚੈੱਕ ਕਰੋ"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"ਟੀਥਰ ਕੀਤਾ"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"ਜਦੋਂ USB ਸਟੋਰੇਜ ਵਰਤੋਂ ਵਿੱਚ ਹੋਵੇ ਤਾਂ ਟੀਥਰ ਨਹੀਂ ਕਰ ਸਕਦਾ"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB ਕਨੈਕਟ ਨਹੀਂ ਕੀਤੀ"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"ਚਾਲੂ ਕਰਨ ਲਈ ਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB ਟੀਥਰਿੰਗ ਅਸ਼ੁੱਧੀ"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"ਫ਼ੋਨ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ USB ਰਾਹੀਂ ਸਾਂਝਾ ਕਰੋ"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"ਟੈਬਲੈੱਟ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ USB ਰਾਹੀਂ ਸਾਂਝਾ ਕਰੋ"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth ਟੈਦਰਿੰਗ"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"ਇਸ ਟੈਬਲੈੱਟ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਬਲੂਟੁੱਥ ਰਾਹੀਂ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"ਇਸ ਫ਼ੋਨ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਬਲੂਟੁੱਥ ਰਾਹੀਂ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"ਇਸ ਟੈਬਲੈੱਟ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਬਲੂਟੁੱਥ ਰਾਹੀਂ 1 ਡੀਵਾਈਸ ਨਾਲ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"ਇਸ ਫ਼ੋਨ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਬਲੂਟੁੱਥ ਰਾਹੀਂ 1 ਡੀਵਾਈਸ ਨਾਲ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"ਇਸ ਟੈਬਲੈੱਟ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਬਲੂਟੁੱਥ ਰਾਹੀਂ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ਡੀਵਾਈਸਾਂ ਨਾਲ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"ਇਸ ਫ਼ੋਨ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਬਲੂਟੁੱਥ ਰਾਹੀਂ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ਡੀਵਾਈਸਾਂ ਨਾਲ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"ਟੈਬਲੈੱਟ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਬਲੂਟੁੱਥ ਰਾਹੀਂ ਸਾਂਝਾ ਕਰੋ"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"ਫ਼ੋਨ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਬਲੂਟੁੱਥ ਰਾਹੀਂ ਸਾਂਝਾ ਕਰੋ"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"ਇਸ <xliff:g id="DEVICE_NAME">%1$d</xliff:g> ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਬਲੂਟੁੱਥ ਰਾਹੀਂ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"ਇਸ ਟੈਬਲੈੱਟ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਬਲੂਟੁੱਥ ਰਾਹੀਂ ਸਾਂਝਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"ਇਸ ਫ਼ੋਨ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਬਲੂਟੁੱਥ ਰਾਹੀਂ ਸਾਂਝਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"ਟੀਥਰ ਨਹੀਂ ਕੀਤਾ"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> ਤੋਂ ਵੱਧ ਡਿਵਾਈਸਾਂ ਨਾਲ ਟੀਥਰ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਅਨਟੀਥਰ ਹੋ ਜਾਏਗਾ।"</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"ਆਪਣੇ ਮੋਬਾਈਲ ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਦੇ ਰਾਹੀਂ ਦੂਜੀਆਂ ਡੀਵਾਈਸਾਂ ਨੂੰ ਇੰਟਰਨੈੱਟ ਮੁਹੱਈਆ ਕਰਨ ਲਈ ਹੌਟਸਪੌਟ ਅਤੇ ਟੈਦਰਿੰਗ ਦੀ ਵਰਤੋਂ ਕਰੋ।"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"ਆਪਣੇ ਮੋਬਾਈਲ ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਦੇ ਰਾਹੀਂ ਦੂਜੀਆਂ ਡੀਵਾਈਸਾਂ ਨੂੰ ਇੰਟਰਨੈੱਟ ਮੁਹੱਈਆ ਕਰਵਾਉਣ ਲਈ ਹੌਟਸਪੌਟ ਅਤੇ ਟੈਦਰਿੰਗ ਦੀ ਵਰਤੋਂ ਕਰੋ। ਨੇੜਲੀਆਂ ਡੀਵਾਈਸਾਂ ਨਾਲ ਸਮੱਗਰੀ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਐਪਾਂ ਵੀ ਇੱਕ ਹੌਟਸਪੌਟ ਬਣਾ ਸਕਦੀਆਂ ਹਨ।"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ਮਦਦ"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"ਮੋਬਾਈਲ ਪਲਾਨ"</string>
@@ -1375,7 +1412,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"ਟਿਕਾਣਾ ਮੋਡ"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"ਟਿਕਾਣੇ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ GPS, Wi‑Fi, ਬਲੂਟੁੱਥ, ਜਾਂ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਵਰਤੋ"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"ਟਿਕਾਣੇ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ Wi‑Fi, ਬਲੂਟੁੱਥ, ਜਾਂ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਵਰਤੋ"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ਟਿਕਾਣੇ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ GPS ਵਰਤੋ"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"ਟਿਕਾਣੇ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ GPS ਅਤੇ ਡੀਵਾਈਸ ਸੈਂਸਰਾਂ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"ਸਕੈਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi ਸਕੈਨਿੰਗ"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ਸਿਸਟਮ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਸਮੇਂ Wi‑Fi ਨੈੱਟਵਰਕਾਂ ਦਾ ਪਤਾ ਲਾਉਣ ਦੀ ਆਗਿਆ ਦੇ ਕੇ ਟਿਕਾਣਾ ਸੇਵਾ ਬਿਹਤਰ ਬਣਾਓ।"</string>
@@ -1420,8 +1457,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"ਤੁਹਾਡੇ ਕੋਲ ਇੱਕ ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ। ਹੁਣ ਇਸ ਜਾਣਕਾਰੀ ਨੂੰ ਦੇਖਣ ਲਈ, ਇੰਟਰਨੈਟ ਨਾਲ ਕਨੈਕਟ ਕੀਤੇ ਕਿਸੇ ਵੀ ਕੰਪਿਊਟਰ ਤੋਂ %s ਤੇ ਜਾਓ।"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"ਆਪਣਾ ਪਾਸਵਰਡ ਚੁਣੋ"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ, ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"ਆਪਣਾ ਪੈਟਰਨ ਚੁਣੋ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ, ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"ਆਪਣਾ PIN ਚੁਣੋ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਲਈ, PIN ਸੈੱਟ ਕਰੋ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"ਆਪਣੇ ਪਾਸਵਰਡ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ਆਪਣੇ ਪੈਟਰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"ਆਪਣੇ PIN ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
@@ -1490,6 +1530,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"ਐਪ ਸੈਟਿੰਗਾਂ"</string>
     <string name="install_applications" msgid="4872012136210802181">"ਅਗਿਆਤ ਸਰੋਤ"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"ਸਾਰੇ ਐਪ ਸਰੋਤਾਂ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"ਹਾਲ ਹੀ ਵਿੱਚ ਖੋਲ੍ਹੀਆਂ ਗਈਆਂ ਐਪਾਂ"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"ਸਾਰੀਆਂ <xliff:g id="COUNT">%1$d</xliff:g> ਐਪਾਂ ਦੇਖੋ"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> ਪਹਿਲਾਂ"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਅਤੇ ਨਿੱਜੀ ਡੈਟਾ ਅਗਿਆਤ ਐਪਾਂ ਤੋਂ ਹਮਲੇ ਪ੍ਰਤੀ ਵਧੇਰੇ ਵਿੰਨਣਸ਼ੀਲ ਹਨ। ਇਸ ਸਰੋਤ ਤੋਂ ਐਪਾਂ ਸਥਾਪਿਤ ਕਰ ਕੇ, ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਹੋਣ ਵਾਲੇ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਜਾਂ ਡੈਟੇ ਦੇ ਗੁੰਮ ਹੋਣ ਲਈ ਤੁਸੀਂ ਜ਼ਿੰਮੇਵਾਰ ਹੋ ਜੋ ਸ਼ਾਇਦ ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਵਰਤਣ ਦੇ ਨਤੀਜੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਅਤੇ ਨਿੱਜੀ ਡੈਟਾ ਅਗਿਆਤ ਐਪਾਂ ਤੋਂ ਹਮਲੇ ਪ੍ਰਤੀ ਵਧੇਰੇ ਵਿੰਨਣਸ਼ੀਲ ਹਨ। ਇਸ ਸਰੋਤ ਤੋਂ ਐਪਾਂ ਸਥਾਪਿਤ ਕਰ ਕੇ, ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਹੋਣ ਵਾਲੇ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਜਾਂ ਡੈਟੇ ਦੇ ਗੁੰਮ ਹੋਣ ਲਈ ਤੁਸੀਂ ਜ਼ਿੰਮੇਵਾਰ ਹੋ ਜੋ ਸ਼ਾਇਦ ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਵਰਤਣ ਦੇ ਨਤੀਜੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"ਉੱਨਤ ਸੈਟਿੰਗਾਂ"</string>
@@ -1658,6 +1701,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"ਕੀ ਸਿਸਟਮ ਸੇਵਾ ਬੰਦ ਕਰਨੀ ਹੈ?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"ਜੇਕਰ ਤੁਸੀਂ ਇਹ ਸੇਵਾ ਬੰਦ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੀ ਟੈਬਲੇਟ ਦੀਆਂ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਕਰਨਾ ਬੰਦ ਕਰ ਸਕਦੀਆਂ ਹਨ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਇਸਦੀ ਪਾਵਰ ਬੰਦ ਅਤੇ ਫਿਰ ਦੁਬਾਰਾ ਚਾਲੂ ਨਹੀਂ ਕਰਦੇ।"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"ਜੇਕਰ ਤੁਸੀਂ ਇਹ ਸੇਵਾ ਬੰਦ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਫੋਨ ਦੀਆਂ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਕਰਨਾ ਬੰਦ ਕਰ ਸਕਦੀਆਂ ਹਨ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਇਸਦੀ ਪਾਵਰ ਬੰਦ ਅਤੇ ਫਿਰ ਦੁਬਾਰਾ ਚਾਲੂ ਨਹੀਂ ਕਰਦੇ।"</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"ਭਾਸ਼ਾਵਾਂ, ਇਨਪੁੱਟ ਅਤੇ ਸੰਕੇਤ"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"ਭਾਸ਼ਾਵਾਂ ਅਤੇ ਇਨਪੁੱਟ"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ਭਾਸ਼ਾਵਾਂ ਅਤੇ ਇਨਪੁੱਟ"</string>
     <string name="input_assistance" msgid="7577795275222555487">"ਇਨਪੁੱਟ ਸਹਾਇਤਾ"</string>
@@ -1872,6 +1919,10 @@
       <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="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <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="print_settings_title" msgid="3685449667822217816">"ਪ੍ਰਿੰਟ ਸੇਵਾਵਾਂ"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"ਕੋਈ ਸੇਵਾਵਾਂ ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤੀਆਂ"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"ਕੋਈ ਪ੍ਰਿੰਟਰ ਨਹੀਂ ਮਿਲੇ"</string>
@@ -1938,6 +1989,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"ਵਰਤੋਂ ਵੇਰਵੇ"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"ਪਾਵਰ ਵਰਤੋਂ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"ਸ਼ਾਮਲ ਕੀਤੇ ਪੈਕੇਜ"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ਬੈਟਰੀ ਦੀ ਖਪਤ ਕਰਨ ਵਾਲੀਆਂ ਐਪਾਂ"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"ਡੀਵਾਈਸ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਡੀਵਾਈਸ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ਵਾਰ-ਵਾਰ ਟਿਕਾਣੇ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ਐਪਾਂ ਅਜੀਬ ਢੰਗ ਨਾਲ ਵਰਤਾਅ ਕਰ ਰਹੀਆਂ ਹਨ"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"ਕੀ ਐਪ ਬੰਦ ਕਰੀਏ?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖ ਰਹੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਠੀਕ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਐਪ ਨੂੰ ਜ਼ਬਰਦਸਤੀ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖ ਰਹੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਠੀਕ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਐਪ ਨੂੰ ਜ਼ਬਰਦਸਤੀ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦੀ ਕਿਉਂਕਿ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖ ਰਹੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਠੀਕ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਐਪ ਨੂੰ ਜ਼ਬਰਦਸਤੀ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"ਐਪ ਬੰਦ ਕਰੋ"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਰਤੋਂ ਬੰਦ ਕਰੀਏ?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ, ਤੁਹਾਡਾ ਫ਼ੋਨ ਇਸ ਐਪ ਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਤੋਂ ਰੋਕ ਸਕਦਾ ਹੈ।"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ, ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਇਸ ਐਪ ਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਤੋਂ ਰੋਕ ਸਕਦਾ ਹੈ।"</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦੀ ਕਿਉਂਕਿ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ, ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਇਸ ਐਪ ਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਤੋਂ ਰੋਕ ਸਕਦੀ ਹੈ।"</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"ਬੰਦ ਕਰੋ"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"ਟਿਕਾਣਾ ਬੰਦ ਕਰੀਏ?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਐਪ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਰਹੇ ਹੁੰਦੇ ਤਾਂ ਵੀ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡਾ ਟਿਕਾਣਾ ਪੁੱਛਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਇਸ ਐਪ ਲਈ ਟਿਕਾਣੇ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਐਪ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਰਹੇ ਹੁੰਦੇ ਹੋ ਤਾਂ ਵੀ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡਾ ਟਿਕਾਣਾ ਪੁੱਛਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਇਸ ਐਪ ਲਈ ਟਿਕਾਣੇ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦੀ ਕਿਉਂਕਿ ਜਦੋਂ ਤੁਸੀਂ <xliff:g id="APP">%1$s</xliff:g> ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਰਹੇ ਹੁੰਦੇ ਤਾਂ ਵੀ ਐਪ ਤੁਹਾਡਾ ਟਿਕਾਣਾ ਪੁੱਛਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਠੀਕ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਇਸ ਐਪ ਲਈ ਟਿਕਾਣਾ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"ਬੰਦ ਕਰੋ"</string>
     <string name="power_screen" msgid="3023346080675904613">"ਸਕ੍ਰੀਨ"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"ਫਲੈਸ਼ਲਾਈਟ"</string>
     <string name="power_camera" msgid="4976286950934622605">"ਕੈਮਰਾ"</string>
@@ -1952,7 +2023,7 @@
     <string name="power_apps" msgid="2043554781293951327">"ਐਪਾਂ"</string>
     <string name="power_service" msgid="1599661212370831780">"ਸੇਵਾਵਾਂ"</string>
     <string name="power_system" msgid="8290455327965307383">"ਸਿਸਟਮ"</string>
-    <string name="power_user" msgid="1889728099253018005">"ਵਰਤੋਂਕਾਰ"</string>
+    <string name="power_user" msgid="3706143225319881667">"ਹੋਰ ਵਰਤੋਂਕਾਰ"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU ਕੁੱਲ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ਫੋਰਗ੍ਰਾਉਂਡ"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ਸਕਿਰਿਆ ਰੱਖੋ"</string>
@@ -2004,6 +2075,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ਓਵਰ-ਕਾਉਂਟਿਡ ਪਾਵਰ ਵਰਤੋਂ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> ਲਈ ਵਰਤਿਆ ਗਿਆ"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"<xliff:g id="TIME">^1</xliff:g> ਲਈ ਸਰਗਰਮ"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"ਸਕ੍ਰੀਨ ਵਰਤਣ ਦਾ ਸਮਾਂ <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ਵੱਲੋਂ <xliff:g id="PERCENT">%1$s</xliff:g> ਵਰਤੀ ਗਈ"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"ਸਮੁੱਚੀ ਬੈਟਰੀ ਦਾ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2563,7 +2635,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN ਬਦਲੋ"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"ਸੂਚਨਾਵਾਂ ਦਿਖਾਓ"</string>
     <string name="help_label" msgid="6886837949306318591">"ਮਦਦ ਅਤੇ ਪ੍ਰਤੀਕਰਮ"</string>
-    <string name="support_summary" msgid="8276116616493882830">"ਮਦਦ ਲੇਖ, ਫ਼ੋਨ ਅਤੇ ਚੈਟ ਸਹਿਯੋਗ"</string>
+    <string name="support_summary" msgid="2705726826263742491">"ਮਦਦ ਲੇਖ, ਫ਼ੋਨ ਅਤੇ ਚੈਟ, ਸ਼ੁਰੂ ਕਰਨਾ"</string>
     <string name="user_account_title" msgid="1127193807312271167">"ਸਮੱਗਰੀ ਲਈ ਖਾਤਾ"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ਫ਼ੋਟੋ ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"ਐਕਸਟ੍ਰੀਮ ਖਤਰੇ"</string>
@@ -2653,9 +2725,12 @@
       <item quantity="other">%d ਲੁਕੀਆਂ ਹੋਈਆਂ ਆਈਟਮਾਂ ਵਿਖਾਓ</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ਨੈੱਟਵਰਕ ਅਤੇ ਇੰਟਰਨੈੱਟ"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, ਮੋਬਾਈਲ, ਡੈਟਾ ਉਪਯੋਗ, ਹੌਟਸਪੌਟ"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ਮੋਬਾਈਲ"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ਡੈਟਾ ਉਪਯੋਗ"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ਹੌਟਸਪੌਟ"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ਕਨੈਕਟ ਕੀਤੀਆਂ ਡੀਵਾਈਸਾਂ"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"ਬਲੂਟੁੱਥ, ਕਾਸਟ, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"ਬਲੂਟੁੱਥ, ਕਾਸਟ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ਐਪਾਂ ਅਤੇ ਸੂਚਨਾਵਾਂ"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ਇਜਾਜ਼ਤਾਂ, ਪੂਰਵ-ਨਿਰਧਾਰਤ ਐਪਾਂ"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"ਵਰਤੋਂਕਾਰ ਅਤੇ ਖਾਤੇ"</string>
@@ -2708,6 +2783,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"ਸੰਕੇਤ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ਭੁਗਤਾਨ ਕਰੋ, ਟੈਪ ਕਰੋ, ਭੁਗਤਾਨ"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ਬੈਕਅੱਪ, ਬੈਕ ਅੱਪ"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"ਸੰਕੇਤ, ਕਿਨਾਰਾ, ਸਾਈਡ, ਕਿਰਿਆਸ਼ੀਲ ਕਿਨਾਰਾ, ਘੁੱਟੋ, ਪਕੜ, ਸਹਾਇਤਾ, ਘੁੱਟਣੀ, ਓਕੇ google, google ਸਹਾਇਕ"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"ਸੰਕੇਤ, ਜਗਾਉਣਾ, ਸੂਚਨਾਵਾਂ, ਸਕ੍ਰੀਨ, ਡਿਸਪਲੇ, ਸਕ੍ਰੀਨ ਬੰਦ, ਸਕ੍ਰੀਨ ਚਾਲੂ, ਘੁੱਟੋ, ਕਿਨਾਰਾ, ਅਕਿਰਿਆਸ਼ੀਲ, ਸਲੀਪ, ਪਕੜ"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"ਸੰਕੇਤ, ਖਾਮੋਸ਼ੀ, ਸਨੂਜ਼, ਅਲਾਰਮ, ਇਨਕਮਿੰਗ ਕਾਲ, ਚੁੱਪ, ਡਿਸਪਲੇ, ਲੌਕਸਕ੍ਰੀਨ, ਘੁੱਟੋ, ਪਕੜ, ਕਿਨਾਰਾ, ਬੰਦ"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ਟੈਗ ਸੈਟ ਅਪ ਕਰੋ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ਲਿਖੋ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ਲਿਖਣ ਲਈ ਇੱਕ ਟੈਗ ਟੈਪ ਕਰੋ..."</string>
@@ -2790,7 +2868,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"ਕੰਮ ਸੂਚਨਾਵਾਂ ਬਿਲਕੁਲ ਵੀ ਨਾ ਵਿਖਾਓ"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"ਜਦੋਂ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਲੌਕ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਪ੍ਰੋਫਾਈਲ ਸੂਚਨਾਵਾਂ ਨੂੰ ਕਿਸ ਤਰ੍ਹਾਂ ਵਿਖਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"ਪ੍ਰੋਫਾਈਲ ਸੂਚਨਾਵਾਂ"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"ਸੂਚਨਾਵਾਂ"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"ਸੂਚਨਾਵਾਂ"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"ਐਪ ਸੂਚਨਾਵਾਂ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"ਸੂਚਨਾ ਸ਼੍ਰੇਣੀ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"ਮਹੱਤਤਾ"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"ਐਪ ਨੂੰ ਤੈਅ ਕਰਨ ਦਿਓ"</string>
@@ -2805,6 +2884,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"ਜ਼ਰੂਰੀ"</string>
     <string name="allow_sound" msgid="1820188704793497324">"ਧੁਨੀ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"ਵਰਤਮਾਨ ਸਕ੍ਰੀਨ \'ਤੇ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਧੁਨੀ ਨਾ ਵਜਾਉਣ ਦਿਓ, ਥਰਥਰਾਹਟ ਨਾ ਕਰਨ ਦਿਓ ਜਾਂ ਝਲਕ ਨਾ ਵਿਖਾਉਣ ਦਿਓ।"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"ਘੱਟ ਮਹੱਤਵ"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"ਔਸਤ ਮਹੱਤਵ"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"ਉੱਚ ਮਹੱਤਵ"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"ਜ਼ਰੂਰੀ ਮਹੱਤਵ"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"ਸੂਚਨਾ ਸਹਾਇਕ"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"ਸੂਚਨਾ ਪਹੁੰਚ"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸੂਚਨਾਵਾਂ \'ਤੇ ਪਹੁੰਚ ਨੂੰ ਬਲੌਕ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
@@ -2832,8 +2915,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ ਮੋਡ"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"ਇਸ ਐਪ ਨੂੰ ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ ਵਿੰਡੋ ਬਣਾਉਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ ਜਦੋਂ ਐਪ ਖੁੱਲ੍ਹੀ ਹੋਵੇ ਜਾਂ ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਨੂੰ ਛੱਡ ਦਿਓ (ਉਦਾਹਰਨ ਲਈ, ਵੀਡੀਓ ਦੇਖਣਾ ਜਾਰੀ ਰੱਖਣ ਲਈ)। ਇਹ ਵਿੰਡੋ ਤੁਹਾਡੇ ਦੁਆਰਾ ਵਰਤੀਆਂ ਜਾ ਰਹੀਆਂ ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਹੁੰਦੀ ਹੈ।"</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"ਹਾਂ"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"ਨਹੀਂ"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\" ਤੱਕ ਪਹੁੰਚ"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ਕਿਸੇ ਵੀ ਸਥਾਪਿਤ ਐਪਸ ਨੇ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਐਕਸੈਸ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ ਹੈ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ਐਪਸ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
@@ -2964,11 +3045,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ਇਹ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਇਸ ਵੱਲੋਂ ਵਿਵਸਥਿਤ ਕੀਤੀ ਗਈ ਹੈ:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> ਦੁਆਰਾ ਪ੍ਰਬੰਧਿਤ"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ਪ੍ਰਯੋਗਾਤਮਿਕ)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"ਡੀਵਾਈਸ ਘੁੰਮਾਅ"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"ਸਕ੍ਰੀਨ ਦੀਆਂ ਸਮੱਗਰੀਆਂ ਨੂੰ ਘੁੰਮਾਓ"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"ਪੋਰਟਰੇਟ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਰਹੋ"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ਲੈਂਡਸਕੇਪ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਰਹੋ"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ਮੌਜੂਦਾ ਅਨੁਕੂਲਨ ਵਿੱਚ ਰਹੋ"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"ਸੁਰੱਖਿਅਤ ਸ਼ੁਰੂਆਤ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ਜਾਰੀ ਰੱਖੋ"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ PIN ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ। \n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ PIN ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਈਏ?"</string>
@@ -2976,7 +3052,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਸ਼ੁਰੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ। \n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਲੋੜੀਂਦਾ ਬਣਾਈਏ?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਇਲਾਵਾ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ PIN ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ।\n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਸਮੇਂ PIN ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਈਏ?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਨਾਲ-ਨਾਲ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ।\n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਈਏ?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਨਾਲ-ਨਾਲ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ।\n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਲੋੜੀਂਦਾ ਬਣਾਈਏ?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਇਲਾਵਾ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ।\n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਸਮੇਂ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਈਏ?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"ਹਾਂ"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"ਨਹੀਂ"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"ਕੀ PIN ਲੁੜੀਂਦਾ ਹੈ?"</string>
@@ -3094,6 +3170,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"ਵਰਤੋਂ ਬਾਰੇ ਸੁਚੇਤਨਾਵਾਂ"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"ਡੀਵਾਈਸ ਦੀ ਪੂਰੀ ਵਰਤੋਂ ਦਿਖਾਓ"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"ਐਪ ਵਰਤੋਂ ਦਿਖਾਓ"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"ਉੱਚ ਵਰਤੋਂ"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> ਐਪ ਅਜੀਬ ਢੰਗ ਨਾਲ ਵਰਤਾਅ ਕਰ ਰਹੀ ਹੈ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ਐਪਾਂ ਅਜੀਬ ਢੰਗ ਨਾਲ ਵਰਤਾਅ ਕਰ ਰਹੀਆਂ ਹਨ</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one"> ਐਪ ਬੈਟਰੀ ਦੀ ਖਪਤ ਕਰ ਰਹੀ ਹੈ</item>
+      <item quantity="other">ਐਪਾਂ ਬੈਟਰੀ ਦੀ ਖਪਤ ਕਰ ਰਹੀਆਂ ਹਨ</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ਸੁਯੋਗ ਨਹੀਂ ਬਣਾਇਆ ਗਿਆ"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ਸੁਯੋਗ ਨਹੀਂ ਬਣਾਇਆ ਗਿਆ"</string>
     <string name="high_power_off" msgid="3393904131961263278">"ਬੈਟਰੀ ਦੇ ਉਪਯੋਗ ਨੂੰ ਅਨੁਕੂਲਿਤ ਕਰ ਰਿਹਾ ਹੈ"</string>
@@ -3186,8 +3271,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="COUNT_0">%1$d</xliff:g> ਐਪਾਂ ਨੂੰ ਹੋਰ ਐਪਾਂ ਉੱਤੇ ਪ੍ਰਦਰਸ਼ਿਤ ਹੋਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿੱਤੀ"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"ਅਨੁਮਤੀ ਵਾਲੀਆਂ ਐਪਸ"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"ਹਾਂ"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"ਨਹੀਂ"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"ਇਜਾਜ਼ਤ ਹੈ"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"ਇਜਾਜ਼ਤ ਨਹੀਂ"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"ਅਗਿਆਤ ਸਰੋਤ ਐਪਾਂ ਸਥਾਪਿਤ ਕਰੋ"</string>
     <string name="write_settings" msgid="4797457275727195681">"ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰੋ"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"ਸੰਸ਼ੋਧਿਤ ਸਿਸਟਮ ਸੈਟਿੰਗਸ ਲਿਖੋ"</string>
@@ -3277,6 +3362,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"ਸਕ੍ਰੀਨ ਨੂੰ ਭੂਰੇ ਪੀਲੇ ਰੰਗ ਦੀ ਭਾਹ ਦਿੱਤੀ ਗਈ ਹੈ। ਇਸ ਨਾਲ ਤੁਹਾਨੂੰ ਸੌਣ ਵਿੱਚ ਮਦਦ ਮਿਲ ਸਕਦੀ ਹੈ।"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"ਸੁਝਾਅ"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> ਹੋਰ"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <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="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <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="suggestion_remove" msgid="904627293892092439">"ਹਟਾਓ"</string>
     <string name="color_temperature" msgid="2070126836910615605">"ਠੰਡਾ ਰੰਗ ਤਾਪਮਾਨ"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ਵਧੇਰੇ ਠੰਡੇ ਡਿਸਪਲੇ ਰੰਗਾਂ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
@@ -3295,8 +3389,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> ਡੈਟਾ ਚੇਤਾਵਨੀ"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> ਡੈਟਾ ਚੇਤਾਵਨੀ / <xliff:g id="ID_2">%2$s</xliff:g> ਡੈਟਾ ਸੀਮਾ"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"ਬਿਲਿੰਗ ਚੱਕਰ"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"ਮਹੀਨਾਵਾਰ ਚੱਕਰ ਹਰ ਮਹੀਨੇ ਦੇ <xliff:g id="ID_1">%1$s</xliff:g> ਨੂੰ ਸ਼ੁਰੂ ਹੁੰਦਾ ਹੈ"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"<xliff:g id="ID_1">%1$s</xliff:g> ਤੋਂ ਮਹੀਨਾਵਾਰ ਤੌਰ \'ਤੇ ਸ਼ੁਰੂ"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"ਮਹੀਨਾਵਾਰ <xliff:g id="ID_1">%1$s</xliff:g> ਤਾਰੀਖ ਨੂੰ"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"ਨੈੱਟਵਰਕ ਪਾਬੰਦੀਆਂ"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> ਪ੍ਰਤਿਬੰਧ</item>
@@ -3316,7 +3409,7 @@
       <item quantity="other">ਜਦੋਂ ਡੈਟਾ ਸੇਵਰ ਚਾਲੂ ਹੋਵੇ ਤਾਂ <xliff:g id="COUNT">%1$d</xliff:g> ਐਪਾਂ ਨੂੰ ਅਣ-ਪ੍ਰਤੀਬੰਧਿਤ ਡੈਟੇ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦਿੱਤੀ ਜਾਂਦੀ ਹੈ</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"ਡੈਟਾ ਸੇਵਰ"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"ਅਣ-ਪ੍ਰਤੀਬੰਧਿਤ ਡੈਟਾ ਪਹੁੰਚ"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"ਗੈਰ-ਪਾਬੰਦੀਸ਼ੁਦਾ ਡੈਟਾ"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"ਪਿਛੋਕੜ ਡੈਟਾ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"ਚਾਲੂ"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"ਬੰਦ"</string>
@@ -3380,8 +3473,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"ਲੌਕ ਸਕ੍ਰੀਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਕੰਟਰੋਲ ਕਰੋ"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"ਸੂਚਨਾ ਸਮੱਗਰੀ ਨੂੰ ਵਿਖਾਓ ਜਾਂ ਲੁਕਾਓ"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"ਸਭ"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"ਸਹਿਯੋਗ"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"ਸਹਾਇਤਾ ਅਤੇ ਨੁਕਤੇ"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ਸਭ ਤੋਂ ਘੱਟ ਚੁੜਾਈ"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ਕਿਸੇ ਵੀ ਸਥਾਪਤ ਐਪ ਨੇ ਪ੍ਰੀਮੀਅਮ SMS ਪਹੁੰਚ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ਪ੍ਰੀਮੀਅਮ SMS ਦਾ ਤੁਹਾਡੇ ਤੋਂ ਖ਼ਰਚਾ ਲਿਆ ਜਾ ਸਕਦਾ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਬਿੱਲਾਂ ਵਿੱਚ ਵਾਧਾ ਹੋ ਜਾਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਲਈ ਇਜਾਜ਼ਤ ਨੂੰ ਯੋਗ ਬਣਾਉਂਦੇ ਹੋ, ਤਾਂ ਤੁਸੀਂ ਉਸ ਐਪ ਦੀ ਵਰਤੋਂ ਨਾਲ ਪ੍ਰੀਮੀਅਮ SMS ਭੇਜਣ ਦੇ ਯੋਗ ਹੋ ਜਾਵੋਗੇ।"</string>
@@ -3446,28 +3538,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ਸਵੈਚਾਲਿਤ"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ਦਸਤੀ"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"ਹੁਣੇ ਜਗ੍ਹਾ ਖਾਲੀ ਕਰੋ"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"ਸੰਕੇਤ"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"ਸੰਕੇਤ ਸ਼ਾਰਟਕੱਟ"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਲਈ ਤੁਰੰਤ ਸੰਕੇਤ"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਲਈ ਤੁਰੰਤ ਸੰਕੇਤ"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਲਈ ਤੁਰੰਤ ਸੰਕੇਤ"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"ਕੈਮਰੇ \'ਤੇ ਜਾਓ"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"ਕੈਮਰੇ ਨੂੰ ਤੁਰੰਤ ਖੋਲ੍ਹਣ ਲਈ, ਪਾਵਰ ਬਟਨ ਨੂੰ ਦੋ ਵਾਰ ਦਬਾਓ। ਇਹ ਕਿਸੇ ਵੀ ਸਕ੍ਰੀਨ ਤੋਂ ਕੰਮ ਕਰਦਾ ਹੈ।"</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"ਤੁਰੰਤ ਕੈਮਰਾ ਖੋਲ੍ਹੋ"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"ਕੈਮਰਾ ਖੋਲ੍ਹਣ ਲਈ ਪਾਵਰ ਬਟਨ ਨੂੰ ਦੋ ਵਾਰ ਦਬਾਓ"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ਕੈਮਰਾ ਫਲਿੱਪ ਕਰੋ"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"ਸੈਲਫ਼ੀਆਂ ਵਧੇਰੇ ਤੇਜ਼ੀ ਨਾਲ ਲਓ"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"ਸੈਲਫ਼ੀ ਮੋਡ ਲਈ ਫ਼ੋਨ ਨੂੰ ਡਬਲ-ਟਵਿਸਟ ਕਰੋ"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"ਸੈਲਫ਼ੀ ਮੋਡ ਲਈ ਟੈਬਲੈੱਟ ਨੂੰ ਡਬਲ-ਟਵਿਸਟ ਕਰੋ"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"ਸੈਲਫ਼ੀ ਮੋਡ ਲਈ ਡੀਵਾਈਸ ਨੂੰ ਡਬਲ-ਟਵਿਸਟ ਕਰੋ"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ ਫ਼ੋਨ \'ਤੇ ਡਬਲ-ਟੈਪ ਕਰੋ"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ ਟੈਬਲੈੱਟ \'ਤੇ ਡਬਲ-ਟੈਪ ਕਰੋ"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ ਡੀਵਾਈਸ \'ਤੇ ਡਬਲ-ਟੈਪ ਕਰੋ"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"ਤੇਜ਼ੀ ਨਾਲ ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਵੇਖਣ ਲਈ, ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਡਬਲ-ਟੈਪ ਕਰੋ।"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"ਸਮਾਂ, ਸੂਚਨਾ ਪ੍ਰਤੀਕਾਂ, ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਡਬਲ-ਟੈਪ ਕਰੋ।"</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"ਸਕ੍ਰੀਨ ਬੰਦ ਹੋਣ \'ਤੇ ਸੂਚਨਾਵਾਂ ਦੇਖੋ"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ ਫ਼ੋਨ ਨੂੰ ਚੁੱਕੋ"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ ਟੈਬਲੈੱਟ ਨੂੰ ਚੁੱਕੋ"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ ਡੀਵਾਈਸ ਨੂੰ ਚੁੱਕੋ"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"ਤੇਜ਼ੀ ਨਾਲ ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਵੇਖਣ ਲਈ, ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਚੁੱਕੋ।"</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"ਤੇਜ਼ੀ ਨਾਲ ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਵੇਖਣ ਲਈ, ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਚੁੱਕੋ।"</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"ਤੇਜ਼ੀ ਨਾਲ ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਵੇਖਣ ਲਈ, ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਚੁੱਕੋ।"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"ਸਮਾਂ, ਸੂਚਨਾ ਪ੍ਰਤੀਕਾਂ, ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਚੁੱਕੋ।"</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"ਸਮਾਂ, ਸੂਚਨਾ ਪ੍ਰਤੀਕਾਂ, ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਚੁੱਕੋ।"</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"ਸਮਾਂ, ਸੂਚਨਾ ਪ੍ਰਤੀਕਾਂ, ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਚੁੱਕੋ।"</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"ਸਕ੍ਰੀਨ ਬੰਦ ਹੋਣ \'ਤੇ ਸੂਚਨਾਵਾਂ ਦੇਖੋ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"ਸੂਚਨਾਵਾਂ ਲਈ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ, ਆਪਣੇ ਫ਼ੋਨ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਹੇਠਾਂ ਨੂੰ ਸਵਾਈਪ ਕਰੋ।"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ, ਆਪਣੇ ਟੈਬਲੈੱਟ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਹੇਠਾਂ ਨੂੰ ਸਵਾਈਪ ਕਰੋ।"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ, ਆਪਣੀ ਡੀਵਾਈਸ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਹੇਠਾਂ ਨੂੰ ਸਵਾਈਪ ਕਰੋ।"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"ਸੂਚਨਾਵਾਂ ਤੇਜ਼ੀ ਨਾਲ ਦੇਖੋ"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਥੱਲੇ ਨੂੰ ਸਵਾਈਪ ਕਰੋ"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"ਕੈਮਰਾ ਖੋਲ੍ਹਣ ਲਈ ਚੁੱਕੋ"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"ਕੈਮਰੇ ਨੂੰ ਸਵੈਚਲਿਤ ਰੂਪ ਵਿੱਚ ਖੋਲ੍ਹਣ ਲਈ, ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਫ਼ੋਟੋ ਖਿੱਚਣ ਦੀ ਸਥਿਤੀ (ਲੈਂਡਸਕੇਪ ਜਾਂ ਪੋਰਟਰੇਟ) ਵਿੱਚ ਚੁੱਕੋ। ਇਹ ਓਦੋਂ ਕੰਮ ਕਰਦਾ ਹੈ ਜਦ ਤੁਹਾਡਾ ਫ਼ੋਨ ਸਲੀਪ ਮੋਡ ਵਿੱਚ ਹੋਵੇ ਜਾਂ ਲੌਕ ਹੋਵੇ।"</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"ਫ਼ੋਨ ਦੀ ਸਕ੍ਰੀਨ ਬੰਦ ਹੋਣ ਜਾਂ ਫ਼ੋਨ ਲੌਕ ਹੋਣ \'ਤੇ ਵੀ ਫ਼ੋਟੋ ਖਿੱਚੋ"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"\"ਸਹਾਇਤਾ\" ਸੰਕੇਤ"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"ਸੰਵੇਦਨਸ਼ੀਲਤਾ"</string>
@@ -3571,6 +3676,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"ਕੀ ਤੁਸੀਂ ਇਸ \'ਤਤਕਾਲ ਐਪ\' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"ਗੇਮਾਂ"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ਔਡੀਓ ਫ਼ਾਈਲਾਂ"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"ਵਰਤੀ ਗਈ ਜਗ੍ਹਾ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ਵਰਤੋਂਕਾਰ <xliff:g id="USER">%s</xliff:g> ਲਈ ਅਣਸਥਾਪਤ ਕੀਤੀ)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ਵਰਤੋਂਕਾਰ <xliff:g id="USER">%s</xliff:g> ਲਈ ਅਯੋਗ ਬਣਾਈ)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"ਆਟੋਫਿਲ ਸੇਵਾ"</string>
@@ -3584,5 +3690,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"ਤਤਕਾਲ ਐਪ"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"ਸਟੋਰੇਜ ਮੈਨੇਜਰ ਨੂੰ ਬੰਦ ਕਰੀਏ?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"ਮੂਵੀ ਅਤੇ ਟੀਵੀ ਐਪਾਂ"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"ਵਰਤੀ ਗਈ ਜਗ੍ਹਾ"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"ਕੈਰੀਅਰ ਵਿਵਸਥਾਕਰਨ ਜਾਣਕਾਰੀ"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ਕੈਰੀਅਰ ਵਿਵਸਥਾਕਰਨ ਨੂੰ ਤੂਲ ਦਿਓ"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"ਕੀ ਕੁਝ ਨਵਾਂ ਅਤੇ ਦਿਲਚਸਪ ਹੈ?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ਪ੍ਰਮੁੱਖ 5 ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਦੇਖੋ"</string>
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index db6284c..ad48481 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Dobra"</item>
     <item msgid="8986346415847956850">"Doskonała"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Zawsze"</item>
-    <item msgid="844721238536786870">"Tylko, gdy podłączony"</item>
-    <item msgid="1986753720941888596">"Nigdy"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Zawsze"</item>
-    <item msgid="7433294150916905997">"Tylko, gdy podłączony"</item>
-    <item msgid="1390404486722375028">"Nigdy"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Ostatnie 30 dni"</item>
     <item msgid="6600989128423965319">"Ustaw cykl danych..."</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 2519282..dfea74f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -32,6 +32,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Jesteś teraz programistą!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"W porządku, już jesteś programistą."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Najpierw włącz opcje dla programistów."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Sieci zwykłe i bezprzewodowe"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Połączenia"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Urządzenie"</string>
@@ -43,6 +44,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Obsługa głosu przez LTE włączona"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Możliwość prowadzenia rozmów wideo"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Możliwość prowadzenia rozmów przez Wi-Fi"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Obsługa EAB/obecności włączona"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Moc sygnału komórkowego"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Wyświetl książkę adresową z karty SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Wyświetl ustalone numery"</string>
@@ -108,10 +110,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Wyszukaj urządzenia"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Zmień nazwę tego urządzenia"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Zmień nazwę"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Rozłączyć?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Spowoduje to zakończenie połączenia z urządzeniem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Rozłączyć urządzenie?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Twój telefon rozłączy się z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Twój tablet rozłączy się z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Twoje urządzenie rozłączy się z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Rozłącz"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Nie masz uprawnień, by zmienić ustawienia Bluetootha."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Sparuj nowe urządzenie"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> jest widoczne dla urządzeń w pobliżu, gdy ustawienia Bluetooth są otwarte."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Adres Bluetooth telefonu: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Adres Bluetooth tabletu: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Adres Bluetooth urządzenia: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Odłączyć urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmisja"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Wyłączyć profil?"</string>
@@ -123,7 +132,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Żądanie parowania Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Żądanie parowania"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Dotknij, by sparować z: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Pokaż odebrane pliki"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Odebrane pliki"</string>
     <string name="device_picker" msgid="4978696506172252813">"Wybierz urządzenie Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> chce włączyć Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> chce wyłączyć Bluetooth"</string>
@@ -159,6 +168,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s chce uzyskać dostęp do Twoich wiadomości. Zezwolić na dostęp?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Prośba o dostęp do karty SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> chce uzyskać dostęp do Twojej karty SIM. Jeśli na to zezwolisz, na czas tego połączenia na urządzeniu zostanie wyłączone połączenie transmisji danych. Przyznaj dostęp do urządzenia <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Widoczne dla innych urządzeń jako „<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Twoje urządzenia"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sparuj nowe urządzenie"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data i czas"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Wybierz strefę czasową"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -333,7 +345,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Konta"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokalizacja"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konta"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Lokalizacja i blokady"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Lokalizacja i blokady"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Szyfrowanie i dane logowania"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon zaszyfrowany"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Urządzenie zaszyfrowane"</string>
@@ -360,40 +372,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Odblokuj odciskiem palca"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Korzystanie z odcisku palca"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Dotknij czytnika linii papilarnych, by odblokować telefon, autoryzować zakupy lub zalogować się w aplikacjach. Z rozwagą dodawaj odciski palców innych osób – każda dodana osoba będzie mogła wykonywać wszystkie powyższe działania.\n\nUwaga: odcisk palca może być mniej bezpieczny niż trudny wzór czy kod PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Autoryzuj zakupy i loguj się do aplikacji, dotykając czujnika linii papilarnych. Z rozwagą dodawaj odciski palców innych osób – każda dodana osoba będzie mogła wykonywać wszystkie powyższe działania.\n\nUwaga: nie możesz odblokowywać tego urządzenia odciskiem palca. Więcej informacji uzyskasz u administratora swojej organizacji."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Dotknij czytnika linii papilarnych, by odblokować telefon, autoryzować zakupy lub zalogować się w aplikacjach. Ostrożnie dodawaj odciski palców innych osób – każda dodana osoba będzie mogła wykonywać wszystkie powyższe działania.\n\nUwaga: odcisk palca może być mniej bezpieczny niż trudny wzór czy kod PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Anuluj"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Dalej"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Pomiń"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Dodaj odcisk palca"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funkcje ochrony urządzenia nie zostaną włączone. Nie będzie można zablokować innym osobom możliwości używania tego tabletu w przypadku jego zgubienia, kradzieży lub zresetowania."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funkcje ochrony urządzenia nie zostaną włączone. Nie będzie można zablokować innym osobom możliwości używania tego urządzenia w przypadku jego zgubienia, kradzieży lub zresetowania."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funkcje ochrony urządzenia nie zostaną włączone. Nie będzie można zablokować innym osobom możliwości używania tego telefonu w przypadku jego zgubienia, kradzieży lub zresetowania."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funkcje ochrony urządzenia nie zostaną włączone. Nie będzie można zablokować innym osobom możliwości używania tego tabletu w przypadku jego zgubienia lub kradzieży."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funkcje ochrony urządzenia nie zostaną włączone. Nie będzie można zablokować innym osobom możliwości używania tego urządzenia w przypadku jego zgubienia lub kradzieży."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funkcje ochrony urządzenia nie zostaną włączone. Nie będzie można zablokować innym osobom możliwości używania tego telefonu w przypadku jego zgubienia lub kradzieży."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Dalej"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Zabezpieczenia urządzenia nie zostaną włączone. Nie będzie można uniemożliwić innym osobom korzystania z tego tabletu, gdy zostanie zgubiony, skradziony lub zresetowany."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Zabezpieczenia urządzenia nie zostaną włączone. Nie będzie można uniemożliwić innym osobom korzystania z urządzenia, gdy zostanie zgubione, skradzione lub zresetowane."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Zabezpieczenia urządzenia nie zostaną włączone. Nie będzie można uniemożliwić innym osobom korzystania z tego telefonu, gdy zostanie zgubiony, skradziony lub zresetowany."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Zabezpieczenia urządzenia nie zostaną włączone. Nie będzie można uniemożliwić innym osobom korzystania z tego tabletu, gdy zostanie zgubiony lub skradziony."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Zabezpieczenia urządzenia nie zostaną włączone. Nie będzie można uniemożliwić innym osobom korzystania z tego urządzenia, gdy zostanie zgubione lub skradzione."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Zabezpieczenia urządzenia nie zostaną włączone. Nie będzie można uniemożliwić innym osobom korzystania z tego telefonu, gdy zostanie zgubiony lub skradziony."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Pomiń mimo to"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Wstecz"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Znajdź czytnik"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Znajdź czytnik linii papilarnych z tyłu telefonu."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Dotknij czytnika"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Znajduje się z tyłu telefonu. Użyj palca wskazującego."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustracja pokazująca urządzenie i umiejscowienie czytnika linii papilarnych"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nazwa"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Usuń"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Zaczynamy"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Dotknij czytnika"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Przyłóż palec do czytnika. Podnieś go, gdy poczujesz wibracje."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Nie przerywaj"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Obróć lekko palcem, by odcisk był bardziej dokładny."</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Odcisk palca dodany"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Za każdym razem, gdy zobaczysz tę ikonę, możesz użyć odcisku palca, aby potwierdzić swoją tożsamość lub autoryzować zakup."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Dotknij czytnika linii papilarnych, by wybudzić i odblokować urządzenie."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Gdy pojawi się ta ikona, możesz w ten sposób autoryzować zakupy i logować się do aplikacji."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Podnieś i przyłóż ponownie"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Unoś palec, by odcisk był dokładniejszy"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Odcisk palca dodany"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Gdy zobaczysz tę ikonę, możesz użyć odcisku palca, aby się zidentyfikować lub zatwierdzić zakup."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Pominąć konfigurację odcisku palca?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Chcesz odblokowywać telefon m.in. odciskiem palca. Jeśli nie skonfigurujesz tej funkcji teraz, musisz to zrobić później. Zajmie Ci to około minuty."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Skonfiguruj blokadę ekranu"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Gotowe"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, to nie jest czytnik"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Użyj czytnika linii papilarnych w urządzeniu."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Dotknij czytnika z tyłu telefonu. Użyj palca wskazującego."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Nie ukończono rejestracji"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Osiągnięto limit czasu rejestracji odcisku palca. Spróbuj ponownie."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Nie udało się zarejestrować odcisku palca. Spróbuj ponownie lub przyłóż inny palec."</string>
@@ -455,6 +465,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego urządzenia bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego telefonu bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Wybierz dodatkową metodę blokowania ekranu"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opcje blokady ekranu"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opcje blokady ekranu"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blokada ekranu"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / bezpośrednio po uśpieniu"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> po uśpieniu"</string>
@@ -525,13 +537,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Zmień wzór odblokowania"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Zmień kod PIN odblokowania"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Zmień hasło odblokowania"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Spróbuj ponownie. Próba <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> z <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Ostatnia próba"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Jeśli podasz teraz nieprawidłowy wzór do profilu, Twój profil do pracy i powiązane dane zostaną usunięte z tego urządzenia."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Jeśli podasz teraz nieprawidłowy kod PIN do profilu, Twój profil do pracy i powiązane dane zostaną usunięte z tego urządzenia."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Jeśli podasz teraz nieprawidłowe hasło do profilu, Twój profil do pracy i powiązane dane zostaną usunięte z tego urządzenia."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Zbyt wiele nieudanych prób. Twój profil do pracy i powiązane dane zostaną usunięte z tego urządzenia."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Zamknij"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Spróbuj ponownie. Próba <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> z <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Dane zostaną usunięte"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Jeśli następnym razem podasz nieprawidłowy wzór, dane na urządzeniu zostaną usunięte"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Jeśli następnym razem podasz nieprawidłowy kod PIN, dane na urządzeniu zostaną usunięte"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Jeśli następnym razem podasz nieprawidłowe hasło, dane na urządzeniu zostaną usunięte"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Jeśli następnym razem podasz nieprawidłowy wzór, użytkownik zostanie usunięty"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Jeśli następnym razem podasz nieprawidłowy kod PIN, użytkownik zostanie usunięty"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Jeśli następnym razem podasz nieprawidłowe hasło, użytkownik zostanie usunięty"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Jeśli następnym razem podasz nieprawidłowy wzór, profil do pracy oraz powiązane z nim dane zostaną usunięte"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Jeśli następnym razem podasz nieprawidłowy kod PIN, profil do pracy oraz powiązane z nim dane zostaną usunięte"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Jeśli następnym razem podasz nieprawidłowe hasło, profil do pracy oraz powiązane z nim dane zostaną usunięte"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Zbyt wiele nieudanych prób. Dane na urządzeniu zostaną usunięte."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Zbyt wiele nieudanych prób. Użytkownik zostanie usunięty."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Zbyt wiele nieudanych prób. Profil do pracy i powiązane z nim dane zostaną usunięte."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Zamknij"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Minimalna liczba znaków to <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Minimalna liczba cyfr w kodzie PIN to <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Dalej"</string>
@@ -648,6 +668,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth – zaawansowane"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Po włączeniu Bluetootha urządzenie może komunikować się z innymi urządzeniami Bluetooth w pobliżu."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Aplikacje i usługi systemowe mogą nadal wykrywać urządzenia Bluetooth, by zwiększyć dokładność lokalizacji. Możesz to zmienić w <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ustawieniach skanowania<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Nie udało się nawiązać połączenia. Spróbuj ponownie."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Szczegóły urządzenia"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Adres Bluetooth urządzenia: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Zapomnieć urządzenie?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Twój telefon nie będzie już sparowany z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Twój tablet nie będzie już sparowany z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Twoje urządzenie nie będzie już sparowane z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Zapomnij urządzenie"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Połącz z siecią…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączone od funkcji audio multimediów."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączone od zestawu głośnomówiącego."</string>
@@ -800,6 +828,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Nie podawaj"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Nie sprawdzaj poprawności"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nie określono certyfikatu. Twoje połączenie nie będzie prywatne."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Nazwa sieci jest zbyt długa."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Musisz określić domenę."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Protokół WPS jest dostępny"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (protokół WPS dostępny)"</string>
@@ -833,7 +862,6 @@
       <item quantity="one">1 sieć</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Zaawansowane"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Skonfiguruj Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adres MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adres IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podsieci"</string>
@@ -870,9 +898,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Zapomnieć o tej grupie?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Przenośny hotspot Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Hotspot Wi‑Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Udostępniaj połączenie komórkowe przez Wi‑Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Nie udostępniam połączenia internetowego tabletu przez hotspot"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Nie udostępniam połączenia internetowego telefonu przez hotspot"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Nie udostępniam internetu ani treści innym urządzeniom"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Udostępniam połączenie internetowe tabletu przez hotspot"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Udostępniam połączenie internetowe telefonu przez hotspot"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikacja udostępnia treści. Aby udostępnić połączenie internetowe, wyłącz i ponownie włącz hostpot"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nazwa Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Włączam: <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Inne urządzenia mogą łączyć się z: <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Hasło Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pasmo punktu dostępu"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Użyj hotspotu do utworzenia sieci Wi-Fi dla innych urządzeń. Hotspot zapewnia dostęp do internetu, korzystając z połączenia mobilnej transmisji danych. Mogą zostać naliczone dodatkowe opłaty za transfer danych."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacje mogą utworzyć hotspot, by udostępniać treści urządzeniom w pobliżu."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Włączanie punktu dostępu…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Wyłączam punkt dostępu…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"Sieć <xliff:g id="NETWORK_SSID">%1$s</xliff:g> jest aktywna"</string>
@@ -919,6 +955,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Gdy połączenia przez Wi-Fi są włączone, telefon może przekazywać połączenia przez sieci Wi-Fi lub sieć operatora (w zależności od ustawień i tego, który sygnał jest w danej chwili silniejszy). Przed włączeniem tej funkcji sprawdź koszt jej obsługi przez operatora."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Zaktualizuj adres alarmowy"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Adres, który służby ratunkowe będą traktować jako Twoją lokalizację, jeśli zadzwonisz pod numer alarmowy 112 przez Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Wyświetlacz"</string>
@@ -976,6 +1013,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Brak wyników"</string>
     <string name="display_settings" msgid="7965901687241669598">"Wyświetlacz"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Autoobracanie ekranu"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Żywe kolory"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Automatycznie przełącz orientację przy obracaniu tabletu"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Automatycznie przełącz orientację przy obracaniu telefonu"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Automatycznie przełącz orientację przy obracaniu tabletu"</string>
@@ -1003,23 +1041,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Dostosowuj poziom jasności do oświetlenia. Gdy ta funkcja jest włączona, nadal możesz tymczasowo korygować jasność."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Podświetlenie nocne"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Gdy Podświetlenie nocne jest włączone, kolory na ekranie mają pomarańczowy odcień. To mniej męczy oczy podczas patrzenia na ekran czy czytania przy słabym oświetleniu i ułatwia zaśnięcie."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Harmonogram"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Stan"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Włącz automatycznie"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nigdy"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Własny harmonogram"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Od zachodu do wschodu słońca"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Harmonogram"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Nigdy"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Włącza się w wybranym czasie"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Działa od zachodu do wschodu słońca"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Czas rozpoczęcia"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Czas zakończenia"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Stan"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensywność"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Wyłączony <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nigdy nie włączy się automatycznie."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Włączy się automatycznie o <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Włączy się automatycznie o zachodzie słońca."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Włączony. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nigdy nie wyłączy się automatycznie."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Wyłączy się automatycznie o <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Wyłączy się automatycznie o wschodzie słońca."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Wył. / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Nigdy nie włączy się automatycznie"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Włączy się automatycznie o <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Włączy się automatycznie o zachodzie słońca"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Wł. / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Nigdy nie wyłączy się automatycznie"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Wyłączy się automatycznie o <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Wyłączy się automatycznie o wschodzie słońca"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Uśpienie"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Wyłączenie ekranu"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
@@ -1043,8 +1080,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Ustawienia"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatyczna"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Podnieś, by wybudzić"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Ekran dostosowany do otoczenia"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ekran dostosowany do otoczenia"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Zawsze włączony"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nowe powiadomienia"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kiedy wyświetlać"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nowe powiadomienia"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Włącz ekran po otrzymaniu powiadomień"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Zawsze włączony"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Pokazuj godzinę, ikony powiadomień i inne informacje"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Rozmiar czcionki"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Powiększ lub pomniejsz tekst"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ustawienia blokady karty SIM"</string>
@@ -1298,6 +1341,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Nazwa APN nie może być pusta."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Pole MCC musi zawierać 3 cyfry."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Pole MNC musi zawierać 2 lub 3 cyfry."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operator nie zezwala na dodawanie nazw APN typu %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Przywracanie domyślnych ustawień APN"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Resetuj ustawienia"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Przywrócono domyślne ustawienia APN."</string>
@@ -1329,6 +1373,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Wymaż kartę SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Usuń z wewnętrznego nośnika USB wszystkie dane, takie jak pliki muzyczne i zdjęcia"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Usuń z karty SD wszystkie dane, takie jak pliki muzyczne i zdjęcia"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Wykasuj karty eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Wykasuj wszystkie karty eSIM z telefonu. To nie spowoduje anulowania abonamentu w sieci komórkowej."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Wykasuj wszystkie karty eSIM z tabletu. To nie spowoduje anulowania abonamentu w sieci komórkowej."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Resetuj tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetuj telefon"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Wymazać wszystkie Twoje informacje osobiste i pobrane aplikacje? Tego działania nie można cofnąć."</string>
@@ -1351,26 +1398,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Nie można korzystać z tetheringu ani przenośnych hotspotów, gdy Oszczędzanie danych jest włączone"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Tethering przez USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Podłączono USB – zaznacz, aby powiązać"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Powiązano"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Nie można powiązać, gdy używany jest nośnik USB."</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Nie podłączono USB"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Podłącz, by uruchomić"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Błąd tetheringu przez USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Udostępnij połączenie internetowe telefonu przez USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Udostępnij połączenie internetowe tabletu przez USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Tethering przez Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Udostępniam połączenie internetowe tabletu przez Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Udostępniam połączenie internetowe telefonu przez Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Udostępniam poł. internetowe tabletu jednemu urządzeniu (Bluetooth)"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Udostępniam poł. internetowe telefonu jednemu urządzeniu (Bluetooth)"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Udostępniam poł. internetowe tabletu <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> urządzeniom (Bluetooth)"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Udostępniam poł. internetowe telefonu <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> urządzeniom (Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Udostępniaj połączenie internetowe tabletu przez Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Udostępniaj połączenie internetowe telefonu przez Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Udostępniam połączenie internetowe urządzenia <xliff:g id="DEVICE_NAME">%1$d</xliff:g> przez Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Nie udostępniam połączenia internetowego na tablecie przez Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Nie udostępniam połączenia internetowego w telefonie przez Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Brak powiązania"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Nie można powiązać więcej niż <xliff:g id="MAXCONNECTION">%1$d</xliff:g> urządzeń."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Powiązanie z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie anulowane."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Funkcje hotspotu i tetheringu pozwalają zapewnić połączenie internetowe innym urządzeniom z wykorzystaniem komórkowej transmisji danych."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Funkcje hotspotu i tetheringu pozwalają zapewnić połączenie internetowe innym urządzeniom z wykorzystaniem komórkowej transmisji danych. Aplikacje mogą też utworzyć hotspot, by udostępniać treści urządzeniom w pobliżu."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoc"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Sieć komórkowa"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Taryfa komórkowa"</string>
@@ -1403,7 +1439,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Tryb lokalizacji"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Ustalaj lokalizację przez GPS, Wi‑Fi, Bluetooth lub sieci komórkowe"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Ustalaj lokalizację przez Wi‑Fi, Bluetooth lub sieci komórkowe"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Określaj lokalizację przez GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Określaj lokalizację, używając GPS-u i czujników urządzenia"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skanowanie"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Skanowanie Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Popraw dokładność lokalizacji, zezwalając aplikacjom i usługom systemowym na ciągłe wykrywanie sieci Wi-Fi."</string>
@@ -1448,8 +1484,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Brak połączenia transmisji danych. Aby wyświetlić te informacje teraz, przejdź do strony %s na dowolnym komputerze połączonym z internetem."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Wczytuję..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Wybierz hasło"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Aby korzystać z odcisku palca, ustaw hasło"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Wybierz wzór"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Aby korzystać z odcisku palca, ustaw wzór"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Wybierz kod PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Aby korzystać z odcisku palca, ustaw kod PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potwierdź hasło"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potwierdź wzór"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potwierdź PIN"</string>
@@ -1518,6 +1557,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Ustawienia aplikacji"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nieznane źródła"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Zezwalaj na wszystkie źródła"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Niedawno otwierane aplikacje"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Wyświetl wszystkie aplikacje (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> temu"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tablet i dane osobiste są bardziej narażone na atak nieznanych aplikacji. Instalując aplikacje z tego źródła, przyjmujesz odpowiedzialność za wszelkie uszkodzenia telefonu bądź utratę danych, które mogą być spowodowane używaniem tych aplikacji."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefon i dane osobiste są bardziej narażone na atak nieznanych aplikacji. Instalując aplikacje z tego źródła, przyjmujesz odpowiedzialność za wszelkie uszkodzenia telefonu bądź utratę danych, które mogą być spowodowane używaniem tych aplikacji."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Ustawienia zaawansowane"</string>
@@ -1688,6 +1730,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Czy zatrzymać usługę systemową?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Jeśli zatrzymasz tę usługę, niektóre funkcje tabletu mogą przestać poprawnie działać do chwili jego wyłączenia i ponownego włączenia."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Jeśli zatrzymasz tę usługę, niektóre funkcje telefonu mogą przestać poprawnie działać do chwili jego wyłączenia i ponownego włączenia."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Języki, metody wprowadzania i gesty"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Języki i metody wprowadzania"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Języki i metody wprowadzania"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Wspomaganie wprowadzania"</string>
@@ -1914,6 +1960,12 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> usługi drukowania włączonej</item>
       <item quantity="one">1 usługa drukowania włączona</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> zadania drukowania</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> zadań drukowania</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> zadania drukowania</item>
+      <item quantity="one">1 zadanie drukowania</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Usługi drukowania"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Brak zainstalowanych usług"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nie znaleziono drukarek"</string>
@@ -1980,6 +2032,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Szczegóły użycia"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Dostosuj wykorzystanie energii"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Dołączone pakiety"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplikacje zużywające baterię"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Nie pozwala uśpić urządzenia"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Wybudza urządzenie w tle"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Często prosi o informację o lokalizacji"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Liczba aplikacji działających nieprawidłowo: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Zatrzymać aplikację?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Twój telefon nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP">%1$s</xliff:g> nie pozwala na jego uśpienie.\n\nAby spróbować rozwiązać ten problem, możesz wymusić zatrzymanie aplikacji.\n\nJeśli to nie pomoże, wydłużenie czasu działania na baterii może wymagać odinstalowania aplikacji."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Twój tablet nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP">%1$s</xliff:g> nie pozwala na jego uśpienie.\n\nAby spróbować rozwiązać ten problem, możesz wymusić zatrzymanie aplikacji.\n\nJeśli to nie pomoże, wydłużenie czasu działania na baterii może wymagać odinstalowania aplikacji."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Twoje urządzenie nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP">%1$s</xliff:g> nie pozwala na jego uśpienie.\n\nAby spróbować rozwiązać ten problem, możesz wymusić zatrzymanie aplikacji.\n\nJeśli to nie pomoże, wydłużenie czasu działania na baterii może wymagać odinstalowania aplikacji."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Zatrzymaj aplikację"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Wyłączyć możliwość działania w tle?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Twój telefon nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP">%1$s</xliff:g> nieustannie go wybudza.\n\nAby rozwiązać ten problem, telefon może uniemożliwić tej aplikacji działanie w tle."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Twój tablet nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP">%1$s</xliff:g> nieustannie go wybudza.\n\nAby rozwiązać ten problem, tablet może uniemożliwić tej aplikacji działanie w tle."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Twoje urządzenie nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP">%1$s</xliff:g> nieustannie je wybudza.\n\nAby rozwiązać ten problem, urządzenie może uniemożliwić tej aplikacji działanie w tle."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Wyłącz"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Wyłączyć lokalizację?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Twój telefon nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP">%1$s</xliff:g> prosi o lokalizację, nawet gdy nie korzystasz z tej aplikacji.\n\nAby rozwiązać ten problem, możesz wyłączyć tej aplikacji dostęp do lokalizacji."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Twój tablet nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP">%1$s</xliff:g> prosi o lokalizację, nawet gdy nie korzystasz z tej aplikacji.\n\nAby rozwiązać ten problem, możesz wyłączyć tej aplikacji dostęp do lokalizacji."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Twoje urządzenie nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP">%1$s</xliff:g> prosi o lokalizację, nawet gdy nie korzystasz z tej aplikacji.\n\nAby rozwiązać ten problem, możesz wyłączyć tej aplikacji dostęp do lokalizacji."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Wyłącz"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ekran"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Latarka"</string>
     <string name="power_camera" msgid="4976286950934622605">"Aparat"</string>
@@ -1994,7 +2066,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Aplikacje"</string>
     <string name="power_service" msgid="1599661212370831780">"Usługi"</string>
     <string name="power_system" msgid="8290455327965307383">"System"</string>
-    <string name="power_user" msgid="1889728099253018005">"Użytkownik"</string>
+    <string name="power_user" msgid="3706143225319881667">"Inni użytkownicy"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU łącznie"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU (pierwszy plan)"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Utrzymanie aktywności"</string>
@@ -2046,6 +2118,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Zużycie energii obliczone z nadmiarem"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Korzystanie przez <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktywna przez <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Wykorzystanie przez ekran (<xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> zużyte przez: <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> całkowitego zużycia baterii"</string>
@@ -2613,7 +2686,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Zmień PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Pokazuj powiadomienia"</string>
     <string name="help_label" msgid="6886837949306318591">"Pomoc i opinie"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Artykuły pomocy, pomoc przez telefon i czat"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Artykuły pomocy, pomoc przez telefon i czat, pierwsze kroki"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Konto na materiały"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Identyfikator zdjęcia"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Krytyczne zagrożenia"</string>
@@ -2705,9 +2778,12 @@
       <item quantity="one">Pokaż %d ukryty element</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Sieć i internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, sieć komórkowa, transmisja danych, hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"sieć komórkowa"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"transmisja danych"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Połączone urządzenia"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, przesyłanie, komunikacja NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, przesyłanie"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacje i powiadomienia"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Uprawnienia, aplikacje domyślne"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Użytkownicy i konta"</string>
@@ -2760,6 +2836,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gest"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"płacenie, klikanie, płatności"</string>
     <string name="keywords_backup" msgid="470070289135403022">"kopia zapasowa, tworzenie kopii zapasowej"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gest, krawędź, bok, aktywna krawędź, ściśnięcie, uchwyt, pomoc, asystent, ścisk, ściskanie, ok google, asystent google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gest, wybudzenie, powiadomienia, ekran, wyświetlacz, wyłączony ekran, włączony ekran, ściśnięcie, krawędź, uśpienie, sen, uchwyt"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gest, wyciszenie, drzemka, alarm, połączenie przychodzące, cicho, wyświetlacz, ekran blokady, ściśnięcie, uchwyt, krawędź, zatrzymanie"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Skonfiguruj tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapisz"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Kliknij tag, by zapisać..."</string>
@@ -2844,7 +2923,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Nie pokazuj żadnych powiadomień związanych z pracą"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Jak mają pokazywać się powiadomienia z profilu, gdy urządzenie jest zablokowane?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Powiadomienia z profilu"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Powiadomienia"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Powiadomienia"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Powiadomienia aplikacji"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategoria powiadomienia"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Ważność"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Do decyzji aplikacji"</string>
@@ -2859,6 +2939,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Pilne"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Zezwól na dźwięk"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Nie sygnalizuj tych powiadomień dźwiękiem ani wibracjami ani nie wyświetlaj ich na bieżącym ekranie."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Mało ważne"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Średnio ważne"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Bardzo ważne"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Pilne"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Asystent powiadomień"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Dostęp do powiadomień"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Dostęp do powiadomień profilu do pracy jest zablokowany"</string>
@@ -2888,8 +2972,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Obraz w obrazie"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Pozwól na tryb obraz w obrazie"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Pozwala tej aplikacji na tworzenie okna typu obraz w obrazie, gdy jest ona otwarta lub gdy ją opuścisz (np. aby kontynuować oglądanie filmu). To okno wyświetla się nad innymi używanymi aplikacjami."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Tak"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Nie"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Dostęp do „Nie przeszkadzać”"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Żadne zainstalowane aplikacje nie prosiły o dostęp do funkcji „Nie przeszkadzać”."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Wczytuję aplikacje..."</string>
@@ -3028,11 +3110,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Tym profilem do pracy zarządza:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Zarządzane przez: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Funkcja eksperymentalna)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Obracanie urządzenia"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Obróć zawartość ekranu"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Pozostaw orientację pionową"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Pozostaw orientację poziomą"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Pozostaw obecną orientację"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Bezpieczne uruchamianie"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Dalej"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Możesz jeszcze lepiej zabezpieczyć urządzenie, wymuszając wpisanie kodu PIN przed uruchomieniem. Do czasu uruchomienia urządzenie nie może odbierać połączeń, wiadomości i powiadomień (w tym alarmów). \n\nTo pomaga zabezpieczyć dane na utraconych lub skradzionych urządzeniach. Wymagać hasła do uruchomienia urządzenia?"</string>
@@ -3040,7 +3117,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Możesz jeszcze lepiej zabezpieczyć urządzenie, wymuszając podanie hasła przed uruchomieniem. Do czasu uruchomienia urządzenie nie może odbierać połączeń, wiadomości i powiadomień (w tym alarmów). \n\nTo pomaga zabezpieczyć dane na utraconych lub skradzionych urządzeniach. Wymagać hasła do uruchomienia urządzenia?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Możesz nie tylko odblokowywać urządzenie odciskiem palca, ale też jeszcze lepiej je zabezpieczyć, wymuszając wpisanie kodu PIN przed uruchomieniem. Do czasu uruchomienia urządzenie nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nTo pomaga zabezpieczyć dane na utraconych lub skradzionych urządzeniach. Czy wymagać kodu PIN do uruchomienia urządzenia?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Możesz nie tylko odblokowywać urządzenie odciskiem palca, ale też jeszcze lepiej je zabezpieczyć, wymuszając narysowanie wzoru przed uruchomieniem. Do czasu uruchomienia urządzenie nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nTo pomaga zabezpieczyć dane na utraconych lub skradzionych urządzeniach. Czy wymagać wzoru do uruchomienia urządzenia?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Możesz nie tylko odblokowywać urządzenie odciskiem palca, ale też jeszcze lepiej je zabezpieczyć, wymuszając podanie hasła przed uruchomieniem. Do czasu uruchomienia urządzenie nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nTo pomaga zabezpieczyć dane na utraconych lub skradzionych urządzeniach. Czy wymagać hasła do uruchomienia urządzenia?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Jeśli korzystasz z funkcji odblokowywania odciskiem palca, dla większego bezpieczeństwa możesz wymagać podania hasła przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych lub skradzionych urządzeniach. Wymagać hasła do uruchomienia urządzenia?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Tak"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nie"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Wymagać kodu PIN?"</string>
@@ -3166,6 +3243,19 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Alerty o transmisji danych"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Pokaż pełne zużycie przez urządzenie"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Pokaż zużycie przez aplikacje1"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Wysokie wykorzystanie"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacje działają nieprawidłowo</item>
+      <item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacji działa nieprawidłowo</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacji działa nieprawidłowo</item>
+      <item quantity="one">Aplikacja <xliff:g id="APP">%1$s</xliff:g> działa nieprawidłowo</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="few">Aplikacje zużywają baterię</item>
+      <item quantity="many">Aplikacje zużywają baterię</item>
+      <item quantity="other">Aplikacje zużywają baterię</item>
+      <item quantity="one">Aplikacja <xliff:g id="APP">%1$s</xliff:g> zużywa baterię</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Bez optymalizacji"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Bez optymalizacji"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Ma włączoną optymalizację baterii"</string>
@@ -3260,8 +3350,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Wyświetlanie nad innymi"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"Aplikacje, które mogą wyświetlać się nad innymi: <xliff:g id="COUNT_0">%1$d</xliff:g> z <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacje z uprawnieniami"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Tak"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Nie"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Dozwolone"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Niedozwolone"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instalowanie aplikacji nieznane źródła"</string>
     <string name="write_settings" msgid="4797457275727195681">"Modyfikowanie ustawień systemu"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"zapisywać modyfikować ustawienia systemu"</string>
@@ -3353,6 +3443,19 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekran ma pomarańczowy odcień. Może to ułatwić zaśnięcie."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Sugestie"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"Jeszcze <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> sugestie</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> sugestii</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> sugestii</item>
+      <item quantity="one">1 sugestia</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="few">Jeszcze <xliff:g id="COUNT">%1$d</xliff:g> sugestie</item>
+      <item quantity="many">Jeszcze <xliff:g id="COUNT">%1$d</xliff:g> sugestii</item>
+      <item quantity="other">Jeszcze <xliff:g id="COUNT">%1$d</xliff:g> sugestii</item>
+      <item quantity="one">Jeszcze 1 sugestia</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Usuń"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Chłodna temperatura kolorów"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Używaj chłodniejszych kolorów na ekranie"</string>
@@ -3371,8 +3474,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Próg ostrzegawczy: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Próg ostrzegawczy: <xliff:g id="ID_1">%1$s</xliff:g> / Limit danych: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Cykl rozliczeniowy"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Początek cyklu miesięcznego: <xliff:g id="ID_1">%1$s</xliff:g> każdego miesiąca"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Miesięczny, początek: <xliff:g id="ID_1">%1$s</xliff:g> każdego miesiąca"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"<xliff:g id="ID_1">%1$s</xliff:g>. każdego miesiąca"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Ograniczenia sieci"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> ograniczenia</item>
@@ -3396,7 +3498,7 @@
       <item quantity="one">1 aplikacja może używać nieograniczonej ilości danych, gdy Oszczędzanie danych jest włączone.</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Oszczędzanie danych"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Nieograniczony dostęp do danych"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Nieograniczony dostęp do danych"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Dane w tle są wyłączone"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Wł."</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Wył."</string>
@@ -3462,8 +3564,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Skonfiguruj powiadomienia na ekranie blokady"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Pokaż lub ukryj informacje w powiadomieniach"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Wszystkie"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Pomoc"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Wsparcie i wskazówki"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Najmniejsza szerokość"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Żadna z zainstalowanych aplikacji nie prosiła o dostęp do SMS-ów specjalnych"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Za SMS-y specjalne może być pobierana dodatkowa, wyższa opłata, która pojawi się na Twoim rachunku telefonicznym. Po włączeniu tego uprawnienia możliwe będzie wysyłanie SMS-ów specjalnych z wybranej aplikacji."</string>
@@ -3534,28 +3635,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatyczne"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Instrukcja"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Zwolnij miejsce teraz"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gesty"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Skróty gestów"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Sterowanie telefonem za pomocą krótkich gestów"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Sterowanie tabletem za pomocą krótkich gestów"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Sterowanie urządzeniem za pomocą krótkich gestów"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Uruchamianie aparatu"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Aby szybko uruchomić aparat, naciśnij dwukrotnie przycisk zasilania. Możesz to zrobić na dowolnym ekranie."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Szybkie uruchamianie aparatu"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Naciśnij dwukrotnie przycisk zasilania, by otworzyć aparat"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Obrót aparatu"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Szybsze robienie selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Dwukrotnie obróć telefon, by uruchomić tryb selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Dwukrotnie obróć tablet, by uruchomić tryb selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Dwukrotnie obróć urządzenie, by uruchomić tryb selfie"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Kliknij dwukrotnie, aby sprawdzić telefon"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Kliknij dwukrotnie, by sprawdzić tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Kliknij dwukrotnie, by sprawdzić urządzenie"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Aby szybko sprawdzić powiadomienia, kliknij dwukrotnie ekran."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Aby sprawdzić godzinę, ikony powiadomień i inne informacje, kliknij ekran dwukrotnie."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Sprawdzaj powiadomienia przy wyłączonym ekranie"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Podnieś, by sprawdzić telefon"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Podnieś, by sprawdzić tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Podnieś, by sprawdzić urządzenie"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Aby szybko sprawdzić powiadomienia, podnieś telefon."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Aby szybko sprawdzić powiadomienia, podnieś tablet."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Aby szybko sprawdzić powiadomienia, podnieś urządzenie."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Aby sprawdzić godzinę, ikony powiadomień i inne informacje, podnieś telefon."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Aby sprawdzić godzinę, ikony powiadomień i inne informacje, podnieś tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Aby sprawdzić godzinę, ikony powiadomień i inne informacje, podnieś urządzenie."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Sprawdzaj powiadomienia przy wyłączonym ekranie"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Sprawdzanie powiadomień"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Aby sprawdzić powiadomienia, przesuń palcem w dół na czytniku linii papilarnych z tyłu telefonu."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Aby sprawdzić powiadomienia, przesuń palcem w dół na czytniku linii papilarnych z tyłu tabletu."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Aby sprawdzić powiadomienia, przesuń palcem w dół na czytniku linii papilarnych z tyłu urządzenia."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Szybkie wyświetlanie powiadomień"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Przesuń palcem w dół po czytniku linii papilarnych"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Podnieś, by otworzyć aparat"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Aby automatycznie otworzyć aparat, podnieś telefon i ustaw jak do zrobienia zdjęcia (poziomo lub pionowo). Działa, gdy telefon jest w trybie uśpienia lub zablokowany."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Robienie zdjęć przy uśpionym lub zablokowanym telefonie"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gest pomocy"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Czułość"</string>
@@ -3673,6 +3787,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Czy chcesz usunąć tę aplikację błyskawiczną?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Gry"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Pliki audio"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Zajmowane miejsce"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> – odinstalowano)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> – wyłączono)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Usługa autouzupełniania"</string>
@@ -3686,5 +3801,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Aplikacja błyskawiczna"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Wyłączyć menedżera miejsca?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplikacje do obsługi filmów i TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Zajmowane miejsce"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Informacje o obsłudze administracyjnej operatora"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Uruchom obsługę administracyjną operatora"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Co nowego i fajnego?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Zobacz 5 najlepszych funkcji"</string>
 </resources>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index 5619fb9..b5d9790 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Boa"</item>
     <item msgid="8986346415847956850">"Excelente"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Sempre"</item>
-    <item msgid="844721238536786870">"Somente quando conectado"</item>
-    <item msgid="1986753720941888596">"Nunca"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Sempre"</item>
-    <item msgid="7433294150916905997">"Somente quando conectado"</item>
-    <item msgid="1390404486722375028">"Nunca"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Últimos 30 dias"</item>
     <item msgid="6600989128423965319">"Definir ciclo de uso..."</item>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 7d5b215..49b0e00 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Você agora é um desenvolvedor!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Não é necessário. Você já é um desenvolvedor."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Primeiro, ative as opções do desenvolvedor."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Redes sem fio e outras"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Conexões"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Dispositivo"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Provisionado VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videochamadas aprovisionadas"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Chamadas por Wi-Fi aprovisionadas"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presença aprovisionados"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Potência do rádio móvel"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Ver o catálogo de endereços do SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Visualizar números de chamada fixa"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Procurar dispositivos"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Renomear o dispositivo"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Renomear"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Desconectar?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Isso encerrará sua conexão com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Desconectar dispositivo?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Seu smartphone se desconectará de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Seu tablet se desconectará de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Seu dispositivo se desconectará de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Desconectar"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Você não tem permissão para alterar as configurações de Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Parear novo dispositivo"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> está visível para dispositivos próximos enquanto as configurações de Bluetooth estão abertas."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Endereço Bluetooth do smartphone: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Endereço Bluetooth do tablet: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Endereço Bluetooth do dispositivo: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Desconectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmissão"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Desativar perfil?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitação de pareamento Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitação de pareamento"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Toque para parear com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar arquivos recebidos"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Arquivos recebidos"</string>
     <string name="device_picker" msgid="4978696506172252813">"Escolher dispositivo Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> quer ativar o Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> quer desativar o Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s deseja acessar suas mensagens. Conceder acesso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitação de acesso ao cartão SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"O <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> deseja acessar seu cartão SIM. A concessão de acesso ao cartão SIM desativará a conectividade de dados no seu dispositivo durante a conexão. Conceda acesso ao <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visível como \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' para outros dispositivos"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Seus dispositivos"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parear novo dispositivo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selecione o fuso horário"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Segurança e local"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Segurança e local"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Criptografia e credenciais"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Smartphone criptografado"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Dispositivo criptografado"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloqueio com digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Usar a impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"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 digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: sua impressão digital pode ser menos segura que um PIN ou padrão forte."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Basta tocar no sensor de impressão digital para autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: Não é possível usar sua impressão digital para desbloquear este dispositivo. Para ver mais informações, entre em contato com o administrador da sua organização."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"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 digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: sua impressão digital pode ser menos segura que um PIN ou padrão forte."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"Use sua impressão digital para desbloquear o smartphone ou aprovar compras.\n\nNota: sua impressão digital pode ser menos segura que um padrão ou PIN forte."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Pular"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Adicionar impressão digital"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este tablet se ele for perdido, roubado ou apagado."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este dispositivo se ele for perdido, roubado ou apagado."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este smartphone se ele for perdido, roubado ou apagado."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este tablet em caso de perda ou roubo."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este dispositivo em caso de perda ou roubo."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este smartphone em caso de perda ou roubo."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Próxima"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este tablet se ele for perdido, roubado ou redefinido."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este dispositivo se ele for perdido, roubado ou redefinido."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este smartphone se ele for perdido, roubado ou redefinido."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este tablet se ele for perdido ou roubado."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este dispositivo se ele for perdido ou roubado."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este smartphone se ele for perdido ou roubado."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ignorar"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Voltar"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Localize o sensor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localize o sensor de impressão digital na parte de trás do smartphone."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Toque no sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Está na parte de trás do seu smartphone. Use seu dedo indicador."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"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="7086763077909041106">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Ok"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Excluir"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Vamos começar"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Toque no sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Coloque seu dedo no sensor e levante após sentir uma vibração"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuar"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mova o dedo levemente para adicionar todas as partes da sua impressão digital"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Adicionada"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Sempre que este ícone é exibido, você pode usar sua impressão digital para se identificar ou para autorizar uma compra."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Basta tocar no sensor de impressão digital para ativar e desbloquear seu dispositivo."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Quando você vê este ícone, também pode autorizar compras ou fazer login em apps."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Levante e toque novamente"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Continue levantando o dedo para adicionar as diferentes partes da sua impressão digital"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Impressão digital adicionada"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Sempre que vir este ícone, use sua impressão digital para se identificar ou aprovar compras."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Pular configuração da impressão digital?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Você optou por usar a impressão digital como uma maneira de desbloquear seu smartphone. Se você pular agora, precisará fazer essa configuração mais tarde. A configuração demora apenas um minuto aproximadamente."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueio de tela"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Concluído"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Opa, este não é o sensor"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Use o sensor de impr. digital do seu disp."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Toque no sensor na parte de trás do smartphone. Use o dedo indicador."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"O registro não foi concluído"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Prazo de registro de impressões digitais atingido. Tente novamente."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"O registro de impressões digitais não funcionou. Tente novamente ou use um dedo diferente."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Para impedir que outras pessoas usem este dispositivo sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Para impedir que outras pessoas usem este smartphone sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Escolha seu método de bloqueio de tela alternativo"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opções de bloqueio de tela"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opções de bloqueio de tela"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueio de tela"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Imediatamente após a suspensão"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> após a suspensão"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Mudar padrão de desbloqueio"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Mudar PIN de desbloqueio"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mudar senha de desbloqueio"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Tente novamente. Tentativa <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Última tentativa"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Se você informar um padrão de trabalho incorreto nesta tentativa, seu perfil de trabalho e os dados associados serão removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Se você informar um PIN de trabalho incorreto nesta tentativa, seu perfil de trabalho e os dados associados serão removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Se você informar uma senha de trabalho incorreta nesta tentativa, seu perfil de trabalho e os dados associados serão removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Excesso de tentativas incorretas. Seu perfil de trabalho e os dados associados serão removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Dispensar"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Tente novamente. Tentativa <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Seus dados serão excluídos"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Se você informar um padrão incorreto na próxima tentativa, os dados deste dispositivo serão excluídos"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Se você informar um PIN incorreto na próxima tentativa, os dados deste dispositivo serão excluídos"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Se você informar uma senha incorreta na próxima tentativa, os dados deste dispositivo serão excluídos."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Se você informar um padrão incorreto na próxima tentativa, este usuário será excluído"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Se você informar um PIN incorreto na próxima tentativa, este usuário será excluído"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Se você informar uma senha incorreta na próxima tentativa, este usuário será excluído"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Se você informar um padrão incorreto na próxima tentativa, seu perfil de trabalho e os dados correspondentes serão excluídos"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Se você informar um PIN incorreto na próxima tentativa, seu perfil de trabalho e os dados correspondentes serão excluídos"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Se você informar uma senha incorreta na próxima tentativa, seu perfil de trabalho e os dados correspondentes serão excluídos"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Excesso de tentativas incorretas. Os dados deste dispositivo serão excluídos."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Excesso de tentativas incorretas. O usuário será excluído."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Excesso de tentativas incorretas. Este perfil de trabalho e os dados correspondentes serão excluídos."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Dispensar"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Precisa ter pelo menos <xliff:g id="COUNT">%d</xliff:g> caracteres"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"O PIN precisa ter pelo menos <xliff:g id="COUNT">%d</xliff:g> dígitos"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avançado"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Com o Bluetooth ativado, o dispositivo pode se comunicar"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Para aumentar a precisão da localização, apps e serviços do sistema ainda detectam dispositivos Bluetooth. É possível alterar isso nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configurações de verificação<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Não foi possível conectar. Tente novamente."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Detalhes do dispositivo"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Endereço Bluetooth do dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Esquecer dispositivo?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Seu smartphone não será mais pareado com o <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Seu tablet não será mais pareado com o <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Seu dispositivo não será mais pareado com o <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Esquecer dispositivo"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectar-se a..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado do áudio da mídia."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado do áudio do viva-voz."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Não fornecer"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Não validar"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nenhum certificado especificado. Sua conexão não será particular."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"O nome da rede é muito longo."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"É necessário especificar um domínio."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
@@ -809,7 +838,6 @@
       <item quantity="other">%d redes</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi avançado"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurar Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Endereço MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Endereço IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de sub-rede"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Esquecer este grupo?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Ponto de acesso Wi-Fi portátil"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Ponto de acesso Wi-Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Usar a conexão móvel para fornecer Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"A conexão de Internet via ponto de acesso não está compartilhada"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"A conexão de Internet do smartphone via ponto de acesso não está compartilhada"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Não está compartilhando a Internet ou conteúdo com outros dispositivos"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Compartilhando a conexão de Internet deste tablet via ponto de acesso"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Compartilhando a conexão de Internet deste smartphone via ponto de acesso"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"O app está compartilhando conteúdo. Para compartilhar a conexão com a Internet, desative e ative o ponto de acesso."</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nome do Wi-Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Ativando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Outros dispositivos podem se conectar a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Senha do Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda de AP"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Use o ponto de acesso para criar uma rede Wi‑Fi para outros dispositivos. O ponto de acesso fornece Internet usando sua conexão de dados móveis. Pode haver cobrança adicional para dados móveis."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Os apps podem criar um ponto de acesso para compartilhamento de conteúdo com dispositivos nas proximidades."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Ativando o ponto de acesso..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desativando o ponto de acesso..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"A rede <xliff:g id="NETWORK_SSID">%1$s</xliff:g> está ativa"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Quando a chamada por Wi-Fi está ativada, seu smartphone pode enviar chamadas por redes Wi-Fi ou pela rede da sua operadora, dependendo da sua preferência e de qual sinal está mais forte. Antes de ativar esse recurso, verifique as taxas e outros detalhes com sua operadora."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Atualizar endereço de emergência"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Endereço usado pelos serviços de emergência como sua localização se você ligar para a emergência usando o Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nenhum resultado"</string>
     <string name="display_settings" msgid="7965901687241669598">"Tela"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Girar tela automaticamente"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Cores vívidas"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Alternar orientação automaticamente ao girar o tablet"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Alternar orientação automaticamente ao girar o telefone"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Alternar orientação automaticamente ao girar o tablet"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Otimizar brilho conforme luz disponível. Quando o recurso está ativado, é possível ajustar o brilho temporariamente."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Modo noturno"</string>
     <string name="night_display_text" msgid="1837277457033025056">"O modo noturno deixa sua tela na cor âmbar. Isso facilita olhar para a tela ou ler com pouca luz, ajudando você a adormecer com mais facilidade."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Programar"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Ativação automática"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nunca"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Personalizada"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Do pôr ao nascer do sol"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Programar"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Nunca"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Ativada em horários definidos por você"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Ativada do anoitecer ao amanhecer"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Horário de início"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Horário de término"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensidade"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Desativado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nunca será ativado automaticamente."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Será ativado automaticamente às <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Será ativado automaticamente ao pôr do sol."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Ativado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nunca será desativado automaticamente."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Será desativado automaticamente às <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Será desativado automaticamente ao nascer do sol."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Desativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Nunca será ativada automaticamente"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Será ativada automaticamente às <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Será ativada automaticamente ao anoitecer"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Nunca será desativada automaticamente"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Será desativada automaticamente às <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Será desativada automaticamente ao amanhecer"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Modo de espera"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A tela é desativada"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Configurações"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para ativar"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Exibição de ambiente"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Exibição de ambiente"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Sempre ativada"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificações"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quando mostrar"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Novas notificações"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ativar a tela ao receber notificações"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre ativado"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostrar horário, ícones de notificação e outras informações"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Tornar o texto maior ou menor"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do SIM"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"O APN não pode estar vazio."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"O campo MCC deve ter 3 dígitos."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"O campo MNC deve ter 2 ou 3 dígitos."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"A operadora não permite adicionar APNs do tipo %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Restaurando as configurações APN padrão."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Redefinir para o padrão"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Redefinição das configurações padrão do APN concluída."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Apagar cartão SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Apagar todos os dados do armazenamento USB interno, como músicas e fotos"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Apagar todos os dados do cartão SD, como músicas e fotos"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Limpar eSIMs"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Limpa todos os eSIMs no smartphone. Essa opção não cancela seu plano de serviços móveis."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Limpa todos os eSIMs no tablet. Essa opção não cancela seu plano de serviços móveis."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Redefinir tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Redefinir telefone"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Limpar todas as suas informações pessoais e apps baixados por download? Não é possível desfazer esta ação."</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Não é possível vincular ou usar pontos de acesso portáteis enquanto a Economia de dados está ativada"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Tethering USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB conectado, marque para vincular"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Vinculado"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Não é possível vincular quando o armazenamento USB está em uso"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB não conectado"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Conecte para ativar"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Erro de tethering de USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Compartilhar conexão com a Internet do smartphone via USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Compartilhar conexão com a Internet do tablet via USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Tethering Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Compartilhando conexão de Internet deste tablet via Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Compartilhando conexão de Internet deste smartphone via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Compartilhando conexão de Internet deste tablet com um dispositivo via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Compartilhando conexão de Internet deste smartphone com um dispositivo via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Compartilhando conexão de Internet deste tablet com <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivos via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Compartilhando conexão de Internet deste smartphone com <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivo via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Compartilhar a conexão de Internet do tablet via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Compartilhar a conexão de Internet do smartphone via Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Compartilhando conexão de Internet deste <xliff:g id="DEVICE_NAME">%1$d</xliff:g> via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Não compartilhando conexão de Internet deste tablet via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Não compartilhando conexão de Internet deste smartphone via Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Não vinculado"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Não é possível vincular a mais de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será vinculado."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Usar ponto de acesso e tethering para fornecer Internet a outros dispositivos por meio da sua conexão de dados móveis."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Usar ponto de acesso e tethering para fornecer Internet a outros dispositivos por meio da sua conexão de dados móveis. Apps podem também criar um ponto de acesso para compartilhamento de conteúdo com dispositivos nas proximidades."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Rede móvel"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plano de celular"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localização"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Usar GPS, Wi‑Fi, Bluetooth ou redes móveis para determinar a localização"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Usar Wi-Fi, Bluetooth ou redes móveis para determinar a localização"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usar GPS para determinar a localização"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Usar GPS e sensores do dispositivo para determinar a localização"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Verificação"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Verificação de Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Melhore a localização permitindo que apps e serviços do sistema detectem redes Wi-Fi a qualquer momento."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Você não tem uma conexão de dados. Para visualizar estas informações agora, acesse %s em qualquer computador conectado à Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Carregando..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Escolha a sua senha"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para usar a impressão digital, defina uma senha"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Escolha seu padrão"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para usar a impressão digital, defina um padrão"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Escolha o seu PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Para usar a impressão digital, defina um PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirme sua senha"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirme seu padrão"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirme o seu PIN"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Configurações do app"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fontes desconhecidas"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Permitir todas as origens"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Apps abertos recentemente"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Ver todos os <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"Há <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Seu tablet e seus dados pessoais estão mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu tablet ou pela perda de dados que possa resultar do uso desses apps."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Seu smartphone e seus dados pessoais estão mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu smartphone ou pela perda de dados que possa resultar do uso desses apps."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configurações avançadas"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Interromper o serviço do sistema?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Se você interromper este serviço, alguns recursos de seu tablet podem parar de funcionar corretamente até que você o desligue e ligue novamente."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Se você interromper este serviço, alguns recursos de seu tablet podem parar de funcionar corretamente até que você o desligue e ligue novamente."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Idiomas, entrada &amp; gestos"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Idiomas e entrada"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Idiomas e entrada"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Assistência para entrada de texto"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> serviço de impressão ativado</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> serviços de impressão ativados</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> trabalho de impressão</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> trabalhos de impressão</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Serviços de impressão"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nenhum serviço instalado"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nenhuma impressora encontrada"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Detalhes de uso"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Ajustar uso de energia"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pacotes incluídos"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps que descarregam a bateria"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Mantendo o dispositivo ativado"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ativando o dispositivo em segundo plano"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Solicitando localização com frequência"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps não estão funcionando bem"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Parar o app?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"O smartphone não consegue gerenciar a bateria normalmente porque o <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, é possível forçar a parada do app.\n\nSe isso continuar a acontecer, talvez seja necessário desinstalar o app para melhorar o desempenho da bateria."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"O tablet não consegue gerenciar a bateria normalmente porque o <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, é possível forçar a parada do app.\n\nSe isso continuar a acontecer, talvez seja necessário desinstalar o app para melhorar o desempenho da bateria."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"O dispositivo não consegue gerenciar a bateria normalmente porque o <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, é possível forçar a parada do app.\n\nSe isso continuar a acontecer, talvez seja necessário desinstalar o app para melhorar o desempenho da bateria."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Parar o app"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Desativar uso em segundo plano?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"O smartphone não consegue gerenciar a bateria normalmente porque o <xliff:g id="APP">%1$s</xliff:g> o ativa constantemente.\n\nPara resolver esse problema, o smartphone pode impedir que esse app seja executado em segundo plano."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"O tablet não consegue gerenciar a bateria normalmente porque o <xliff:g id="APP">%1$s</xliff:g> o ativa constantemente.\n\nPara resolver esse problema, o tablet pode impedir que esse app seja executado em segundo plano."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"O dispositivo não consegue gerenciar a bateria normalmente porque o <xliff:g id="APP">%1$s</xliff:g> o ativa constantemente.\n\nPara resolver esse problema, o dispositivo pode impedir que esse app seja executado em segundo plano."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Desativar"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Desativar localização?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"O smartphone não consegue gerenciar a bateria normalmente porque o <xliff:g id="APP">%1$s</xliff:g> solicita sua localização constantemente quando você não está usando o app.\n\nPara resolver esse problema, é possível desativar a localização para esse app."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"O tablet não consegue gerenciar a bateria normalmente porque o <xliff:g id="APP">%1$s</xliff:g> solicita sua localização constantemente quando você não está usando o app.\n\nPara resolver esse problema, é possível desativar a localização para esse app."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"O dispositivo não consegue gerenciar a bateria normalmente porque o <xliff:g id="APP">%1$s</xliff:g> solicita sua localização constantemente quando você não está usando o app.\n\nPara resolver esse problema, é possível desativar a localização para esse app."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Desativar"</string>
     <string name="power_screen" msgid="3023346080675904613">"Tela"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lanterna"</string>
     <string name="power_camera" msgid="4976286950934622605">"Câmera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
     <string name="power_service" msgid="1599661212370831780">"Serviços"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
-    <string name="power_user" msgid="1889728099253018005">"Usuário"</string>
+    <string name="power_user" msgid="3706143225319881667">"Outros usuários"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU prioritária"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Permanecer ativo"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo de energia superestimado"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Usada por <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Ativo para <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Uso da tela: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> de uso por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da bateria total"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Alterar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificações"</string>
     <string name="help_label" msgid="6886837949306318591">"Ajuda e feedback"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Artigos de ajuda, suporte via bate-papo e telefone"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Artigos de ajuda, telefone e bate-papo, primeiros passos"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Conta para conteúdo"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ameaças extremas"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="other">Mostrar %d itens ocultos</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rede e Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, dispositivo móvel, uso de dados, ponto de acesso"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"rede móvel"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"uso de dados"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ponto de acesso"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, transmissão, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, transmissão"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps e notificações"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissões, apps padrão"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Usuários e contas"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, tocar, pagamentos"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gesto, borda, lado, borda ativa, compressão, aperto, assistência, assistente, squeezy, squeezie, squeezey, squeezee, ok google, google assistente"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gesto, ativo, notificações, tela, exibição, tela desligada, tela ligada, compressão, borda, suspenso, suspensão, aperto"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gesto, silêncio, soneca, alarme, chamada recebida, silencioso, exibição, bloqueio de tela, aperto, aderência, borda, parada"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Gravar"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toque em uma marca para gravar…"</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Não mostrar notificações de trabalho"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Como você deseja que as notificações sejam exibidas quando o dispositivo estiver bloqueado?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notificações do perfil"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Notificações"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Notificações"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notificações de apps"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria da notificação"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importância"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Deixar o app decidir"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgente"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Permitir som"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Não emitir som, vibrar ou mostrar parcialmente essas notificações na tela atual."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Importância baixa"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Importância média"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importância elevada"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Importância urgente"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Assistente de notificação"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Acesso a notificações"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"O acesso às notificações do perfil de trabalho está bloqueado"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permite que esse app crie uma janela picture-in-picture enquanto o app é aberto ou depois que você sai dele (por exemplo, para continuar a assistir um vídeo). Essa janela é sobreposta a outros apps que você está usando."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Sim"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Não"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acesso \"Não perturbe\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nenhum app instalado solicitou o acesso \"Não perturbe\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Carregando apps…"</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"O perfil de trabalho é gerenciado por:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Gerenciado por <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Rotação do dispositivo"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Girar o conteúdo da tela"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Manter o modo retrato"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Manter o modo paisagem"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Manter a orientação atual"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Inicialização segura"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Para proteger ainda mais o dispositivo, solicite o PIN antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar o PIN para ligar o dispositivo?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Para proteger ainda mais o dispositivo, solicite uma senha antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar uma senha para ligar o dispositivo?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando o PIN antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar o PIN para ligar o dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando um padrão antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar um padrão para ligar o dispositivo?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando uma senha antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar uma senha para ligar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo sua senha antes da inicialização. O dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes, até que ele seja iniciado.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Solicitar senha para iniciar o dispositivo?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sim"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Não"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Exigir PIN?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso total no dispositivo"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de apps"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Uso elevado"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> app está com comportamento anormal</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apps estão com comportamento anormal</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">App que descarrega a bateria</item>
+      <item quantity="other">Apps que descarregam a bateria</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Não otimizados"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Não otimizado"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Otimizando o uso de bateria"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Sobrepor a outros apps"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> apps têm permissão para serem sobrepostos a outros apps"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Apps com permissão"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Sim"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Não"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Permitido"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Não permitido"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instalar apps fontes desconhecidas"</string>
     <string name="write_settings" msgid="4797457275727195681">"Mudar configurações do sistema"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"gravar modificar configurações de modificação"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"A cor da tela muda para âmbar. Isso pode ajudar você a adormecer."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Sugestões"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"Mais <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> sugestão</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> sugestões</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="one">Mais <xliff:g id="COUNT">%1$d</xliff:g> sugestão</item>
+      <item quantity="other">Mais <xliff:g id="COUNT">%1$d</xliff:g> sugestões</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Remover"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar cores de tela mais frias"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Aviso de dados em <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Aviso de dados em <xliff:g id="ID_1">%1$s</xliff:g> / Limite de dados em <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciclo de faturamento"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"O ciclo mensal começa no dia <xliff:g id="ID_1">%1$s</xliff:g> de cada mês"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mensal a partir do dia <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Todos os meses, no dia <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Restrições de rede"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restrição</item>
@@ -3316,7 +3408,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apps autorizados a usar dados irrestritos quando a Economia de dados estiver ativada</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Economia de dados"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Acesso irrestrito a dados"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Dados irrestritos"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Os dados em segundo plano estão desativados"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Ativada"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Desativada"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notificações da tela de bloqueio"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar o conteúdo da notificação"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Todas as opções"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Suporte"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Suporte e dicas"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Menor largura"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nenhum app instalado solicitou acesso a SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"O SMS premium pode gerar custos e será adicionado ao faturamento da sua operadora. Se você conceder permissão para um app, será possível enviar SMS premium usando esse app."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Modo automático"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Modo manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liberar espaço agora"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestos"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Atalhos de gestos"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gestos rápidos para controlar seu smartphone"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gestos rápidos para controlar seu tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gestos rápidos para controlar seu dispositivo"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Ir para a câmera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Para abrir a câmera rapidamente, pressione o botão liga/desliga duas vezes. O recurso funciona em qualquer tela."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Abrir a câmera rapidamente"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Pressione o botão liga/desliga duas vezes p/ abrir a câmera"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Virar câmera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Tirar selfies com mais rapidez"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Girar duas vezes o smartphone para abrir o modo selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Girar duas vezes o tablet para abrir o modo selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Girar duas vezes o dispositivo para abrir o modo selfie"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Toque duas vezes na tela para verificar o smartphone"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Toque duas vezes na tela para verificar o tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Toque duas vezes na tela para verificar o dispositivo"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Para verificar suas notificações rapidamente, toque duas vezes na tela."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Para verificar a hora, ícones de notificação e outras informações, toque duas vezes na tela."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Verificar as notificações quando a tela estiver desligada"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levantar o smartphone para verificá-lo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levante o tablet para verificá-lo"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levante o dispositivo para verificá-lo"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Para verificar suas notificações rapidamente, pegue seu smartphone."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Para verificar suas notificações rapidamente, pegue seu tablet."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Para verificar suas notificações rapidamente, pegue seu dispositivo."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Para verificar a hora, ícones de notificação e outras informações, pegue o smartphone."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Para verificar a hora, ícones de notificação e outras informações, pegue o tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Para verificar a hora, ícones de notificação e outras informações, pegue o dispositivo."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Verificar as notificações quando a tela estiver desligada"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Deslizar impressão digital para ver as notificações"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do smartphone."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do dispositivo."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Ver notificações rapidamente"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Deslize para baixo no sensor de impressão digital"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Levantar para abrir a câmera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Para abrir a câmera automaticamente, levante o smartphone até uma posição de tirar fotos (paisagem ou retrato). Funciona quando o smartphone está em suspensão ou bloqueado."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Tire fotos quando o telefone estiver em repouso ou bloqueado"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto do Assistente"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Confidencialidade"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Deseja remover esse app instantâneo?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Jogos"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Arquivos de áudio"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Espaço utilizado"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstalado para o usuário <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desativado para o usuário <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Preenchimento automático"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"App instantâneo"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Desativar o gerenciador de armazenamento?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Apps de filme e televisão"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Espaço utilizado"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Informações de aprovisionamento da operadora"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar aprovisionamento da operadora"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"O que é novo e incrível?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Confira os cinco melhores recursos"</string>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index c69a2e1..d79abab 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Boa"</item>
     <item msgid="8986346415847956850">"Excelente"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Sempre"</item>
-    <item msgid="844721238536786870">"Apenas quando estiver ligado"</item>
-    <item msgid="1986753720941888596">"Nunca"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Sempre"</item>
-    <item msgid="7433294150916905997">"Apenas quando estiver ligado"</item>
-    <item msgid="1390404486722375028">"Nunca"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Últimos 30 dias"</item>
     <item msgid="6600989128423965319">"Def. ciclo utilização..."</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index a31e581..1ca5cac 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Agora é um programador!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Não é necessário, já é um programador."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Ative primeiro as Opções de programador."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Redes sem fios e outras"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Ligações"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Dispositivo"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE fornecido"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videochamadas fornecidas"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Chamadas Wi-Fi fornecidas"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/presença aprovisionada"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Potência do rádio móvel"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Ver livro de endereços do SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ver números de marcação fixos"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Procurar dispositivos"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Mudar o nome deste dispositivo"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Mudar o nome"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Desligar?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Isto terminará a sua ligação com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Pretende desl. o dispositivo?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"O telemóvel irá desligar-se de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"O tablet irá desligar-se de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"O dispositivo irá desligar-se de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Desligar"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Não tem autorização para alterar as definições de Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Sincronizar o novo dispositivo"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> é visível para dispositivos próximos enquanto as definições de Bluetooth estiverem abertas."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Endereço Bluetooth do telemóvel: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Endereço Bluetooth do tablet: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Endereço Bluetooth do dispositivo: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Desligar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Difusão"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Desativar perfil?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Pedido de emparelhamento de Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Pedido de emparelhamento"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Toque para sincronizar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar ficheiros recebidos"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Ficheiros recebidos"</string>
     <string name="device_picker" msgid="4978696506172252813">"Escolher dispositivo Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"A aplicação <xliff:g id="APP_NAME">%1$s</xliff:g> pretende ativar o Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"A aplicação <xliff:g id="APP_NAME">%1$s</xliff:g> pretende desativar o Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s pretende aceder às suas mensagens. Conceder acesso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Pedido de acesso ao SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> pretende aceder ao seu cartão SIM. Ao conceder acesso ao cartão SIM, desativa a conetividade de dados no seu dispositivo durante a ligação. Fornecer acesso a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visível como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Os seus dispositivos"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sincronizar o novo dispositivo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Escolher o fuso horário"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Segurança e localização"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Segurança e localização"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encriptação e credenciais"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Dados do telemóvel encriptados"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Dispositivo encriptado"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloquear com impr. digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Utilizar a impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Basta tocar no sensor de impressões digitais para desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações. Quaisquer impressões digitais adicionadas ao telemóvel podem executar estas ações, pelo que deve ter cuidado com quem adiciona.\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_message_unlock_disabled" msgid="4193477159493347679">"Basta tocar no sensor de impressões digitais para autorizar compras ou iniciar sessão em aplicações. Quaisquer impressões digitais adicionadas podem executar estas ações, pelo que deve ter cuidado com quem adiciona.\n\nNota: não é possível utilizar a sua impressão digital para desbloquear este dispositivo. Para mais informações, contacte o administrador da sua entidade."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Basta tocar no sensor de impressões digitais para desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações. Quaisquer impressões digitais adicionadas ao telemóvel podem executar estas ações, pelo que deve ter cuidado com quem adiciona.\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_message_unlock_disabled" msgid="1550756694054944874">"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 administrador da sua entidade."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"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="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Ignorar"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Adicionar impressão digital"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este tablet se o perder ou for roubado ou apagado."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este dispositivo se o perder ou for roubado ou apagado."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este telemóvel se o perder ou for roubado ou apagado."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este tablet se o perder ou for roubado."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este dispositivo se o perder ou for roubado."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este telemóvel se o perder ou for roubado."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Seguinte"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este tablet em caso de perda, de roubo ou de reposição."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este dispositivo em caso de perda, de roubo ou de reposição."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este telemóvel em caso de perda, de roubo ou de reposição."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este tablet em caso de perda ou de roubo."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este dispositivo em caso de perda ou de roubo."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"As funcionalidades de proteção do dispositivo não serão ativadas. Não poderá impedir terceiros de utilizar este telemóvel em caso de perda ou de roubo."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ignorar mesmo assim"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Voltar"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Localizar o sensor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localize o sensor de impressões digitais na parte de trás do seu telemóvel."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Tocar no sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Está na parte traseira do telemóvel. Utilize o dedo indicador."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"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="7086763077909041106">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Eliminar"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Vamos começar"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Tocar no sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Coloque o dedo sobre o sensor e levante-o depois de sentir uma vibração"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuar"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Desloque o dedo ligeiramente para adicionar as diferentes partes da sua impressão digital"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Adicionada!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quando vir este ícone, pode utilizar a sua impressão digital para identificação ou para autorizar uma compra."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Basta tocar no sensor de impressões digitais para ativar e desbloquear o dispositivo."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Quando vir este símbolo, também pode autorizar compras ou iniciar sessão nas aplicações."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Levantar e tocar novamente"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Mantenha o dedo levantado para adicionar as diferentes partes da sua impressão digital"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Impressão digital adicionada"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Quando vir este ícone, utilize a sua impressão digital para identificação ou para autorizar compras."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ignorar configur. de impressão digital?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Optou por utilizar a sua impressão digital como uma forma de desbloquear o telemóvel. Se ignorar agora, terá de configurar esta opção mais tarde. A configuração demora apenas alguns minutos."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar o bloqueio de ecrã"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Concluído"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, isso não é o sensor"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utilize o sensor de impr. digit. no seu disp."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Toque no sensor na parte traseira do telemóvel com o indicador."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"A inscrição não foi concluída"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Atingiu o tempo limite da inscrição de impressões digitais. Tente novamente."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"A inscrição de impressões digitais não funcionou. Tente novamente ou utilize um dedo diferente."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Impeça terceiros de utilizar este dispositivo sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Impeça terceiros de utilizar este telemóvel sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Escolha o método de bloqueio de ecrã de segurança"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opções de bloqueio de ecrã"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opções de bloqueio de ecrã"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueio de ecrã"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/imediatamente após a suspensão"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> após a suspensão"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Mudar padrão de desbloqueio"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Alterar PIN de desbloqueio"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Alterar palavra-passe de desbloqueio"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Tente novamente. Tentativa <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Última tentativa"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Se introduzir um padrão de trabalho incorreto nesta tentativa, o perfil de trabalho e os dados associados são removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Se introduzir um PIN de trabalho incorreto nesta tentativa, o perfil de trabalho e os dados associados são removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Se introduzir uma palavra-passe de trabalho incorreta nesta tentativa, o perfil de trabalho e os dados associados são removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Demasiadas tentativas incorretas. O perfil de trabalho e os dados associados serão removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Ignorar"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Tente novamente. Tentativa <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Os seus dados serão eliminados"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Se introduzir um padrão incorreto na tentativa seguinte, os dados deste dispositivo serão eliminados."</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Se introduzir um PIN incorreto na tentativa seguinte, os dados deste dispositivo serão eliminados."</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Se introduzir uma palavra-passe incorreta na tentativa seguinte, os dados deste dispositivo serão eliminados."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Se introduzir um padrão incorreto na tentativa seguinte, este utilizador será eliminado."</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Se introduzir um PIN incorreto na tentativa seguinte, este utilizador será eliminado."</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Se introduzir uma palavra-passe incorreta na tentativa seguinte, este utilizador será eliminado."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Se introduzir um padrão incorreto na tentativa seguinte, o seu perfil de trabalho e os respetivos dados serão eliminados."</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Se introduzir um PIN incorreto na tentativa seguinte, o seu perfil de trabalho e os respetivos dados serão eliminados."</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Se introduzir uma palavra-passe incorreta na tentativa seguinte, o seu perfil de trabalho e os respetivos dados serão eliminados."</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Demasiadas tentativas incorretas. Os dados deste dispositivo serão eliminados."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Demasiadas tentativas incorretas. Este utilizador será eliminado."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Demasiadas tentativas incorretas. Este perfil de trabalho e os respetivos dados serão eliminados."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ignorar"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Tem de ter, pelo menos, <xliff:g id="COUNT">%d</xliff:g> carateres"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"O PIN tem de ter, pelo menos, <xliff:g id="COUNT">%d</xliff:g> dígitos"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth Avançado"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Quando o Bluetooth está ativado, o disp. pode comunicar com outros disp. Bluetooth próximos."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Para melhorar a precisão da localização, os serviços e as aplicações do sistema podem continuar a detetar dispositivos Bluetooth. Pode alterar esta opção nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>definições de procura<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Não foi possível ligar. Tente novamente."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Detalhes do dispositivo"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Endereço Bluetooth do dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Pretende esquecer o dispositivo?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"O telemóvel deixará de estar sincronizado com o <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"O tablet deixará de estar sincronizado com o <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"O dispositivo deixará de estar sincronizado com o <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Esquecer dispositivo"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Ligar a..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado do áudio multimédia."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado do áudio mãos-livres."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Não fornecer"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Não validar"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nenhum certificado especificado. A sua ligação não será privada."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"O nome da rede é demasiado longo."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"É necessário especificar um domínio."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
@@ -809,7 +838,6 @@
       <item quantity="other">%d redes</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi Avançada"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurar o Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Endereço MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Endereço IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de sub-rede"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Esquecer este grupo?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Zona Wi-Fi portátil"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Zona Wi-Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Utilizar ligação móvel para fornecer rede Wi‑Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Não está a partilhar a ligação à Internet deste tablet através de zona Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Não está a partilhar a ligação à Internet deste telemóvel através de zona Wi-Fi"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Não está a partilhar Internet ou conteúdo com outros dispositivos"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"A partilhar a ligação à Internet deste tablet através de zona Wi-Fi"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"A partilhar a ligação à Internet deste telemóvel através de zona Wi-Fi"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"A aplicação está a partilhar conteúdo. Para partilhar a ligação à Internet, desative a zona Wi-Fi e, de seguida, ative-a"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nome de Wi-Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"A ativar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Podem ser ligados outros dispositivos a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Palavra-passe de Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda do PA"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Utilize uma zona Wi-Fi para criar uma rede Wi-Fi para os seus outros dispositivos. A zona Wi-Fi disponibiliza Internet através da sua ligação móvel de dados. Podem ser aplicados custos de dados móveis adicionais."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"As aplicações podem criar uma zona Wi-Fi para partilhar conteúdo com dispositivos próximos."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"A ativar zona Wi-Fi..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"A desativar zona Wi-Fi..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> está ativa"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Se as chamadas Wi-Fi estiverem ativadas, o telemóvel pode encaminhar as chamadas através de redes Wi-Fi ou da rede do seu operador, consoante as suas preferências e do sinal que for mais forte. Antes de ativar esta funcionalidade, verifique junto do seu operador questões como tarifas, entre outras."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Atualizar o endereço de emergência"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"O endereço utilizado pelos serviços de emergência como a sua localização se fizer uma chamada para o 112 através de Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ecrã"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Sem resultados"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ecrã"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rodar ecrã automaticamente"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Cores vivas"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Mudar orientação automaticamente ao rodar o tablet"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Mudar orientação automaticamente ao rodar o telefone"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Mudar orientação automaticamente ao rodar o tablet"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Otimize o nível de luminosidade em função da luz disponível. Com esta funcionalidade ativada, continua a ser possível ajustar a luminosidade temporariamente."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Luz noturna"</string>
     <string name="night_display_text" msgid="1837277457033025056">"A Luz noturna aplica uma tonalidade âmbar ao ecrã que torna mais fácil olhar para ele ou ler com pouca luz. Também pode ajudar a adormecer mais facilmente."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Programação"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Estado"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Ativar automaticamente"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nunca"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Programação personalizada"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Do pôr do sol ao nascer do sol"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Programação"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Nunca"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"É ativado à hora personalizada"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Ativado do pôr ao nascer do sol"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Hora de início"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de fim"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Estado"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensidade"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Desativada. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nunca ativar automaticamente."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Ativar automaticamente à(s) <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Ativar automaticamente ao pôr do sol."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Ativada. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nunca desativar automaticamente."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Desativar automaticamente à(s) <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Desativar automaticamente ao nascer do sol."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Desativada/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Nunca se ativa automaticamente"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Ativa-se automaticamente à(s) <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Ativa-se automaticamente ao pôr do sol"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Ativada/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Nunca se desativa automaticamente"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Desativa-se automaticamente à(s) <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Desativa-se automaticamente ao nascer do sol"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspensão"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"O ecrã desliga-se"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Definições"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ativar ao levantar"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Visualização de ambiente"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Visualização ambiente"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Sempre ativado"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificações"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quando apresentar"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Novas notificações"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ativar o ecrã quando recebe notificações"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre ativado"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostrar as horas, os ícones das notificações e outras informações"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho do tipo de letra"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Aumentar ou diminuir o texto"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Definições de bloqueio do cartão SIM"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"O APN não pode estar vazio."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"O campo MCC tem de ter 3 dígitos."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"O campo MNC tem de ter 2 ou 3 dígitos."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"O operador não permite a adição de APNs do tipo %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"A restaurar predefinições de APN"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Repor predefinição"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Reposição de predefinições de APN concluída."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Apagar cartão SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Apagar todos os dados da memória de armazenamento USB interna, como músicas ou fotografias"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Apagar todos os dados do cartão SD, como músicas ou fotografias"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Apagar eSIMs"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Apaga todos os eSIMs no telemóvel. Esta ação não cancela o seu plano de serviços móveis."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Apaga todos os eSIMs no tablet. Esta ação não cancela o seu plano de serviços móveis."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Repor o tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Repor telefone"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Pretende apagar todas as informações pessoais e as aplicações transferidas? Não é possível anular esta ação!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Não é possível ligar via telemóvel ou utilizar zonas Wi-Fi portáteis com a Poupança de dados ativada"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Associação USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Ligado via USB; confirme para associar"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Associada"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Não é possível ligar quando a memória de armazenamento USB está a ser utilizada"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB não ligado"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Ligar para ativar"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Erro na associação USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Partilhar a ligação à Internet do telemóvel através de USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Partilhar a ligação à Internet do tablet através de USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Ligação Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"A partilhar a ligação de Internet do tablet por Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"A partilhar a ligação de Internet do telemóvel por Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"A partilhar a ligação de Internet do tablet com 1 dispositivo por Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"A partilhar a ligação de Internet do telemóvel com 1 dispositivo por Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"A partilhar ligação Internet tablet com <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivos por Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"A partilhar ligação Internet telem. com <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp. por Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Partilhar a ligação à Internet do tablet por Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Partilhar a ligação à Internet do telemóvel por Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"A partilhar a ligação de Internet deste <xliff:g id="DEVICE_NAME">%1$d</xliff:g> por Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Não partilhar a ligação de Internet deste tablet por Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Não partilhar a ligação de Internet deste telemóvel por Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Não ligado"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Não é possível ligar mais de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> aparelhos."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Utilize uma zona Wi-Fi e uma ligação via telemóvel para disponibilizar Internet a outros dispositivos através da sua ligação de dados móveis."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Utilize uma zona Wi-Fi e uma ligação à Internet via telemóvel para disponibilizar Internet a outros dispositivos através da sua ligação móvel de dados. As aplicações podem igualmente criar uma zona Wi-Fi para partilhar conteúdo com dispositivos próximos."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Rede móvel"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plano de telemóvel"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localização"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Utilizar GPS, Wi-Fi, Bluetooth ou redes móveis para determinar a localização"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Utilizar Wi-Fi, Bluetooth ou redes móveis para determinar a localização"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utilizar o GPS para determinar a localização"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Utilizar o GPS e os sensores do dispositivo para determinar a localização"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"A analisar"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Procurar por Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Melhorar a localização ao permitir que os serviços e as aplicações do sistema detetem redes Wi-Fi a qualquer momento."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Não tem uma ligação de dados. Para visualizar estas informações agora, aceda a %s a partir de qualquer computador ligado à internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"A carregar..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Escolha a palavra-passe"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para util. imp. dig., def. pal.-passe"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Escolher o padrão"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para util. imp. dig., def. pad."</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Escolha o PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Para util. imp. dig., def. PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirmar palavra-passe"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmar o padrão"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmar PIN"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Definições da aplicação"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fontes desconhecidas"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Permit. todas as fontes aplic."</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Aplicações abertas recentemente"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Ver as <xliff:g id="COUNT">%1$d</xliff:g> aplicações"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"Há <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"O seu tablet e os dados pessoais são mais vulneráveis a ataques de aplicações desconhecidas. Ao instalar aplicações desta fonte, aceita ser responsável por quaisquer danos no tablet ou perdas de dados que possam resultar da utilização do mesmo."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"O seu telemóvel e os dados pessoais são mais vulneráveis a ataques de aplicações desconhecidas. Ao instalar aplicações desta fonte, aceita ser responsável por quaisquer danos no telemóvel ou perdas de dados que possam resultar da utilização do mesmo."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Definições avançadas"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Parar serviço de sistema?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Se interromper este serviço, algumas funcionalidades do tablet podem deixar de funcionar corretamente até ser desligado e ligado novamente."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Se interromper este serviço, algumas funcionalidades do telemóvel podem deixar de funcionar corretamente até ser desligado e ligado novamente."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Idiomas, introdução e gestos"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Idiomas e introdução"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Idiomas e introdução"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Assistência de introdução"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> serviços de impressão ativados</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> print jobs</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tarefas de impressão</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Serviços de impressão"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nenhum serviço instalado"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nenhuma impressora encontrada"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Utilizar detalhes"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Ajustar utilização de energia"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pacotes incluídos"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplicações a consumir rapidamente a bateria"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Mantém o dispositivo ativo"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ativa o dispositivo em segundo plano"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Solicita frequentemente a localização"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplicações que não estão a funcionar corretamente"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Pretende parar a aplicação?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"O telemóvel não consegue gerir a bateria normalmente, pois a aplicação <xliff:g id="APP">%1$s</xliff:g> mantém-no constantemente ativo.\n\nPara tentar resolver este problema, pode forçar a paragem da aplicação.\n\nSe isto continuar a acontecer, pode ser necessário desinstalar a aplicação para melhorar o desempenho da bateria.."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"O tablet não consegue gerir a bateria normalmente, pois a aplicação <xliff:g id="APP">%1$s</xliff:g> mantém-no constantemente ativo.\n\nPara tentar resolver este problema, pode forçar a paragem da aplicação.\n\nSe isto continuar a acontecer, pode ser necessário desinstalar a aplicação para melhorar o desempenho da bateria."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"O dispositivo não consegue gerir a bateria normalmente, pois a aplicação <xliff:g id="APP">%1$s</xliff:g> mantém-no constantemente ativo.\n\nPara tentar resolver este problema, pode forçar a paragem da aplicação.\n\nSe isto continuar a acontecer, pode ser necessário desinstalar a aplicação para melhorar o desempenho da bateria."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Parar a aplicação"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Pretende desativar a utilização em segundo plano?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"O telemóvel não consegue gerir a bateria normalmente, pois a aplicação<xliff:g id="APP">%1$s</xliff:g> está constantemente a ativá-lo.\n\nPara resolver este problema, o telemóvel pode impedir que esta aplicação seja executada em segundo plano."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"O tablet não consegue gerir a bateria normalmente, pois a aplicação <xliff:g id="APP">%1$s</xliff:g> está constantemente a ativá-lo.\n\nPara resolver este problema, o tablet pode impedir que esta aplicação seja executada em segundo plano."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"O dispositivo não consegue gerir a bateria normalmente, pois a aplicação <xliff:g id="APP">%1$s</xliff:g> está constantemente a ativá-lo.\n\nPara resolver este problema, o dispositivo pode impedir que esta aplicação seja executada em segundo plano."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Desativar"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Pretende desativar a localização?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"O telemóvel não consegue gerir a bateria normalmente, pois a aplicação <xliff:g id="APP">%1$s</xliff:g> está constantemente a solicitar a sua localização quando não está a utilizar a aplicação.\n\nPara resolver este problema, pode desativar a localização para esta aplicação."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"O tablet não consegue gerir a bateria normalmente, pois a aplicação <xliff:g id="APP">%1$s</xliff:g> está constantemente a solicitar a sua localização quando não está a utilizar a aplicação.\n\nPara resolver este problema, pode desativar a localização para esta aplicação."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"O dispositivo não consegue gerir a bateria normalmente, pois a aplicação <xliff:g id="APP">%1$s</xliff:g> está constantemente a solicitar a sua localização quando não está a utilizar a aplicação.\n\nPara resolver este problema, pode desativar a localização para esta aplicação."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Desativar"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ecrã"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lanterna"</string>
     <string name="power_camera" msgid="4976286950934622605">"Câmara"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Aplicações"</string>
     <string name="power_service" msgid="1599661212370831780">"Serviços"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
-    <string name="power_user" msgid="1889728099253018005">"Utilizador"</string>
+    <string name="power_user" msgid="3706143225319881667">"Outros utilizadores"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primeiro plano da CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Manter desperto"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Utilização de energia contabilizada em excesso"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Utilizada durante <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Ativa durante <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Utilização do ecrã: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilizado pela aplicação <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da bateria total"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Alterar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificações"</string>
     <string name="help_label" msgid="6886837949306318591">"Ajuda e comentários"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Artigos de ajuda, apoio técnico por telefone e por chat"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Artigos de ajuda, telefone e chat, começar a utilizar"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Conta para conteúdo"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID da fotografia"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ameaças extremas"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="other">Mostrar %d itens ocultos</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rede e Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, dispositivo móvel, utilização de dados, zona Wi-Fi"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"rede móvel"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"utilização de dados"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"zona Wi-Fi"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos ligados"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, transmissão, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, transmissão"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicações e notificações"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Autorizações, aplicações predefinidas"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Utilizadores e contas"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, tocar, pagamentos"</string>
     <string name="keywords_backup" msgid="470070289135403022">"cópia de segurança, fazer uma cópia de segurança"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gesto, limite, lado, limite ativo, apertar, manusear, assistência, assistente, squeezy, squeezie, squeezey, squeezee, ok google, assistente do google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gesto, ativar, notificações, ecrã, visualização, ecrã desativado, ecrã ativado, apertar, limite, em suspensão, suspensão, manusear"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gesto, silenciar, suspender, alarme, chamada recebida, silencioso, visualização, ecrã de bloqueio, apertar, manusear, limite, parar"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Config. etiqueta NFC p/ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escrever"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toque numa etiqueta para escrever..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Não mostrar qualquer notificação"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Como pretende que as notificações do perfil sejam apresentadas quando o dispositivo está bloqueado?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notificações do perfil"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Notificações"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Notificações"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notificações de aplicações"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria de notificações"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importância"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Permitir que a aplicação decida"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgente"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Permitir som"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Não emitir som, vibrar, nem mostrar estas notificações no ecrã atual."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Importância baixa"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Importância média"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importância alta"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Importância máxima"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Assistente de notificações"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Acesso a notificações"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"O acesso às notificações do perfil de trabalho está bloqueado"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Imagem na imagem"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir imagem na imagem"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permita que esta aplicação crie uma janela de imagem na imagem enquanto a aplicação está aberta ou depois de sair da mesma (por exemplo, para continuar a ver um vídeo). Esta janela é apresentada sobre as outras aplicações que estiver a utilizar."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Sim"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Não"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acesso Não incomodar"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nenhuma aplicação instalada solicitou acesso Não incomodar"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"A carregar aplicações..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Este perfil de trabalho é gerido por:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Gerido por <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Rotação do dispositivo"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Rodar o conteúdo do ecrã"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Manter na vista de retrato"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Manter na vista de paisagem"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Manter na orientação atual"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Arranque seguro"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Pode melhorar a proteção deste dispositivo através da solicitação do PIN antes do arranque do mesmo. Até arrancar, o dispositivo não pode receber chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsto ajuda a proteger os dados em caso de perda ou roubo do dispositivo. Pretende que o PIN seja solicitado para o arranque do dispositivo?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Pode melhorar a proteção deste dispositivo através da solicitação da palavra-passe antes do arranque do mesmo. Até arrancar, o dispositivo não pode receber chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsto ajuda a proteger os dados em caso de perda ou roubo do dispositivo. Pretende que a palavra-passe seja solicitada para o arranque do dispositivo?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Para além de utilizar a impressão digital para desbloquear o dispositivo, pode melhorar a proteção do mesmo através da solicitação do PIN antes do arranque. Até arrancar, o dispositivo não pode receber chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsto ajuda a proteger os dados em caso de perda ou roubo do dispositivo. Pretende que o PIN seja solicitado para o arranque do dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Para além de utilizar a impressão digital para desbloquear o dispositivo, pode melhorar a proteção do mesmo através da solicitação do padrão antes do arranque. Até arrancar, o dispositivo não pode receber chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsto ajuda a proteger os dados em caso de perda ou roubo do dispositivo. Pretende que o padrão seja solicitado para o arranque do dispositivo?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Para além de utilizar a impressão digital para desbloquear o dispositivo, pode melhorar a proteção do mesmo através da solicitação da palavra-passe antes do arranque. Até arrancar, o dispositivo não pode receber chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsto ajuda a proteger os dados em caso de perda ou roubo do dispositivo. Pretende que a palavra-passe seja solicitada para o arranque do dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Além de utilizar a sua impressão digital para desbloquear o dispositivo, pode protegê-lo ainda mais ao solicitar a sua palavra-passe antes do arranque. Até que o dispositivo arranque, não pode receber chamadas, mensagens nem notificações, incluindo alarmes.\n\nIsto ajuda a proteger os dados do dispositivo em caso de perda ou de roubo. Pretende que a palavra-passe seja solicitada para o arranque do dispositivo?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sim"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Não"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Solicitar PIN?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de utilização"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Mostrar utilização completa do dispositivo"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar utilização de aplic."</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Utilização elevada"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplicações estão a apresentar um comportamento anormal</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Aplicações a consumir rapidamente a bateria</item>
+      <item quantity="other">Aplicações a consumir rapidamente a bateria</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Não otimizada"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Não otimizada"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Utilização otimizada da bateria"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Sobrepor a outras aplicações"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> aplicações autorizadas a sobreporem-se a outras aplicações"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplicações com autorização"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Sim"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Não"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Permitida"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Não permitida"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instalar aplicações fontes desconhecidas"</string>
     <string name="write_settings" msgid="4797457275727195681">"Modificar definições sistema"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"gravar modificar definições do sistema"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"O ecrã ficou com uma tonalidade âmbar. Isto pode ajudá-lo a adormecer."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Sugestões"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"Mais <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> sugestões</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> sugestões</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="one">Mais <xliff:g id="COUNT">%1$d</xliff:g> sugestões</item>
+      <item quantity="other">Mais <xliff:g id="COUNT">%1$d</xliff:g> sugestões</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Remover"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura da cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizar cores de visualização mais frias"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Aviso de dados de <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Aviso de dados de <xliff:g id="ID_1">%1$s</xliff:g>/limite de dados de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciclo de faturação"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"O ciclo mensal começa no dia <xliff:g id="ID_1">%1$s</xliff:g> de cada mês"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mensalmente a partir do dia <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Mensalmente no dia <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Restrições de rede"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
@@ -3316,7 +3408,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicações autorizadas a utilizar dados sem restrições quando a Poupança de dados está ativada</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Poupança de dados"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Acesso a dados sem restrições"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Dados sem restrições"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Os dados de segundo plano estão desativados"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Ativada"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Desativada"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notific. do ecrã de bloqueio"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar conteúdo de notificações"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Todas"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Apoio técnico"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Apoio téc. e sugest."</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"A menor largura"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nenhuma aplicação instalada solicitou acesso a SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"O serviço de SMS premium pode custar dinheiro e, nesse caso, será adicionado às faturas do seu operador. Se ativar a autorização para uma aplicação, poderá enviar SMS premium através da mesma."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automático"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Libertar espaço agora"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestos"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Atalhos de gestos"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gestos rápidos para controlar o telemóvel"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gestos rápidos para controlar o tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gestos rápidos para controlar o dispositivo"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Aceder à câmara"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Para abrir rapidamente a câmara, prima duas vezes o botão ligar/desligar. Funciona a partir de qualquer ecrã."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Abrir a câmara rapidamente"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Premir o botão ligar/desligar duas vezes para abrir a câmara"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Virar a câmara"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Tirar selfies mais rapidamente"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Rodar o telemóvel duas vezes para aceder ao modo de selfies"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Rodar o tablet duas vezes para aceder ao modo de selfies"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Rodar o dispositivo 2 vezes para aceder ao modo de selfies"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tocar duas vezes para verificar o telemóvel"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tocar duas vezes para verificar o tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tocar duas vezes para verificar o dispositivo"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Para verificar rapidamente as suas notificações, toque duas vezes no ecrã."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Para consultar a hora, os ícones das notificações e outras informações, toque duas vezes no ecrã."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Consultar as notificações com o ecrã desativado"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levantar para verificar o telemóvel"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levantar para verificar o tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levantar para verificar o dispositivo"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Para verificar rapidamente as suas notificações, pegue no telemóvel."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Para verificar rapidamente as suas notificações, pegue no tablet."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Para verificar rapidamente as suas notificações, pegue no dispositivo."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Para consultar a hora, os ícones das notificações e outras informações, pegue no telemóvel."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Para consultar a hora, os ícones das notificações e outras informações, pegue no tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Para consultar a hora, os ícones das notificações e outras informações, pegue no dispositivo."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Consultar as notificações com o ecrã desativado"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Deslizar rapidamente a impressão digital para ver as notificações"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para verificar as suas notificações, deslize rapidamente para baixo no sensor de impressões digitais situado na parte posterior do telemóvel."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para verificar as suas notificações, deslize rapidamente para baixo no sensor de impressões digitais situado na parte posterior do tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para verificar as suas notificações, deslize rapidamente para baixo no sensor de impressões digitais situado na parte posterior do dispositivo."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Ver as notificações rapidamente"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Deslizar rapid. p/ baixo no sensor de impressões digitais"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Levantar para abrir a câmara"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Para abrir a câmara automaticamente, levante o telemóvel e coloque-o numa posição adequada para tirar fotos (orientação de paisagem ou de retrato). Funciona quando o telemóvel está em suspensão ou bloqueado."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Tire fotos quando o telemóvel está em suspensão ou bloqueado"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto de assistência"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilidade"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Pretende remover esta aplicação instantânea?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Jogos"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Ficheiros de áudio"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Espaço utilizado"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstalar para o utilizador <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desativ. para o utilizador <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Serviço de preenchimento automático"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Aplicação instantânea"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Pretende desativar o gestor de armazenamento?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplicações de filmes e TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Espaço utilizado"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Informações de fornecimento do operador"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar fornecimento do operador"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Quais são as grandes novidades?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Conhecer as 5 principais funcionalidades"</string>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 5619fb9..b5d9790 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Boa"</item>
     <item msgid="8986346415847956850">"Excelente"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Sempre"</item>
-    <item msgid="844721238536786870">"Somente quando conectado"</item>
-    <item msgid="1986753720941888596">"Nunca"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Sempre"</item>
-    <item msgid="7433294150916905997">"Somente quando conectado"</item>
-    <item msgid="1390404486722375028">"Nunca"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Últimos 30 dias"</item>
     <item msgid="6600989128423965319">"Definir ciclo de uso..."</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 7d5b215..49b0e00 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Você agora é um desenvolvedor!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Não é necessário. Você já é um desenvolvedor."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Primeiro, ative as opções do desenvolvedor."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Redes sem fio e outras"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Conexões"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Dispositivo"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Provisionado VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videochamadas aprovisionadas"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Chamadas por Wi-Fi aprovisionadas"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presença aprovisionados"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Potência do rádio móvel"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Ver o catálogo de endereços do SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Visualizar números de chamada fixa"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Procurar dispositivos"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Renomear o dispositivo"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Renomear"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Desconectar?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Isso encerrará sua conexão com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Desconectar dispositivo?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Seu smartphone se desconectará de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Seu tablet se desconectará de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Seu dispositivo se desconectará de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Desconectar"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Você não tem permissão para alterar as configurações de Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Parear novo dispositivo"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> está visível para dispositivos próximos enquanto as configurações de Bluetooth estão abertas."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Endereço Bluetooth do smartphone: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Endereço Bluetooth do tablet: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Endereço Bluetooth do dispositivo: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Desconectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmissão"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Desativar perfil?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitação de pareamento Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitação de pareamento"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Toque para parear com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar arquivos recebidos"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Arquivos recebidos"</string>
     <string name="device_picker" msgid="4978696506172252813">"Escolher dispositivo Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> quer ativar o Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> quer desativar o Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s deseja acessar suas mensagens. Conceder acesso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitação de acesso ao cartão SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"O <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> deseja acessar seu cartão SIM. A concessão de acesso ao cartão SIM desativará a conectividade de dados no seu dispositivo durante a conexão. Conceda acesso ao <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Visível como \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' para outros dispositivos"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Seus dispositivos"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parear novo dispositivo"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selecione o fuso horário"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Segurança e local"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Segurança e local"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Criptografia e credenciais"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Smartphone criptografado"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Dispositivo criptografado"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloqueio com digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Usar a impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"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 digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: sua impressão digital pode ser menos segura que um PIN ou padrão forte."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Basta tocar no sensor de impressão digital para autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: Não é possível usar sua impressão digital para desbloquear este dispositivo. Para ver mais informações, entre em contato com o administrador da sua organização."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"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 digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: sua impressão digital pode ser menos segura que um PIN ou padrão forte."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"Use sua impressão digital para desbloquear o smartphone ou aprovar compras.\n\nNota: sua impressão digital pode ser menos segura que um padrão ou PIN forte."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Pular"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Adicionar impressão digital"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este tablet se ele for perdido, roubado ou apagado."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este dispositivo se ele for perdido, roubado ou apagado."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este smartphone se ele for perdido, roubado ou apagado."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este tablet em caso de perda ou roubo."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este dispositivo em caso de perda ou roubo."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Os recursos de proteção de dispositivos não serão ativados. Não será possível impedir que outras pessoas usem este smartphone em caso de perda ou roubo."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Próxima"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este tablet se ele for perdido, roubado ou redefinido."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este dispositivo se ele for perdido, roubado ou redefinido."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este smartphone se ele for perdido, roubado ou redefinido."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este tablet se ele for perdido ou roubado."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este dispositivo se ele for perdido ou roubado."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Os recursos de proteção do dispositivo não serão ativados. Você não poderá impedir que outras pessoas usem este smartphone se ele for perdido ou roubado."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ignorar"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Voltar"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Localize o sensor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localize o sensor de impressão digital na parte de trás do smartphone."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Toque no sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Está na parte de trás do seu smartphone. Use seu dedo indicador."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"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="7086763077909041106">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Ok"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Excluir"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Vamos começar"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Toque no sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Coloque seu dedo no sensor e levante após sentir uma vibração"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Continuar"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mova o dedo levemente para adicionar todas as partes da sua impressão digital"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Adicionada"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Sempre que este ícone é exibido, você pode usar sua impressão digital para se identificar ou para autorizar uma compra."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Basta tocar no sensor de impressão digital para ativar e desbloquear seu dispositivo."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Quando você vê este ícone, também pode autorizar compras ou fazer login em apps."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Levante e toque novamente"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Continue levantando o dedo para adicionar as diferentes partes da sua impressão digital"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Impressão digital adicionada"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Sempre que vir este ícone, use sua impressão digital para se identificar ou aprovar compras."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Pular configuração da impressão digital?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Você optou por usar a impressão digital como uma maneira de desbloquear seu smartphone. Se você pular agora, precisará fazer essa configuração mais tarde. A configuração demora apenas um minuto aproximadamente."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurar bloqueio de tela"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Concluído"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Opa, este não é o sensor"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Use o sensor de impr. digital do seu disp."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Toque no sensor na parte de trás do smartphone. Use o dedo indicador."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"O registro não foi concluído"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Prazo de registro de impressões digitais atingido. Tente novamente."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"O registro de impressões digitais não funcionou. Tente novamente ou use um dedo diferente."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Para impedir que outras pessoas usem este dispositivo sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Para impedir que outras pessoas usem este smartphone sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Escolha seu método de bloqueio de tela alternativo"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opções de bloqueio de tela"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opções de bloqueio de tela"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueio de tela"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Imediatamente após a suspensão"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> após a suspensão"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Mudar padrão de desbloqueio"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Mudar PIN de desbloqueio"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mudar senha de desbloqueio"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Tente novamente. Tentativa <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Última tentativa"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Se você informar um padrão de trabalho incorreto nesta tentativa, seu perfil de trabalho e os dados associados serão removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Se você informar um PIN de trabalho incorreto nesta tentativa, seu perfil de trabalho e os dados associados serão removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Se você informar uma senha de trabalho incorreta nesta tentativa, seu perfil de trabalho e os dados associados serão removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Excesso de tentativas incorretas. Seu perfil de trabalho e os dados associados serão removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Dispensar"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Tente novamente. Tentativa <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Seus dados serão excluídos"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Se você informar um padrão incorreto na próxima tentativa, os dados deste dispositivo serão excluídos"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Se você informar um PIN incorreto na próxima tentativa, os dados deste dispositivo serão excluídos"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Se você informar uma senha incorreta na próxima tentativa, os dados deste dispositivo serão excluídos."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Se você informar um padrão incorreto na próxima tentativa, este usuário será excluído"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Se você informar um PIN incorreto na próxima tentativa, este usuário será excluído"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Se você informar uma senha incorreta na próxima tentativa, este usuário será excluído"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Se você informar um padrão incorreto na próxima tentativa, seu perfil de trabalho e os dados correspondentes serão excluídos"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Se você informar um PIN incorreto na próxima tentativa, seu perfil de trabalho e os dados correspondentes serão excluídos"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Se você informar uma senha incorreta na próxima tentativa, seu perfil de trabalho e os dados correspondentes serão excluídos"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Excesso de tentativas incorretas. Os dados deste dispositivo serão excluídos."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Excesso de tentativas incorretas. O usuário será excluído."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Excesso de tentativas incorretas. Este perfil de trabalho e os dados correspondentes serão excluídos."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Dispensar"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Precisa ter pelo menos <xliff:g id="COUNT">%d</xliff:g> caracteres"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"O PIN precisa ter pelo menos <xliff:g id="COUNT">%d</xliff:g> dígitos"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avançado"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Com o Bluetooth ativado, o dispositivo pode se comunicar"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Para aumentar a precisão da localização, apps e serviços do sistema ainda detectam dispositivos Bluetooth. É possível alterar isso nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configurações de verificação<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Não foi possível conectar. Tente novamente."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Detalhes do dispositivo"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Endereço Bluetooth do dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Esquecer dispositivo?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Seu smartphone não será mais pareado com o <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Seu tablet não será mais pareado com o <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Seu dispositivo não será mais pareado com o <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Esquecer dispositivo"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectar-se a..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado do áudio da mídia."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado do áudio do viva-voz."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Não fornecer"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Não validar"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nenhum certificado especificado. Sua conexão não será particular."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"O nome da rede é muito longo."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"É necessário especificar um domínio."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
@@ -809,7 +838,6 @@
       <item quantity="other">%d redes</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi avançado"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurar Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Endereço MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Endereço IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de sub-rede"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Esquecer este grupo?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Ponto de acesso Wi-Fi portátil"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Ponto de acesso Wi-Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Usar a conexão móvel para fornecer Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"A conexão de Internet via ponto de acesso não está compartilhada"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"A conexão de Internet do smartphone via ponto de acesso não está compartilhada"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Não está compartilhando a Internet ou conteúdo com outros dispositivos"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Compartilhando a conexão de Internet deste tablet via ponto de acesso"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Compartilhando a conexão de Internet deste smartphone via ponto de acesso"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"O app está compartilhando conteúdo. Para compartilhar a conexão com a Internet, desative e ative o ponto de acesso."</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Nome do Wi-Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Ativando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Outros dispositivos podem se conectar a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Senha do Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda de AP"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Use o ponto de acesso para criar uma rede Wi‑Fi para outros dispositivos. O ponto de acesso fornece Internet usando sua conexão de dados móveis. Pode haver cobrança adicional para dados móveis."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Os apps podem criar um ponto de acesso para compartilhamento de conteúdo com dispositivos nas proximidades."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Ativando o ponto de acesso..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desativando o ponto de acesso..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"A rede <xliff:g id="NETWORK_SSID">%1$s</xliff:g> está ativa"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Quando a chamada por Wi-Fi está ativada, seu smartphone pode enviar chamadas por redes Wi-Fi ou pela rede da sua operadora, dependendo da sua preferência e de qual sinal está mais forte. Antes de ativar esse recurso, verifique as taxas e outros detalhes com sua operadora."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Atualizar endereço de emergência"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Endereço usado pelos serviços de emergência como sua localização se você ligar para a emergência usando o Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nenhum resultado"</string>
     <string name="display_settings" msgid="7965901687241669598">"Tela"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Girar tela automaticamente"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Cores vívidas"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Alternar orientação automaticamente ao girar o tablet"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Alternar orientação automaticamente ao girar o telefone"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Alternar orientação automaticamente ao girar o tablet"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Otimizar brilho conforme luz disponível. Quando o recurso está ativado, é possível ajustar o brilho temporariamente."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Modo noturno"</string>
     <string name="night_display_text" msgid="1837277457033025056">"O modo noturno deixa sua tela na cor âmbar. Isso facilita olhar para a tela ou ler com pouca luz, ajudando você a adormecer com mais facilidade."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Programar"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Ativação automática"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nunca"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Personalizada"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Do pôr ao nascer do sol"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Programar"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Nunca"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Ativada em horários definidos por você"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Ativada do anoitecer ao amanhecer"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Horário de início"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Horário de término"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensidade"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Desativado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nunca será ativado automaticamente."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Será ativado automaticamente às <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Será ativado automaticamente ao pôr do sol."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Ativado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nunca será desativado automaticamente."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Será desativado automaticamente às <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Será desativado automaticamente ao nascer do sol."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Desativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Nunca será ativada automaticamente"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Será ativada automaticamente às <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Será ativada automaticamente ao anoitecer"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Nunca será desativada automaticamente"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Será desativada automaticamente às <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Será desativada automaticamente ao amanhecer"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Modo de espera"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A tela é desativada"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Configurações"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para ativar"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Exibição de ambiente"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Exibição de ambiente"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Sempre ativada"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificações"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quando mostrar"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Novas notificações"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ativar a tela ao receber notificações"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre ativado"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostrar horário, ícones de notificação e outras informações"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Tornar o texto maior ou menor"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do SIM"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"O APN não pode estar vazio."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"O campo MCC deve ter 3 dígitos."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"O campo MNC deve ter 2 ou 3 dígitos."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"A operadora não permite adicionar APNs do tipo %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Restaurando as configurações APN padrão."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Redefinir para o padrão"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Redefinição das configurações padrão do APN concluída."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Apagar cartão SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Apagar todos os dados do armazenamento USB interno, como músicas e fotos"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Apagar todos os dados do cartão SD, como músicas e fotos"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Limpar eSIMs"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Limpa todos os eSIMs no smartphone. Essa opção não cancela seu plano de serviços móveis."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Limpa todos os eSIMs no tablet. Essa opção não cancela seu plano de serviços móveis."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Redefinir tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Redefinir telefone"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Limpar todas as suas informações pessoais e apps baixados por download? Não é possível desfazer esta ação."</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Não é possível vincular ou usar pontos de acesso portáteis enquanto a Economia de dados está ativada"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Tethering USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB conectado, marque para vincular"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Vinculado"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Não é possível vincular quando o armazenamento USB está em uso"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB não conectado"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Conecte para ativar"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Erro de tethering de USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Compartilhar conexão com a Internet do smartphone via USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Compartilhar conexão com a Internet do tablet via USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Tethering Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Compartilhando conexão de Internet deste tablet via Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Compartilhando conexão de Internet deste smartphone via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Compartilhando conexão de Internet deste tablet com um dispositivo via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Compartilhando conexão de Internet deste smartphone com um dispositivo via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Compartilhando conexão de Internet deste tablet com <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivos via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Compartilhando conexão de Internet deste smartphone com <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivo via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Compartilhar a conexão de Internet do tablet via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Compartilhar a conexão de Internet do smartphone via Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Compartilhando conexão de Internet deste <xliff:g id="DEVICE_NAME">%1$d</xliff:g> via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Não compartilhando conexão de Internet deste tablet via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Não compartilhando conexão de Internet deste smartphone via Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Não vinculado"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Não é possível vincular a mais de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será vinculado."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Usar ponto de acesso e tethering para fornecer Internet a outros dispositivos por meio da sua conexão de dados móveis."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Usar ponto de acesso e tethering para fornecer Internet a outros dispositivos por meio da sua conexão de dados móveis. Apps podem também criar um ponto de acesso para compartilhamento de conteúdo com dispositivos nas proximidades."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Rede móvel"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plano de celular"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localização"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Usar GPS, Wi‑Fi, Bluetooth ou redes móveis para determinar a localização"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Usar Wi-Fi, Bluetooth ou redes móveis para determinar a localização"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usar GPS para determinar a localização"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Usar GPS e sensores do dispositivo para determinar a localização"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Verificação"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Verificação de Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Melhore a localização permitindo que apps e serviços do sistema detectem redes Wi-Fi a qualquer momento."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Você não tem uma conexão de dados. Para visualizar estas informações agora, acesse %s em qualquer computador conectado à Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Carregando..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Escolha a sua senha"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para usar a impressão digital, defina uma senha"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Escolha seu padrão"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para usar a impressão digital, defina um padrão"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Escolha o seu PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Para usar a impressão digital, defina um PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirme sua senha"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirme seu padrão"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirme o seu PIN"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Configurações do app"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fontes desconhecidas"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Permitir todas as origens"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Apps abertos recentemente"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Ver todos os <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"Há <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Seu tablet e seus dados pessoais estão mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu tablet ou pela perda de dados que possa resultar do uso desses apps."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Seu smartphone e seus dados pessoais estão mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu smartphone ou pela perda de dados que possa resultar do uso desses apps."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configurações avançadas"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Interromper o serviço do sistema?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Se você interromper este serviço, alguns recursos de seu tablet podem parar de funcionar corretamente até que você o desligue e ligue novamente."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Se você interromper este serviço, alguns recursos de seu tablet podem parar de funcionar corretamente até que você o desligue e ligue novamente."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Idiomas, entrada &amp; gestos"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Idiomas e entrada"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Idiomas e entrada"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Assistência para entrada de texto"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> serviço de impressão ativado</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> serviços de impressão ativados</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> trabalho de impressão</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> trabalhos de impressão</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Serviços de impressão"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nenhum serviço instalado"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nenhuma impressora encontrada"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Detalhes de uso"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Ajustar uso de energia"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pacotes incluídos"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps que descarregam a bateria"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Mantendo o dispositivo ativado"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ativando o dispositivo em segundo plano"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Solicitando localização com frequência"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps não estão funcionando bem"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Parar o app?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"O smartphone não consegue gerenciar a bateria normalmente porque o <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, é possível forçar a parada do app.\n\nSe isso continuar a acontecer, talvez seja necessário desinstalar o app para melhorar o desempenho da bateria."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"O tablet não consegue gerenciar a bateria normalmente porque o <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, é possível forçar a parada do app.\n\nSe isso continuar a acontecer, talvez seja necessário desinstalar o app para melhorar o desempenho da bateria."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"O dispositivo não consegue gerenciar a bateria normalmente porque o <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, é possível forçar a parada do app.\n\nSe isso continuar a acontecer, talvez seja necessário desinstalar o app para melhorar o desempenho da bateria."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Parar o app"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Desativar uso em segundo plano?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"O smartphone não consegue gerenciar a bateria normalmente porque o <xliff:g id="APP">%1$s</xliff:g> o ativa constantemente.\n\nPara resolver esse problema, o smartphone pode impedir que esse app seja executado em segundo plano."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"O tablet não consegue gerenciar a bateria normalmente porque o <xliff:g id="APP">%1$s</xliff:g> o ativa constantemente.\n\nPara resolver esse problema, o tablet pode impedir que esse app seja executado em segundo plano."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"O dispositivo não consegue gerenciar a bateria normalmente porque o <xliff:g id="APP">%1$s</xliff:g> o ativa constantemente.\n\nPara resolver esse problema, o dispositivo pode impedir que esse app seja executado em segundo plano."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Desativar"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Desativar localização?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"O smartphone não consegue gerenciar a bateria normalmente porque o <xliff:g id="APP">%1$s</xliff:g> solicita sua localização constantemente quando você não está usando o app.\n\nPara resolver esse problema, é possível desativar a localização para esse app."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"O tablet não consegue gerenciar a bateria normalmente porque o <xliff:g id="APP">%1$s</xliff:g> solicita sua localização constantemente quando você não está usando o app.\n\nPara resolver esse problema, é possível desativar a localização para esse app."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"O dispositivo não consegue gerenciar a bateria normalmente porque o <xliff:g id="APP">%1$s</xliff:g> solicita sua localização constantemente quando você não está usando o app.\n\nPara resolver esse problema, é possível desativar a localização para esse app."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Desativar"</string>
     <string name="power_screen" msgid="3023346080675904613">"Tela"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lanterna"</string>
     <string name="power_camera" msgid="4976286950934622605">"Câmera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
     <string name="power_service" msgid="1599661212370831780">"Serviços"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
-    <string name="power_user" msgid="1889728099253018005">"Usuário"</string>
+    <string name="power_user" msgid="3706143225319881667">"Outros usuários"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU prioritária"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Permanecer ativo"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo de energia superestimado"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Usada por <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Ativo para <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Uso da tela: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> de uso por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da bateria total"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Alterar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificações"</string>
     <string name="help_label" msgid="6886837949306318591">"Ajuda e feedback"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Artigos de ajuda, suporte via bate-papo e telefone"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Artigos de ajuda, telefone e bate-papo, primeiros passos"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Conta para conteúdo"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Ameaças extremas"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="other">Mostrar %d itens ocultos</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rede e Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, dispositivo móvel, uso de dados, ponto de acesso"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"rede móvel"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"uso de dados"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ponto de acesso"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, transmissão, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, transmissão"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps e notificações"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissões, apps padrão"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Usuários e contas"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, tocar, pagamentos"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gesto, borda, lado, borda ativa, compressão, aperto, assistência, assistente, squeezy, squeezie, squeezey, squeezee, ok google, google assistente"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gesto, ativo, notificações, tela, exibição, tela desligada, tela ligada, compressão, borda, suspenso, suspensão, aperto"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gesto, silêncio, soneca, alarme, chamada recebida, silencioso, exibição, bloqueio de tela, aperto, aderência, borda, parada"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Gravar"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toque em uma marca para gravar…"</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Não mostrar notificações de trabalho"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Como você deseja que as notificações sejam exibidas quando o dispositivo estiver bloqueado?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notificações do perfil"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Notificações"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Notificações"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notificações de apps"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria da notificação"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importância"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Deixar o app decidir"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgente"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Permitir som"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Não emitir som, vibrar ou mostrar parcialmente essas notificações na tela atual."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Importância baixa"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Importância média"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importância elevada"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Importância urgente"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Assistente de notificação"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Acesso a notificações"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"O acesso às notificações do perfil de trabalho está bloqueado"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permite que esse app crie uma janela picture-in-picture enquanto o app é aberto ou depois que você sai dele (por exemplo, para continuar a assistir um vídeo). Essa janela é sobreposta a outros apps que você está usando."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Sim"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Não"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acesso \"Não perturbe\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nenhum app instalado solicitou o acesso \"Não perturbe\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Carregando apps…"</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"O perfil de trabalho é gerenciado por:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Gerenciado por <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Rotação do dispositivo"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Girar o conteúdo da tela"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Manter o modo retrato"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Manter o modo paisagem"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Manter a orientação atual"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Inicialização segura"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Para proteger ainda mais o dispositivo, solicite o PIN antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar o PIN para ligar o dispositivo?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Para proteger ainda mais o dispositivo, solicite uma senha antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar uma senha para ligar o dispositivo?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando o PIN antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar o PIN para ligar o dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando um padrão antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar um padrão para ligar o dispositivo?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando uma senha antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar uma senha para ligar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo sua senha antes da inicialização. O dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes, até que ele seja iniciado.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Solicitar senha para iniciar o dispositivo?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sim"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Não"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Exigir PIN?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso total no dispositivo"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de apps"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Uso elevado"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> app está com comportamento anormal</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apps estão com comportamento anormal</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">App que descarrega a bateria</item>
+      <item quantity="other">Apps que descarregam a bateria</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Não otimizados"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Não otimizado"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Otimizando o uso de bateria"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Sobrepor a outros apps"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> apps têm permissão para serem sobrepostos a outros apps"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Apps com permissão"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Sim"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Não"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Permitido"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Não permitido"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instalar apps fontes desconhecidas"</string>
     <string name="write_settings" msgid="4797457275727195681">"Mudar configurações do sistema"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"gravar modificar configurações de modificação"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"A cor da tela muda para âmbar. Isso pode ajudar você a adormecer."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Sugestões"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"Mais <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> sugestão</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> sugestões</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="one">Mais <xliff:g id="COUNT">%1$d</xliff:g> sugestão</item>
+      <item quantity="other">Mais <xliff:g id="COUNT">%1$d</xliff:g> sugestões</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Remover"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura de cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Usar cores de tela mais frias"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Aviso de dados em <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Aviso de dados em <xliff:g id="ID_1">%1$s</xliff:g> / Limite de dados em <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciclo de faturamento"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"O ciclo mensal começa no dia <xliff:g id="ID_1">%1$s</xliff:g> de cada mês"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mensal a partir do dia <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Todos os meses, no dia <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Restrições de rede"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restrição</item>
@@ -3316,7 +3408,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apps autorizados a usar dados irrestritos quando a Economia de dados estiver ativada</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Economia de dados"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Acesso irrestrito a dados"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Dados irrestritos"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Os dados em segundo plano estão desativados"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Ativada"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Desativada"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notificações da tela de bloqueio"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar o conteúdo da notificação"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Todas as opções"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Suporte"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Suporte e dicas"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Menor largura"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nenhum app instalado solicitou acesso a SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"O SMS premium pode gerar custos e será adicionado ao faturamento da sua operadora. Se você conceder permissão para um app, será possível enviar SMS premium usando esse app."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Modo automático"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Modo manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liberar espaço agora"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestos"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Atalhos de gestos"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gestos rápidos para controlar seu smartphone"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gestos rápidos para controlar seu tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gestos rápidos para controlar seu dispositivo"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Ir para a câmera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Para abrir a câmera rapidamente, pressione o botão liga/desliga duas vezes. O recurso funciona em qualquer tela."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Abrir a câmera rapidamente"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Pressione o botão liga/desliga duas vezes p/ abrir a câmera"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Virar câmera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Tirar selfies com mais rapidez"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Girar duas vezes o smartphone para abrir o modo selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Girar duas vezes o tablet para abrir o modo selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Girar duas vezes o dispositivo para abrir o modo selfie"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Toque duas vezes na tela para verificar o smartphone"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Toque duas vezes na tela para verificar o tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Toque duas vezes na tela para verificar o dispositivo"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Para verificar suas notificações rapidamente, toque duas vezes na tela."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Para verificar a hora, ícones de notificação e outras informações, toque duas vezes na tela."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Verificar as notificações quando a tela estiver desligada"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levantar o smartphone para verificá-lo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levante o tablet para verificá-lo"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levante o dispositivo para verificá-lo"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Para verificar suas notificações rapidamente, pegue seu smartphone."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Para verificar suas notificações rapidamente, pegue seu tablet."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Para verificar suas notificações rapidamente, pegue seu dispositivo."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Para verificar a hora, ícones de notificação e outras informações, pegue o smartphone."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Para verificar a hora, ícones de notificação e outras informações, pegue o tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Para verificar a hora, ícones de notificação e outras informações, pegue o dispositivo."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Verificar as notificações quando a tela estiver desligada"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Deslizar impressão digital para ver as notificações"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do smartphone."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do dispositivo."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Ver notificações rapidamente"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Deslize para baixo no sensor de impressão digital"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Levantar para abrir a câmera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Para abrir a câmera automaticamente, levante o smartphone até uma posição de tirar fotos (paisagem ou retrato). Funciona quando o smartphone está em suspensão ou bloqueado."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Tire fotos quando o telefone estiver em repouso ou bloqueado"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto do Assistente"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Confidencialidade"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Deseja remover esse app instantâneo?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Jogos"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Arquivos de áudio"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Espaço utilizado"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstalado para o usuário <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desativado para o usuário <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Preenchimento automático"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"App instantâneo"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Desativar o gerenciador de armazenamento?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Apps de filme e televisão"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Espaço utilizado"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Informações de aprovisionamento da operadora"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar aprovisionamento da operadora"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"O que é novo e incrível?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Confira os cinco melhores recursos"</string>
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index b42fe5e..61604fd 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Bun"</item>
     <item msgid="8986346415847956850">"Excelent"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Întotdeauna"</item>
-    <item msgid="844721238536786870">"Doar atunci când este conectat"</item>
-    <item msgid="1986753720941888596">"Niciodată"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Întotdeauna"</item>
-    <item msgid="7433294150916905997">"Doar atunci când este conectat"</item>
-    <item msgid="1390404486722375028">"Niciodată"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Ultimele 30 de zile"</item>
     <item msgid="6600989128423965319">"Setați ciclu utilizare..."</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index de565cd..52ca124 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -31,6 +31,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Ați devenit dezvoltator!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nu mai este nevoie, sunteți deja dezvoltator."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Mai întâi activați opțiunile pentru dezvoltatori."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Wireless și rețele"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Conexiuni"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Dispozitiv"</string>
@@ -42,6 +43,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Oferit de VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Apelarea video este configurată"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Apelarea prin Wi-Fi este configurată"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Setări configurate pentru EAB/prezență"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Alimentare radio celular"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Afișați agenda de pe SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Afișați numerele fixe de apelare"</string>
@@ -107,10 +109,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Scanați pentru a detecta dispozitive"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Redenumiți acest dispozitiv"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Redenumiți"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Deconectați?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Astfel se va încheia conexiunea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Deconectați dispozitivul?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Telefonul dvs. se va deconecta de la <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Tableta dvs. se va deconecta de la <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Dispozitivul dvs. se va deconecta de la <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Deconectați"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Nu aveți permisiunea de a modifica setările Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Asociați un nou dispozitiv"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> este vizibil pentru dispozitivele din apropiere când conexiunea Bluetooth este deschisă."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Adresa Bluetooth a telefonului: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Adresa Bluetooth a tabletei: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Adresa Bluetooth a dispozitivului: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Deconectați <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmitere"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Dezactivați profilul?"</string>
@@ -122,7 +131,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitare de conectare prin Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitare de asociere"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Atingeți pentru a asocia cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Afișați fișierele primite"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Fișiere primite"</string>
     <string name="device_picker" msgid="4978696506172252813">"Alegeți dispozitivul Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> încearcă să activeze Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> încearcă să dezactiveze Bluetooth"</string>
@@ -158,6 +167,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s dorește să acceseze mesajele dvs. Oferiți acces pentru %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitare de acces la SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> dorește să acceseze cardul SIM. Dacă acordați accesul la cardul SIM, conexiunea de date de pe dispozitiv va fi dezactivată pe durata conectării. Acordați accesul pentru <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Vizibil ca „<xliff:g id="DEVICE_NAME">^1</xliff:g>” pentru alte dispozitive"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Dispozitivele dvs."</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Asociați un nou dispozitiv"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data și ora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selectați fusul orar"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -331,7 +343,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Conturi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Locație"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Conturi"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Securitate și locație"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Securitate și locație"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Criptare și date de conectare"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon criptat"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Dispozitiv criptat"</string>
@@ -357,40 +369,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Deblocați cu amprenta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Folosiți amprenta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Puteți să deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații atingând senzorul pentru amprente. Aveți grijă ce amprente adăugați. Aceste acțiuni sunt posibile folosind chiar și o singură amprentă adăugată.\n\nNotă: este posibil ca amprenta să fie mai puțin sigură decât un model sau un cod PIN puternic."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Puteți 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ă.\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="3635924459027832861">"Puteți să deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații atingând senzorul pentru amprente. Aveți grijă ce amprente adăugați. Aceste acțiuni sunt posibile folosind chiar și o singură amprentă adăugată.\n\nNotă: este posibil ca amprenta să fie mai puțin sigură decât un model sau un cod PIN puternic."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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 puternic."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Anulați"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuați"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Omiteți"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Adăugați amprenta"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu veți putea împiedica alte persoane să folosească tableta, dacă este pierdută, furată sau dacă datele de pe aceasta sunt șterse."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu veți putea împiedica alte persoane să folosească acest dispozitiv, dacă este pierdut, furat sau dacă datele de pe acesta sunt șterse."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu veți putea împiedica alte persoane să folosească acest telefon, dacă este pierdut, furat sau dacă datele de pe acesta sunt șterse."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu veți putea împiedica alte persoane să folosească această tabletă, dacă este pierdută sau furată."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu veți putea împiedica alte persoane să folosească acest dispozitiv, dacă este pierdut sau furat."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu veți putea să împiedicați alte persoane să folosească acest telefon, dacă este pierdut sau furat."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Înainte"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu îi veți putea împiedica pe alții să folosească această tabletă dacă este pierdută, furată sau resetată."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu îi veți putea împiedica pe alții să folosească acest dispozitiv dacă este pierdut, furat sau resetat."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu îi veți putea împiedica pe alții să folosească acest telefon dacă este pierdut, furat sau resetat."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu îi veți putea împiedica pe alții să folosească această tabletă dacă este pierdută sau furată."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu îi veți putea împiedica pe alții să folosească acest dispozitiv dacă este pierdut sau furat."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Funcțiile de protecție a dispozitivului nu vor fi activate. Nu îi veți putea împiedica pe alții să folosească acest telefon dacă este pierdut sau furat."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Omiteți oricum"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Înapoi"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Găsiți senzorul"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Găsiți senzorul de amprentă pe partea din spate a telefonului."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Atingeți senzorul"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Se află pe partea din spate a telefonului. Folosiți degetul arătător."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Imagine cu dispozitivul și poziția senzorului de amprentă"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Denumiți"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Ștergeți"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Să începem"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Atingeți senzorul"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Puneți degetul pe senzor și ridicați-l după ce simțiți o vibrație"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Atingeți în continuare"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Mișcați ușor degetul pentru a adăuga toate porțiunile amprentei"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Amprentă adăugată!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"De fiecare dată când vedeți această pictogramă, vă puteți folosi amprenta pentru identificare sau pentru a autoriza o achiziție."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Ca să activați și să deblocați dispozitivul, este suficient să atingeți senzorul pentru amprentă."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"De asemenea, când se afișează această pictogramă, puteți autoriza achizițiile sau vă puteți conecta la aplicații."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Ridicați, apoi atingeți din nou"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Ridicați încontinuu degetul pentru a adăuga toate părțile amprentei"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Amprentă adăugată"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Când vedeți această pictogramă, folosiți amprenta pentru identificare sau pentru a aproba achizițiile."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Omiteți configurarea amprentei?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Ați ales ca amprenta să fie una dintre modalitățile de deblocare a telefonului. Dacă omiteți acum această etapă, va trebui să o configurați mai târziu. Configurarea durează în jur de un minut."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Configurați blocarea ecranului"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Terminat"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hopa, acela nu este senzorul"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Folosiți senzorul de amprentă pe dispozitiv."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Atingeți senzorul de pe spatele telefonului. Folosiți degetul arătător."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Înregistrarea nu a fost finalizată"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Timpul limită pentru înregistrarea amprentei a expirat. Încercați din nou."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Înregistrarea amprentei nu a funcționat. Încercați din nou sau folosiți un alt deget."</string>
@@ -452,6 +462,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească acest dispozitiv fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească acest telefon fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Alegeți metoda de rezervă de blocare a ecranului"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opțiuni de blocare a ecranului"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opțiuni de blocare a ecranului"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blocarea ecranului"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/imediat după inactivitate"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> după inactivitate"</string>
@@ -522,13 +534,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Schimbați modelul pentru deblocare"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Schimbați codul PIN de deblocare"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Schimbați parola pentru deblocare"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Încercați din nou. Încercarea <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> din <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Ultima încercare"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Dacă la această încercare introduceți un model incorect pentru serviciu, profilul de serviciu și datele asociate acestuia vor fi eliminate de pe dispozitiv."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Dacă la această încercare introduceți un cod PIN incorect pentru serviciu, profilul de serviciu și datele asociate acestuia vor fi eliminate de pe dispozitiv."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Dacă la această încercare introduceți o parolă incorectă pentru serviciu, profilul de serviciu și datele asociate acestuia vor fi eliminate de pe dispozitiv."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Prea multe încercări incorecte. Profilul dvs. de serviciu și datele asociate acestuia vor fi eliminate de pe dispozitiv."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Închideți"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Încercați din nou. Încercarea <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> din <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Datele dvs. vor fi șterse"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Dacă la următoarea încercare introduceți un model incorect, datele de pe acest dispozitiv vor fi șterse"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Dacă la următoarea încercare introduceți un cod PIN incorect, datele de pe acest dispozitiv vor fi șterse"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Dacă la următoarea încercare introduceți o parolă incorectă, datele de pe acest dispozitiv vor fi șterse"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Dacă la următoarea încercare introduceți un model incorect, acest utilizator va fi șters"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Dacă la următoarea încercare introduceți un cod PIN incorect, acest utilizator va fi șters"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Dacă la următoarea încercare introduceți o parolă incorectă, acest utilizator va fi șters"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Dacă la următoarea încercare introduceți un model incorect, profilul de serviciu și datele sale vor fi șterse"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Dacă la următoarea încercare introduceți un cod PIN incorect, profilul de serviciu și datele sale vor fi șterse"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Dacă la următoarea încercare introduceți o parolă incorectă, profilul de serviciu și datele sale vor fi șterse"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Prea multe încercări incorecte. Datele de pe acest dispozitiv vor fi șterse."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Prea multe încercări incorecte. Acest utilizator va fi șters."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Prea multe încercări incorecte. Acest profil de serviciu și datele sale vor fi șterse."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Închideți"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Trebuie să aibă cel puțin <xliff:g id="COUNT">%d</xliff:g> caractere"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Codul PIN trebuie să aibă cel puțin <xliff:g id="COUNT">%d</xliff:g> cifre"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuați"</string>
@@ -637,6 +657,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Setări Bluetooth avansate"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Activarea Bluetooth facilitează comunicarea cu alte dispozitive Bluetooth din apropiere."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Pentru a îmbunătăți precizia localizării, aplicațiile și serviciile de sistem pot totuși să detecteze dispozitivele Bluetooth. Puteți să schimbați acest aspect din <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>setările de scanare<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Nu s-a putut conecta. Încercați din nou."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Detalii despre dispozitiv"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Adresa Bluetooth a dispozitivului: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Eliminați dispozitivul?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Telefonul dvs. nu va mai fi asociat cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Tableta dvs. nu va mai fi asociată cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Dispozitivul dvs. nu va mai fi asociat cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Eliminați dispozitivul"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectați-vă la..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la media audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la componenta audio mâini libere."</string>
@@ -789,6 +817,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Nu se furnizează"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Nu se validează"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nu s-a specificat niciun certificat. Conexiunea nu va fi privată."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Numele rețelei este prea lung."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Trebuie să specificați un domeniu."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponibil"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibil)"</string>
@@ -821,7 +850,6 @@
       <item quantity="one">1 rețea</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Setări Wi-Fi avansate"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurați Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresă MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adresă IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Mască de subrețea"</string>
@@ -858,9 +886,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Eliminați acest grup?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Hotspot Wi-Fi portabil"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Hotspot Wi-Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Utilizați conexiunea mobilă pentru a furniza rețea Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Nu se permite accesul la conexiunea la internet a tabletei prin hotspot"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Nu se permite accesul la conexiunea la internet a telefonului prin hotspot"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Nu se permite altor dispozitive accesul la conexiunea de internet sau la conținut"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Se permite accesul la conexiunea de internet a tabletei prin hotspot"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Se permite accesul la conexiunea de internet a telefonului prin hotspot"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplicația trimite conținut. Pentru a permite accesul la conexiunea de internet, dezactivați hotspotul, apoi activați-l"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Numele Wi-Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Se activează <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Alte dispozitive se pot conecta la <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Parola rețelei Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda AP"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Folosiți hotspotul pentru a crea o rețea Wi-Fi pentru celelalte dispozitive. Hotspotul oferă o conexiune de internet folosind conexiunea dvs. de date mobile. Este posibil să se aplice taxe suplimentare pentru datele mobile."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplicațiile pot crea un hotspot pentru a trimite conținut dispozitivelor din apropiere."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Se activează hotspotul..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Se dezactivează hotspotul..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> este activ"</string>
@@ -907,6 +943,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Când Apelarea prin Wi-Fi este activată, puteți să direcționați apelurile prin rețele Wi-Fi sau prin rețeaua operatorului, în funcție de preferință și de intensitatea mai mare a semnalului. Înainte de a activa această funcție, consultați-vă operatorul în privința taxelor și a altor detalii."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Actualizați adresa de urgență"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Adresa folosită de serviciile de urgență ca locație a dvs. dacă apelați 911 prin Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Afișaj"</string>
@@ -964,6 +1001,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Niciun rezultat"</string>
     <string name="display_settings" msgid="7965901687241669598">"Afișaj"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotire automată a ecranului"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Culori vii"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Doresc comutarea automată a orientării atunci când se rotește tableta"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Schimbați automat orientarea la rotirea telefonului"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Doresc comutarea automată a orientării atunci când se rotește tableta"</string>
@@ -991,23 +1029,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimizați luminozitatea pentru lumina disponibilă. Când funcția este activată, puteți ajusta temporar luminozitatea."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Lumină de noapte"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Lumina de noapte dă o nuanță de chihlimbar ecranului. Astfel, este mai ușor să priviți ecranul sau să citiți într-o lumină slabă și vă poate ajuta să adormiți mai rapid."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Program"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Stare"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Activați automat"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Niciodată"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Programare personalizată"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"De la apus la răsărit"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Program"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Niciodată"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Se activează la o anumită oră"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Se activează de la apus la răsărit"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Ora începerii"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Ora încheierii"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Stare"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensitate"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Dezactivat. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nu se va activa niciodată automat."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Se va activa automat la <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Se va activa automat la apus."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Activat. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nu se va dezactiva niciodată automat."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Se va dezactiva automat la <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Se va dezactiva automat la răsărit."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Dezactivat/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Nu se va activa niciodată automat"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Se va activa automat la <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Se va activa automat la apus"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Activat/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Nu se va dezactiva niciodată automat"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Se va dezactiva automat la <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Se va dezactiva automat la răsărit"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Inactivitate"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ecranul se dezactivează"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"După <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1031,8 +1068,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Setări"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminozitate automată"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ridicați pentru a reactiva"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Afișare Ambient"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Afișaj ambiental"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Activat permanent"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Notificări noi"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Când să se afișeze"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Notificări noi"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activează ecranul când primiți notificări"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Activat permanent"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Afișați ora, pictogramele pentru notificări și alte informații"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Dimensiunea fontului"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Măriți sau micșorați textul"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setări de blocare a cardului SIM"</string>
@@ -1285,6 +1328,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Numele APN nu poate fi necompletat."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Câmpul MCC trebuie să conțină 3 cifre."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Câmpul MNC trebuie să conțină 2 sau 3 cifre."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operatorul nu permite adăugarea numelor APN de tipul %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Se restabilesc setările APN prestabilite."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Resetați la valorile prestabilite"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Resetarea setărilor APN prestabilite a fost finalizată."</string>
@@ -1315,6 +1359,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Ștergeți cardul SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ștergeți toate datele din stocarea USB internă, cum ar fi muzica sau fotografiile"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ștergeți toate datele de pe cardul SD, cum ar fi muzica sau fotografiile"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Ștergeți cardurile eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Ștergeți toate cardurile eSIM de pe telefon. Prin această acțiune nu vă veți anula planul de servicii mobile."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Ștergeți toate cardurile eSIM de pe telefon. Prin această acțiune nu vă veți anula planul de servicii mobile."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Resetați tableta"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetați telefonul"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Ștergeți toate datele personale și aplicațiile descărcate? Nu puteți anula această acțiune!"</string>
@@ -1337,26 +1384,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Nu se poate face tethering și nu se pot folosi hotspoturile portabile în timp ce Economizorul de date este activat"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Tethering prin USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB conectat, verificați pentru distribuirea de internet"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Se utilizează pentru distribuirea de internet"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Nu se poate conecta ca modem când se utilizează stocarea USB"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB neconectat"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Conectați pentru a activa"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Eroare de tethering prin USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Permiteți accesul la conexiunea de internet a telefonului prin USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Permiteți accesul la conexiunea de internet a tabletei prin USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Tethering prin Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Se permite accesul prin Bluetooth la conexiunea de internet a tabletei"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Se permite accesul prin Bluetooth la conexiunea de internet a telefonului"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Se permite accesul prin Bluetooth la conexiunea de internet a tabletei pentru 1 dispozitiv"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Se permite accesul prin Bluetooth la conexiunea de internet a telefonului pentru 1 dispozitiv"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Se permite accesul prin Bluetooth la conexiunea de internet a tabletei pentru <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispozitive"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Se permite accesul prin Bluetooth la conexiunea de internet a telefonului pentru <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispozitive"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Permiteți accesul prin Bluetooth la conexiunea de internet a tabletei"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Permiteți accesul prin Bluetooth la conexiunea de internet a telefonului"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Se permite accesul prin Bluetooth la conexiunea de internet a dispozitivului <xliff:g id="DEVICE_NAME">%1$d</xliff:g>"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Nu se permite accesul prin Bluetooth la conexiunea de internet a tabletei"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Nu se permite accesul prin Bluetooth la conexiunea de internet a telefonului"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Nu este conectat ca modem"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Este imposibil tethering cu peste <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispozitive."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Folosiți hotspot și tethering pentru a furniza internet altor dispozitive prin intermediul conexiunii dvs. de date mobile."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Folosiți hotspotul și tetheringul pentru a oferi o conexiune de internet altor dispozitive prin conexiunea dvs. de date mobile. Aplicațiile pot crea un hotspot pentru a trimite conținut dispozitivelor din apropiere."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajutor"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Rețea mobilă"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plan de date mobile"</string>
@@ -1389,7 +1425,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mod de localizare"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Utilizați GPS, Wi-Fi, Bluetooth sau rețelele mobile pentru determinarea locației"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Utilizați Wi-Fi, Bluetooth sau rețelele mobile pentru determinarea locației"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Folosiți GPS-ul pentru a stabili locația"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Folosiți GPS-ul și senzorii dispozitivului pentru a determina locația"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanare"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Căutare de rețele Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Îmbunătățiți localizarea permițând aplicațiilor și serviciilor de sistem să detecteze rețelele Wi-Fi oricând."</string>
@@ -1434,8 +1470,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nu aveți o conexiune de date. Pentru a vedea aceste informații acum, accesați %s de pe orice computer conectat la internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Se încarcă…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Alegeți parola"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Pentru a utiliza amprenta, setați parola"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Alegeți modelul"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Pentru a utiliza amprenta, setați modelul"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Alegeți codul PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Pentru a utiliza amprenta, setați codul PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirmați parola"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmați modelul"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmați codul PIN"</string>
@@ -1504,6 +1543,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Setări aplicații"</string>
     <string name="install_applications" msgid="4872012136210802181">"Surse necunoscute"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Permite aplic. din orice surse"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Aplicații deschise recent"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Afișați toate cele <xliff:g id="COUNT">%1$d</xliff:g> aplicații"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"Acum <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tableta și datele dvs. personale sunt mai vulnerabile la un atac din partea aplicațiilor necunoscute. Dacă instalați aplicații din această sursă, acceptați că sunteți singura persoană responsabilă pentru deteriorarea tabletei sau pentru pierderea datelor, care pot avea loc în urma utilizării acestor aplicații."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefonul și datele dvs. personale sunt mai vulnerabile la un atac din partea aplicațiilor necunoscute. Dacă instalați aplicații din această sursă, acceptați că sunteți singura persoană responsabilă pentru deteriorarea telefonului sau pentru pierderea datelor, care pot avea loc în urma utilizării acestor aplicații."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Setări avansate"</string>
@@ -1673,6 +1715,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Opriți serviciul de sistem?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Dacă opriți acest serviciu, este posibil ca unele funcții ale tabletei să nu mai funcționeze corect decât după ce o veți închide și redeschide."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Dacă opriți acest serviciu, este posibil ca unele funcții ale telefonului să nu mai funcționeze corect decât după ce îl veți închide și redeschide."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Limbi, intrare și gesturi"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Limbi și introducerea textului"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Limbi și introducerea textului"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Asistență pentru introducerea textului"</string>
@@ -1893,6 +1939,11 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> de servicii de printare activate</item>
       <item quantity="one">1 serviciu de printare activat</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> sarcini de printare</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> de sarcini de printare</item>
+      <item quantity="one">1 sarcină de printare</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Servicii de printare"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nu există servicii instalate"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nu au fost găsite imprimante"</string>
@@ -1959,6 +2010,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Detalii despre utilizare"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Ajustați utilizarea de energie"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pachete incluse"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplicații care consumă bateria"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Se păstrează dispozitivul activ"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Se activează dispozitivul în fundal"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Se solicită frecvent locația"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplicații funcționează incorect"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Opriți aplicația?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Telefonul dvs. nu poate gestiona în mod normal bateria, deoarece <xliff:g id="APP">%1$s</xliff:g> păstrează telefonul activ.\n\nCa să remediați problema, puteți să opriți forțat aplicația.\n\nDacă problema persistă, poate fi necesar să dezinstalați aplicația pentru a îmbunătăți performanța bateriei."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Tableta dvs. nu poate gestiona în mod normal bateria, deoarece <xliff:g id="APP">%1$s</xliff:g> păstrează tableta activă.\n\nCa să remediați problema, puteți să opriți forțat aplicația.\n\nDacă problema persistă, poate fi necesar să dezinstalați aplicația pentru a îmbunătăți performanța bateriei."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Dispozitivul dvs. nu poate gestiona în mod normal bateria, deoarece <xliff:g id="APP">%1$s</xliff:g> păstrează dispozitivul activ.\n\nCa să remediați problema, puteți să opriți forțat aplicația.\n\nDacă problema persistă, poate fi necesar să dezinstalați aplicația pentru a îmbunătăți performanța bateriei."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Opriți aplicația"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Dezactivați utilizarea în fundal?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Telefonul dvs. nu poate gestiona în mod normal bateria, deoarece <xliff:g id="APP">%1$s</xliff:g> activează telefonul încontinuu.\n\nPentru a remedia problema, telefonul dvs. poate să împiedice această aplicație să ruleze în fundal."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Tableta dvs. nu poate gestiona în mod normal bateria, deoarece <xliff:g id="APP">%1$s</xliff:g> activează tableta încontinuu.\n\nPentru a remedia problema, tableta dvs. poate să împiedice această aplicație să ruleze în fundal."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Dispozitivul dvs. nu poate gestiona în mod normal bateria, deoarece <xliff:g id="APP">%1$s</xliff:g> activează dispozitivul încontinuu.\n\nPentru a remedia problema, dispozitivul dvs. poate să împiedice această aplicație să ruleze în fundal."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Dezactivați"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Dezactivați locația?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Telefonul dvs. nu poate gestiona în mod normal bateria, deoarece <xliff:g id="APP">%1$s</xliff:g> continuă să solicite locația dvs. când nu folosiți aplicația.\n\nPentru a remedia problema, puteți să dezactivați locația pentru această aplicație."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Tableta dvs. nu poate gestiona în mod normal bateria, deoarece <xliff:g id="APP">%1$s</xliff:g> continuă să solicite locația dvs. când nu folosiți aplicația.\n\nPentru a remedia problema, puteți să dezactivați locația pentru această aplicație."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Dispozitivul dvs. nu poate gestiona în mod normal bateria, deoarece <xliff:g id="APP">%1$s</xliff:g> continuă să solicite locația dvs. când nu folosiți aplicația.\n\nPentru a remedia problema, puteți să dezactivați locația pentru această aplicație."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Dezactivați"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ecran"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lanternă"</string>
     <string name="power_camera" msgid="4976286950934622605">"Cameră foto"</string>
@@ -1973,7 +2044,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Aplicații"</string>
     <string name="power_service" msgid="1599661212370831780">"Servicii"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistem"</string>
-    <string name="power_user" msgid="1889728099253018005">"Utilizator"</string>
+    <string name="power_user" msgid="3706143225319881667">"Alți utilizatori"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total procesor"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Procesor în prim plan"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Păstrare în activitate"</string>
@@ -2025,6 +2096,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumul supraevaluat al bateriei"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Utilizată <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Activ timp de <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Utilizarea ecranului: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> folosită de <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> din bateria încărcată complet"</string>
@@ -2588,7 +2660,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Schimbați codul PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Afișați notificările"</string>
     <string name="help_label" msgid="6886837949306318591">"Ajutor și feedback"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Articole de ajutor, telefon și asistență prin chat"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Articole de ajutor, telefon și chat, noțiuni introductive"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Cont pentru conținut"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografie"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Pericole extreme"</string>
@@ -2679,9 +2751,12 @@
       <item quantity="one">Afișați %d element ascuns</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rețea și internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobil, utilizarea datelor, hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"rețeaua mobilă"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"utilizarea datelor"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispozitive conectate"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, proiecție, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicații și notificări"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permisiuni, aplicații prestabilite"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Utilizatori și conturi"</string>
@@ -2734,6 +2809,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gest"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"plată, atingere, plăți"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gest, margine, latură, margine activă, strângere, prindere, asistență, asistent, strâns, strângeți, ok google, asistent google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gest, activare, notificări, ecran, afișaj, ecran dezactivat, ecran activat, strângere, margine, inactiv, prindere"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gest, dezactivarea sunetului, amânare, alarmă, apel primit, silențios, afișaj, ecran de blocare, strângere, prindere, margine, oprire"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurarea etichetei NFC pentru Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Scrieți"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Atingeți o etichetă pentru a scrie..."</string>
@@ -2817,7 +2895,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Nu afișați nicio notificare de serviciu"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Cum doriți să fie afișate notificările din profil când dispozitivul este blocat?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notificări din profil"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Notificări"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Notificări"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notificări din aplicații"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria notificării"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Importanță"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Permiteți aplicației să decidă"</string>
@@ -2832,6 +2911,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgentă"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Permiteți sunetul"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Sunetul și vibrațiile sunt dezactivate, iar aceste notificări nu se afișează pentru o scurtă durată pe ecranul actual."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Importanță redusă"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Importanță medie"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importanță ridicată"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Importanță urgentă"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Asistent pentru notificări"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Acces la notificări"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Accesul la notificările privind profilul de serviciu este blocat"</string>
@@ -2860,8 +2943,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permiteți modul picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permiteți acestei aplicații să creeze o fereastră picture-in-picture în timp ce aplicația este deschisă sau după ce ieșiți (de exemplu, pentru a continua vizionarea unui videoclip). Această fereastră se afișează peste alte aplicații pe care le folosiți."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Da"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Nu"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acces la funcția Nu deranja"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nicio aplicație instalată nu a solicitat accesul Nu deranja"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Se încarcă aplicațiile..."</string>
@@ -2996,11 +3077,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Acest profil de serviciu este gestionat de:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Gestionat de <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Rotirea dispozitivului"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Rotiți conținutul ecranului"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Mențineți vizualizarea portret"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Mențineți vizualizarea peisaj"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Mențineți orientarea actuală"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Pornire securizată"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuați"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând codul PIN înainte de a-l porni. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit. \n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să solicitați un cod PIN pentru a vă porni dispozitivul?"</string>
@@ -3008,7 +3084,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând parola înainte de a-l porni. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit. \n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să solicitați o parolă pentru a vă porni dispozitivul?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"În plus față de folosirea amprentei digitale pentru deblocarea dispozitivului, puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând codul PIN înainte de a-l porni. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit.\n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să solicitați un cod PIN pentru a vă porni dispozitivul?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"În plus față de folosirea amprentei digitale pentru deblocarea dispozitivului, puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând modelul înainte de a-l porni. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit.\n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să solicitați un model pentru a vă porni dispozitivul?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"În plus față de folosirea amprentei digitale pentru deblocarea dispozitivului, puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând parola înainte de a-l porni. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit.\n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să solicitați o parolă pentru a vă porni dispozitivul&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"În plus față de folosirea amprentei pentru deblocarea dispozitivului, puteți să protejați și mai bine dispozitivul setând solicitarea parolei înainte de pornire. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări, inclusiv alarme, înainte ca acesta să pornească.\n\nAstfel, datele sunt protejate pe dispozitivele pierdute sau furate. Doriți să se solicite o parolă pentru pornirea dispozitivului?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Da"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nu"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Solicitați codul PIN?"</string>
@@ -3130,6 +3206,17 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Alerte privind utilizarea"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Afișați utilizarea completă a dispozitivului"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Afișați utilizarea aplicațiilor"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Utilizare intensă"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> aplicații care se comportă anormal</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> de aplicații care se comportă anormal</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> se comportă anormal</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="few">Aplicații care consumă bateria</item>
+      <item quantity="other">Aplicații care consumă bateria</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> consumă bateria</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Neoptimizate"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Neoptimizată"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Se optimizează utilizarea bateriei"</string>
@@ -3223,8 +3310,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Afișare peste alte aplicații"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> din <xliff:g id="COUNT_1">%2$d</xliff:g> aplicații au voie să afișeze peste alte aplicații"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplicații cu permisiune"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Da"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Nu"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Permisă"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Nepermisă"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instalare aplicații din surse necunoscute"</string>
     <string name="write_settings" msgid="4797457275727195681">"Modifică setările de sistem"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"scrie modifică setări de sistem"</string>
@@ -3315,6 +3402,17 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ecranul are o tentă de chihlimbar. Acest lucru vă poate ajuta să adormiți."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Sugestii"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+ încă <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> sugestii</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> de sugestii</item>
+      <item quantity="one">O sugestie</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="few">+<xliff:g id="COUNT">%1$d</xliff:g> sugestii</item>
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> de sugestii</item>
+      <item quantity="one">+1 sugestie</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Eliminați"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura culorii: rece"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Folosiți culori mai reci pentru afișare"</string>
@@ -3333,8 +3431,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Avertisment pentru date: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Avertisment pentru date: <xliff:g id="ID_1">%1$s</xliff:g>/Limită pentru date: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciclu de facturare"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Ciclul lunar începe în data de <xliff:g id="ID_1">%1$s</xliff:g> a fiecărei luni"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Lunar, începând cu data de <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"În fiecare lună pe data de <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Restricții de rețea"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> restricții</item>
@@ -3356,7 +3453,7 @@
       <item quantity="one">O aplicație are permisiunea să utilizeze date nerestricționat când Economizorul de date e activat</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Economizor de date"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Acces nerestricționat la date"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Date nerestricționate"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Datele de fundal sunt dezactivate"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Activat"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Dezactivat"</string>
@@ -3421,8 +3518,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlați notificările pe ecranul de blocare"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Afișați sau ascundeți conținutul notificării"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Toate"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Asistență"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Asistență și sfaturi"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Cea mai mică lățime"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nicio aplicație instalată nu a solicitat accesul la SMS-urile premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS-urile premium pot genera costuri care se vor adăuga la factura operatorului. Dacă activați permisiunea pentru o aplicație, veți putea trimite SMS-uri premium folosind acea aplicație."</string>
@@ -3490,28 +3586,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automat"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuale"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Eliberați spațiu acum"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gesturi"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Comenzi rapide pentru gesturi"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gesturi rapide pentru a controla telefonul"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gesturi rapide pentru controlul tabletei"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gesturi rapide pentru controlul dispozitivului"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Accesați camera foto"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Pentru a deschide rapid camera foto, apăsați de două ori butonul de pornire. Funcționează de pe orice ecran."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Deschideți rapid camera foto"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Deschideți camera foto apăsând butonul de pornire de 2 ori"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Comutați camera foto"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Faceți autoportrete mai rapid"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Răsuciți de două ori telefonul pentru modul autoportret"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Răsuciți de două ori tableta pentru modul autoportret"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Răsuciți de două ori dispozitivul pentru modul autoportret"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Atingeți de două ori pentru a verifica telefonul"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Atingeți de două ori pentru a verifica tableta"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Atingeți de două ori pentru a verifica dispozitivul"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Pentru a verifica rapid notificările, atingeți ecranul de două ori."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Ca să verificați ora, pictogramele de notificare și alte informații, atingeți ecranul de două ori."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Verificați notificările când ecranul este inactiv"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Ridicați pentru a verifica telefonul"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Ridicați pentru a verifica tableta"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Ridicați pentru a verifica dispozitivul"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Pentru a verifica rapid notificările, ridicați telefonul."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Pentru a verifica rapid notificările, ridicați tableta."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Pentru a verifica rapid notificările, ridicați dispozitivul."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Ca să verificați ora, pictogramele pentru notificări și alte informații, ridicați telefonul."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ca să verificați ora, pictogramele pentru notificări și alte informații, ridicați tableta."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ca să verificați ora, pictogramele pentru notificări și alte informații, ridicați dispozitivul."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Verificați notificările când ecranul este inactiv"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Glisați amprenta digitală pentru notificări"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Pentru a verifica notificările, glisați în jos pe senzorul de amprentă de pe spatele telefonului."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Pentru a verifica notificările, glisați în jos pe senzorul de amprentă de pe spatele tabletei."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Pentru a verifica notificările, glisați în jos pe senzorul de amprentă de pe spatele dispozitivului."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Vedeți notificările rapid"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Glisați în jos pe senzorul de amprentă"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Ridicați pentru a deschide camera foto"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Pentru a deschide automat camera foto, ridicați telefonul în poziție de fotografiat (portret sau peisaj). Funcționează când telefonul este în modul inactiv sau blocat."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Fotografiați când telefonul este în modul inactiv sau blocat"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gest pentru asistență"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilitate"</string>
@@ -3622,6 +3731,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Doriți să eliminați această aplicație instantanee?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Jocuri"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Fișiere audio"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Spațiu utilizat"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(dezinstalat pentru <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(dezactivat pentru <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Serviciu de completare automată"</string>
@@ -3635,5 +3745,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Aplicație instantanee"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Dezactivați managerul spațiului de stocare?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplicații pentru filme și emisiuni TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Spațiu utilizat"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Informații despre provizionarea operatorului"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Declanșați provizionarea operatorului"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Ce este nou și interesant?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Încercați cele 5 funcții principale"</string>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 1f47436..621dd40 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Хороший"</item>
     <item msgid="8986346415847956850">"Отличный"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Не выключать"</item>
-    <item msgid="844721238536786870">"Только при питании от сети"</item>
-    <item msgid="1986753720941888596">"Всегда выключать"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Не выключать"</item>
-    <item msgid="7433294150916905997">"Только при питании от сети"</item>
-    <item msgid="1390404486722375028">"Всегда выключать"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"За последние 30 дней"</item>
     <item msgid="6600989128423965319">"Цикл использования данных"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b619cb6..372404c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -32,6 +32,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Вы стали разработчиком!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Не нужно, вы уже разработчик"</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Сначала включите параметры для разработчиков."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Беспроводные сети"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Подключения"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Устройство"</string>
@@ -43,6 +44,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Синхронизация VoLTE включена"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Видеосвязь предоставлена"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Связь по Wi-Fi предоставлена"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Синхронизация EAB/Presence включена"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Мощность радиосигнала"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Просмотреть адресную книгу на SIM-карте"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Просм. список разреш. номеров"</string>
@@ -108,10 +110,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Поиск устройств"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Переименовать устройство"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Переименовать"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Отключиться?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Произойдет разъединение с устройством &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Отключить устройство?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Будет прервано соединение с устройством \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Будет прервано соединение с устройством \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Будет прервано соединение с устройством \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Отключить"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"У вас нет разрешения на смену настроек Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Подключить новое устройство"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Устройства поблизости могут обнаружить <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, пока открыты настройки Bluetooth."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Адрес Bluetooth для телефона: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Адрес Bluetooth для планшета: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Адрес Bluetooth для устройства: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Отключить <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Передача данных"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Отключить профиль?"</string>
@@ -123,7 +132,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Запрос сопряжения Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Запрос на сопряжение"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Нажмите, чтобы установить соединение с устройством \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Полученные файлы"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Полученные файлы"</string>
     <string name="device_picker" msgid="4978696506172252813">"Выбрать устройство Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"Приложению \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" требуется включить Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"Приложению \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" требуется отключить Bluetooth"</string>
@@ -159,6 +168,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s хочет получить доступ к вашим сообщениям. Предоставить доступ %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Запрос на доступ к SIM-карте"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Устройство \"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>\" запрашивает доступ к вашей SIM-карте. Если вы его предоставите, будет установлено соединение, на время которого будут отключены все сервисы передачи данных. Открыть доступ устройству \"<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>\""</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Название в списке устройств: <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ваши устройства"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Подключение нового устройства"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Дата и время"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Выбрать часовой пояс"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -333,7 +345,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Аккаунты"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Местоположение"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Аккаунты"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Безопасность и местоположение"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Местоположение и защита"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрование и учетные данные"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Телефон зашифрован"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Устройство зашифровано"</string>
@@ -360,40 +372,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Сканер отпечатков пальцев"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Сканер отпечатков пальцев"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Чтобы разблокировать телефон, подтвердить покупку или войти в приложение, приложите палец к сканеру отпечатков. Сохраните на устройстве отпечатки тех, кому вы доверяете, и они тоже смогут это делать.\n\nУчтите, что распознавание отпечатков защищает не так надежно, как графический ключ или PIN-код."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Чтобы подтвердить покупку или войти в приложение, приложите палец к сканеру. Сохраните на устройстве отпечатки пользователей, которым доверяете, и они тоже смогут это делать.\n\nПомните, что сканер нельзя использовать для разблокировки этого устройства. За подробной информацией обратитесь к системному администратору."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Чтобы разблокировать телефон, подтвердить покупку или войти в приложение, приложите палец к сканеру отпечатков. Сохраните на устройстве отпечатки тех, кому вы доверяете, и они тоже смогут это делать.\n\nУчтите, что распознавание отпечатков защищает не так надежно, как графический ключ или PIN-код."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Снимайте блокировку экрана и подтверждайте покупки с помощью отпечатка пальца.\n\nВнимание! Для разблокировки этого устройства сканер отпечатков использовать нельзя. За подробной информацией обратитесь к администратору."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Снимайте блокировку экрана и подтверждайте покупки с помощью отпечатка пальца.\n\nОбратите внимание, что распознавание отпечатков обеспечивает менее надежную защиту, чем графический ключ или PIN-код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Отмена"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Продолжить"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Пропустить"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Добавить отпечаток пальца"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Защита устройства не будет активирована. Если планшет потеряется, его украдут или с него сотрут все данные, им смогут воспользоваться посторонние."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Защита устройства не будет включена. Если устройство будет потеряно или украдено либо все его данные будут удалены, его смогут использовать посторонние лица."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Защита устройства не будет включена. Если телефон будет потерян или украден либо все его данные будут удалены, его смогут использовать посторонние лица."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Защита устройства не будет активирована. Если планшет потеряется или его украдут, им смогут воспользоваться посторонние."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Защита устройства не будет активирована. Если оно потеряется или его украдут, им смогут воспользоваться посторонние."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Защита устройства не будет активирована. Если телефон потеряется или его украдут, им смогут воспользоваться посторонние."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Далее"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Защита устройства не будет активирована. В случае потери или кражи планшета либо сброса его настроек им смогут воспользоваться посторонние."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Защита не будет активирована. В случае потери или кражи устройства либо сброса его настроек им смогут воспользоваться посторонние."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Защита устройства не будет активирована. В случае потери или кражи телефона либо сброса его настроек им смогут воспользоваться посторонние."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Защита устройства не будет активирована. В случае потери или кражи планшета им смогут воспользоваться посторонние."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Защита не будет активирована. В случае потери или кражи устройства им смогут воспользоваться посторонние."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Защита устройства не будет активирована. В случае потери или кражи телефона им смогут воспользоваться посторонние."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Все равно пропустить"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Назад"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Найдите сканер"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Найдите сканер отпечатков пальцев на задней поверхности телефона."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Коснитесь сканера отпечатков"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Сканер находится на задней панели устройства. Используйте указательный палец."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"На этом рисунке показано, где находится сканер"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Название"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ОК"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Удалить"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Начало работы"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Коснитесь сканера отпечатков"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Приложите палец к сканеру и удерживайте, пока не почувствуете вибрацию."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Нажмите ещё раз"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Немного перемещайте палец, чтобы получить полный отпечаток."</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Отпечаток добавлен!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Этот значок сообщает, что вы можете подтверждать покупки и проходить индентификацию с помощью отпечатка пальца."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Чтобы разблокировать устройство, приложите палец к сканеру."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Этот значок означает, что вы можете подтверждать покупки и входить в приложения."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Коснитесь несколько раз"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Немного перемещайте палец, чтобы отсканировать его полностью"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Отпечаток добавлен"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Этот значок указывает на то, что вы можете подтверждать покупки и свою личность с помощью отпечатка пальца."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Не настраивать доступ по отпечаткам?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Для разблокировки телефона вы выбрали сканирование отпечатка пальца. Настройка займет около минуты. Если вы пропустите ее сейчас, вам все равно придется сделать это позже."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Настроить блокировку экрана"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Готово"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Мимо! Это не сканер отпечатков пальцев..."</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Он точно есть на устройстве. Найдите его!"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Найдите сканер на задней панели и коснитесь его указательным пальцем."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Отпечаток не добавлен"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Превышен срок ожидания. Повторите попытку"</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Не удалось добавить отпечаток. Повторите попытку или попробуйте сохранить отпечаток другого пальца."</string>
@@ -455,6 +465,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Чтобы никто не мог пользоваться этим устройством без вашего разрешения, активируйте его защиту. Выберите подходящий для вас способ блокировки экрана."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Чтобы никто не мог пользоваться этим устройством без вашего разрешения, активируйте его защиту. Выберите подходящий для вас способ блокировки экрана."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Выберите дополнительный способ блокировки экрана"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Параметры блокировки экрана"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Параметры блокировки экрана"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блокировка экрана"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>, сразу после спящего режима"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>, через <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> после спящего режима"</string>
@@ -525,13 +537,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Изменить графический ключ разблокировки"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Изменить ПИН-код разблокировки"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Изменить пароль разблокировки"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Попробуйте ещё раз. Попытка <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> из <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Последняя попытка"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Если вы неправильно введете графический ключ, ваш рабочий профиль и связанные с ним данные будут удалены с устройства."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Если вы неправильно введете PIN-код, ваш рабочий профиль и связанные с ним данные будут удалены с устройства."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Если вы неправильно введете пароль, ваш рабочий профиль и связанные с ним данные будут удалены с устройства."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"У вас больше нет попыток. Рабочий профиль и связанные с ним данные будут удалены с устройства."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Закрыть"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Попробуйте ещё раз. Попытка <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> из <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Осталась одна попытка"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Если вы неправильно введете графический ключ, с устройства будут удалены все данные."</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Если вы неправильно введете PIN-код, с устройства будут удалены все данные."</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Если вы неправильно введете пароль, с устройства будут удалены все данные."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Если вы неправильно введете графический ключ, этот пользователь будет удален."</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Если вы неправильно введете PIN-код, этот пользователь будет удален."</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Если вы неправильно введете пароль, этот пользователь будет удален."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Если вы неправильно введете графический ключ, ваш рабочий профиль и его данные будут удалены."</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Если вы неправильно введете PIN-код, ваш рабочий профиль и его данные будут удалены."</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Если вы неправильно введете пароль, ваш рабочий профиль и его данные будут удалены."</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Слишком много неудачных попыток. С устройства будут удалены все данные."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Слишком много неудачных попыток. Этот пользователь будет удален."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Слишком много неудачных попыток. Этот рабочий профиль и его данные будут удалены."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Закрыть"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Должно быть не менее <xliff:g id="COUNT">%d</xliff:g> символов"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Должно быть не менее <xliff:g id="COUNT">%d</xliff:g> символов"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Продолжить"</string>
@@ -648,6 +668,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Расш. настройки Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Включите Bluetooth, чтобы подключаться к другим Bluetooth-устройствам"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Чтобы точнее определять местоположение, системные приложения и сервисы продолжат искать находящиеся поблизости Bluetooth-устройства. Вы можете отключить эту функцию в <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>настройках сканирования<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Ошибка подключения. Повторите попытку."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Информация об устройстве"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Адрес Bluetooth для устройства: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Прервать соединение?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Соединение с устройством \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" будет прервано."</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Соединение с устройством \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" будет прервано."</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Соединение с устройством \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" будет прервано."</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"ОК"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Подключить к..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Устройство <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет отключено от источника звука."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Устройство <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет отключено от гарнитуры."</string>
@@ -800,6 +828,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Не указывать"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Не проверять"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Сертификат не указан. Будет установлено незащищенное соединение."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Слишком длинное имя сети."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Укажите домен."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Поддерживает WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (доступно WPS)"</string>
@@ -833,7 +862,6 @@
       <item quantity="other">%d сети</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Дополнительные функции"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Настройка Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-адрес"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-адрес"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска подсети"</string>
@@ -870,9 +898,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Удалить эту группу?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Точка доступа Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Точка доступа Wi‑Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Использовать мобильное подключение, чтобы предоставлять доступ к сети Wi‑Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Нет доступа к интернет-подключению планшета через точку доступа"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Нет доступа к интернет-подключению телефона через точку доступа"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Другим устройствам закрыт доступ к Интернету или контенту"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Доступ к интернет-соединению планшета через точку доступа открыт"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Доступ к интернет-соединению телефона через точку доступа открыт"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Предоставлен доступ к контенту приложения. Чтобы открыть другим устройствам доступ к интернет-соединению, отключите и снова включите точку доступа."</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Название точки доступа Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Подключение к точке доступа \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\"..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Другие устройства могут подключаться к точке доступа \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\""</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Пароль Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Диапазон частот Wi-Fi"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Создайте сеть Wi‑Fi для других своих устройств с помощью точки доступа. Она позволяет пользоваться мобильным Интернетом. За передачу и скачивание данных может взиматься дополнительная плата."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Через приложения можно создавать точки доступа, чтобы делиться контентом с устройствами поблизости."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Включение точки доступа…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Выключение точки доступа…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"Сеть <xliff:g id="NETWORK_SSID">%1$s</xliff:g> активна"</string>
@@ -919,6 +955,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Когда функция \"Звонки по Wi-Fi\" включена, для исходящих вызовов может использоваться как Wi-Fi, так и мобильная сеть (в зависимости от ваших предпочтений и уровня сигнала). Прежде чем включить эту функцию, свяжитесь со своим оператором и уточните детали."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Изменение адреса для экстренных случаев"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Адрес, по которому будут направлены экстренные службы в случае вызова по номеру 112 через сеть Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Экран"</string>
@@ -976,6 +1013,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Ничего не найдено"</string>
     <string name="display_settings" msgid="7965901687241669598">"Экран"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Автоповорот экрана"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Насыщенные цвета"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Автоматически изменять ориентацию экрана при повороте планшетного ПК"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Автоматически менять ориентацию экрана при повороте телефона"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Автоматически изменять ориентацию экрана при повороте планшетного ПК"</string>
@@ -1003,23 +1041,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Яркость регулируется с учетом уровня освещенности. При необходимости ее можно временно изменить."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Ночной режим"</string>
     <string name="night_display_text" msgid="1837277457033025056">"В ночном режиме экран приобретает желтоватый оттенок. Это снижает напряжение глаз при тусклом свете и может помочь вам быстрее заснуть."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Расписание"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Статус"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Включать автоматически"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Никогда"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Мое расписание"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"От заката до рассвета"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"По расписанию"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Никогда"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"В выбранное время"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"От заката до рассвета"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Время включения"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Время отключения"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Статус"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Яркость"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Отключено (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Не включать автоматически"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Включать автоматически в <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Включать автоматически на закате"</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Включено (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Не отключать автоматически"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Отключать автоматически в <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Отключать автоматически на рассвете"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Отключен/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Не включать автоматически"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Включать автоматически в <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Включать автоматически на закате"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Включен/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Не отключать автоматически"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Отключать автоматически в <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Отключать автоматически на рассвете"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Спящий режим"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Отключение экрана"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездействия"</string>
@@ -1043,8 +1080,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Настройки"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автонастройка"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Активация в вертикальном положении"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Автоматическое включение экрана"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Автоматич. включение экрана"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Всегда включен"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"При новых уведомлениях"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Когда включать экран"</string>
+    <string name="doze_title" msgid="2375510714460456687">"При новых уведомлениях"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Включать экран, когда приходит уведомление"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Всегда включено"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Показывать время, значки уведомлений и другую информацию"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Размер шрифта"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Увеличение или уменьшение размера шрифта"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Настройки блокировки SIM-карты"</string>
@@ -1298,6 +1341,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Необходимо указать APN."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Поле MCC должно содержать 3 цифры."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Поле MNC должно содержать 2 или 3 цифры."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Оператор запретил добавлять точки доступа этого типа (%s)."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Восстановление настроек APN по умолчанию..."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Сбросить настройки"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Настройки по умолчанию восстановлены"</string>
@@ -1329,6 +1373,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Очистить SD-карту"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Удалить с USB-накопителя музыку, фотографии и все остальные данные."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Удалить с SD-карты все данные, в том числе музыку и фотографии"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Удалить все данные eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Удалить все данные eSIM на телефоне (вы не потеряете доступ к услугам оператора связи)"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Удалить все данные eSIM на планшете (вы не потеряете доступ к услугам оператора связи)"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Сбросить настройки планшета"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Сбросить настройки телефона"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Удалить всю личную информацию и скачанные приложения? Это действие нельзя отменить."</string>
@@ -1351,26 +1398,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"В режиме экономии трафика нельзя подключаться к точкам доступа"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-модем"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Устройство USB подключено, включите передачу данных"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Подключено"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Невозможно подключиться при использовании USB-накопителя"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB-подключения не обнаружено"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Подключите USB"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Ошибка подключения USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Открыть доступ к интернет-соединению телефона через USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Открыть доступ к интернет-соединению планшета через USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-модем"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Доступ к интернет-подключению планшета через Bluetooth открыт"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Доступ к интернет-подключению телефона через Bluetooth открыт"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Интернет-подключение планшета используется одним устройством через Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Интернет-подключение телефона используется одним устройством через Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Интернет-подключение планшета используется <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> устройствами через Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Интернет-подключение телефона используется <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> устройствами через Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Открыть доступ к интернет-соединению планшета через Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Открыть доступ к интернет-соединению телефона через Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Доступ к интернет-подключению устройства \"<xliff:g id="DEVICE_NAME">%1$d</xliff:g>\" через Bluetooth открыт"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Нет доступа к интернет-подключению планшета через Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Нет доступа к интернет-подключению телефона через Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Отсутствует подключение"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Макс. число подключаемых устройств: <xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Подключение к <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет прервано."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Используйте точку доступа и режим модема, чтобы подключать другие устройства к Интернету по мобильной сети."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Используйте точку доступа и режим модема, чтобы подключать другие устройства к Интернету по мобильной сети. Через приложения можно создавать точки доступа, чтобы делиться контентом с устройствами поблизости."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Справка"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Мобильная сеть"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Тарифный план"</string>
@@ -1403,7 +1439,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Определение местоположения"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Использовать GPS, Wi‑Fi, Bluetooth и мобильные сети для определения местоположения"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Использовать Wi‑Fi, Bluetooth и мобильные сети для определения местоположения"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Использовать GPS для определения местоположения"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Использовать GPS и датчики устройства для определения местоположения"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Поиск"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Поиск сетей Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Точнее определять местоположение, разрешив системным приложениям и сервисам постоянно искать сети Wi‑Fi"</string>
@@ -1448,8 +1484,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Устройство не подключено к Интернету. Чтобы просмотреть эту информацию, откройте страницу %s на любом компьютере с интернет-доступом."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Загрузка…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Выберите пароль"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Задайте пароль"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Создайте графический ключ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Задайте графический ключ"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Введите PIN-код"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Задайте PIN-код"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Подтвердите пароль"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Подтвердите графический ключ"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Подтвердите PIN-код"</string>
@@ -1518,6 +1557,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Настройки приложения"</string>
     <string name="install_applications" msgid="4872012136210802181">"Неизвестные источники"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Разрешить из всех источников"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Недавно открытые приложения"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Показать все приложения (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> назад"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Ваши личные данные и данные планшета более уязвимы для атак приложений из неизвестных источников. Устанавливая приложения из этого источника, вы соглашаетесь с тем, что несете полную ответственность за любой ущерб, нанесенный планшету, и потерю данных, связанные с использованием этих приложений."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Ваши личные данные и данные телефона более уязвимы для атак приложений из неизвестных источников. Устанавливая приложения из этого источника, вы соглашаетесь с тем, что несете полную ответственность за любой ущерб, нанесенный телефону, и потерю данных, связанные с использованием этих приложений."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Расширенные настройки"</string>
@@ -1688,6 +1730,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Остановить системную службу?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Отключение этой системной службы может повлиять на функциональность планшетного ПК. Чтобы восстановить работу устройства, потребуется перезагрузить его."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Отключение этой системной службы может повлиять на функциональность телефона. Чтобы восстановить работу устройства, потребуется перезагрузить его."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Языки, ввод и жесты"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Язык и ввод"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Язык и ввод"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Помощь при вводе"</string>
@@ -1914,6 +1960,12 @@
       <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="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <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="print_settings_title" msgid="3685449667822217816">"Службы печати"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Сервисов нет"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Ничего не найдено"</string>
@@ -1980,6 +2032,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Расход батареи"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Режим энергопотребления"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Пакеты"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Приложения, сильно расходующие заряд батареи"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Устройство не переходит в спящий режим"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Спящий режим отключается в фоновом режиме"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Устройство слишком часто запрашивает данные о местоположении"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Количество неправильно работающих приложений: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Остановить работу приложения?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP">%1$s</xliff:g>\" не дает телефону перейти в спящий режим.\n\nЧтобы устранить проблему, принудительно остановите работу приложения.\n\nЕсли это не поможет, удалите его."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP">%1$s</xliff:g>\" не дает планшету перейти в спящий режим.\n\nЧтобы устранить проблему, принудительно остановите работу приложения.\n\nЕсли это не поможет, удалите его."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP">%1$s</xliff:g>\" не дает устройству перейти в спящий режим.\n\nЧтобы устранить проблему, принудительно остановите работу приложения.\n\nЕсли это не поможет, удалите его."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Остановить"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Запретить работу в фоновом режиме?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP">%1$s</xliff:g>\" часто выводит телефон из спящего режима.\n\nЧтобы устранить эту проблему, запретите приложению работать в фоновом режиме."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP">%1$s</xliff:g>\" часто выводит планшет из спящего режима.\n\nЧтобы устранить эту проблему, запретите приложению работать в фоновом режиме."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP">%1$s</xliff:g>\" часто выводит устройство из спящего режима.\n\nЧтобы устранить эту проблему, запретите приложению работать в фоновом режиме."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Запретить"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Запретить доступ к геоданным?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP">%1$s</xliff:g>\" запрашивает данные о вашем местоположении, даже когда вы им не пользуетесь.\n\nЧтобы устранить эту проблему, запретите приложению доступ к геоданным."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP">%1$s</xliff:g>\" запрашивает данные о вашем местоположении, даже когда вы им не пользуетесь.\n\nЧтобы устранить эту проблему, запретите приложению доступ к геоданным."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP">%1$s</xliff:g>\" запрашивает данные о вашем местоположении, даже когда вы им не пользуетесь.\n\nЧтобы устранить эту проблему, запретите приложению доступ к геоданным."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Запретить"</string>
     <string name="power_screen" msgid="3023346080675904613">"Экран"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Фонарик"</string>
     <string name="power_camera" msgid="4976286950934622605">"Камера"</string>
@@ -1994,7 +2066,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Приложения"</string>
     <string name="power_service" msgid="1599661212370831780">"Службы"</string>
     <string name="power_system" msgid="8290455327965307383">"Система"</string>
-    <string name="power_user" msgid="1889728099253018005">"Пользователь"</string>
+    <string name="power_user" msgid="3706143225319881667">"Другие пользователи"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"ЦП – всего"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ЦП – акт. режим"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Акт. режим"</string>
@@ -2046,6 +2118,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Преувеличенное энергопотребление"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мА·ч"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Время использования: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Время работы: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Использование экрана: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> – <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> заряда батареи"</string>
@@ -2613,7 +2686,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Изменить PIN-код"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Включить уведомления"</string>
     <string name="help_label" msgid="6886837949306318591">"Справка/отзыв"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Справочные статьи, поддержка по телефону и в чате"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Справочные статьи, поддержка по телефону и в чате, инструкции по началу работы"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Аккаунт для контента"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Документ с фото"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Серьезные угрозы"</string>
@@ -2705,9 +2778,12 @@
       <item quantity="other">Показать %d скрытых объекта</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Сеть и Интернет"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, мобильный Интернет, передача данных, точка доступа"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"моб. сети"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"передача данных"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"точка доступа"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Подключенные устройства"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, трансляция, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, трансляция"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Приложения и уведомления"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Разрешения, приложения по умолчанию"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Пользователи и аккаунты"</string>
@@ -2760,6 +2836,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"жест"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"Бесконтактная оплата"</string>
     <string name="keywords_backup" msgid="470070289135403022">"создать резервную копию"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"жест, край, сторона, active edge, сжатие, захват, помощь, ассистент, squeezy, о\'кей, google, google ассистент"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"жест, разбудить, уведомления, экран, отключенный экран, включенный экран, сжатие, край, спящий режим, сон, захват"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"жест, отключить звук, отложить, будильник, входящий вызов, низкая громкость, экран, заблокированный экран, сжатие, захват, край, остановить"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Настройка NFC-метки"</string>
     <string name="write_tag" msgid="8571858602896222537">"Записать"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Нажмите на метку, чтобы начать запись..."</string>
@@ -2844,7 +2923,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Не показывать рабочие уведомления"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Выберите режим уведомлений профиля на заблокированном устройстве."</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Уведомления профиля"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Уведомления"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Уведомления"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Уведомления приложений"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Категория оповещения"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Важность"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"На усмотрение приложения"</string>
@@ -2859,6 +2939,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Крайняя важность"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Разрешить звуковой сигнал"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Отключить звуковой сигнал и вибрацию, не показывать оповещения поверх других приложений."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Низкая важность"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Средняя важность"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Высокая важность"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Крайняя важность"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Настройка уведомлений"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Доступ к уведомлениям"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Доступ к уведомлениям в рабочем профиле заблокирован"</string>
@@ -2888,8 +2972,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Картинка в картинке"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Поддержка режима \"Картинка в картинке\""</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Когда приложение открыто или когда вы выходите из него, оно может создавать окно \"Картинка в картинке\". Так вы можете, например, продолжить просмотр видео. Это окно отображается поверх остальных приложений."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Да"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Нет"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Доступ к функции \"Не беспокоить\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Установленные приложения не запрашивали доступ к функции \"Не беспокоить\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Загрузка..."</string>
@@ -3028,11 +3110,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Профилем управляет"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Управляется <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(экспериментальная настройка)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Поворот устройства"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Поворачивать изображение"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Сохранять вертикальную ориентацию"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Зафиксировать в горизонтальной ориентации"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Зафиксировать в текущей ориентации"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Безопасный запуск"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Продолжить"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Вы можете задать PIN-код для разблокировки, чтобы защитить данные, например, в случае потери устройства. Пока телефон заблокирован, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЗадать PIN-код?"</string>
@@ -3040,7 +3117,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Вы можете задать пароль для разблокировки, чтобы защитить данные, например, в случае потери устройства. Пока телефон заблокирован, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЗадать пароль?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Вы также можете задать PIN-код для разблокировки, чтобы обеспечить дополнительную защиту данных, например, в случае потери устройства. Пока телефон заблокирован, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЗадать PIN-код?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Вы также можете задать графический ключ для разблокировки, чтобы обеспечить дополнительную защиту данных, например, в случае потери устройства. Пока телефон заблокирован, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЗадать графический ключ?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Вы также можете задать пароль для разблокировки, чтобы обеспечить дополнительную защиту данных, например, в случае потери устройства. Пока телефон заблокирован, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЗадать пароль?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Вы также можете задать пароль для запуска устройства. Это поможет ещё надежнее защитить ваши данные, если вы, например, потеряете телефон. Пока устройство заблокировано, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЗадать пароль?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Да"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Нет"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Запрашивать PIN-код?"</string>
@@ -3166,6 +3243,19 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Предупреждения"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Вся информация об использовании"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Использование приложений"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Большой расход заряда"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> приложение работает неправильно</item>
+      <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> приложения работают неправильно</item>
+      <item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> приложений работает неправильно</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> приложения работает неправильно</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Приложения, сильно расходующие заряд батареи</item>
+      <item quantity="few">Приложения, сильно расходующие заряд батареи</item>
+      <item quantity="many">Приложения, сильно расходующие заряд батареи</item>
+      <item quantity="other">Приложения, сильно расходующие заряд батареи</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Не экономят заряд"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Не экономит заряд"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Экономия заряда включена"</string>
@@ -3260,8 +3350,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Поверх других приложений"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> из <xliff:g id="COUNT_1">%2$d</xliff:g> приложений отображаются поверх других окон"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Авторизованные приложения"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Да"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Нет"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Разрешено"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Запрещено"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"установка приложений неизвестные источники"</string>
     <string name="write_settings" msgid="4797457275727195681">"Изменение системных настроек"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"запись изменение системных настроек"</string>
@@ -3353,6 +3443,19 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Экран теперь имеет желтоватый оттенок. Это поможет вам быстрее заснуть."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Подсказки"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"Ещё <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <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="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <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="suggestion_remove" msgid="904627293892092439">"Убрать"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Холодные оттенки"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Использовать более холодные цвета на экране"</string>
@@ -3371,8 +3474,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Предупреждение передачи данных: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Предупреждения при передаче данных: <xliff:g id="ID_1">%1$s</xliff:g>/Лимит передачи данных: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Платежный цикл"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Платежный цикл начинается <xliff:g id="ID_1">%1$s</xliff:g>-го числа каждого месяца"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Ежемесячно с <xliff:g id="ID_1">%1$s</xliff:g>-го числа"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Ежемесячно, <xliff:g id="ID_1">%1$s</xliff:g> числа"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Ограничения трафика"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> ограничение</item>
@@ -3396,7 +3498,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> приложения может использовать мобильный Интернет без ограничений в режиме экономии трафика</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Экономия трафика"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Неограниченный мобильный Интернет"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Неограниченный мобильный Интернет"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Фоновый режим выключен"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Включено"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Отключено"</string>
@@ -3462,8 +3564,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Управление уведомлениями на заблокированном экране"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Скрыть или показать содержание уведомлений"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Все"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Поддержка"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Помощь и советы"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Минимальная ширина"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Установленные приложения не запрашивали доступ к платным SMS"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Обратите внимание, что такие SMS могут оплачиваться дополнительно. Предоставив разрешение приложению, вы сможете отправлять платные SMS с его помощью."</string>
@@ -3534,28 +3635,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Автоматически"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Вручную"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Очистить хранилище"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Жесты"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Быстрые жесты"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Жесты для управления телефоном"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Жесты для управления устройством"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Жесты для управления устройством"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Быстрый доступ к камере"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Включение камеры двойным нажатием кнопки питания в любом приложении"</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Быстрое включение камеры"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Чтобы включить камеру, дважды нажмите кнопку питания"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Смена камеры"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Быстрое включение фронтальной камеры"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Чтобы включить фронтальную камеру, дважды поверните запястье"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Чтобы включить фронтальную камеру, дважды поверните запястье"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Чтобы включить фронтальную камеру, дважды поверните запястье"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Просмотр времени и уведомлений двойным нажатием"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Просмотр времени и уведомлений двойным нажатием"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Просмотр времени и уведомлений двойным нажатием"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Чтобы увидеть уведомления, дважды нажмите на экран устройства"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Чтобы увидеть время, значки уведомлений и другую информацию, дважды коснитесь экрана."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Проверять уведомления при отключенном экране"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Поднять телефон, чтобы проверить уведомления"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Просмотр уведомлений в вертикальном положении планшета"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Просмотр уведомлений в вертикальном положении устройства"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Чтобы увидеть уведомления, возьмите телефон в руки"</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Чтобы увидеть уведомления, возьмите планшет в руки"</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Чтобы увидеть уведомления, возьмите устройство в руки"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Чтобы увидеть время, значки уведомлений и другую информацию, возьмите телефон."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Чтобы увидеть время, значки уведомлений и другую информацию, возьмите планшет."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Чтобы увидеть время, значки уведомлений и другую информацию, возьмите устройство."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Проверять уведомления при отключенном экране"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Использовать сканер отпечатков для просмотра уведомлений"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Чтобы увидеть уведомления, проведите вниз по сканеру отпечатков пальцев на задней панели телефона"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Чтобы увидеть уведомления, проведите вниз по сканеру отпечатков пальцев на задней панели планшета"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Чтобы увидеть уведомления, проведите вниз по сканеру отпечатков пальцев на задней панели устройства"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Быстрый просмотр уведомлений"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Проведите вниз по сканеру отпечатков пальцев"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Поднимите устройство, чтобы включить камеру"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Чтобы автоматически открыть камеру, поднимите телефон (в горизонтальном или вертикальном положении) на уровень глаз. Эта функция работает, когда телефон заблокирован или находится в спящем режиме."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Делайте фото, когда телефон в спящем режиме или заблокирован"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Жест для вызова помощника"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Чувствительность"</string>
@@ -3673,6 +3787,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Удалить приложение с мгновенным запуском?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Игры"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудиофайлы"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Занятое пространство"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(удалено у пользователя <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(отключено для пользователя <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Автозаполнение"</string>
@@ -3686,5 +3801,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Приложение с мгновенным запуском"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Отключить менеджер хранилища?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Фильмы и сериалы"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Занятое пространство"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Сведения об операторе"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Запустить синхронизацию оператора"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Новые и интересные функции"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"5 функций, которые вам пригодятся"</string>
 </resources>
diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml
index 3745655..aa1a012 100644
--- a/res/values-si/arrays.xml
+++ b/res/values-si/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"හොඳ"</item>
     <item msgid="8986346415847956850">"ඉතා හොඳ"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"සැමවිටම"</item>
-    <item msgid="844721238536786870">"පේනුව ගත කළ විට පමණක්"</item>
-    <item msgid="1986753720941888596">"කවදාවත් නොවේ"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"සැමවිටම"</item>
-    <item msgid="7433294150916905997">"පේනුව සක්‍රිය කලවිට පමණක්"</item>
-    <item msgid="1390404486722375028">"කවදාවත් නොවේ"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"අවසන් දින 30"</item>
     <item msgid="6600989128423965319">"භාවිත කිරීමේ කවය සකසන්න..."</item>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 2ac1967..9cd7647 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ඔබ දැන් වර්ධකයෙකි"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"අවශ්‍ය නැත, ඔබ දැනටමත් වර්ධකයෙකි."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"කරුණාකර පළමුව සංවර්ධක විකල්ප සබල කරන්න."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"නොරැහැන් සහ ජාල"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"සම්බන්ධතා"</string>
     <string name="header_category_device" msgid="4544026001618307754">"උපාංගය"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ප්රතිපාදන ලත්"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"වීඩියෝ ඇමතුම් ප්‍රතිපාදනය"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi ඇමතුම් ප්‍රතිපාදනය"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/තිබීම ප්‍රතිපාදනය කර ඇත"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"ජංගම රේඩියෝ බලය"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM ලිපින පොත බලන්න"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ස්ථිර ඇමතුම් අංක පෙන්වන්න"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"උපාංග සඳහා පරිලෝකනය කරන්න"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"මෙම උපාංගය යළි නම් කරන්න"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"නැවත නම් කරන්න"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"විසන්ධි කරන්නද?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"මෙය &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; සමඟ ඔබගේ සම්බන්ධය අවසන් කරනු ඇත"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"උපාංගය විසන්ධි කරන්නද?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"ඔබේ දුරකථනය <xliff:g id="DEVICE_NAME">%1$s</xliff:g> වෙතින් විසන්ධි කරනු ඇත."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"ඔබේ ටැබ්ලට් පරිගණකය <xliff:g id="DEVICE_NAME">%1$s</xliff:g> වෙතින් විසන්ධි කරනු ඇත."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"ඔබේ උපාංගය <xliff:g id="DEVICE_NAME">%1$s</xliff:g> වෙතින් විසන්ධි කරනු ඇත."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"විසන්ධි කරන්න"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"බ්ලූටූත් සැකසීම් වෙනස් කිරීමට ඔබට අවසර නැත."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"නව උපාංගය යුගල කරන්න"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"බ්ලූටූත් සැකසීම් විවෘත කරන අතරතුර ආසන්න උපකරණ වලට <xliff:g id="DEVICE_NAME">%1$s</xliff:g> දර්ශනය වේ."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"දුරකථනයේ බ්ලූටූත් ලිපිනය: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"ටැබ්ලට් පරිගණකයේ බ්ලූටූත් ලිපිනය: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"උපාංගයේ බ්ලූටූත් ලිපිනය: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> විසන්ධි කරද?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"විකාශනය කරමින්"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"අක්‍රිය පැතිකඩක්ද?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"බ්ලූටූත් යුගලකිරීමේ ඉල්ලීම"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"යුගල කිරීමේ ඉල්ලීම"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> සමඟ යුගල කිරීමට තට්ටු කරන්න."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"ලැබුණු ගොනු පෙන්වන්න"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"ලැබුණ ගොනු"</string>
     <string name="device_picker" msgid="4978696506172252813">"බ්ලූටූත් උපාංගය තෝරන්න"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> හට බ්ලූටූත් ක්‍රියාත්මක කිරීමට අවශ්‍යය"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> හට බ්ලූටූත් ක්‍රියාවිරහිත කිරීමට අවශ්‍යය"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s හට ඔබගේ පණිවිඩ වෙත ප්‍රවේශ විමට අවශ්‍යයි. %2$s හට ප්‍රවේශය දෙන්නද?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM කාඩ්පත් ප්‍රවේශය ඉල්ලීම"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> හට ඔබේ SIM කාඩ්පත වෙත පිවිසීමට අවශ්‍යයි. SIM කාඩ්පතට ප්‍රවේශය ලබා දිම ඔබේ උපාංගයට සබැඳුම් කාල සීමාව සඳහා දත්ත සබැඳුම් හැකියාව අබල කරනු ඇත. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> වෙත ප්‍රවේශය ලබා දෙන්න"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"වෙනත් උපාංගවලට <xliff:g id="DEVICE_NAME">^1</xliff:g> ලෙස දෘශ්‍යමානයි"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ඔබගේ උපාංග"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"නව උපාංගය යුගල කරන්න"</string>
     <string name="date_and_time" msgid="9062980487860757694">"දිනය සහ වේලාව"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"වේලා කලාපය තෝරන්න"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ගිණුම්"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ස්ථානය"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ගිණුම්"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"ආරක්ෂාව සහ ස්ථානය"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"ආරක්ෂාව සහ පිහිටීම"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"සංකේතනය සහ අක්තපත්‍ර"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"දුරකතනය සංකේතනය කර ඇත"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"උපාංගය සංකේතිතයි"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"ඇඟිලි සලකුණින් අගුළු හරින්න"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"ඔබේ ඇඟිලි සලකුණ භාවිත කරන්න"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"ඔබේ දුරකථනය අවදි කිරීමට සහ අගුලු හැරීමට, මිලදී ගැනීම් අනුමත කිරීමට, හෝ යෙදුම් වෙත පිරීමට ඇඟිලි සලකුණු සංවේදකය ස්පර්ශ කරන්න. ඔබ කාගේ ඇඟිලි සලකුණු එක් කරන්නේද යන්න ගැන සැලකිලිමත් වන්න. එක් කළ එක් සලකුණකට පවා මෙම දේවල්වලින් ඕනෑම එකක් කළ හැකිය.\n\nසටහන: ඔබේ ඇඟිලි සලකුණ ප්‍රබල රටාවකට හෝ PIN අංකයකට වඩා ආරක්ෂාකාරී බව අඩු විය හැකිය."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"මිලදී ගැනීම් අනුමත කිරීමට, හෝ යෙදුම් වෙත පිරීමට ඇඟිලි සලකුණු සංවේදකය ස්පර්ශ කරන්න. ඔබ එක් කරන ඇඟිලි සලකුණු පිළිබඳ සැලකිලිමත් වන්න. එක් කළ එක් සලකුණකට පවා මේ දේවල්වලින් ඕනෑම එකක් කළ හැකිය.\n\nසටහන: මෙම උපාංගය අගුලු හැරීමට ඔබට ඔබේ ඇඟිලි සලකුණ භාවිත කළ නොහැකිය. තව තොරතුරු සඳහා, ඔබේ සංවිධානයෙහි පරිපාලක අමතන්න."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"ඔබේ දුරකථනය අවදි කිරීමට සහ අගුලු හැරීමට, මිලදී ගැනීම් අනුමත කිරීමට, හෝ යෙදුම් වෙත පිරීමට ඇඟිලි සලකුණු සංවේදකය ස්පර්ශ කරන්න. ඔබ කාගේ ඇඟිලි සලකුණු එක් කරන්නේද යන්න ගැන සැලකිලිමත් වන්න. එක් කළ එක් සලකුණකට පවා මෙම දේවල්වලින් ඕනෑම එකක් කළ හැකිය.\n\nසටහන: ඔබේ ඇඟිලි සලකුණ ප්‍රබල රටාවකට හෝ PIN අංකයකට වඩා ආරක්ෂාකාරී බව අඩු විය හැකිය."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"ඔබේ දුරකථනය අගුලු හැරීමට, හෝ මිලදී ගැනීම් අනුමත කිරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කරන්න.\n\nසටහන: ඔබට ඔබේ ඇඟිලි සලකුණ මෙම උපාංගය අගුලු හැරීමට භාවිත කළ නොහැකිය. තව තොරතුරු සඳහා, ඔබේ සංවිධානයෙහි පරිපාලක අමතන්න."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"ඔබේ දුරකථනය අගුලු හැරීමට, හෝ මිලදී ගැනීම් අනුමත කිරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කරන්න.\n\nසටහන: ඔබේ ඇඟිලි සලකුණ ප්‍රබල රටාවකට හෝ PIN අංකයකට වඩා ආරක්ෂාකාරී බව අඩු විය හැකිය."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"අවලංගු කරන්න"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"දිගටම කර ගෙන යන්න"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"මඟ හරින්න"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"ඇඟිලි සලකුණ එක් කරන්න"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය නොකෙරෙනු ඇත. මෙම ටැබ්ලට් පරිගණකය නැති වුවහොත්, සොරකම් කළහොත් හෝ අහිමි වුවහොත්, වෙනත් අය මෙම ටැබ්ලට් පරිගණකය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය නොකෙරෙනු ඇත. මෙම උපාංගය නැති වුවහොත්, සොරකම් කළහොත් හෝ, ගෙන ගියහොත්, වෙනත් අය මෙම උපාංගය භාවිතා කිරීම නැවත්වීමට ඔබට නොහැකියි."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය නොකෙරෙනු ඇත. මෙම දුරකථනය නැති වුවහොත්, සොරකම් කළහොත් හෝ, ගෙන ගියහොත්, වෙනත් අය මෙම දුරකථනය භාවිතා කිරීම නැවත්වීමට ඔබට නොහැකියි"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය නොකෙරෙනු ඇත. මෙම ටැබ්ලට් පරිගණකය නැති වුවහොත් හෝ සොරකම් කළහොත්, වෙනත් අය මෙම ටැබ්ලට් පරිගණකය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය නොකෙරෙනු ඇත. මෙම උපාංගය නැති වුවහොත් හෝ සොරකම් කළහොත්, වෙනත් අය මෙම උපාංගය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය නොකෙරෙනු ඇත. මෙම දුරකථනය නැති වුවහොත් හෝ සොරකම් කළහොත්, වෙනත් අය එය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"ඊළඟ"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"උපාංග ආරක්ෂණ විශේෂාංග ක්‍රියාත්මක නොකරනු ඇත. මෙම ටැබ්ලට් පරිගණකය නැති වුවහොත්, සොරකම් කළහොත්, හෝ යළි සැකසුවහොත් වෙනත් අය එය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"උපාංග ආරක්ෂණ විශේෂාංග ක්‍රියාත්මක නොකරනු ඇත. මෙම උපාංගය නැති වුවහොත්, සොරකම් කළහොත්, හෝ යළි සැකසුවහොත් වෙනත් අය එය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"උපාංග ආරක්ෂණ විශේෂාංග ක්‍රියාත්මක නොකරනු ඇත. මෙම දුරකථනය නැති වුවහොත්, සොරකම් කළහොත්, හෝ යළි සැකසුවහොත් වෙනත් අය එය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"උපාංග ආරක්ෂණ විශේෂාංග ක්‍රියාත්මක නොකරනු ඇත. මෙම ටැබ්ලට් පරිගණකය නැති වුවහොත් හෝ සොරකම් කළහොත්, වෙනත් අය එය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"උපාංග ආරක්ෂණ විශේෂාංග ක්‍රියාත්මක නොකරනු ඇත. මෙම උපාංගය නැති වුවහොත් හෝ සොරකම් කළහොත්, වෙනත් අය එය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"උපාංග ආරක්ෂණ විශේෂාංග ක්‍රියාත්මක නොකරනු ඇත. මෙම දුරකථනය නැති වුවහොත් හෝ සොරකම් කළහොත්, වෙනත් අය එය භාවිත කිරීම වැළැක්වීමට ඔබට නොහැකි වනු ඇත."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"කෙසේ වෙතත් මග හරින්න"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"ආපසු යන්න"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"සංවේදකය සොයන්න"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ඔබේ දුරකථනයේ පිටුපස පැත්තේ ඇති ඇඟිලි සලකුණු සංවේදකය ස්ථානගත කරන්න."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"සංවේදකය ස්පර්ශ කරන්න"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"එය ඔබගේ දුරකථනය පිටුපස ඇත. ඔබේ දබරැඟිල්ල භාවිත කරන්න."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"උපාංගයේ ඇඟිලි සලකුණු සංවේදකයේ පිහිටීම නිරූපණය"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"නම‍"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"හරි"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"මකන්න"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"අපි පටන් ගනිමු"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"සංවේදකය ස්පර්ශ කරන්න"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ඔබගේ ඇඟිල්ල සංවේදකය මත තබා කම්පනයක් දැනෙන විට ඔසවන්න"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"දිගටම කර ගෙන යන්න"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"ඔබගේ ඇඟිලි සලකුණේ වෙනස් කොටස් සියල්ල එක් කිරීම සඳහා ඔබගේ ඇඟිල්ල යන්තමින් වෙනස් කරන්න"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"ඇඟිලි සලකුණ එකතු කරන ලදි."</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"මෙම නිරූපකය ඔබ දුටු විට, ඔබව හඳුනා ගැනීම සඳහා හෝ මිලදි ගැනීමක් සඳහා අනුමැතිය දීමට ඔබගේ ඇඟිලි සලකුණු යොදා ගත හැක."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"ඔබේ උපාංගය අවදි කර අගුලු හැරීමට ඇඟිලි සලකුණු සංවේදකය ස්පර්ශ කරන්න."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"ඔබ මෙම නිරූපකය දුටු විට, ඔබට මිලදී ගැනීම්වලට බලය දීමට හෝ යෙදුම්වලට පිරීමටද හැකිය."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"ඔසවා, පසුව නැවත ස්පර්ශ කරන්න"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"ඔබේ ඇඟිලි සලකුණෙහි විවිධ කොටස් එක් කිරීමට ඔබගේ ඇඟිල්ල ඔසවා තබා ගන්න"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"ඇඟිලි සලකුණ එක් කරන ලදී"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"ඔබ මෙම නිරූපකය දුටු විට, හඳුනා ගැනීම හෝ මිලදී ගැනීම් සඳහා අනුමැතිය දීමට ඔබගේ ඇඟිලි සලකුණ භාවිත කරන්න."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ඇඟිලි සලකුණ පිහිටුවීම මග හරින්නද?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ඔබ ඔබේ දුරකථනය අගුලු හැරීමේ එක් ක්‍රමයක් ලෙස ඔබේ ඇඟිලි සලකුණ භාවිත කිරීම තෝරා ඇත. ඔබ දැන් මග හැරියොත්, ඔබට මෙය පසුව පිහිටුවීමට අවශ්‍ය වනු ඇත. පිහිටුවීම මිනිත්තුවක් හෝ කිහිපයක් ගනු ඇත."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"තිර අගුළු දැමීම සකසන්න"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"නිමයි"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"අපොයි, එය සංවේදකය නොවෙයි"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"ඔබගේ උපාංගයේ ඇති ඇඟිලි සලකුණු සංවේදකය භාවිත කරන්න."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"දුරකථනය පිටුපස ඇති සංවේදකය ස්පර්ශ ක. දබරැඟිල්ල භාවිත ක."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"බඳවා ගැනීම අවසන් නොකරන ලදී"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"ඇඟිලි සලකුණ ඇතුළත් කිරිමේ කාල සීමාව ළඟා විය. නැවත උත්සාහ කරන්න."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ඇඟිලි සලකුණ ඇතුළත් කිරිම ක්‍රියා කළේ නැත. නැවත උත්සාහ කරන්න, නැතහොත් වෙනත් ඇඟිල්ලක් භාවිත කරන්න."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කිරීමෙන්, ඔබගේ අවසරය නොමැතිව වෙනත් අය මෙම උපාංගය භාවිත කිරීම වළක්වන්න. ඔබට භාවිත කිරීමට අවශ්‍ය තිර අගුල තෝරන්න."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කිරීමෙන්, ඔබගේ අවසරය නොමැතිව වෙනත් අය මෙම දුරකථනය භාවිත කිරීම වළක්වන්න. ඔබට භාවිත කිරීමට අවශ්‍ය තිර අගුල තෝරන්න."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"ඔබේ උපස්ථ කිර අගුලු ක්‍රමය තෝරන්න"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"තිරයේ අගුලු විකල්ප"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"තිර අගුලු විකල්ප"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"තිර අගුල"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / නිදාගැනීමෙන් පසු වහාම"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> නිදාගැනීමෙන් පසුව"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"අගුළු ඇරීමේ රටාව වෙනස් කරන්න"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"අගුළු ඇරීමේ PIN එක වෙනස් කරන්න"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"අඟුළු හැරීමේ මුරපදය වෙනස් කරන්න"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"නැවත උත්සාහ කරන්න. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>කින් <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> උත්සාහය."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"අවසන් උත්සාහ කිරීම"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"ඔබ මෙම උත්සාහයේදී වැරදි කාර්යාල රටාවක් ඇතුළු කළහොත්, ඔබේ කාර්යාල පැතිකඩ සහ සම්බන්ධිත දත්ත මෙම උපාංගය වෙතින් ඉවත් කරනු ඇත."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"ඔබ මෙම උත්සාහයේදී වැරදි කාර්යාල PIN අංකයක් ඇතුළු කළහොත්, ඔබේ කාර්යාල පැතිකඩ සහ සම්බන්ධිත දත්ත මෙම උපාංගය වෙතින් ඉවත් කරනු ඇත."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"ඔබ මෙම උත්සාහයේදී වැරදි කාර්යාල මුරපදයක් ඇතුළු කළහොත්, ඔබේ කාර්යාල පැතිකඩ සහ සම්බන්ධිත දත්ත මෙම උපාංගය වෙතින් ඉවත් කරනු ඇත."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"වැරදි උත්සාහයන් ඉතා වැඩි ගණනකි. ඔබේ කාර්යාල පැතිකඩ සහ සම්බන්ධිත දත්ත මෙම උපාංගය වෙතින් ඉවත් කරනු ඇත."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ඉවතලන්න"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"නැවත උත්සාහ කරන්න. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>කින් <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> උත්සාහය."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"ඔබගේ දත්ත මකනු ඇත"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"ඔබ ඊළඟ උත්සාහයේදී වැරදි රටාවක් ඇතුළු කළහොත්, මෙම උපාංගයෙහි දත්ත මකනු ඇත"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"ඔබ ඊළඟ උත්සාහයේදී වැරදි PIN එකක් ඇතුළු කළහොත්, මෙම උපාංගයෙහි දත්ත මකනු ඇත"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"ඔබ ඊළඟ උත්සාහයේදී වැරදි මුරපදයක් ඇතුළු කළහොත්, මෙම උපාංගයෙහි දත්ත මකනු ඇත"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"ඔබ ඊළඟ උත්සාහයේදී වැරදි රටාවක් ඇතුළු කළහොත්, මෙම පරිශීලකයා මකනු ඇත"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"ඔබ ඊළඟ උත්සාහයේදී වැරදි PIN එකක් ඇතුළු කළහොත්, මෙම පරිශීලකයා මකනු ඇත"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"ඔබ ඊළඟ උත්සාහයේදී වැරදි මුරපදයක් ඇතුළු කළහොත්, මෙම පරිශීලකයා මකනු ඇත"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"ඔබ ඊළඟ උත්සාහයේදී වැරදි රටාවක් ඇතුළු කළහොත්, ඔබේ කාර්යාල පැතිකඩ සහ එහි දත්ත මකනු ඇත"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"ඔබ ඊළඟ උත්සාහයේදී වැරදි PIN එකක් ඇතුළු කළහොත්, ඔබේ කාර්යාල පැතිකඩ සහ එහි දත්ත මකනු ඇත"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"ඔබ ඊළඟ උත්සාහයේදී වැරදි මුරපදයක් ඇතුළු කළහොත්, ඔබේ කාර්යාල පැතිකඩ සහ එහි දත්ත මකනු ඇත"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"වැරදි උත්සාහයන් ඉතා වැඩි ගණනකි. මෙම උපාංගයෙහි දත්ත මකනු ඇත."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"වැරදි උත්සාහයන් ඉතා වැඩි ගණනකි. මෙම පරිශීලකයා මකනු ඇත."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"වැරදි උත්සාහයන් ඉතා වැඩි ගණනකි. මෙම කාර්යාල පැතිකඩ සහ එහි දත්ත මකනු ඇත."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"ඉවතලන්න"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"අඩු තරමින් අකුරු <xliff:g id="COUNT">%d</xliff:g>ක් තිබිය යුතුය"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN එකෙහි අඩු තරමින් සංඛ්‍යාමය ඉලක්කම් <xliff:g id="COUNT">%d</xliff:g>ක් තිබිය යුතුය"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"කරගෙන යන්න"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"දියුණු බ්ලූටූත්"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"බ්ලූටූත් සබල විට, ඔබගේ උපාංගයට අවට ඇති බ්ලූටූත් උපාංග සමඟ සන්නිවේදනය කළ හැක."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"ස්ථාන නිරවද්‍යතාව වැඩිදියුණු කිරීමට පද්ධති යෙදුම් සහ සේවාවලට තවමත්, බ්ලූටූත් උපාංග අනාවරණය කර ගැනීමට හැකිය. ඔබට මෙය <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ස්කෑන් කිරීමේ සැකසීම්<xliff:g id="LINK_END_1">LINK_END</xliff:g> තුළ වෙනස් කළ හැකිය."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"සම්බන්ධ වීමට නොහැකි විය. නැවත උත්සාහ කරන්න."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"උපාංග විස්තර"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"උපාංගයේ බ්ලූටූත් ලිපිනය: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"උපාංගය අමතකද?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"ඔබගේ දුරකථනය තවදුරටත් <xliff:g id="DEVICE_NAME">%1$s</xliff:g> සමග යුගල නොකරනු ඇත"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"ඔබගේ ටැබ්ලට් පරිගණකය තවදුරටත් <xliff:g id="DEVICE_NAME">%1$s</xliff:g> සමග යුගල නොකරනු ඇත"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"ඔබගේ උපාංගය තවදුරටත් <xliff:g id="DEVICE_NAME">%1$s</xliff:g> සමග යුගල නොකරනු ඇත"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"උපාංගය අමතක කරන්න"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"වෙත සම්බන්ධ වෙන්න…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> මාධ්‍ය ශ්‍රව්‍ය වෙතින් විසන්ධි වනු ඇත."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> හෑන්ඩ්ස්ෆ්‍රී ශබ්ද වෙතින් විසන්ධි වනු ඇත."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"නොසපයන්න"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"වලංගු නොකරන්න"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"සහතිකයක් දක්වා නැත. ඔබේ සබැඳුම පුද්ගලික නොවනු ඇත."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"ජාල නම දිග වැඩියි."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"වසමක් නියම කළ යුතුය."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ඇත"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS පවතී)"</string>
@@ -809,7 +838,6 @@
       <item quantity="other">ජාල %dක්</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"උසස් Wi‑Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wi‑Fi වින්‍යාස කිරීම"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC ලිපිනය"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP ලිපිනය"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"සබ්නෙට් මාස්ක්"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"මෙම කණ්ඩායම අමතකද?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ජංගම Wi-Fi හොට්ස්පොට්"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi හොට්ස්පොට්"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Wi‑Fi ජාලය සැපයීමට ලිපින සම්බන්ධතාව භාවිත කරන්න"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"මෙම ටැබ්ලටයේ අන්තර්ජාල සම්බන්ධතාවය හෝට් සපෝට් හරහා බෙදා නොගනී"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"මෙම දුරකතනයේ අන්තර්ජාල සම්බන්ධතාවය හෝට් සපෝට් හරහා බෙදා නොගනියි"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"වෙනත් උපාංග සමග අන්තර්ජාලය හෝ අන්තර්ගතය බෙදා නොගනී"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"හොට්ස්පොට් හරහා මෙම ටැබ්ලට් පරිගණකයේ අන්තර්ජාල සබැඳුම බෙදා ගනිමින්"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"හොට්ස්පොට් හරහා මෙම දුරකථනයේ අන්තර්ජාල සබැඳුම බෙදා ගනිමින්"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"යෙදුම අන්තර්ගතය බෙදා ගනිමින් සිටී. අන්තර්ජාල සබැඳුමක් බෙදා ගැනීමට, හොට්ස්පොට් ක්‍රියාවිරහිත කර, අනතුරුව ක්‍රියාත්මක කරන්න"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi-Fi නම"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ක්‍රියාත්මක කරමින්..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"වෙනත් උපාංගවලට <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> වෙත සම්බන්ධ විය හැකිය"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi මුරපදය"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP කලාපය"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ඔබගේ අනෙකුත් උපාංග සඳහා Wi-Fi ජාලයක් තැනීමට හොට්ස්පොට් භාවිත කරන්න. හොට්ස්පොට් ඔබගේ ජංගම දත්ත සබැඳුම භාවිත කරමින් අන්තර්ජාල සපයයි. අමතර ජංගම දත්ත ගාස්තු අදාළ විය හැකිය."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"යෙදුම් අවට උපාංග සමග අන්තර්ගතය බෙදා ගැනීමට හොට්ස්පොට් එකක් සෑදිය හැකිය."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"හොට්ස්පොට් සක්‍රිය කරමින්..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"හොට්ස්පොට් අක්‍රිය කරමින්…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> සක්‍රීයයි"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi ඇමතීම ක්‍රියාත්මකයි, ඔබේ දුරකථනයට ඔබේ මනාපය සහ සංඥා ප්‍රබලතාව අනුව, Wi-Fi ජාල හරහා හෝ ඔබේ වාහකයේ ජාලය හරහා ඇමතුම් ගමන් කරවිය හැකිය. මෙම විශේෂාංගය ක්‍රියාත්මක කිරීමට පෙර, ගාස්තු සහ අනෙකුත් විස්තර පිළිබඳව ඔබේ වාහකය සමගින් පරීක්ෂා කර බලන්න."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"හදිසි අවස්ථා ලිපිනය යාවත්කාලීන කරන්න"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"ඔබ WiFi භාවිත කර 911 වෙත ඇමතුමක් කළ විට හදිසි අවස්ථා සේවා විසින් භාවිත කරන ලිපිනය"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"සංදර්ශකය"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"ප්‍රතිඵල නැත"</string>
     <string name="display_settings" msgid="7965901687241669598">"සංදර්ශකය"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ස්වයංක්‍රීයව-භ්‍රමණය වන තීරය"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"විචිත්‍ර වර්ණ"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ටැබ්ලටය කරකැවීමේදී ස්වයංක්‍රියව දිශානතිය වෙනස් කරන්න"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"දුරකථනය කරකැවීමේදී ස්වයංක්‍රියව දිශානතිය වෙනස් කරන්න"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"ටැබ්ලටය කරකැවීමේදී ස්වයංක්‍රියව දිශානතිය වෙනස් කරන්න"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"පවතින ආලෝකය සඳහා දීප්තිමත් මට්ටම ප්‍රශස්තකරණය කරන්න. මෙම අංගය සබල විට, ඔබට තවමත් දීප්තිය තාවකාලිකව සීරුමාරු කළ හැක."</string>
     <string name="night_display_title" msgid="2626451512200357686">"රාත්‍රී ආලෝකය"</string>
     <string name="night_display_text" msgid="1837277457033025056">"රාත්‍රී ආලෝකය රාත්‍රියට ඔබේ තිරය ඇම්බර් වර්ණ ගන්වයි. මෙය අඳුරු ආලෝකයේදී ඔබේ තිරය දෙස බැලීම වඩා පහසු කරන අතර, ඔබට වඩාත් පහසුවෙන් නින්දට පත් වීමට උදවු විය හැකිය."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"කාල සටහන"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"තත්ත්වය"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"ස්වයංක්‍රියව ක්‍රියාත්මක කරන්න"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"කිසිවිටෙකත් නොවේ"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"අභිරුචි කාල සටහන"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"හිරු නැගීමේ සිට හිරු බැසීම"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"කාල සටහන"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"කිසිවක් නැත"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"අභිරුචි වේලාවකට ක්‍රියාත්මක කරයි"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"හිරු නැගීමේ සිට හිරු බැසීම දක්වා ක්‍රියාත්මක කරයි"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"ආරම්භක වේලාව"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"අවසන් වන වේලාව"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"තත්ත්වය"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"ත්‍රීවතාවය"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"ක්‍රියාවිරහිතයි. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"කිසි විටෙක ස්වයංක්‍රියව ක්‍රියාත්මක නොකරනු ඇත."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g> දී ස්වයංක්‍රියව ක්‍රියාත්මක කරනු ඇත."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"හිරු බැස යාමේදී ස්වයංක්‍රියව ක්‍රියාත්මක නොකරනු ඇත."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"ක්‍රියාත්මකයි. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"කිසි විටෙක ස්වයංක්‍රියව ක්‍රියාවිරහිත නොකරනු ඇත."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g> දී ස්වයංක්‍රියව ක්‍රියාවිරහිත කරනු ඇත."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"හිරු නැගීමේදී ස්වයංක්‍රියව ක්‍රියාවිරහිත කරනු ඇත."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"ක්‍රියාවිරහිතයි / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"කිසි විටෙක ස්වයංක්‍රියව ක්‍රියාත්මක නොකරනු ඇත"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g>ට ස්වයංක්‍රියව ක්‍රියාත්මක කරනු ඇත."</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"හිරු බැස යාමේදී ස්වයංක්‍රියව ක්‍රියාත්මක කරනු ඇත"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"ක්‍රියාත්මකයි / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"කිසි විටෙක ස්වයංක්‍රියව ක්‍රියාවිරහිත නොකරනු ඇත"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g>ට ස්වයංක්‍රියව ක්‍රියාවිරහිත කරනු ඇත"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"හිරු නැගීමේදී ස්වයංක්‍රියව ක්‍රියාවිරහිත කරනු ඇත"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"නිදන්න"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"තිරය අක්‍රිය කරන්න"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"අක්‍රියතාවයෙන් <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> පසු"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"සැකසීම්"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ස්වයංක්‍රිය දීප්තිය"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"අවදි කිරීමට ඔසවන්න"</string>
-    <string name="doze_title" msgid="2259176504273878294">"ස්ථානික දර්ශනය"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"ස්ථානික සංදර්ශකය"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"සැම විට ක්‍රියාත්මකයි"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"නව දැනුම්දීම්"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"පෙන්වන අවස්ථාව"</string>
+    <string name="doze_title" msgid="2375510714460456687">"නව දැනුම්දීම්"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ඔබට දැනුම්දීම් ලැබුණ විට තිරය අවදි කරන්න"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"සැමවිට ක්‍රියාත්මක"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"වේලාව, දැනුම්දීම් තොරතුරු, සහ වෙනත් තොරතුරු පෙන්වන්න"</string>
     <string name="title_font_size" msgid="4405544325522105222">"අකුරු ප්‍රමාණය"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"පෙළ වඩාත් විශාල හෝ කුඩා කරන්න"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM කාඩ් පතෙහි අඟුළු සැකසුම්"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN හිස් විය නොහැක."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC ක්ෂේත්‍රය සංඛ්‍යා 3 ක් විය යුතුය."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC ක්ෂේත්‍රය ඉලක්කම් 2 ක් හෝ 3 ක් විය යුතුය."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"වාහකය %s වර්ගයේ APN එක් කිරීම සඳහා සහාය නොදක්වයි."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"සුපුරුදු APN සැකසුම් යළි පිහිටුවමින්."</string>
     <string name="menu_restore" msgid="8260067415075573273">"සුපුරුදු වෙත යළි සකසන්න"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"සුපුරුදු APN සැකසීම නැවත සැකසීම සම්පූර්ණ කරන ලදි."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD කාඩ් පත මකන්න"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"සංගීත හෝ ජායාරුප ආදී අභ්‍යන්තර USB ආචයනයේ සියලු දත්ත මකන්න"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"සංගීත හෝ ඡායාරූප ආදී SD කාඩ් පතේ සියලු දත්ත මකන්න"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIMs මකන්න"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"දුරකථනයෙහි සියලු eSIMs මකන්න. මෙය ඔබගේ ජංගම සේවා සැලසුම අවලංගු නොකරනු ඇත."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"ටැබ්ලට් පරිගණකයෙහි සියලු eSIMs මකන්න. මෙය ඔබගේ ජංගම සේවා සැලසුම අවලංගු නොකරනු ඇත."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ටැබ්ලටය යළි සකසන්න"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"දුරකථනය නැවත සකසන්න"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"ඔබගේ සියලු පෞද්ගලික තොරතුරු සහ බාගත කළ යෙදුම් මකන්නද? ඔබට මෙම ක්‍රියාව ආපසු හැරවිය නොහැක!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"දත්ත සුරැකුම ක්‍රියාත්මක විට ටෙදර් කිරීමට හෝ අතේ ගෙන යා හැකි හොට්ස්පොට් භාවිත කිරීමට නොහැකිය"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB ටෙදරින්"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB සම්බන්ධිතයි, ටෙදර් කිරීමට සලකුණ දමන්න"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"ටෙදර් කර ඇත"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USB ආචයනය භාවිතයේ ඇති විට ටෙදර් කළ නොහැක"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB සම්බන්ධ නැත"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"ක්‍රියාත්මක කරන්න සම්බන්ධ වන්න"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB ටෙදරින් කිරීමේ දෝෂය"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"USB හරහා දුරකථනයේ අන්තර්ජාල සබැඳුම බෙදා ගන්න"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"USB හරහා ටැබ්ලට් පරිගණකයේ අන්තර්ජාල සබැඳුම බෙදා ගන්න"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"බ්ලූටූත් ටෙදරින්"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"මෙම ටැබ්ලටයේ අන්තර්ජාල සම්බන්ධතාවය බ්ලූටූත් හරහා බෙදාගනිමින්"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"මෙම දුරකතනයේ අන්තර්ජාල සම්බන්ධතාවය බ්ලූටූත් හරහා බෙදාගනිමින්"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"මෙම ටැබ්ලටයේ අන්තර්ජාල සම්බන්ධතාවය බ්ලූටූත් හරහා උපාංග 1කට බෙදාගනිමින්"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"මෙම දුරකතනයේ අන්තර්ජාල සම්බන්ධතාවය බ්ලූටූත් හරහා උපාංග 1කට බෙදාගනිමින්"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"මෙම ටැබ්ලටයේ අන්තර්ජාල සම්බන්ධතාවය බ්ලූටූත් හරහා උපාංග <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>කට බෙදාගනිමින්"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"මෙම දුරකතනයේ අන්තර්ජාල සම්බන්ධතාවය බ්ලූටූත් හරහා උපාංග <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>කට බෙදාගනිමින්"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"බ්ලූටූත් හරහා මෙම ටැබ්ලට් පරිගණකයේ අන්තර්ජාල සබැඳුම බෙදා ගන්න"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"බ්ලූටූත් හරහා මෙම දුරකථනයේ අන්තර්ජාල සබැඳුම බෙදා ගන්න"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"මෙම <xliff:g id="DEVICE_NAME">%1$d</xliff:g>යේ අන්තර්ජාල සම්බන්ධතාවය බ්ලූටූත් හරහා බෙදා ගනිමින්"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"මෙම ටැබ්ලටයේ අන්තර්ජාල සම්බන්ධතාවය බ්ලූටූත් හරහා බෙදා නොගනියි"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"මෙම දුරකතනයේ අන්තර්ජාල සම්බන්ධතාවය බ්ලූටූත් හරහා බෙදා නොගනියි"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"ටෙදර් කර නැත"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"උපාංග <xliff:g id="MAXCONNECTION">%1$d</xliff:g> කට වඩා ටෙදර් කළ නොහැක."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ටෙදර් නොකරනු ඇත."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"ඔබගේ ජංගම දත්ත සම්බන්ධතාවය හරහා වෙනත් උපාංග වලට අන්තර්ජාලය ලබාදීමට හොට් සපෝට් සහ ටෙදරින් භාවිතා කරන්න."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"ඔබගේ ජංගම දත්ත සබැඳුම හරහා වෙනත් උපාංග සඳහා අන්තර්ජාලය සැපයීමට හොට්ස්පොට් හා ටෙදරින් භාවිත කරන්න. යෙදුම් අවට උපාංග සමග අන්තර්ගතය බෙදා ගැනීමට හොට්ස්පොට් එකක්ද සෑදිය හැකිය."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"උදවු"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"ජංගම ජාලය"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"ජංගම සැලසුම"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"ස්ථාන ආකාරය"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"ස්ථානය නිර්ණය කිරීමට GPS, Wi-Fi, බ්ලූටූත්, හෝ ජංගම ජාල භාවිත කරන්න"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"ස්ථානය නිර්ණය කිරීමට Wi-Fi, බ්ලූටූත්, හෝ ජංගම ජාල භාවිත කරන්න"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ඔබේ ස්ථානය නිර්ණය කිරීමට GPS භාවිත කරන්න"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"ඔබේ ස්ථානය නිර්ණය කිරීමට GPS සහ උපාංග සංවේදක භාවිත කරන්න"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"පරිලෝකනය කිරීම"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi පරිලෝකනය"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ඕනෑම අවස්ථාවකදී පද්ධති යෙදුම් සහ සේවා වෙත Wi‑Fi ජාල නිර්ණය කිරීමට ඉඩ දීමෙන් ස්ථානය වැඩි දියුණු කරන්න."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"ඔබට දත්ත සම්බන්ධතාවයක් නොමැත. දැන් මෙම තොරතුරු නැරඹීමට, අන්තර්ජාලයට සම්බන්ධ ඕනෑම පරිගණකයකින් %s වෙත යන්න."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"පූරණය වෙමින්..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"ඔබගේ මුරපදය තෝරන්න"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"ඇඟිලි සලකුණ භාවිත කිරීමට, මුරපදයක් සකසන්න"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"ඔබගේ රටාව තෝරන්න"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"ඇඟිලි සලකුණ භාවිත කිරීමට, රටාවක් සකසන්න"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"ඔබගේ PIN තෝරාගන්න"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"ඇඟිලි සලකුණ භාවිත කිරීමට, PIN අංකයක් සකසන්න"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"ඔබගේ මුරපදය තහවුරු කරන්න"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ඔබගේ රටාව තහවුරු කරන්න"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"ඔබගේ PIN තහවුරු කරන්න"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"යෙදුම් සැකසීම්"</string>
     <string name="install_applications" msgid="4872012136210802181">"නොදන්නා මුලාශ්‍ර"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"සියලුම යෙදුම් මූලාශ්‍ර වලට ඉඩ දෙන්න"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"මෑතකදී විවෘත කරන ලද යෙදුම්"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"සියලු යෙදුම් <xliff:g id="COUNT">%1$d</xliff:g> බලන්න"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g>කට පෙර"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ඔබගේ ටැබ්ලටය සහ පෞද්ගලික දත්ත නොදන්නා යෙදුම් මඟින් තර්ජන එල්ල කිරීමේ හැකියාව වැඩිය. මෙම මුලාශ්‍රය මඟින් ලැබෙන යෙදුම් ස්ථාපනයෙන් සහ භාවිතයෙන් ඔබේ දුරකතනයට හෝ ඔබේ දත්ත වලට සිදුවන හානිය පිලිබඳ වගකීම ඔබ ලබා ගන්නා බවට එකඟ වේ."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"ඔබගේ දුරකථනය සහ පෞද්ගලික දත්ත නොදන්නා යෙදුම් මඟින් තර්ජන එල්ල කිරීමේ හැකියාව වැඩිය. මෙම මුලාශ්‍රය මඟින් ලැබෙන යෙදුම් ස්ථාපනයෙන් සහ භාවිතයෙන් ඔබේ දුරකතනයට හෝ ඔබේ දත්ත වලට සිදුවන හානිය පිලිබඳ වගකීම ඔබ ලබා ගන්නා බවට එකඟ වේ."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"උසස් සැකසුම්"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"පද්ධති සේවාව නවත් වන්නද?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"ඔබ මෙම සේවාව නැවත්වුවහොත්, ඔබගේ ටැබ්ලටයේ සමහර අංග ඔබ එය බලය අක්‍රිය කර නැවත බල ගන්වන තුරු නිවැරදිව ක්‍රියා නොකිරීමට හැක."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"ඔබ මෙම සේවාව නැවත්වුවහොත්, ඔබගේ දුරකථනයේ සමහර අංග ඔබ එය බලය අක්‍රිය කර නැවත දමන තුරු නිවැරදිව ක්‍රියා නොකිරීමට හැක."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"භාෂා, ආදානය සහ, ඉංගිත"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"භාෂා සහ ආදානය"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"භාෂා සහ ආදානය"</string>
     <string name="input_assistance" msgid="7577795275222555487">"ආදාන සහය"</string>
@@ -1872,6 +1918,10 @@
       <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="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <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="print_settings_title" msgid="3685449667822217816">"මුද්‍රණ සේවා"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"සේවා ස්ථාපනය කර නැත"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"මුද්‍රක සොයා නොගැනුණි"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"විස්තර භාවිත කරන්න"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"බල භාවිතය සීරුමාරු කරන්න"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"ඇතුළත් පැකේජ"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"යෙදුම් බැටරිය බැසීමට හේතු වේ"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"උපාංගය අවදියෙන් තබා ගනිමින්"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"පසුබිමින් උපාංගය අවදි කරමින්"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"නිතර ස්ථානය ඉල්ලා සිටිමින්"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"යෙදුම් <xliff:g id="NUMBER">%1$d</xliff:g>ක් වැරදි ලෙස හැසිරෙමින්"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"යෙදුම නවත්වන්නද?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"<xliff:g id="APP">%1$s</xliff:g> ඔබේ දුරකථනය අවදියෙන් තබා ගන්නා නිසා ඔබේ දුරකථනයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට උත්සාහ කිරීමට, ඔබට යෙදුම බලෙන් නැවැත්විය හැකිය.\n\nමෙය දිගටම සිදු වන්නේ නම්, බැටරි කාර්ය සාධනය වැඩි දියුණු කිරීමට ඔබ යෙදුම අස්ථාපනය කිරීම අවශ්‍ය විය හැකිය."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"<xliff:g id="APP">%1$s</xliff:g> ඔබේ ටැබ්ලට් පරිගණකය අවදියෙන් තබා ගන්නා නිසා ඔබේ ටැබ්ලට් පරිගණකයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට උත්සාහ කිරීමට, ඔබට යෙදුම බලෙන් නැවැත්විය හැකිය.\n\nමෙය දිගටම සිදු වන්නේ නම්, බැටරි කාර්ය සාධනය වැඩි දියුණු කිරීමට ඔබ යෙදුම අස්ථාපනය කිරීම අවශ්‍ය විය හැකිය."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"<xliff:g id="APP">%1$s</xliff:g> ඔබේ උපාංගය අවදියෙන් තබා ගන්නා නිසා ඔබේ උපාංගයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට උත්සාහ කිරීමට, ඔබට යෙදුම බලෙන් නැවැත්විය හැකිය.\n\nමෙය දිගටම සිදු වන්නේ නම්, බැටරි කාර්ය සාධනය වැඩි දියුණු කිරීමට ඔබ යෙදුම අස්ථාපනය කිරීම අවශ්‍ය විය හැකිය."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"යෙදුම නවත්වන්න"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"පසුබිම් භාවිතය ක්‍රියාවිරහිත කරන්නද?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"<xliff:g id="APP">%1$s</xliff:g> ඔබේ දුරකථනය අවදියෙන් තබා ගන්නා නිසා ඔබේ දුරකථනයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට, ඔබේ දුරකථනයට මෙම යෙදුම පසුබිමින් ධාවනය වීම වැළැක්වීමට හැකිය."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"<xliff:g id="APP">%1$s</xliff:g> ඔබේ ටැබ්ලට් පරිගණකය අවදියෙන් තබා ගන්නා නිසා ඔබේ ටැබ්ලට් පරිගණකයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට, ඔබේ ටැබ්ලට් පරිගණකයට මෙම යෙදුම පසුබිමින් ධාවනය වීම වැළැක්වීමට හැකිය."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"<xliff:g id="APP">%1$s</xliff:g> ඔබේ උපාංගය අවදියෙන් තබා ගන්නා නිසා ඔබේ උපාංගයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට, ඔබේ උපාංගයට මෙම යෙදුම පසුබිමින් ධාවනය වීම වැළැක්වීමට හැකිය."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"ක්‍රියාවිරහිත කරන්න"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"ස්ථානය ක්‍රියාවිරහිත කරන්නද?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"<xliff:g id="APP">%1$s</xliff:g> ඔබ යෙදුම භාවිත නොකරන විට ඔබේ ස්ථානය ඉල්ලමින් සිටින නිසා ඔබේ දුරකථනයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට, ඔබට මෙම යෙදුම සඳහා ස්ථානය ක්‍රියාවිරහිත කළ හැකිය."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"<xliff:g id="APP">%1$s</xliff:g> ඔබ යෙදුම භාවිත නොකරන විට ඔබේ ස්ථානය ඉල්ලමින් සිටින නිසා ඔබේ ටැබ්ලට් පරිගණකයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට, ඔබට මෙම යෙදුම සඳහා ස්ථානය ක්‍රියාවිරහිත කළ හැකිය."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"<xliff:g id="APP">%1$s</xliff:g> ඔබ යෙදුම භාවිත නොකරන විට ඔබේ ස්ථානය ඉල්ලමින් සිටින නිසා ඔබේ උපාංගයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට, ඔබට මෙම යෙදුම සඳහා ස්ථානය ක්‍රියාවිරහිත කළ හැකිය."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"ක්‍රියාවිරහිත කරන්න"</string>
     <string name="power_screen" msgid="3023346080675904613">"තිරය"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"සැණෙළි ආලෝකය"</string>
     <string name="power_camera" msgid="4976286950934622605">"කැමරාව"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"යෙදුම්"</string>
     <string name="power_service" msgid="1599661212370831780">"සේවා"</string>
     <string name="power_system" msgid="8290455327965307383">"පද්ධතිය"</string>
-    <string name="power_user" msgid="1889728099253018005">"පරිශීලක"</string>
+    <string name="power_user" msgid="3706143225319881667">"වෙනත් පරිශීලකයින්"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU මුළු ගණන"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"පෙරබිම් CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"අවදිව සිටින්න"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"වැඩියෙන් ගණනය කළ බල භාවිතය"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>ක් භාවිත කරන ලදී"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"<xliff:g id="TIME">^1</xliff:g>ක් සක්‍රියයි"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"තිර භාවිතය <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> වෙතින් <xliff:g id="PERCENT">%1$s</xliff:g>ක් භාවිතා කර ඇත"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"සමස්ත බැටරියෙන් <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN වෙනස් කරන්න"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"දැනුම්දීම් පෙන්වන්න"</string>
     <string name="help_label" msgid="6886837949306318591">"උදවු සහ ප්‍රතිපෝෂණ"</string>
-    <string name="support_summary" msgid="8276116616493882830">"උදවු ලිපි, දුරකථන සහ කතාබස් සහාය"</string>
+    <string name="support_summary" msgid="2705726826263742491">"උදවු ලිපි, දුරකථන සහ කතාබස්, ආරම්භ කිරීම"</string>
     <string name="user_account_title" msgid="1127193807312271167">"අන්තර්ගතය සඳහා ගිණුම"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ඡායාරූප ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"උපරිම තර්ජන"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="other">සඟවන ලද අයිතම %dක් පෙන්වන්න</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ජාලය සහ අන්තර්ජාලය"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, ජංගම, දත්ත භාවිතය, හොට්ස්පොට්"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ජංගම"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"දත්ත භාවිතය"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"හොට්ස්පොට්"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"සම්බන්ධ කළ උපාංග"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"බ්ලුටූත්, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"බ්ලුටූත්, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"යෙදුම් සහ දැනුම්දීම්"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"අවසර, පෙරනිමි යෙදුම්"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"පරිශීලකයන් සහ ගිණුම්"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"ඉංගිතය"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ගෙවීම, තට්ටු කිරීම, ගෙවීම්"</string>
     <string name="keywords_backup" msgid="470070289135403022">"උපස්ථ, උපස්ථ"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"ඉංගිතය, දාරය, පැත්ත, ක්‍රියාකාරී දාරය, මිරිකීම, ග්‍රහණය, සහාය, සහකාර, මිරිකුම්, මිරිකී, මිරිකීම්, මිරිකීම, ok Google, Google සහායක"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"ඉංගිතය, අවදි කරන්න, දැනුම්දීම්, තිරය, සංදර්ශකය, තිරය ක්‍රියාවිරහිතයි, මිරිකීම, දාරය, නිදිය, නින්ද, ග්‍රහණය"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"ඉංගිතය, නිහඬතාව, ස්නූස්, එලාම, ලැබෙන ඇමතුම්, නිහඬ, සංදර්ශකය, අගුලු තිරය, මිරිකීම්, ග්‍රහණය, දාරය, නවත්වන්න"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ටැගයක් ස්ථාපනය කරන්න"</string>
     <string name="write_tag" msgid="8571858602896222537">"ලියනවා"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ලිවීමට ටැගයට තට්ටු කරන්න..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"කෙසේවත් කාර්යාල දැනුම්දීම් පෙන්වන්න එපා"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"උපාංගය අගුලු දමා ඇති විට, ඔබට පැතිකඩ දැනුම්දීම් පෙන්වීමට අවශ්‍ය කෙසේද?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"පැතිකඩ දැනුම්දීම්"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"දැනුම්දීම්"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"දැනුම්දීම්"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"යෙදුම් දැනුම්දීම්"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"දැනුම්දීම් ප්‍රවර්ගය"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"වැදගත්කම"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"යෙදුමට තීරණය කිරීමට ඉඩ දෙන්න"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"හදිසි"</string>
     <string name="allow_sound" msgid="1820188704793497324">"ශබ්දයට ඉඩ දෙන්න"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"ශබ්ද කිරීම, කම්පනය කිරීම, හෝ මෙම දැනුම්දීම් වත්මන් තිරයේ දසුන මතට එබිකම් කිරීම නොකරන්න."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"අඩු වැදගත්කම"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"මධ්‍යම වැදගත්කම"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"වැඩි වැදගත්කම"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"හදිසි වැදගත්කම"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"දැනුම්දීම් සහායක"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"දැනුම්දීම් ප්‍රවේශනය"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"කාර්යාල පැතිකඩ දැනුම් දීම්වලට පිවිසීම අවහිර කර ඇත"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"පින්තූරය-තුළ-පින්තූරය"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"පින්තූරය-තුළ-පින්තූරය වෙත ඉඩ දෙන්න"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"මෙම යෙදුම විවෘතව තිබෙන අතරතුර හෝ එයින් ඉවත් වන විට පින්තූරය-තුළ-පින්තූරය කවුළුවක් සැදීමට ඉඩ දෙන්න (උදාහරණයකට, වීඩියෝව දිගටම බැලීමට). මෙම කවුළුව ඔබ භාවිතා කරන අනෙක් යෙදුම් උඩින් පෙන්වයි."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"ඔව්"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"නැත"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ප්‍රවේශය බාධා නොකරන්න"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ස්ථාපිත යෙදුම් කිසිවක් ප්‍රවේශය බාධා නොකරන්න ඉල්ලා නැත"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"යෙදුම් පූරණය වේ..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"මෙම කාර්යාල පැතිකඩ කළමනාකරණය කරන්නේ:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> විසින් කළමනාකරණය කරන ලදී"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(පරීක්ෂණාත්මක)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"උපාංගය කරකැවීම"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"තීරයේ අන්තර්ගතය කරකවන්න"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"සිරස් දසුන තුළ සිටින්න"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"තිරස් දසුන තුළ සිටින්න"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"දැනට තිබෙන දිශානතියේ සිටින්න"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"ආරක්ෂිත ආරම්භය"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ඉදිරියට යන්න"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"උපාංගය ආරම්භ වීමට පෙර ඔබගේ PIN එක අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැක. උපාංගය ආරම්භ වන තෙක්, එයට සීනු ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබාගත නොහැක.\n\nනැතිවූ හෝ සොරකම් කළ උපාංග වල දත්ත ආරක්ෂා කිරීමට මෙය උදව් කරයි. ඔබගේ උපාංගය පණ ගැන්වීමට PIN එක අවශ්‍යද?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"උපාංගය ආරම්භ වීමට පෙර ඔබගේ මුරපදය අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැක. උපාංගය ආරම්භ වන තෙක්, එයට සීනු ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබාගත නොහැක.\n\nනැතිවූ හෝ සොරකම් කළ උපාංග වල දත්ත ආරක්ෂා කිරීමට මෙය උදව් කරයි. ඔබගේ උපාංගය පණ ගැන්වීමට මුරපදයක් අවශ්‍යද?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"ඔබේ උපාංගය අගුලු හැරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කිරීමට අමතරව, උපාංගය ආරම්භ වීමට පෙර ඔබගේ PIN අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැකිය. උපාංගය ආරම්භ වන තෙක්, එයට එලාම ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබා ගත නොහැකිය.\n\nනැතිවූ හෝ සොරකම් කළ උපාංගවල දත්ත ආරක්ෂා කිරීමට මෙය උදවු කරයි. ඔබගේ උපාංගය පණ ගැන්වීමට PIN එක අවශ්‍යද?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"ඔබේ උපාංගය අගුලු හැරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කිරීමට අමතරව, උපාංගය ආරම්භ වීමට පෙර ඔබගේ රටාව අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැකිය. උපාංගය ආරම්භ වන තෙක්, එයට එලාම ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබා ගත නොහැකිය.\n\nනැතිවූ හෝ සොරකම් කළ උපාංගවල දත්ත ආරක්ෂා කිරීමට මෙය උදවු කරයි. ඔබගේ උපාංගය පණ ගැන්වීමට රටාවක් අවශ්‍යද?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"ඔබේ උපාංගය අගුලු හැරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කිරීමට අමතරව, උපාංගය ආරම්භ වීමට පෙර ඔබගේ මුරපදය අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැකිය. උපාංගය ආරම්භ වන තෙක්, එයට එලාම ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබා ගත නොහැකිය.\n\nනැතිවූ හෝ සොරකම් කළ උපාංගවල දත්ත ආරක්ෂා කිරීමට මෙය උදවු කරයි. ඔබගේ උපාංගය පණ ගැන්වීමට මුරපදයක් අවශ්‍යයි&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"ඔබේ උපාංගය අගුලු හැරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කිරීමට අමතරව, උපාංගය ආරම්භ වීමට පෙර ඔබගේ මුරපදය අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැකිය. උපාංගය ආරම්භ වන තෙක්, එයට එලාම ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබා ගත නොහැකිය.\n\nනැතිවූ හෝ සොරකම් කළ උපාංගවල දත්ත ආරක්ෂා කිරීමට මෙය උදවු කරයි. ඔබගේ උපාංගය පණ ගැන්වීමට මුරපදය එක අවශ්‍යද?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"ඔව්"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"නැත"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN එක අවශ්‍යද?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"භාවිත ඇඟවීම්"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"පූර්ණ උපාංග භාවිතය පෙන්වන්න"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"යෙදුම් භාවිතය පෙන්වන්න"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"ඉහළ භාවිතය"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one">යෙදුම් <xliff:g id="NUMBER">%2$d</xliff:g>ක් අසාමාන්‍ය ලෙස හැසිරෙමින් ඇත</item>
+      <item quantity="other">යෙදුම් <xliff:g id="NUMBER">%2$d</xliff:g>ක් අසාමාන්‍ය ලෙස හැසිරෙමින් ඇත</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">යෙදුම් බැටරිය බැස යාමට හේතු වේ</item>
+      <item quantity="other">යෙදුම් බැටරිය බැස යාමට හේතු වේ</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ප්‍රශස්තකරණය වී නොමැත"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ප්‍රශස්තකරණය වී නොමැත"</string>
     <string name="high_power_off" msgid="3393904131961263278">"බැටරි භාවිතය ප්‍රශස්තකරණය"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"වෙනත් යෙදුම් උඩින් පෙන්වන්න"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"යෙදුම් <xliff:g id="COUNT_1">%2$d</xliff:g>කින් <xliff:g id="COUNT_0">%1$d</xliff:g> කට වෙනත් යෙදුම් උඩින් පෙන්වන්න අවසර ඇත"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"අවසරය ඇති යෙදුම්"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"ඔව්"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"නැත"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"ඉඩ දුන්"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"ඉඩ නොදෙන"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"යෙදුම් ස්ථාපනය නොදන්නා මුලාශ්‍ර"</string>
     <string name="write_settings" msgid="4797457275727195681">"පද්ධති සැකසීම් විකරණය කරන්න"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"පද්ධති සැකසීම් ලිවිම වෙනස් කිරීම"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"තිරය ඇම්බර් වර්ණ ගන්වා ඇත. මෙය ඔබට නින්දට පත් වීමට උදවු විය හැකිය."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"යෝජනා"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"තවත් +<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <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="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <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="suggestion_remove" msgid="904627293892092439">"ඉවත් කරන්න"</string>
     <string name="color_temperature" msgid="2070126836910615605">"සිසිල් වර්ණ උෂ්ණත්වය"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"වඩා සිසිල් සංදර්ශක වර්ණ භාවිත කිරීම"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> දත්ත අනතුරු ඇඟවීම"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> දත්ත අනතුරු ඇඟවීම / <xliff:g id="ID_2">%2$s</xliff:g> දත්ත සීමාව"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"බිල්පත් චක්‍රය"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"මාසික චක්‍රය සෑම මසකම <xliff:g id="ID_1">%1$s</xliff:g> දින ඇරඹේ"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"මාසික ආරම්භය <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"<xliff:g id="ID_1">%1$s</xliff:g> දින මාසිකව"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"ජාලය සීමා කිරීම්"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one">සීමා <xliff:g id="COUNT">%1$d</xliff:g>ක්</item>
@@ -3316,7 +3408,7 @@
       <item quantity="other">දත්ත සුරැකුම ක්‍රියාත්මක විට බාධා නොකළ දත්ත භාවිත කිරීමට යොදුම් <xliff:g id="COUNT">%1$d</xliff:g>කට ඉඩ දෙන ලදී</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"දත්ත සුරැකුම"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"බාධා නොකළ දත්ත ප්‍රවේශය"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"සීමා නොකළ දත්ත"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"පසුබිම් දත්ත ක්‍රියාවිරහිතයි"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"ක්‍රියාත්මකයි"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"ක්‍රියාවිරහිතයි"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"අගුලු තිර දැනුම්දීම් පාලනය කරන්න"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"දැනුම්දීම් අන්තර්ගතය පෙන්වන්න නැතහොත් සඟවන්න"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"සියලු"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"සහාය"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"සහාය සහ ඉඟි"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"කුඩාම පළල"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"කිසිදු ස්ථාපනය කළ යෙදුමක් වාරික SMS ප්රවේශ ඉල්ලා නැත"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"වාරික SMS ඔබෙන් මුදල් අය කළ හැකි අතර ඔබේ වාහක බිල්පතට එක් කරනු ඇත. ඔබ යෙදුමක් සඳහා අවසර සබල කරන්නේ නම්, ඔබට එම යෙදුම භාවිතයෙන් වාරික SMS යැවීමට හැකි වනු ඇත."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ස්වයංක්‍රිය"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"අත්පොත"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"දැන් ඉඩ නිදහස් කර ගන්න"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"ඉංගිත"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"ඉංගිත කෙටි මං"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"ඔබගේ දුරකථනය පාලනය කිරීමට ඉක්මන් ඉංගිත"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"ඔබගේ ටැබ්ලට් පරිගණකය පාලනය කිරීමට ඉක්මන් ඉංගිත"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"ඔබගේ උපාංගය පාලනය කිරීමට ඉක්මන් ඉංගිත"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"කැමරාව වෙත පනින්න"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"ඉක්මනින් කැමරාව විවෘත කිරීමට, බල බොත්තම දෙවරක් ඔබන්න. ඕනෑම තිරයක සිට ක්‍රියා කරයි."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"කැමරාව ඉක්මනින් විවෘත කරන්න"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"කැමරාව විවෘත කිරීමට බල සැපයුම් බොත්තම දෙවරක් ඔබන්න"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ෆ්ලිප් කැමරාව"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"වඩාත් වේගයෙන් සෙල්ෆී ඡායාරූප ගන්න"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"සෙල්ෆි ප්‍රකාරය සඳහා දුරකථනය දෙවරක් කරකවන්න"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"සෙල්ෆි ප්‍රකාරය සඳහා ටැබ්ලට් පරිගණකය දෙවරක් කරකවන්න"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"සෙල්ෆි ප්‍රකාරය සඳහා උපාංගය දෙවරක් කරකවන්න"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"දුරකථනය පරීක්ෂා කිරීමට දෙවරක් තට්ටු කරන්න"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ටැබ්ලට් පරිගණකය පරීක්ෂා කිරීමට දෙවරක් තට්ටු කරන්න"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"උපාංගය පරීක්ෂා කිරීමට දෙවරක් තට්ටු කරන්න"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"ඔබගේ දැනුම්දීම් ඉක්මනින් පරීක්ෂා කිරීමට, ඔබගේ තිරය දෙවරක් තට්ටු කරන්න."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"වේලාව, දැනුම්දීම් නිරූපක, සහ වෙනත් තොරතුරු පරීක්ෂා කිරීමට, ඔබේ තිරය දෙවරක් තට්ටු කරන්න."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"තිරය ක්‍රියාවිරහිත විට දැනුම්දීම් පරීක්ෂා කරන්න"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"දුරකථනය පරීක්ෂා කිරීමට ඔසවන්න"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ටැබ්ලට් පරිගණකය පරීක්ෂා කිරීමට ඔසවන්න"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"උපාංගය පරීක්ෂා කිරීමට ඔසවන්න"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"ඔබගේ දැනුම්දීම් ඉක්මනින් පරීක්ෂා කිරීමට, ඔබගේ දුරකථනය අතට ගන්න."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"ඔබගේ දැනුම්දීම් ඉක්මනින් පරීක්ෂා කිරීමට, ඔබගේ ටැබ්ලට් පරිගණකය අතට ගන්න."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"ඔබගේ දැනුම්දීම් ඉක්මනින් පරීක්ෂා කිරීමට, ඔබගේ උපාංගය අතට ගන්න."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"වේලාව, දැනුම්දීම් නිරූපක, සහ වෙනත් තොරතුරු පරීක්ෂා කිරීමට, ඔබේ දුරකථනය අතට ගන්න."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"වේලාව, දැනුම්දීම් නිරූපක, සහ වෙනත් තොරතුරු පරීක්ෂා කිරීමට, ඔබේ ටැබ්ලට් පරිගණකය අතට ගන්න."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"වේලාව, දැනුම්දීම් නිරූපක, සහ වෙනත් තොරතුරු පරීක්ෂා කිරීමට, ඔබේ උපාංගය අතට ගන්න."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"තිරය ක්‍රියාවිරහිත විට දැනුම්දීම් පරීක්ෂා කරන්න"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"දැනුම්දීම් සඳහා ඇඟිලි සලකුණ ස්වයිප් කරන්න"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"ඔබේ දැනුම්දීම් පරීක්ෂා කිරීමට, ඔබේ දුරකථනයේ පිටුපස පැත්තේ ඇති ඇඟිලි සලකුණු සංවේදකය මත පහළට ස්වයිප් කරන්න."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"ඔබේ දැනුම්දීම් පරීක්ෂා කිරීමට, ඔබේ ටැබ්ලට් පරිගණකයේ පිටුපස පැත්තේ ඇති ඇඟිලි සලකුණු සංවේදකය මත පහළට ස්වයිප් කරන්න."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"ඔබේ දැනුම්දීම් පරීක්ෂා කිරීමට, ඔබේ උපාංගයේ පිටුපස පැත්තේ ඇති ඇඟිලි සලකුණු සංවේදකය මත පහළට ස්වයිප් කරන්න."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"දැනුම්දීම් ඉක්මනින් බලන්න"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"ඇඟිලි සලකුණු සංවේදකය මත පහළට ස්වයිප් කරන්න"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"කැමරාව විවෘත කිරීමට ඔසවන්න"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"කැමරාව ස්වයංක්‍රියව විවෘත කිරීමට, ඔබගේ දුරකථනය ඡායාරූප ගන්නා පිහිටුමකට ඔසවන්න (තිරස් හෝ සිරස්). ඔබේ දුරකථනය නින්දේ හෝ අගුලු දමා ඇති විට ක්‍රියා කරයි."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"දුරකථනය නිද්‍රාවෙහි හෝ අගුලු දමා ඇති විට ඡායාරූප ගන්න"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"ඉඟිතයට සහාය දක්වන්න"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"සංවේදීතාවය"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"ඔබට මෙම ක්ෂණික යෙදුම ඉවත් කිරීමට අවශ්‍යද?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"ක්‍රීඩා"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ශ්‍රව්‍ය ගොනු"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"භාවිතා කළ ඉඩ ප්‍රමාණය"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> පරිශීලක සඳහා අස්ථාපනය කෙරිණි)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> පරිශීලක සඳහා අබල කෙරිණි)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"ස්වයං පිරවුම් සේවාව"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"ක්ෂණික යෙදුම"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"ආචයන කළමනාකරු අක්‍රිය කරන්නද?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"චිත්‍රපටය සහ රූපවාහිනී යෙදුම්"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"භාවිතා කළ ඉඩ ප්‍රමාණය"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"වාහක ප්‍රතිපාදන තතු"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"උත්ප්‍රේරක වාහක ප්‍රතිපාදන"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"අලුත් සහ උද්යෝගිමත් දේවල් මොනවාද?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ඉහළම විශේෂාංග 5 පරීක්ෂා කරන්න"</string>
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index cd29ee5..90cc3ec 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Dobré"</item>
     <item msgid="8986346415847956850">"Vynikajúce"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Vždy"</item>
-    <item msgid="844721238536786870">"Iba počas napájania"</item>
-    <item msgid="1986753720941888596">"Nikdy"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Vždy"</item>
-    <item msgid="7433294150916905997">"Iba počas napájania"</item>
-    <item msgid="1390404486722375028">"Nikdy"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Posledných 30 dní"</item>
     <item msgid="6600989128423965319">"Nastaviť cyklus využitia"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 7236e4c..c0804a8 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -32,6 +32,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Teraz ste vývojár!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nie je to potrebné, už ste vývojár."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Najprv povoľte možnosti pre vývojárov"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Bezdrôtové pripojenia a siete"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Pripojenia"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Zariadenie"</string>
@@ -43,6 +44,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Poskytované VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Poskytované videohovory"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Poskytované volanie cez Wi-Fi"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Zaistenie EAB/Presence"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Sila signálu GSM"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Zobraziť adresár SIM karty"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Zobraziť povolené čísla"</string>
@@ -108,10 +110,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Vyhľadať zariadenia"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Premenovať toto zariadenie"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Premenovať"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Odpojiť?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Táto akcia ukončí vaše pripojenie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Odpojiť zariadenie?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Váš telefón sa odpojí od zariadenia <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Váš tablet sa odpojí od zariadenia <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Vaše zariadenie sa odpojí od zariadenia <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Odpojiť"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Nemáte povolenie na zmenu nastavení Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Spárovať nové zariadenie"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Pri otvorených nastaveniach Bluetooth je zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> viditeľné pre zariadenia v okolí."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Adresa Bluetooth telefónu: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Adresa Bluetooth tabletu: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Adresa Bluetooth zariadenia: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Odpojiť zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Vysielanie"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Zakázať profil?"</string>
@@ -123,7 +132,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Žiadosť o párovanie zariadenia Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Žiadosť na párovanie"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> spárujete klepnutím."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Zobraziť prijaté súbory"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Prijaté súbory"</string>
     <string name="device_picker" msgid="4978696506172252813">"Vybrať zariadenie Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnúť Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> chce vypnúť Bluetooth"</string>
@@ -159,6 +168,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Zariadenie %1$s chce získať prístup k vašim správam. Chcete zariadeniu %2$s tento prístup umožniť?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Žiadosť o prístup k SIM karte"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Zariadenie <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> chce pristupovať k vašej SIM karte. Udelenie prístupu k SIM karte zakáže na vašom zariadení dátové pripojenie po dobu jeho trvania. Udeliť prístup zariadeniu <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Viditeľné pre ostatné zariadenia ako <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaše zariadenia"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Párovanie nového zariadenia"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Dátum a čas"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Zvoľte časové pásmo"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -333,7 +345,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Účty"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Poloha"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Účty"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Zabezpečenie a poloha"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Zabezpečenie a poloha"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifrovanie a poverenia"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefón zašifrovaný"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Zariadenie je šifrované"</string>
@@ -360,40 +372,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Odomknutie odtlačkom prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Používanie odtlačku prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Ak chcete odomknúť telefón, schváliť nákupy alebo sa prihlásiť do aplikácií, stačí sa dotknúť senzora odtlačkov prstov. Dobre zvážte, čie odtlačky pridáte. Tieto operácie bude totiž možné vykonávať pomocou každého pridaného odtlačku.\n\nPoznámka: Odtlačok môže byť menej bezpečný ako silný bezpečnostný vzor alebo kód PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Ak chcete 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.\n\nPoznámka: Odtlačok prsta nie je možné použiť na odomknutie tohto zariadenia. Ďalšie informácie vám poskytne správca vašej organizácie."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Ak chcete odomknúť telefón, schváliť nákupy alebo sa prihlásiť do aplikácií, stačí sa dotknúť senzora odltačkov prstov. Dobre zvážte, čie odtlačky pridáte. Tieto operácie bude totiž možné vykonávať pomocou každého pridaného odtlačku.\n\nPoznámka: Odtlačok môže byť menej bezpečný ako silný bezpečnostný vzor alebo kód PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Zrušiť"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Pokračovať"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Preskočiť"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Pridať odtlačok"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funkcie ochrany zariadenia nebudú aktivované. V prípade straty, krádeže alebo vymazania tabletu nebudete môcť ostatným zabrániť v jeho používaní."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funkcie ochrany zariadenia nebudú aktivované. V prípade straty, krádeže alebo vymazania zariadenia nebudete môcť ostatným zabrániť v jeho používaní."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funkcie ochrany zariadenia nebudú aktivované. V prípade straty, krádeže alebo vymazania telefónu nebudete môcť ostatným zabrániť v jeho používaní."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funkcie ochrany zariadenia nebudú aktivované. V prípade straty alebo krádeže tohto tabletu nebudete môcť ostatným zabrániť v jeho používaní."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funkcie ochrany zariadenia nebudú aktivované. V prípade straty alebo krádeže tohto zariadenia nebudete môcť ostatným zabrániť v jeho používaní."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funkcie ochrany zariadenia nebudú aktivované. V prípade straty alebo krádeže tohto telefónu nebudete môcť ostatným zabrániť v jeho používaní."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Ďalej"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funkcie ochrany zariadenia sa nezapnú. V prípade straty, krádeže alebo obnovenia nebudete môcť cudzím osobám zabrániť v používaní tohto tabletu."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funkcie ochrany zariadenia sa nezapnú. V prípade straty, krádeže alebo obnovenia nebudete môcť cudzím osobám zabrániť v používaní tohto zariadenia."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funkcie ochrany zariadenia sa nezapnú. V prípade straty, krádeže alebo obnovenia nebudete môcť cudzím osobám zabrániť v používaní tohto telefónu."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Funkcie ochrany zariadenia sa nezapnú. V prípade straty alebo krádeže nebudete môcť cudzím osobám zabrániť v používaní tohto tabletu."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Funkcie ochrany zariadenia sa nezapnú. V prípade straty alebo krádeže nebudete môcť cudzím osobám zabrániť v používaní tohto zariadenia."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Funkcie ochrany zariadenia sa nezapnú. V prípade straty alebo krádeže nebudete môcť cudzím osobám zabrániť v používaní tohto telefónu."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Preskočiť"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Späť"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Nájdite senzor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Nájdite snímač odtlačkov prstov na zadnej strane telefónu."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Dotknutie sa snímača"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Nachádza sa na zadnej strane telefónu. Použite ukazovák."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustrácia zariadenia a umiestnenia senzoru odtlačku prsta"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Meno"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Odstrániť"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Začíname"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Dotyk na snímač"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Priložte prst k senzoru a zdvihnite ho, keď zacítite vibráciu."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Pokračujte"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Pohýbte zľahka prstom, aby ste pridali všetky odlišné časti vášho odtlačku"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Odtlačok bol pridaný!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kedykoľvek uvidíte túto ikonu, môžete na identifikáciu alebo povolenie nákupu použiť odtlačok prsta."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Ak chcete prebudiť a odomknúť svoje zariadenie, stačí sa dotknúť senzora odtlačkov prstov."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Keď uvidíte túto ikonu, môžete tiež autorizovať nákupy alebo sa prihlásiť do aplikácií."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Zdvihnite a opäť priložte"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Zdvíhajte prst, aby ste pridali všetky odlišné časti odtlačku"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Odtlačok bol pridaný"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Keď uvidíte túto ikonu, môžete na identifikáciu alebo schválenie nákupov použiť odtlačok prsta."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Preskočiť nastavenie odtlačkov prstov?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Vybrali ste, že chcete používať odtlačok prsta ako jeden zo spôsobov odomknutia telefónu. Ak tento krok preskočíte, budete musieť odtlačok nastaviť neskôr. Trvá to približne minútu."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Nastaviť zámku obrazovky"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Hotovo"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ojoj, to nie je senzor"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Použite senzor odtlačku prsta na zariadení."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Dotknite sa snímača na zadnej strane telefónu. Použite ukazovák."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registrácia nebola dokončená"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Časový limit registrácie odtlačku prsta vypršal. Skúste to znova."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Registrácia odtlačku prsta nefungovala. Skúste to znova alebo použite iný prst."</string>
@@ -455,6 +465,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto zariadenia bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto telefónu bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Zvoľte dodatočnú metódu zámky obrazovky"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Možnosti zámky obrazovky"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Možnosti zámky obrazovky"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zámka obrazovky"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / okamžite po spánku"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> po spánku"</string>
@@ -525,13 +537,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Zmena bezpečnostného vzoru"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Zmena bezpečnostného kódu PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Zmeniť bezpečnostné heslo"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Skúste to znova. Pokus <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> z <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Posledný pokus"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Ak pri tomto pokuse zadáte nesprávny pracovný vzor, váš pracovný profil a združené údaje budú z tohto zariadenia odstránené."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Ak pri tomto pokuse zadáte nesprávny pracovný kód PIN, váš pracovný profil a združené údaje budú z tohto zariadenia odstránené."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Ak pri tomto pokuse zadáte nesprávne pracovné heslo, váš pracovný profil a združené údaje budú z tohto zariadenia odstránené."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Príliš veľa chybných pokusov. Váš pracovný profil a združené údaje budú z tohto zariadenia odstránené."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Odmietnuť"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Skúste to znova. Pokus <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> z <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Vaše dáta budú odstránené"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ak pri ďalšom pokuse zadáte nesprávny vzor, dáta tohto zariadenia budú odstránené"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ak pri ďalšom pokuse zadáte nesprávny kód PIN, dáta tohto zariadenia budú odstránené"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ak pri ďalšom pokuse zadáte nesprávne heslo, dáta tohto zariadenia budú odstránené"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ak pri ďalšom pokuse zadáte nesprávny vzor, tento používateľ bude odstránený"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ak pri ďalšom pokuse zadáte nesprávny kód PIN, tento používateľ bude odstránený"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ak pri ďalšom pokuse zadáte nesprávne heslo, tento používateľ bude odstránený"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ak pri ďalšom pokuse zadáte nesprávny vzor, váš pracovný profil a jeho dáta budú odstránené"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ak pri ďalšom pokuse zadáte nesprávny kód PIN, váš pracovný profil a jeho dáta budú odstránené."</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ak pri ďalšom pokuse zadáte nesprávne heslo, váš pracovný profil a jeho dáta budú odstránené"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Príliš veľa chybných pokusov. Dáta tohto zariadenia budú odstránené."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Príliš veľa chybných pokusov. Tento používateľ bude odstránený."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Príliš veľa chybných pokusov. Tento pracovný profil a jeho dáta budú odstránené."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Zatvoriť"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Musí obsahovať aspoň tento počet znakov: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN musí obsahovať aspoň tento počet čísel: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Pokračovať"</string>
@@ -648,6 +668,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Rozšírené nastavenia Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Keď je zapnuté pripojenie Bluetooth, zariadenie môže komunikovať s ostatnými zariadeniami s funkciou Bluetooth v okolí."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Systémové aplikácie a služby môžu stále rozpoznávať zariadenia Bluetooth, aby tak zlepšili presnosť polohy. Môžete to zmeniť v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastaveniach vyhľadávania zariadení<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Nepodarilo sa pripojiť. Skúste to znova."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Podrobnosti o zariadení"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Adresa Bluetooth zariadenia: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Zabudnúť zariadenie?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Váš telefón už nebude spárovaný so zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Váš tablet už nebude spárovaný so zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Vaše zariadenie už nebude spárované so zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Zabudnúť zariadenie"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Pripojiť k…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojené od zvukovej jednotky média."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojené od zvukovej jednotky handsfree."</string>
@@ -800,6 +828,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Neposkytovať"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Neoverovať"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nebol určený žiadny certifikát. Vaše pripojenie nebude súkromné."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Názov siete je príliš dlhý."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Je potrebné zadať doménu."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je k dispozícii"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je k dispozícii)"</string>
@@ -833,7 +862,6 @@
       <item quantity="one">1 sieť</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi, rozšírené"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfigurácia Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresa MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adresa IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podsiete"</string>
@@ -870,9 +898,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Odstrániť túto skupinu?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prenosný hotspot Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Hotspot Wi‑Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Poskytovať Wi-Fi pomocou mobilného pripojenia"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Internetové pripojenie tohto tabletu sa nezdieľa cez hotspot"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Internetové pripojenie tohto telefónu sa nezdieľa cez hotspot"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"S inými zariadeniami sa nezdieľa internet ani obsah"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Internetové pripojenie tohto tabletu sa zdieľa cez hotspot"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Internetové pripojenie tohto telefónu sa zdieľa cez hotspot"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikácia zdieľa obsah. Ak chcete zdieľať internetové pripojenie, vypnite hotspot a potom ho zapnite."</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Názov siete Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Zapína sa hotspot <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Iné zariadenia sa môžu pripojiť k hotspotu <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Heslo siete Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pásmo pre prístupový bod"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Použite hotspot na vytvorenie siete Wi‑Fi pre ostatné zariadenia. Hotspot poskytuje internet pomocou mobilného dátového pripojenia. Môžu vám byť účtované ďalšie poplatky za mobilné dáta."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikácie tiež môžu vytvoriť hostpot na zdieľanie obsahu so zariadeniami v okolí."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Prebieha zapínanie hotspotu..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Prebieha vypínanie hotspotu..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"Sieť <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktívna"</string>
@@ -919,6 +955,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Ak je zapnuté volanie Wi-Fi, váš telefón môže smerovať volania cez siete Wi-Fi alebo cez sieť vášho operátora. Závisí to od vašich nastavení a od toho, ktorý signál je silnejší. Pred zapnutím tejto funkcie kontaktujte svojho operátora a informujte sa o poplatkoch a ďalších podrobnostiach."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Aktualizácia tiesňovej adresy"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Adresa, ktorej polohu použijú tiesňové služby, keď zavoláte linku 112 pomocou Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Obrazovka"</string>
@@ -976,6 +1013,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Žiadne výsledky"</string>
     <string name="display_settings" msgid="7965901687241669598">"Obrazovka"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automaticky otáčať obrazovku"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Živé farby"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Pri otáčaní tabletu automaticky prepínať orientáciu"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Pri otáčaní telefónu automaticky prepínať orientáciu"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Pri otáčaní tabletu automaticky prepínať orientáciu"</string>
@@ -1003,23 +1041,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimalizovať jas podľa okolitého svetla. Keď je táto funkcia zapnutá, môžete jas stále dočasne upraviť."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Nočný režim"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Nočný režim zafarbí obrazovku do žltohneda. Obrazovka bude pri tlmenom osvetlení menej rušivá aj čitateľnejšia a bude sa vám lepšie zaspávať."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Rozvrh"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Stav"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Zapínať automaticky"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nikdy"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Vlastný rozvrh"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Od západu do východu slnka"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Rozvrh"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Nikdy"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Zapínať vo vlastnom čase"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Zapne sa od západu do východu slnka"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Čas začiatku"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Čas ukončenia"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Stav"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intenzita"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Vypnuté. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nikdy sa automaticky nezapne."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Zapne sa automaticky o <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Zapne sa automaticky pri západe slnka."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Zapnuté. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nikdy sa automaticky nevypne."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Vypne sa automaticky o <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Vypne sa automaticky pri východe slnka."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Vypnuté / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Nikdy sa automaticky nezapne"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Zapne sa automaticky o <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Zapne sa automaticky pri západe slnka"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Zapnuté / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Nikdy sa automaticky nevypne"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Vypne sa automaticky o <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Vypne sa automaticky pri východe slnka"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Režim spánku"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Vypnutie obrazovky"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
@@ -1043,8 +1080,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Nastavenia"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Prebudiť zdvihnutím"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Ambientné zobrazenie"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambientné zobrazenie"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Vždy zapnuté"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nové upozornenia"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kedy zobrazovať"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nové upozornenia"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Prebudiť obrazovku, keď dostanete upozornenie"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Vždy zapnuté"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Zobrazovať čas, ikony upozornení a ďalšie informácie"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veľkosť písma"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Zväčšite alebo zmenšite text"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavenia zámky SIM karty"</string>
@@ -1298,6 +1341,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Názov prístupového bodu (APN) nemôže byť prázdny."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Pole MCC musí obsahovať 3 číslice."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Pole MNC musí obsahovať 2 alebo 3 číslice."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operátor zakázal pridávanie názvov prístupového bodu typu %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Prebieha obnovovanie predvolených nastavení názvu prístupového bodu (APN)."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Obnoviť predvolené"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Predvolené nastavenia prístupových bodov boli obnovené"</string>
@@ -1329,6 +1373,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Vymazať SD kartu"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Vymazať všetky dáta v internom úložisku USB, napríklad hudbu a fotky"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Vymazať všetky dáta na SD karte, napríklad hudbu a fotky"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Vymazať eSIM karty"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Vymažte všetky eSIM karty na telefóne. Nezrušíte tým svoj plán mobilných služieb."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Vymažte všetky eSIM karty na tablete. Nezrušíte tým svoj plán mobilných služieb."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Resetovať tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetovať telefón"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Chcete vymazať všetky osobné údaje a stiahnuté aplikácie? Túto akciu nebude možné vrátiť späť."</string>
@@ -1351,26 +1398,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Keď je šetrič dát zapnutý, nie je možné zdieľať dátové pripojenie ani používať prenosné hotspoty"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Pripojenie cez USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Prepojené cez USB. Ak chcete zdieľať dátové pripojenie, zapnite túto voľbu."</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Zdieľané dátové pripojenie"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Internetové pripojenie nie je možné zdieľať, pokiaľ sa používa úložisko USB"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Pripojenie USB nie je k dispozícii"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Ak chcete úložisko USB zapnúť, pripojte ho"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Chyba zdieľania dátového pripojenia prostredníctvom USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Zdieľať internetové pripojenie telefónu cez USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Zdieľať internetové pripojenie tabletu cez USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Pripojenie cez Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Internetové pripojenie tohto tabletu sa zdieľa cez Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Internetové pripojenie tohto telefónu sa zdieľa cez Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Internetové pripojenie tabletu sa zdieľa s 1 zariadením cez Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Internetové pripojenie telefónu sa zdieľa s 1 zariadením cez Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Internetové pripojenie tabletu sa zdieľa cez Bluetooth s týmto počtom zariadení: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Internetové pripojenie telefónu sa zdieľa cez Bluetooth s týmto počtom zariadení: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Zdieľanie internetového pripojenia tabletu cez Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Zdieľanie internetového pripojenia telefónu cez Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Internetové pripojenie zariadenia <xliff:g id="DEVICE_NAME">%1$d</xliff:g> sa zdieľa cez Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Internetové pripojenie tohto tabletu sa nezdieľa cez Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Internetové pripojenie tohto telefónu sa nezdieľa cez Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Internetové pripojenie nie je zdieľané"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Maximálny počet zariadení na zdieľanie dátového pripojenia: <xliff:g id="MAXCONNECTION">%1$d</xliff:g>."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Ukončí sa zdieľané dát. pripojenie zariad. <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Hotspot a zdieľané pripojenie umožňujú poskytovať internet ostatným zariadeniam prostredníctvom vášho mobilného dátového pripojenia."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Hotspot a zdieľané pripojenie umožňujú poskytovať internet iným zariadeniam prostredníctvom vášho mobilného dátového pripojenia. Aplikácie tiež môžu vytvoriť hostpot na zdieľanie obsahu so zariadeniami v okolí."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomocník"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobilná sieť"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilný plán"</string>
@@ -1403,7 +1439,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Režim polohy"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Na určenie polohy používať GPS, Wi-Fi, Bluetooth alebo mobilné siete"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Na určenie polohy používať Wi-Fi, Bluetooth alebo mobilné siete"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Na určenie polohy používať GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Na určenie polohy používať GPS a senzory zariadenia"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Vyhľadávanie"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Vyhľadávať siete Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Vylepšite určovanie polohy tým, že systémovým aplikáciám a službám umožníte kedykoľvek rozpoznávať siete Wi-Fi."</string>
@@ -1448,8 +1484,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nemáte dátové pripojenie. Ak chcete tieto informácie zobraziť teraz, prejdite v ľubovoľnom počítači pripojenom na Internet na adresu %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Načítava sa…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Zvoľte si heslo"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Ak chcete použiť odtlačok prsta, nastavte heslo"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Zvoľte si vzor"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Ak chcete použiť odtlačok prsta, nastavte vzor"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Zvoľte si PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Ak chcete použiť odtlačok prsta, nastavte PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potvrďte heslo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrďte svoj vzor"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potvrďte kód PIN"</string>
@@ -1518,6 +1557,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Nastavenia aplikácie"</string>
     <string name="install_applications" msgid="4872012136210802181">"Neznáme zdroje"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Povoliť všet. zdroje aplikácií"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Nedávno spustené aplikácie"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Zobraziť všetky aplikácie (počet: <xliff:g id="COUNT">%1$d</xliff:g>)"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"pred <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Váš tablet a osobné dáta sú náchylnejšie na útok z neznámych aplikácií. Inštaláciou aplikácií z tohto zdroja vyjadrujete súhlas s tým, že nesiete zodpovednosť za akékoľvek poškodenie tabletu alebo stratu dát, ktoré by mohli nastať pri ich používaní."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Váš telefón a osobné dáta sú náchylnejšie na útok z neznámych aplikácií. Inštaláciou aplikácií z tohto zdroja vyjadrujete súhlas s tým, že nesiete zodpovednosť za akékoľvek poškodenie telefónu alebo stratu dát, ktoré by mohli nastať pri ich používaní."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Rozšírené nastavenia"</string>
@@ -1688,6 +1730,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Zastaviť systémovú službu?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Ak túto službu zastavíte, niektoré funkcie vášho tabletu nemusia fungovať. Ich funkčnosť sa obnoví až po vypnutí tabletu a jeho opätovnom zapnutí."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ak túto službu zastavíte, niektoré funkcie vášho telefónu nemusia fungovať. Ich funkčnosť sa obnoví až po vypnutí telefónu a jeho opätovnom zapnutí."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Jazyky, vstup a gestá"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Jazyky a vstup"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Jazyky a vstup"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Pomoc so zadávaním"</string>
@@ -1914,6 +1960,12 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> zapnutých tlačových služieb</item>
       <item quantity="one">1 zapnutá tlačová služba</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> tlačové úlohy</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> tlačovej úlohy</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tlačových úloh</item>
+      <item quantity="one">1 tlačová úloha</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Tlačové služby"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nie sú nainštalované žiadne služby"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nenašli sa žiadne tlačiarne"</string>
@@ -1980,6 +2032,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Využitie"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Upraviť spotrebu energie"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Zahrnuté balíčky"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplikácie vybíjajúce batériu"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Ponecháva zariadenie zapnuté"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Prebúdza zariadenie na pozadí"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Často vyžaduje polohu"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Aplikácie s problémovým správaním: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Zastaviť aplikáciu?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Telefón nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP">%1$s</xliff:g> ho ponecháva zapnutý.\n\nAk chcete tento problém vyriešiť, môžete vynútiť zastavenie tejto aplikácie.\n\nAk sa to bude diať aj naďalej, budete musieť aplikáciu odinštalovať a zlepšiť tak výkonnosť batérie."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Tablet nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP">%1$s</xliff:g> ho ponecháva zapnutý.\n\nAk chcete tento problém vyriešiť, môžete vynútiť zastavenie tejto aplikácie.\n\nAk sa to bude diať aj naďalej, budete musieť aplikáciu odinštalovať a zlepšiť tak výkonnosť batérie."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Zariadenie nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP">%1$s</xliff:g> ho ponecháva zapnuté.\n\nAk chcete tento problém vyriešiť, môžete vynútiť zastavenie tejto aplikácie.\n\nAk sa to bude diať aj naďalej, budete musieť aplikáciu odinštalovať a zlepšiť tak výkonnosť batérie."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Zastaviť aplikáciu"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Vypnúť používanie na pozadí?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Telefón nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP">%1$s</xliff:g> ho prebúdza.\n\nAk chcete vyriešiť tento problém, môžete telefón nastaviť tak, aby zabránil tejto aplikácii spúšťať sa na pozadí."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Tablet nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP">%1$s</xliff:g> ho prebúdza.\n\nAk chcete vyriešiť tento problém, môžete tablet nastaviť tak, aby zabránil tejto aplikácii spúšťať sa na pozadí."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Zariadenie nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP">%1$s</xliff:g> ho prebúdza.\n\nAk chcete vyriešiť tento problém, môžete zariadenie nastaviť tak, aby zabránilo tejto aplikácii spúšťať sa na pozadí."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Vypnúť"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Vypnúť polohu?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Telefón nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP">%1$s</xliff:g> často požaduje polohu, keď ju nepoužívate.\n\nAk chcete tento problém vyriešiť, môžete vypnúť polohu pre túto aplikáciu."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Tablet nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP">%1$s</xliff:g> často požaduje polohu, keď ju nepoužívate.\n\nAk chcete tento problém vyriešiť, môžete vypnúť polohu pre túto aplikáciu."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Zariadenie nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP">%1$s</xliff:g> často požaduje polohu, keď ju nepoužívate.\n\nAk chcete tento problém vyriešiť, môžete vypnúť polohu pre túto aplikáciu."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Vypnúť"</string>
     <string name="power_screen" msgid="3023346080675904613">"Obrazovka"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Svetlo"</string>
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparát"</string>
@@ -1994,7 +2066,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Aplikácie"</string>
     <string name="power_service" msgid="1599661212370831780">"Služby"</string>
     <string name="power_system" msgid="8290455327965307383">"Systém"</string>
-    <string name="power_user" msgid="1889728099253018005">"Používateľ"</string>
+    <string name="power_user" msgid="3706143225319881667">"Ďalší používatelia"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Doba prevádzky procesora"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU v popredí"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zakázať režim spánku"</string>
@@ -2046,6 +2118,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Nadsadená spotreba energie"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Používané <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktívna <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Využitie obrazovky <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> využila aplikácia <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> celkovej výdrže batérie"</string>
@@ -2613,7 +2686,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Zmeniť kód PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Zobrazovať upozornenia"</string>
     <string name="help_label" msgid="6886837949306318591">"Pomocník a spät. väzba"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Články pomocníka, podpora cez telefón a čet"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Články pomocníka, telefón a čet, začíname"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Účet pre obsah"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografie"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Extrémne hrozby"</string>
@@ -2705,9 +2778,12 @@
       <item quantity="one">Zobraziť %d skrytú položku</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Sieť a internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobilné, spotreba dát, hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilné"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"spotreba dát"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Pripojené zariadenia"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, prenos, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikácie a upozornenia"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Povolenia, predvolené aplikácie"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Používatelia a účty"</string>
@@ -2760,6 +2836,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"platiť, klepnutie, platby"</string>
     <string name="keywords_backup" msgid="470070289135403022">"záloha, zálohovanie"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gesto, okraj, strana, aktívny okraj, stlačiť, uchopiť, asistovať, asistent, stlačenie, stláčať, ok google, asistent google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gesto, prebudiť, upozornenia, obrazovka, zobraziť, vypnutá obrazovka, zapnutá obrazovka, stlačiť, okraj, spať, spánok, uchopiť"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gesto, ticho, odložiť, budík, prichádzajúci hovor, tichý, zobrazenie, uzamknutá obrazovka, stlačiť, uchopiť, okraj, zastaviť"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavenie štítka NFC pre Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapísať"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Klepnutím na značku začnete zápis..."</string>
@@ -2844,7 +2923,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Nezobrazovať pracovné upozornenia"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Akým spôsobom chcete zobrazovať profilové upozornenia na uzamknutom zariadení?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profilové upozornenia"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Upozornenia"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Upozornenia"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Upozornenia aplikácií"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategória upozornenia"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Dôležitosť"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Umožnite aplikácii rozhodovať sa"</string>
@@ -2859,6 +2939,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Neodkladná"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Povoliť zvuk"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Bez zvukov, vibrovania alebo posunutia do zobrazenia na aktuálnej obrazovke"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Nízka dôležitosť"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Stredná dôležitosť"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Vysoká dôležitosť"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Neodkladná dôležitosť"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Asistent upozornení"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Prístup k upozorneniam"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Prístup k upozorneniam pracovného profilu je zablokovaný"</string>
@@ -2888,8 +2972,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Obraz v obraze"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Povoliť obraz v obraze"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Povoliť tejto aplikácii vytvoriť okno obrazu v obraze, kým je otvorená alebo keď ju opustíte (napríklad pokračovanie v pozeraní videa). Toto okno sa zobrazuje cez ďalšie aplikácie, ktoré používate."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Áno"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Nie"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Prístup k režimu Nerušiť"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Prístup k nastaveniu Nerušiť si nevyžiadali žiadne nainštalované aplikácie"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Načítavajú sa aplikácie..."</string>
@@ -3028,11 +3110,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Tento pracovný profil spravuje aplikácia:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Spravované aplikáciou <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimentálne)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Otočenie zariadenia"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Otočiť obsah obrazovky"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Zachovať zobrazenie na výšku"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Ponechať obrazovku v zobrazení na šírku"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ponechať obrazovku v súčasnej orentácii"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Bezpečné spustenie"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Pokračovať"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Ďalšiu ochranu tohto zariadenia zabezpečíte požadovaním kódu PIN pred spustením. Toto zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí. \n\nPomáha to chrániť dáta v stratených alebo ukradnutých zariadeniach. Vyžadovať kód PIN na spustenie zariadenia?"</string>
@@ -3040,7 +3117,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Ďalšiu ochranu tohto zariadenia zabezpečíte požadovaním hesla pred jeho spustením. Toto zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí. \n\nPomáha to chrániť dáta v stratených alebo ukradnutých zariadeniach. Vyžadovať heslo na spustenie zariadenia?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Okrem odomknutia pomocou odtlačku prsta môžete toto zariadenie ochrániť aj vyžadovaním kódu PIN pred spustením. Zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí.\n\nPomáha to chrániť dáta v stratených alebo ukradnutých zariadeniach. Vyžadovať kód PIN na spustenie zariadenia?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Okrem odomknutia pomocou odtlačku prsta môžete svoje zariadenie ochrániť aj vyžadovaním bezpečnostného vzoru pred spustením. Zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí.\n\nPomáha to chrániť dáta v stratených alebo ukradnutých zariadeniach. Vyžadovať vzor na spustenie zariadenia?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Okrem odomknutia pomocou odtlačku prsta môžete svoje zariadenie ochrániť aj vyžadovaním hesla pred spustením. Zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí.\n\nPomáha to chrániť dáta v stratených alebo ukradnutých zariadeniach. Vyžadovať heslo na spustenie zariadenia?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Okrem odomknutia pomocou odtlačku prsta môžete svoje zariadenie ochrániť aj vyžadovaním hesla pred spustením. Zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí.\n\nPomáha to chrániť dáta v stratených alebo ukradnutých zariadeniach. Vyžadovať heslo na spustenie zariadenia?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Áno"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nie"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Vyžadovať kód PIN?"</string>
@@ -3166,6 +3243,19 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Upozornenia o spotrebe"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Zobraziť úplné využitie v zariadení"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Zobraziť využitie aplikácií"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Vysoká spotreba"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> aplikácie s abnormálnym správaním</item>
+      <item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> aplikácie s abnormálnym správaním</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikácií s abnormálnym správaním</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> aplikácia s abnormálnym správaním</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="few">Aplikácie vybíjajúce batériu</item>
+      <item quantity="many">Aplikácie vybíjajúce batériu</item>
+      <item quantity="other">Aplikácie vybíjajúce batériu</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> vybíja batériu</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Neoptimalizované"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Neoptimalizované"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimalizuje používanie batérie"</string>
@@ -3260,8 +3350,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Zobrazenie cez iné aplikácie"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> z <xliff:g id="COUNT_1">%2$d</xliff:g> aplikácií má povolené zobrazovanie cez iné aplikácie"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikácie s povolením"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Áno"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Nie"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Povolené"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Nepovolené"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"inštalácia aplikácie neznáme zdroje"</string>
     <string name="write_settings" msgid="4797457275727195681">"Úpravy nastavení systému"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"zápis a úprava nastavení systému"</string>
@@ -3353,6 +3443,19 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Obrazovka je zafarbená na žltohnedo, vďaka čomu sa vám bude lepšie zaspávať."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Návrhy"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+ďalšie (<xliff:g id="ID_1">%1$d</xliff:g>)"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> návrhy</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> návrhu</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> návrhov</item>
+      <item quantity="one">1 návrh</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="few">+ <xliff:g id="COUNT">%1$d</xliff:g> návrhy</item>
+      <item quantity="many">+ <xliff:g id="COUNT">%1$d</xliff:g> návrhu</item>
+      <item quantity="other">+ <xliff:g id="COUNT">%1$d</xliff:g> návrhov</item>
+      <item quantity="one">+ 1 návrh</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Odstrániť"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Studená teplota farby"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Používať studenšie farby obrazovky"</string>
@@ -3371,8 +3474,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Dátové upozornenie <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Dátové upozornenie <xliff:g id="ID_1">%1$s</xliff:g> / dátový limit <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Fakturačný cyklus"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Cyklus sa začína každý <xliff:g id="ID_1">%1$s</xliff:g>. deň mesiaca"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mesačne od <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Každý mesiac v <xliff:g id="ID_1">%1$s</xliff:g>. deň"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Obmedzenia siete"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> obmedzenia</item>
@@ -3396,7 +3498,7 @@
       <item quantity="one">1 aplikácia má povolené používať neobmedzené dáta, keď je zapnutý šetrič dát</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Šetrič dát"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Neobmedzený prístup k dátam"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Neobmedzené dáta"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Dátové prenosy na pozadí sú vypnuté"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Zapnutý"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Vypnutý"</string>
@@ -3462,8 +3564,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Ovládajte upozornenia na zamk. obrazovke"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Zobrazujte si obsah upozornení alebo ho skryte"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Všetko"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Podpora"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Podpora a tipy"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Minimálna šírka"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Prístup k prémiovým správam SMS si nevyžiadali žiadne nainštalované aplikácie"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Za prémiové správy SMS sa môžu účtovať poplatky, ktoré sa naúčtujú na faktúru operátora. Ak aktivujete toto povolenie pre aplikáciu, budete môcť pomocou nej posielať prémiové správy SMS."</string>
@@ -3534,28 +3635,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automaticky"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ručne"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Uvoľniť miesto"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestá"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Skratky gest"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Rýchle gestá na ovládanie telefónu"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Rýchle gestá na ovládanie tabletu"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Rýchle gestá na ovládanie zariadenia"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Spustiť fotoaparát"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Fotoaparát rýchlo otvoríte dvojitým stlačením vypínača. Funguje to na každej obrazovke."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Rýchle spustenie fotoaparátu"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Fotoaparát spustíte dvojitým stlačením vypínača"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Prepnúť fotoaparáty"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Rýchlejšie fotenie snímok selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Režim selfie spustíte tak, že dvakrát pokrútite telefónom"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Režim selfie spustíte tak, že dvakrát pokrútite tabletom"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Režim selfie spustíte tak, že dvakrát pokrútite zariadením"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Telefón skontrolujete dvojitým klepnutím"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tablet skontrolujete dvojitým klepnutím"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Zariadenie skontrolujete dvojitým klepnutím"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Ak chcete rýchlo skontrolovať upozornenia, dvakrát klepnite na obrazovku."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Ak chcete zistiť čas, skontrolovať ikony upozornení a ďalšie informácie, klepnite dvakrát na obrazovku."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Prezeranie upozornení pri vypnutej obrazovke"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Kontrola telefónu zdvihnutím"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tablet skontrolujete tak, že ho zodvihnete"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Zariadenie skontrolujete tak, že ho zodvihnete"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Ak chcete rýchlo skontrolovať upozornenia, zodvihnite telefón."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Ak chcete rýchlo skontrolovať upozornenia, zodvihnite tablet."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Ak chcete rýchlo skontrolovať upozornenia, zodvihnite zariadenie."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Ak chcete zistiť čas, skontrolovať ikony upozornení a ďalšie informácie, zdvihnite telefón."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ak chcete zistiť čas, skontrolovať ikony upozornení a ďalšie informácie, zdvihnite tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ak chcete zistiť čas, skontrolovať ikony upozornení a ďalšie informácie, zdvihnite zariadenie."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Prezeranie upozornení pri vypnutej obrazovke"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Upozornenia odtlačkom prsta"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Upozornenia zobrazíte prejdením prstom nadol po senzore odtlačkov prstov na zadnej strane telefónu."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Upozornenia zobrazíte prejdením prstom nadol po senzore odtlačkov prstov na zadnej strane tabletu."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Upozornenia zobrazíte prejdením prstom nadol po senzore odtlačkov prstov na zadnej strane zariadenia."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Rýchle zobrazenie upozornení"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Prejdite nadol po senzore odtlačkov prstov"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Zdvihnutím spustite fotoaparát"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Ak chcete automaticky otvoriť fotoaparát, zdvihnite telefón do polohy na fotenie (na šírku alebo na výšku). Funguje, aj keď je telefón v režime spánku alebo uzamknutý."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Foťte, keď je telefón v režime spánku alebo uzamknutý"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto asistencie"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Citlivosť"</string>
@@ -3673,6 +3787,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Chcete túto okamžitú aplikáciu odstrániť?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Hry"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Zvukové súbory"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Využité miesto"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(odinštalované pre používateľa <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(vypnuté pre používateľa <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Služba automatického dopĺňania"</string>
@@ -3686,5 +3801,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Okamžitá aplikácia"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Vypnúť správcu úložiska?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Filmové a televízne aplikácie"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Využité miesto"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Informácie o poskytovaní služieb operátorom"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Spustiť poskytovanie služieb operátorom"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Aké sú najaktuálnejšie novinky?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Prezrite si 5 najlepších funkcií"</string>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index a07385c..4e034f3 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Dobro"</item>
     <item msgid="8986346415847956850">"Odlično"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Vedno"</item>
-    <item msgid="844721238536786870">"Samo, ko je priključen"</item>
-    <item msgid="1986753720941888596">"Nikoli"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Vedno"</item>
-    <item msgid="7433294150916905997">"Samo, ko je priključen"</item>
-    <item msgid="1390404486722375028">"Nikoli"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Zadnjih 30 dni"</item>
     <item msgid="6600989128423965319">"Nastav. cikla porabe ..."</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 1eb56a0..959e0e2 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -32,6 +32,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Zdaj ste razvijalec."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Ni treba, ker ste že razvijalec."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Najprej omogočite možnosti za razvijalce."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Brezžično in omrežja"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Povezave"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Naprava"</string>
@@ -43,6 +44,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Pripravljeno za uporabo tehnologije VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videoklicanje je pripravljeno"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Klicanje prek Wi-Fi-ja je pripravljeno"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/prisotnost omogočena"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Moč radia mobilne naprave"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Prikaži imenik na kartici SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Prikaži številke za zaporo odhodnih klicev"</string>
@@ -108,10 +110,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Išči naprave"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Preimenuj to napravo"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Preimenuj"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Želite prekiniti povezavo?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"S tem bo prekinjena povezava z napravo:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Prekinitev povezave z napravo?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Povezava telefona z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bo prekinjena."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Povezava tabličnega računalnika z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bo prekinjena."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Povezava vaše naprave z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bo prekinjena."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Prekini povezavo"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Nimate dovoljenja za spreminjanje nastavitev za Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Seznanitev nove naprave"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Naprava <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je vidna napravam v bližini, ko so odprte nastavitve za Bluetooth."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Naslov Bluetooth telefona: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Naslov Bluetooth tabličnega računalnika: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Naslov Bluetooth naprave: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Ali želite prekiniti povezavo z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Oddajanje"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Želite onemogočiti profil?"</string>
@@ -123,7 +132,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Zahteva za seznanitev Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Zahteva za seznanitev"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Dotaknite se, če želite opraviti seznanitev z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Pokaži prejete datoteke"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Prejete datoteke"</string>
     <string name="device_picker" msgid="4978696506172252813">"Izberite napravo Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> želi vklopiti Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> želi izklopiti Bluetooth"</string>
@@ -159,6 +168,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s želi dostopati do vaših sporočil. Želite omogočiti dostop za %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Zahteva za dostop do kartice SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> želi dostopati do vaše kartice SIM. Z omogočanjem dostopa do kartice SIM bodo v napravi za čas trajanja povezave onemogočene podatkovne povezave. Omogočite dostop za <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Drugim napravam vidno kot »<xliff:g id="DEVICE_NAME">^1</xliff:g>«"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaše naprave"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Seznanitev nove naprave"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum in ura"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Izberite časovni pas"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -333,7 +345,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Računi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Varnost in lokacija"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Varnost in lokacija"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifriranje in poverilnice"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon je šifriran"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Naprava je šifrirana"</string>
@@ -360,40 +372,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Odklepanje s prstnim odtisom"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Uporaba prstnega odtisa"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"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.\n\nOpomba: prstni odtis bo morda manj varen kot zapleten vzorec ali koda PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Odobrite nakupe ali se prijavite v aplikacije samo z dotikom tipala prstnih odtisov. Pazite, čigave prstne odtise boste dodali, saj ta dejanja lahko izvaja že en sam dodan prstni odtis.\n\nOpomba: prstnega odtisa ne morete uporabiti za odklepanje naprave. Za več informacij se obrnite na skrbnika v organizaciji."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Dotaknite se tipala prstnih odtisov, če želite odkleniti telefon, odobriti nakupe ali se prijaviti v aplikacije. Ta dejanja bo mogoče izvesti že z enim dodanim prstnim odtisom, zato pazite, čigave prstne odtise boste dodali.\n\nOpomba: prstni odtis bo morda manj varen kot zapleten vzorec ali koda PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Prekliči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Naprej"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Preskoči"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Dodaj prstni odtis"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Zaščitne funkcije naprave ne bodo aktivirane. V primeru izgube ali kraje tabličnega računalnika oziroma izbrisa vseh podatkov v njem ne boste mogli preprečiti drugim, da ga uporabljajo."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Zaščitne funkcije naprave ne bodo aktivirane. V primeru izgube ali kraje naprave oziroma izbrisa vseh podatkov v njej ne boste mogli preprečiti drugim, da jo uporabljajo."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Zaščitne funkcije naprave ne bodo aktivirane. V primeru izgube ali kraje telefona oziroma izbrisa vseh podatkov v njem ne boste mogli preprečiti drugim, da ga uporabljajo."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funkcije za zaščito naprave ne bodo aktivirane. V primeru izgube ali kraje tabličnega računalnika drugim ne boste mogli preprečiti njegove uporabe."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funkcije za zaščito naprave ne bodo aktivirane. V primeru izgube ali kraje naprave drugim ne boste mogli preprečiti njene uporabe."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funkcije za zaščito naprave ne bodo aktivirane. V primeru izgube ali kraje telefona drugim ne boste mogli preprečiti njegove uporabe."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Naprej"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funkcije za zaščito naprave ne bodo vklopljene. Če tablični računalnik izgubite, vam ga ukradejo ali ponastavijo na tovarniške nastavitve, drugim osebam ne boste mogli preprečiti njegove uporabe."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funkcije za zaščito naprave ne bodo vklopljene. Če napravo izgubite, vam jo ukradejo ali ponastavijo na tovarniške nastavitve, drugim osebam ne boste mogli preprečiti njene uporabe."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funkcije za zaščito naprave ne bodo vklopljene. Če telefon izgubite, vam ga ukradejo ali ponastavijo na tovarniške nastavitve, drugim osebam ne boste mogli preprečiti njegove uporabe."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Funkcije za zaščito naprave ne bodo vklopljene. Če tablični računalnik izgubite ali vam ga ukradejo, drugim osebam ne boste mogli preprečiti njegove uporabe."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Funkcije za zaščito naprave ne bodo vklopljene. Če napravo izgubite ali vam jo ukradejo, drugim osebam ne boste mogli preprečiti njene uporabe."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Funkcije za zaščito naprave ne bodo vklopljene. Če telefon izgubite ali vam ga ukradejo, drugim osebam ne boste mogli preprečiti njegove uporabe."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Vseeno preskoči"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Nazaj"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Iskanje tipala"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Poiščite tipalo prstnih odtisov na hrbtni strani telefona."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Dotaknite se tipala"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Je na hrbtni strani telefona. Uporabite kazalec."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustracija z napravo in lokacijo tipala prstnih odtisov"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Ime"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"V redu"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Izbriši"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Začnimo"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Dotaknite se tipala"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Položite prst na tipalo in ga dvignite, ko začutite vibriranje"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Kar tako naprej"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Rahlo premaknite prst, da dodate vse različne dele prstnega odtisa"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Prstni odtis dodan."</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ko vidite to ikono, lahko za preverjanje istovetnosti ali odobritev nakupa uporabite prstni odtis."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Dotaknite se tipala za prstne odtise, da preklopite napravo iz stanja pripravljenosti in jo odklenete."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Ko je prikazana ta ikona, lahko prav tako odobrite nakupe ali se prijavite v aplikacije."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Dvignite in se spet dotaknite"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Še naprej privzdigujte prst, da dodate različne dele prstnega odtisa"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Prstni odtis dodan"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Ko se pokaže ta ikona, uporabite prstni odtis za identifikacijo ali odobritev nakupov."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Želite preskočiti nast. prstnega odtisa?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Za odklepanja telefona ste izbrali možnost prstnega odtisa. Če zdaj preskočite, boste to morali nastaviti pozneje. Nastavitev traja samo približno eno minuto."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Nastavi zaklepanje zaslona"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Končano"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Ups, to ni tipalo"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Uporabite tipalo prstnih odtisov na napravi."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"S kazalcem se dotaknite tipala na hrbtni strani telefona."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Včlanitev ni bila dokončana."</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Dosežena časovna omejitev za včlanitev prstnega odtisa. Poskusite znova."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Včlanitev prstnega odtisa ni uspela. Poskusite znova ali uporabite drug prst."</string>
@@ -455,6 +465,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Vklopite zaščitne funkcije naprave, da drugim preprečite njeno uporabo brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Vklopite zaščitne funkcije naprave, da drugim preprečite uporabo tega telefona brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Izberite nadomestni način zaklepanja zaslona"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Možnosti zaklepanja zaslona"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Možnosti zaklepanja zaslona"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zaklepanje zaslona"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Takoj po stanju pripravljenosti"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> po stanju pripravljenosti"</string>
@@ -525,13 +537,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Spremeni vzorec za odklepanje"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Spremeni kodo PIN za odklepanje"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Spremeni geslo za odklepanje"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Poskusite znova. Poskus <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> od <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Zadnji poskus"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Če tudi tokrat vnesete nepravilni vzorec za delovni profil, bodo delovni profil in povezani podatki odstranjeni iz te naprave."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Če tudi tokrat vnesete nepravilno kodo PIN za delovni profil, bodo delovni profil in povezani podatki odstranjeni iz te naprave."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Če tudi tokrat vnesete nepravilno geslo za delovni profil, bodo delovni profil in povezani podatki odstranjeni iz te naprave."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Preveč napačnih poskusov. Delovni profil in povezani podatki bodo odstranjeni iz te naprave."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Opusti"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Poskusite znova. Poskus <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> od <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Vaši podatki bodo izbrisani"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Če pri naslednjem poskusu vnesete napačen vzorec, bodo podatki v tej napravi izbrisani"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Če pri naslednjem poskusu vnesete napačno kodo PIN, bodo podatki v tej napravi izbrisani"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Če pri naslednjem poskusu vnesete napačno geslo, bodo podatki v tej napravi izbrisani"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Če pri naslednjem poskusu vnesete napačen vzorec, bo uporabnik izbrisan"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Če pri naslednjem poskusu vnesete napačno kodo PIN, bo uporabnik izbrisan"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Če pri naslednjem poskusu vnesete napačno geslo, bo uporabnik izbrisan"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Če pri naslednjem poskusu vnesete napačen vzorec, bodo delovni profil in podatki v njem izbrisani"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Če pri naslednjem poskusu vnesete napačno kodo PIN, bodo delovni profil in podatki v njem izbrisani"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Če pri naslednjem poskusu vnesete napačno geslo, bodo delovni profil in podatki v njem izbrisani"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Preveč napačnih poskusov. Podatki v napravi bodo izbrisani."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Preveč napačnih poskusov. Uporabnik bo izbrisan."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Preveč napačnih poskusov. Delovni profil in podatki v njem bodo izbrisani."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Opusti"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Geslo mora biti dolgo vsaj toliko znakov: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Koda PIN mora biti vsaj <xliff:g id="COUNT">%d</xliff:g>-mestna"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Naprej"</string>
@@ -648,6 +668,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Dodatne nast. za Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Ko je Bluetooth vklopljen, lahko vaša naprava komunicira z drugimi napravami Bluetooth v bližini."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Zaradi večje natančnosti ugotavljanja lokacije lahko sistemske aplikacije in storitve še vedno zaznajo naprave Bluetooth. To lahko spremenite v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastavitvah iskanja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Povezave ni bilo mogoče vzpostaviti. Poskusite znova."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Podrobnosti o napravi"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Naslov Bluetooth naprave: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Želite, da vaša naprava pozabi seznanjeno napravo?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Telefon ne bo več seznanjen z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Tablični računalnik ne bo več seznanjen z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Vaša naprava ne bo več seznanjena z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Pozabi napravo"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Vzpostavi povezavo z ..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Povezava med napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> in zvokom nosilca podatkov bo prekinjena."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Povezava med napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> in prostoročnim zvokom bo prekinjena."</string>
@@ -800,6 +828,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Ne posreduj"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ne potrdi"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Ni navedenih potrdil. Povezava ne bo zasebna."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Ime omrežja je predolgo."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Določiti morate domeno."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je na voljo"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je na voljo)"</string>
@@ -833,7 +862,6 @@
       <item quantity="other">%d omrežij</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Dodatne nast. za Wi‑Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfiguriranje povezave Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Naslov MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Naslov IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podomrežja"</string>
@@ -870,9 +898,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Želite pozabiti to skupino?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prenosna dostopna točka Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Dostopna točka Wi-Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Uporaba mobilne povezave za omrežje Wi‑Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Brez skupne rabe internetne povezave tega tabličnega računalnika prek dostopne točke"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Brez skupne rabe internetne povezave tega telefona prek dostopne točke"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Internetna povezava ali vsebina ni v skupni rabi z drugimi napravami"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Skupna raba internetne povezave tega tabličnega računalnika prek dostopne točke"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Skupna raba internetne povezave tega telefona prek dostopne točke"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikacija daje vsebino v skupno rabo. Če želite omogočiti skupno rabo internetne povezave, dostopno točko izklopite in znova vklopite."</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Ime dostopne točke Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Vklapljanje dostopne točke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Druge naprave se lahko povežejo z dostopno točko <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Geslo za Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pas dostopne točke"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Uporabite dostopno točko, da ustvarite omrežje Wi‑Fi za druge svoje naprave. Dostopna točka omogoča uporabo interneta prek mobilne podatkovne povezave, zato lahko nastanejo dodatni stroški prenosa podatkov po mobilnem omrežju."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacije lahko ustvarijo dostopno točko za skupno rabo vsebin z napravami v bližini."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Vklop dostopne točke  ..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Izklop dostopne točke ..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"Povezava <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivna"</string>
@@ -919,6 +955,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Ko je vklopljeno klicanje prek omrežja Wi-Fi, lahko telefon preusmeri klice prek omrežij Wi-Fi ali omrežja operaterja na podlagi vaše nastavitve in moči signala. Pred vklopom te funkcije pri operaterju preverite cene in druge podrobnosti."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Posodobitev naslova za nujne primere"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Naslov, ki ga službe za ukrepanje v sili uporabljajo kot vaš naslov, če prek Wi-Fi-ja pokličete na številko 911"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Zaslon"</string>
@@ -976,6 +1013,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Ni rezultatov"</string>
     <string name="display_settings" msgid="7965901687241669598">"Zaslon"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Samodejno zasukaj zaslon"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Intenzivne barve"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Samodejno spremeni usmerjenost ob zasuku tabličnega računalnika"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Samodejno preklopi usmeritev ob zasuku telefona"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Samodejno spremeni usmerjenost ob zasuku tabličnega računalnika"</string>
@@ -1003,23 +1041,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimiziranje ravni svetlosti glede na razpoložljivo svetlobo. Ko je ta funkcija vklopljena, lahko še vedno začasno prilagodite svetlost."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Nočna svetloba"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Nočna svetloba zaslon obarva z jantarnim odtenkom. To olajša gledanje na zaslon ali branje pri šibki svetlobi in vam lahko pomaga prej zaspati."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Razpored"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Stanje"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Samodejni vklop"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Nikoli"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Razpored po meri"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Od sončnega zahoda do vzhoda"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Ustvari časovni razpored"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Brez"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Vklop ob poljubni nastavljeni uri"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Vklop od sončn. zahoda do vzhoda"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Začetni čas"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Končni čas"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Stanje"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intenzivnost"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Izklopljeno. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Brez samodejnega vklopa."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Samodejni vklop ob <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Samodejni vklop ob sončnem zahodu."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Vklopljeno. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Brez samodejnega izklopa."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Samodejni izklop ob <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Samodejni izklop ob sončnem vzhodu."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Izklopljeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Brez samodejnega vklopa"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Samodejni vklop ob <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Samodejni vklop ob sončnem zahodu"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Vklopljeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Brez samodejnega izklopa"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Samodejni izklop ob <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Samodejni izklop ob sončnem vzhodu"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Stanje pripravljenosti"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Zaslon se izklopi"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po toliko nedejavnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1043,8 +1080,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Nastavitve"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Samodejna svetlost"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Preklop iz stanja pripravlj. z dviganjem"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Prikaz na podlagi okolja"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Prikaz na podlagi okolja"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Vedno vklopljeno"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nova obvestila"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Nastavitve prikaza"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nova obvestila"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Preklop zaslona iz stanja pripravljenosti, ko prejmete obvestila"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Vedno vklopljeno"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Pokaži čas, ikone obvestil in druge informacije"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost pisave"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Pomanjšava ali povečava besedila"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavitve zaklepanja kartice SIM"</string>
@@ -1298,6 +1341,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN ne sme biti prazen."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Polje z mobilno kodo države mora vsebovati 3 števke."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Polje s kodo mobilnega omrežja mora vsebovati 2 ali 3 števke."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operater ne podpira dodajanja APN-jev vrste %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Obnavljanje privzetih nastavitev APN-jev"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Ponastavi na privzeto"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ponastavitev privzetih nastavitev APN-jev končana"</string>
@@ -1329,6 +1373,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Izbriši kartico SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Izbriši vse podatke v notranjem pomnilniku USB, na primer glasbo ali fotografije."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Izbriši vse podatke na kartici SD, na primer glasbo ali fotografije."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Izbriši kartice e-SIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Brisanje vseh kartic e-SIM v telefonu. S tem ne boste prekinili naročniškega paketa za mobilno telefonijo."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Brisanje vseh kartic e-SIM v tabličnem računalniku. S tem ne boste prekinili naročniškega paketa za mobilno telefonijo."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Ponastavi tablični računalnik"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Ponastavi telefon"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Želite izbrisati vse osebne podatke in prenesene aplikacije? Tega dejanja ni mogoče razveljaviti."</string>
@@ -1351,26 +1398,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Dokler je vklopljeno varčevanje s podatki, ni mogoče vzpostaviti povezave z internetom prek mobilnega telefona ali uporabljati prenosnih dostopnih točk."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Internetna povezava prek USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Povezava USB je vzpostavljena, označite za internetno povezavo prek telefona"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Uporablja se internetna povezava prek telefona"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Internetna povezava prek telefona ni mogoča, kadar se uporablja pomnilnik USB"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Povezava USB ni vzpostavljena"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Za vklop se povežite"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Zaradi povezave USB je prišlo do napake internetne povezave prek telefona"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Skupna raba internetne povezave telefona prek USB-ja"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Skupna raba internetne povezave tabličnega računalnika prek USB-ja"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Internet prek Bluetootha"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Deljenje internetne povezave tabličnega računalnika prek Bluetootha"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Deljenje internetne povezave telefona prek Bluetootha"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Deljenje internetne povezave tabličnega računalnika z 1 napravo prek Bluetootha"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Deljenje internetne povezave telefona z 1 napravo prek Bluetootha"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Deljenje internetne povezave tabličnega računalnika z več (<xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>) napravami prek Bluetootha"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Deljenje internetne povezave telefona z več (<xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>) napravami prek Bluetootha"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Skupna raba internetne povezave tabličnega računalnika prek Bluetootha"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Skupna raba internetne povezave telefona prek Bluetootha"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Deljenje internetne poezave naprave <xliff:g id="DEVICE_NAME">%1$d</xliff:g> prek Bluetootha"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Brez deljenja internetne povezave tabličnega računalnika prek Bluetootha"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Brez deljenja internetne povezave telefona prek Bluetootha"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Ni povezave"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Internetna povezava ni mogoča z več kot <xliff:g id="MAXCONNECTION">%1$d</xliff:g> naprav."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Internetna povezava z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bo prekinjena."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Uporabite dostopno točko in povezavo z internetom prek mobilnega telefona, da zagotovite internet drugim napravam prek svoje mobilne podatkovne povezave."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Uporabite dostopno točko in povezavo z internetom prek mobilnega telefona, da zagotovite internet drugim napravam prek svoje mobilne podatkovne povezave. Tudi aplikacije lahko ustvarijo dostopno točko za skupno rabo vsebin z napravami v bližini."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoč"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobilno omrežje"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Naročniški paket za mobilno napravo"</string>
@@ -1403,7 +1439,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Način ugotavljanja lokacije"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Uporaba GPS-ja, Bluetootha, Wi-Fi-ja in mobilnih omrežij za določanje lokacije"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Uporaba Wi-Fi-ja, Bluetootha in mobilnih omrežij za določanje lokacije"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Uporaba GPS-ja za določanje lokacije"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Uporaba GPS-a in tipal naprave za določanje lokacije"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Iskanje"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Iskanje omrežij Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Izboljšajte natančnost lokacijskih podatkov, tako da sistemskim aplikacijam in storitvam omogočite, da kadar koli zaznajo omrežja Wi-Fi."</string>
@@ -1448,8 +1484,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nimate podatkovne povezave. Če si želite te podatke ogledati zdaj, odprite %s iz katerega koli računalnika z internetno povezavo."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Nalaganje …"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Izberite geslo"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Nastavite geslo za prstni odtis"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Izberite vzorec"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Nastavite vzorec za prstni odtis"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Izberite kodo PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Nastavite kodo PIN za prstni odtis"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potrdite geslo"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potrdite vzorec"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potrdite kodo PIN"</string>
@@ -1518,6 +1557,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Nastavitve aplikacij"</string>
     <string name="install_applications" msgid="4872012136210802181">"Neznani viri"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Dovoli vse vire aplikacij"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Nedavno odprte aplikacije"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Prikaži vse (<xliff:g id="COUNT">%1$d</xliff:g>) aplikacije"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"pred <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Neznane aplikacije lažje napadejo tablični računalnik in osebne podatke v njem. Če namestite aplikacije iz tega vira, se strinjate, da ste sami odgovorni za morebitno škodo, nastalo v tabličnem računalniku, ali izgubo podatkov, ki je lahko posledica uporabe teh aplikacij."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Neznane aplikacije lažje napadejo telefon in osebne podatke v njem. Če namestite aplikacije iz tega vira, se strinjate, da ste sami odgovorni za morebitno škodo, nastalo v telefonu, ali izgubo podatkov, ki je lahko posledica uporabe teh aplikacij."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Dodatne nastavitve"</string>
@@ -1688,6 +1730,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Želite ustaviti sistemsko storitev?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Če ustavite to storitev, lahko nekatere funkcije v tabličnem računalniku nehajo pravilno delovati, dokler ga ne izklopite in znova vklopite."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Če ustavite to stgoritev, lahko nekatere funkcije v telefonu nehajo pravilno delovati, dokler ga ne izklopite in znova vklopite."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Jeziki, vnos in poteze"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Jeziki in vnos"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Jeziki in vnos"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Pomoč pri vnosu"</string>
@@ -1914,6 +1960,12 @@
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> storitve tiskanja so vklopljene</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> storitev tiskanja je vklopljenih</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> tiskalno opravilo</item>
+      <item quantity="two"><xliff:g id="COUNT">%1$d</xliff:g> tiskalni opravili</item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> tiskalna opravila</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tiskalnih opravil</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Tiskalne storitve"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nameščena ni nobena storitev"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Tiskalnikov ni mogoče najti"</string>
@@ -1980,6 +2032,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Podrobnosti uporabe"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Prilagodi porabo energije"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Vključeni paketi"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Energijsko potratne aplikacije"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Ohranjanje prebujene naprave"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Prebujanje naprave iz ozadja"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Pogosto zahtevanje lokacije"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Nepravilno delovanje več aplikacij (<xliff:g id="NUMBER">%1$d</xliff:g>)"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Želite ustaviti aplikacijo?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Telefon ne more ustrezno upravljati porabe energije akumulatorja, ker aplikacija <xliff:g id="APP">%1$s</xliff:g> ohranja telefon prebujen.\n\nTežavo lahko poskusite rešiti z vsiljeno ustavitvijo aplikacije.\n\nČe se težava ponovi, boste za podaljšanje časa delovanja akumulatorja morda morali aplikacijo odstraniti."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Tablični računalnik ne more ustrezno upravljati porabe energije akumulatorja, ker aplikacija <xliff:g id="APP">%1$s</xliff:g> ohranja tablični računalnik prebujen.\n\nTežavo lahko poskusite rešiti z vsiljeno ustavitvijo aplikacije.\n\nČe se težava ponovi, boste za podaljšanje časa delovanja akumulatorja morda morali aplikacijo odstraniti."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Naprava ne more ustrezno upravljati porabe energije akumulatorja, ker aplikacija <xliff:g id="APP">%1$s</xliff:g> ohranja napravo prebujeno.\n\nTežavo lahko poskusite rešiti z vsiljeno ustavitvijo aplikacije.\n\nČe se težava ponovi, boste za podaljšanje časa delovanja akumulatorja morda morali aplikacijo odstraniti."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Ustavi aplikacijo"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Želite izklopiti izvajanje v ozadju?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Telefon ne more ustrezno upravljati porabe energije akumulatorja, ker aplikacija <xliff:g id="APP">%1$s</xliff:g> nenehno prebuja telefon.\n\nTežavo lahko odpravite tako, da v telefonu preprečite izvajanje te aplikacije v ozadju."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Tablični računalnik ne more ustrezno upravljati porabe energije akumulatorja, ker aplikacija <xliff:g id="APP">%1$s</xliff:g> nenehno prebuja tablični računalnik.\n\nTežavo lahko odpravite tako, da v tabličnem računalniku preprečite izvajanje te aplikacije v ozadju."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Naprava ne more ustrezno upravljati porabe energije akumulatorja, ker aplikacija <xliff:g id="APP">%1$s</xliff:g> nenehno prebuja napravo.\n\nTežavo lahko odpravite tako, da v napravi preprečite izvajanje te aplikacije v ozadju."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Izklopi"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Želite izklopiti ugotavljanje lokacije?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Telefon ne more ustrezno upravljati porabe energije akumulatorja, ker aplikacija <xliff:g id="APP">%1$s</xliff:g> nenehno zahteva lokacijo, tudi ko aplikacije ne uporabljate.\n\nTežavo lahko odpravite tako, da izklopite ugotavljanje lokacije za to aplikacijo."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Tablični računalnik ne more ustrezno upravljati porabe energije akumulatorja, ker aplikacija <xliff:g id="APP">%1$s</xliff:g> nenehno zahteva lokacijo, tudi ko aplikacije ne uporabljate.\n\nTežavo lahko odpravite tako, da izklopite ugotavljanje lokacije za to aplikacijo."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Naprava ne more ustrezno upravljati porabe energije akumulatorja, ker aplikacija <xliff:g id="APP">%1$s</xliff:g> nenehno zahteva lokacijo, tudi ko aplikacije ne uporabljate.\n\nTežavo lahko odpravite tako, da izklopite ugotavljanje lokacije za to aplikacijo."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Izklopi"</string>
     <string name="power_screen" msgid="3023346080675904613">"Zaslon"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Svetilka"</string>
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparat"</string>
@@ -1994,7 +2066,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Aplikacije"</string>
     <string name="power_service" msgid="1599661212370831780">"Storitve"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistem"</string>
-    <string name="power_user" msgid="1889728099253018005">"Uporabnik"</string>
+    <string name="power_user" msgid="3706143225319881667">"Drugi uporabniki"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Skupni čas za CPE"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Ospredje CPE"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ohrani odklenjen zaslon"</string>
@@ -2046,6 +2118,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Preveč šteta uporaba energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Trajanje uporabe: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Čas dejavnosti: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Uporaba zaslona: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> uporablja <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> celotne napolnjenosti akumulatorja"</string>
@@ -2613,7 +2686,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Sprememba kode PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Pokaži obvestila"</string>
     <string name="help_label" msgid="6886837949306318591">"Pomoč in povr. inf."</string>
-    <string name="support_summary" msgid="8276116616493882830">"Članki s pomočjo, podpora prek telefona in klepeta"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Članki s pomočjo, telefon in klepet, prvi koraki"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Račun za vsebino"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografije"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Skrajne grožnje"</string>
@@ -2705,9 +2778,12 @@
       <item quantity="other">Pokaži %d skritih elementov</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Omrežje in internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobilno, prenesena količina podatkov, dostopna točka"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilno"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"prenesena količina podatkov"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"dostopna točka"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Povezane naprave"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije in obvestila"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Dovoljenja, privzete aplikacije"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Uporabniki in računi"</string>
@@ -2760,6 +2836,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"poteza"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"plačaj, dotakni se, plačevanje z dotikom, plačila"</string>
     <string name="keywords_backup" msgid="470070289135403022">"varnostna kopija, varnostno kopiranje, varnostno kopirati"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"poteza, rob, stran, aktivni rob, stisk, prijem, oprijem, pomoč, pomočnik, squeezy, squeezie, squeezey, squeezee, Ok Google, Pomočnik Google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"poteza, prebujanje, obvestila, zaslon, prikaz, izklopljen zaslon, izklop zaslona, vklopljen zaslon, vklop zaslona, stisk, rob, v stanju pripravljenosti, stanje pripravljenosti, prijem, oprijem"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"poteza, utišanje, dremanje, dremež, alarm, dohodni klic, tiho, prikaz, zaklenjen zaslon, stisk, prijem, oprijem, rob, ustavitev"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavitev brezžič. oznake NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapiši"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Dotaknite se oznake za zapisovanje ..."</string>
@@ -2844,7 +2923,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Ne prikazuj obvestil za delovni profil"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kako naj se obvestila o profilu prikazujejo, ko je naprava zaklenjena?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Obvestila o profilu"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Obvestila"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Obvestila"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Obvestila aplikacij"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorija obvestil"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Pomembnost"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Dovoli, da se aplikacija sama odloči"</string>
@@ -2859,6 +2939,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Nujno"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Omogoči zvok"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Na trenutnem zaslonu ne predvajaj zvoka, vibriraj ali na hitro prikazuj teh obvestil."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Nizka pomembnost"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Srednja pomembnost"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Visoka pomembnost"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Nujna pomembnost"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Pomočnik za obvestila"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Dostop do obvestil"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Dostop do obvestil delovnega profila je blokiran"</string>
@@ -2888,8 +2972,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Slika v sliki"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Dovoli sliko v sliki"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Dovoli tej aplikaciji, da ustvari okno s sliko v sliki, medtem ko je aplikacija odprta ali potem ko jo zapustite (na primer, da nadaljujete z ogledom videoposnetka). To okno prekrije druge aplikacije, ki jih uporabljate."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Da"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Ne"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Dostop do načina »ne moti«"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nobena nameščena aplikacija ni zahtevala dostopa do načina »ne moti«"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Nalaganje aplikacij ..."</string>
@@ -3028,11 +3110,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Ta delovni profil upravlja:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Upravlja: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Poskusno)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Zasuk zaslona"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Zasukaj vsebino zaslona"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Ohrani pokončni pogled"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Ohrani ležeči pogled"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ohrani trenutno postavitev"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Varni zagon"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Naprej"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Napravo lahko dodatno zaščitite tako, da ob zagonu zahteva vašo kodo PIN. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti zahtevo za kodo PIN za zagon naprave?"</string>
@@ -3040,7 +3117,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Napravo lahko dodatno zaščitite tako, da ob zagonu zahteva vaše geslo. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti zahtevo za geslo za zagon naprave?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Poleg tega, da napravo odklepate s prstnim odtisom, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vašo kodo PIN. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti zahtevo za kodo PIN za zagon naprave?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Poleg tega, da napravo odklepate s prstnim odtisom, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vaš vzorec. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti zahtevo za vzorec za zagon naprave?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Poleg tega, da napravo odklepate s prstnim odtisom, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vaše geslo. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti zahtevo za geslo za zagon naprave?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Poleg tega, da napravo odklepate s prstnim odtisom, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vaše geslo. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi.\n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti zahtevo za geslo za zagon naprave?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Da"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ne"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Zahtevanje kode PIN?"</string>
@@ -3166,6 +3243,19 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Opozorila o porabi"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Prikaz vseh podatkov o uporabi naprave"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Prikaz uporabe aplikacij"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Visoka poraba energije"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one">Neobičajno delovanje <xliff:g id="NUMBER">%2$d</xliff:g> aplikacije</item>
+      <item quantity="two">Neobičajno delovanje <xliff:g id="NUMBER">%2$d</xliff:g> aplikacij</item>
+      <item quantity="few">Neobičajno delovanje <xliff:g id="NUMBER">%2$d</xliff:g> aplikacij</item>
+      <item quantity="other">Neobičajno delovanje <xliff:g id="NUMBER">%2$d</xliff:g> aplikacij</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Energijsko potratne aplikacije</item>
+      <item quantity="two">Energijsko potratni aplikaciji</item>
+      <item quantity="few">Energijsko potratne aplikacije</item>
+      <item quantity="other">Energijsko potratne aplikacije</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Ni optimizirano"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Ni optimizirano"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizacija uporabe akumulatorja"</string>
@@ -3260,8 +3350,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Prekrivanje drugih aplikacij"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g> aplikacij, ki lahko prekrivajo druge aplikacije"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacije z dovoljenjem"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Da"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Ne"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Dovoljene"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Nedovoljene"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"nameščanje aplikacij neznani viri"</string>
     <string name="write_settings" msgid="4797457275727195681">"Spreminjanje sist. nastavitev"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"zapisovanje spreminjanje sistemske nastavitve"</string>
@@ -3353,6 +3443,19 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Zaslon ima jantarni odtenek. To vam lahko pomaga prej zaspati."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Predlogi"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"in še <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"in še <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> predlog</item>
+      <item quantity="two"><xliff:g id="COUNT">%1$d</xliff:g> predloga</item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> predlogi</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> predlogov</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="one">in še <xliff:g id="COUNT">%1$d</xliff:g> predlog</item>
+      <item quantity="two">in še <xliff:g id="COUNT">%1$d</xliff:g> predloga</item>
+      <item quantity="few">in še <xliff:g id="COUNT">%1$d</xliff:g> predlogi</item>
+      <item quantity="other">in še <xliff:g id="COUNT">%1$d</xliff:g> predlogov</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Odstrani"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Hladnejša barvna temperatura"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Uporaba hladnejših barv zaslona"</string>
@@ -3371,8 +3474,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Opozorilo za prenos podatkov: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Opozorilo za prenos podatkov: <xliff:g id="ID_1">%1$s</xliff:g>/omejitev prenosa podatkov: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Obračunsko obdobje"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Mesečno obdobje se začne vsakega <xliff:g id="ID_1">%1$s</xliff:g>. v mesecu"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mesečno obdobje se začne <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Mesečno na dan <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Omejitve omrežja"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> omejitev</item>
@@ -3396,7 +3498,7 @@
       <item quantity="other">Ko je vklopljeno varčevanje s podatki, je neomejen prenos podatkov dovoljen <xliff:g id="COUNT">%1$d</xliff:g> aplikacijam.</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Varčevanje s podatki"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Neomejen podatkovni dostop"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Neomejen podatkovni dostop"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Prenos podatkov v ozadju je izklopljen"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Vklopljeno"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Izklopljeno"</string>
@@ -3462,8 +3564,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Nadzor obvestil na zaklenjenem zaslonu"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Prikaz ali skrivanje vsebine obvestil"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Vse"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Podpora"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Podpora in nasveti"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Najmanjša širina"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Nobena nameščena aplikacija ni zahtevala dostopa za plačljiva sporočila SMS."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Plačljiva sporočila SMS vam lahko povzročijo stroške in povečajo račun za mobilno telefonijo. Če za aplikacijo omogočite dovoljenje, boste lahko s tisto aplikacijo pošiljali plačljiva sporočila SMS."</string>
@@ -3534,28 +3635,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Samodejno"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ročno"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Sprostitev prostora"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Poteze"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Bližnjice za poteze"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Hitre poteze za upravljanje telefona"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Hitre poteze za upravljanje tabličnega računalnika"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Hitre poteze za upravljanje naprave"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Preklop na fotoaparat"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Če želite hitro odpreti fotoaparat, dvakrat pritisnite gumb za vklop. Deluje na vsakem zaslonu."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Hitro odpiranje fotoaparata"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Odpiranje fotoaparata z dvakratnim pritiskom gumba za vklop"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Obrat fotoaparata"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Hitrejši vklop načina za sebke"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Vklop načina za sebke z dvojnim zasukom telefona"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Vklop načina za sebke z dvojnim zasukom tablice"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Vklop načina za sebke z dvojnim zasukom naprave"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dvakrat se dotaknite, da preverite telefon"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dvakrat se dotaknite, da preverite tablični računalnik"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dvakrat se dotaknite, da preverite napravo"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Če želite hitro preveriti obvestila, se dvakrat dotaknite zaslona."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Če želite preveriti uro, ikone obvestil in druge informacije, se dvakrat dotaknite zaslona."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Preverjanje obvestil pri izklopljenem zaslonu"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Primite telefon, da ga preverite"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Primite tablični računalnik, da ga preverite"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Primite napravo, da jo preverite"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Če želite hitro preveriti obvestila, primite telefon."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Če želite hitro preveriti obvestila, primite tablični računalnik."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Če želite hitro preveriti obvestila, primite napravo."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Če želite preveriti uro, ikone obvestil in druge informacije, primite telefon."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Če želite preveriti uro, ikone obvestil in druge informacije, primite tablični računalnik."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Če želite preveriti uro, ikone obvestil in druge informacije, primite napravo."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Preverjanje obvestil pri izklopljenem zaslonu"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Poteg s prstom po tipalu prstnih odtisov za prikaz obvestil"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Če želite preveriti obvestila, povlecite navzdol po tipalu prstnih odtisov na hrbtni strani telefona."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Če želite preveriti obvestila, povlecite navzdol po tipalu prstnih odtisov na hrbtni strani tabličnega računalnika."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Če želite preveriti obvestila, povlecite navzdol po tipalu prstnih odtisov na hrbtni strani naprave."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Hiter ogled obvestil"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Vlečenje navzdol po tipalu prstnih odtisov"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Odpiranje fotoaparata z dvigom"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Fotoaparat se odpre samodejno, ko telefon dvignete in nastavite v položaj za fotografiranje (pokončno ali ležeče). Telefon je lahko v stanju pripravljenosti ali zaklenjen."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Fotografiranje, ko je tel. v stanju priprav. ali zaklenjen"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Poteza za pomoč"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Občutljivost"</string>
@@ -3673,6 +3787,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Ali želite odstraniti to nenamestljivo aplikacijo?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Igre"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Zvočne datoteke"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Uporabljen prostor"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(odstranjeno za uporabnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(onemogočeno za uporabnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Storitev samodejnega izpolnjevanja"</string>
@@ -3686,5 +3801,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Nenamestljiva aplikacija"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Želite izklopiti upravitelja shrambe?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplikacije za filme in TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Uporabljen prostor"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Podatki o omogočanju uporabe operaterja"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Sproži omogočanje uporabe operaterja"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Odkrijte zanimive novosti"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Spoznajte pet najuporabnejših funkcij"</string>
 </resources>
diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml
index 2340b34..7324054 100644
--- a/res/values-sq/arrays.xml
+++ b/res/values-sq/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"I mirë"</item>
     <item msgid="8986346415847956850">"I shkëlqyer"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Gjithmonë!"</item>
-    <item msgid="844721238536786870">"Vetëm kur është i futur në prizë"</item>
-    <item msgid="1986753720941888596">"Asnjëherë!"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Gjithmonë"</item>
-    <item msgid="7433294150916905997">"Vetëm kur është në prizë"</item>
-    <item msgid="1390404486722375028">"Asnjëherë!"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 ditët e fundit"</item>
     <item msgid="6600989128423965319">"Cakto ciklin e përdorimit..."</item>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 50f2da4..352d8f3 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Tani je zhvillues!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nuk ka nevojë, ti je programues tashmë!"</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Aktivizo opsionet e zhvilluesit në fillim."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Rrjetet me valë"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Lidhjet"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Pajisja"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE e përgatitur"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Telefonata me video u parapërgatit"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Telefonata me Wifi u parapërgatit"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/prania është parapërgatitur"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Fuqia e radios së rrjetit celular"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Shiko librin e adresave të kartës SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Shiko numrat me telefonim të përzgjedhur"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Skano për pajisje"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Riemërto këtë pajisje"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Riemërto"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Të shkëputet?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Kjo do të mbyllë lidhjen tënde me:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Të shkëputet pajisja?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Telefoni yt do të shkëputet nga <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Tableti yt do të shkëputet nga <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Pajisja jote do të shkëputet nga <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Shkëput"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Nuk ke leje për të ndryshuar cilësimet e \"Bluetooth-it\"."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Çifto pajisjen e re"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> është e dukshme për pajisjet në afërsi kur Cilësimet e Bluetooth-it janë të hapura."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Adresa e Bluetooth-it e telefonit: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Adresa e Bluetooth-it e tabletit: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Adresa e Bluetooth-it e pajisjes: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Të shkëputet <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmetimi"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Të çaktivizohet profili?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Kërkesë çiftimi me Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Kërkesa e çiftimit"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Trokit për ta çiftuar me <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Shfaq skedarët e marrë"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Skedarët e marrë"</string>
     <string name="device_picker" msgid="4978696506172252813">"Zgjidh pajisjen me Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> kërkon të aktivizojë Bluetooth-in"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> kërkon të çaktivizojë Bluetooth-in"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s kërkon të ketë qasje te mesazhet e tua. Të lejohet qasja për %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Kërkesa për qasje në kartën SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Pajisja <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> dëshiron të ketë qasje në kartën tënde SIM. Dhënia e të drejtës për qasje në kartën SIM do të çaktivizojë lidhjen e të dhënave në pajisjen tënde gjatë kohëzgjatjes së lidhjes. Jepi qasje pajisjes <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"E dukshme si \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" për pajisjet e tjera"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Pajisjet e tua"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Çifto pajisjen e re"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data dhe ora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Zgjidh brezin orar"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Llogaritë"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Vendndodhja"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Llogaritë"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Siguria dhe vendndodhja"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkriptimi dhe kredencialet"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefoni është i enkriptuar"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Pajisja është e enkriptuar"</string>
@@ -354,40 +367,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Shkyçe me gjurmën e gishtit"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Përdor gjurmën e gishtit"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"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. Trego kujdes se gjurmët e kujt shton. Çdo gjurmë gishti e shtuar do të mund t\'i kryejë këto gjëra. \n\nShënim: Gjurma jote e gishtit mund të jetë më pak e sigurt se një motiv ose një kod PIN i fortë."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Thjesht prek te sensori i gjurmës së gishtit për të autorizuar blerjet ose për t\'u identifikuar tek aplikacionet. Trego kujdes se gjurmët e kujt shton. Çdo gjurmë gishti e shtuar do të mund t\'i kryejë këto gjëra.\n\nShënim: Nuk mund ta përdorësh gjurmën tënde të gishtit për të 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="3635924459027832861">"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. Trego kujdes se gjurmët e kujt shton. Çdo gjurmë gishti e shtuar do të mund t\'i kryejë këto gjëra.\n\nShënim: Gjurma jote e gishtit mund të jetë më pak e sigurt se një motiv ose një kod PIN i fortë."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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 të 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="6817326798834882531">"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="3199351118385606526">"Anulo"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Vazhdo"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Kapërceje"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Shto gjurmë gishti"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do të mund t\'i parandalosh të tjerët të përdorin këtë tablet nëse ai humb, të vidhet ose fshihet."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund t\'i parandalosh të tjerët ta përdorin këtë pajisje nëse nëse e humb atë ose nëse të vidhet."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund t\'i parandalosh të tjerët ta përdorin këtë telefon nëse e humb atë ose nëse të vidhet."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund t\'i parandalosh të tjerët ta përdorin këtë tablet nëse e humb atë ose nëse të vidhet."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund t\'i parandalosh të tjerët ta përdorin këtë pajisje nëse e humb atë ose nëse të vidhet."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund t\'i parandalosh të tjerët ta përdorin këtë telefon nëse e humb atë ose nëse të vidhet."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Përpara"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund të parandalosh që të tjerët të mos e përdorin këtë tablet nëse ai humb, vidhet ose rivendoset."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund të parandalosh që të tjerët të mos e përdorin këtë pajisje nëse ajo humb, vidhet ose rivendoset."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund të parandalosh që të tjerët të mos e përdorin këtë telefon nëse ai humb, vidhet ose rivendoset."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund të parandalosh që të tjerët të mos e përdorin këtë tablet nëse ai humb ose vidhet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund të parandalosh që të tjerët të mos e përdorin këtë pajisje nëse ajo humb ose vidhet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Funksionet e mbrojtjes së pajisjes nuk do të aktivizohen. Ti nuk do mund të parandalosh që të tjerët të mos e përdorin këtë telefon nëse ai humb ose vidhet."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Kapërceje gjithsesi"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Kthehu prapa"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Gjej sensorin"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Gjej sensorin e gjurmës së gishtit në pjesën e pasme të telefonit."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Prek sensorin"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Ndodhet në pjesën e pasme të telefonit. Përdor gishtin tregues."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ilustrim me pajisjen dhe vendndodhjen e sensorit të gjurmës së gjishtit"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Emri"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Në rregull"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Fshi"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Fillojmë"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Prek sensorin"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Vendose gishtin mbi sensor dhe ngrije pasi të ndjesh një dridhje"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Vazhdo"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Lëvize pak gishtin për të shtuar të gjitha pjesët e ndryshme të gishtit tënd"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Gjurma u shtua!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Sa herë që shikon këtë ikonë, mund të përdorësh gjurmën e gishtit për identifikim ose për të autorizuar një blerje."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Mjafton të prekësh sensorin e gjurmës së gishtit për të zgjuar dhe shkyçur pajisjen."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Kur e sheh këtë ikonë, mund të autorizosh gjithashtu blerjet ose të identifikohesh në aplikacione."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Ngrije dhe më pas prek përsëri"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Vazhdo ta ngresh gishtin për të shtuar pjesë të ndryshme të gjurmës së gishtit"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Gjurma e gishtit u shtua"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Kur shikon këtë ikonë, përdor gjurmën e gishtit për identifikim ose për të miratuar blerjet."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Kapërce konfigurimin e gjurmës së gishtit?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Ke zgjedhur që të përdorësh gjurmën e gishtit si një mënyrë për ta shkyçur telefonin. Nëse e kapërcen teni, do të duhet ta konfigurosh këtë më vonë. Konfigurimi do të zgjasë vetëm afro një minutë."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Konfiguro kyçjen e ekranit"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"U krye"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Jo, sensori nuk është ai"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Përdor sensorin e gjurmës së gishtit në pajisje."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Prek sensorin në pjesën e pasme të telefonit. Përdor gishtin tregues."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Regjistrimi nuk përfundoi"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"U arrit kufiri kohor për regjistrimin e gjurmës së gishtit. Provo përsëri."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Regjistrimi i gjurmës së gishtit nuk funksionoi. Provo përsëri ose përdor një gisht tjetër."</string>
@@ -449,6 +460,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Parandalo që të tjerët ta përdorin këtë pajisje pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Parandalo që të tjerët ta përdorin këtë telefon pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Zgjidh mënyrën rezervë të kyçjes së ekranit"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opsionet e kyçjes së ekranit"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opsionet e kyçjes së ekranit"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Kyçja e ekranit"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / menjëherë pas gjumit"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> pas gjumit"</string>
@@ -519,13 +532,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Ndrysho motivin e shkyçjes"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Ndrysho kodin PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ndrysho fjalk. shkyçjes"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Provo sërish. Përpjekja <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> nga <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Përpjekja e fundit"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Nëse fut motivin e punës gabimisht gjatë kësaj përpjekjeje, profili i punës dhe të dhënat shoqëruese do të hiqeni nga kjo pajisje."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Nëse fut numrin PIN të punës gabimisht gjatë kësaj përpjekjeje, profili i punës dhe të dhënat shoqëruese do të hiqeni nga kjo pajisje."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Nëse fut fjalëkalimin e punës gabimisht gjatë kësaj përpjekjeje, profili i punës dhe të dhënat shoqëruese do të hiqeni nga kjo pajisje."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Shumë përpjekje të pasakta. Profili i punës dhe të dhënat shoqëruese do të hiqeni nga kjo pajisje."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Largoje"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Provo sërish. Tentativa <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> nga <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Të dhënat e tua do të fshihen"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Nëse fut një motiv të pasaktë në tentativën tjetër, të dhënat e kësaj pajisjeje do të fshihen"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Nëse fut një kod PIN të pasaktë në tentativën tjetër, të dhënat e kësaj pajisjeje do të fshihen"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Nëse fut një fjalëkalim të pasaktë në tentativën tjetër, të dhënat e kësaj pajisjeje do të fshihen"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Nëse fut një motiv të pasaktë në tentativën tjetër, ky përdorues do të fshihet"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Nëse fut një kod PIN të pasaktë në tentativën tjetër, ky përdorues do të fshihet"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Nëse fut një fjalëkalim të pasaktë në tentativën tjetër, ky përdorues do të fshihet"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Nëse fut një motiv të pasaktë në tentativën tjetër, profili yt i punës dhe të dhënat e tij do të fshihen"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Nëse fut një kod PIN të pasaktë në tentativën tjetër, profili yt i punës dhe të dhënat e tij do të fshihen"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Nëse fut një fjalëkalim të pasaktë në tentativën tjetër, profili yt i punës dhe të dhënat e tij do të fshihen"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Shumë tentativa të pasakta. Të dhënat e kësaj pajisjeje do të fshihen."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Shumë tentativa të pasakta. Ky përdorues do të fshihet."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Shumë tentativa të pasakta. Ky profil pune dhe të dhënat e tij do të fshihen."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Hiqe"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Duhet të jetë të paktën <xliff:g id="COUNT">%d</xliff:g> karaktere"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Kodi PIN duhet të jetë të paktën <xliff:g id="COUNT">%d</xliff:g> shifra"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Vazhdo"</string>
@@ -626,6 +647,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Cilësimet e përparuara të Bluetooth-it"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kur Bluetooth-i është i aktivizuar, pajisja jote mund të komunikojë me pajisjet e tjera me Bluetooth në afërsi."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Për të përmirësuar saktësinë e vendndodhjes, aplikacionet dhe shërbimet e sistemit mund t\'i zbulojnë akoma pajisjet me Bluetooth. Këtë mund ta ndryshosh te <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>cilësimet e skanimit<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Nuk mund të lidhej. Provo përsëri."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Detajet e pajisjes"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Adresa e Bluetooth-it e pajisjes: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Të harrohet pajisja?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Telefoni yt nuk do të jetë më i çiftuar me <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Tableti yt nuk do të jetë më i çiftuar me <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Pajisja jote nuk do të jetë më e çiftuar me <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Harroje pajisjen"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Lidhu me…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> do të shkëputet nga audioja e medias."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> do të shkëputet nga audioja \"pa duar\"."</string>
@@ -778,6 +807,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Mos e ofro"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Mos e mirato"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Nuk u specifikua asnjë certifikatë. Lidhja jote nuk do të jetë private."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Emri i rrjetit është shumë i gjatë."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Duhet të specifikohet një domen."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Ofrohet WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Ofrohet WPS)"</string>
@@ -809,7 +839,6 @@
       <item quantity="one">1 rrjet</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Cilësimet e Wi‑Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfiguro Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresa MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adresa e IP-së"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska e nënrrjetit"</string>
@@ -846,9 +875,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Të harrohet ky grup?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Zona e lirë qasjeje Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Zonë e lirë qasjeje për Wi-Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Përdor lidhjen celulare për të ofruar rrjetin Wi‑Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Lidhja e internetit të këtij tableti nuk po ndahet përmes zonës së qasjes"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Nuk po e ndan lidhjen e internetit të këtij telefoni përmes zonës së qasjes"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Nuk po ndan internetin ose përmbajtje me pajisjet e tjera"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Po ndan lidhjen e internetit të këtij tableti nëpërmjet zonës së qasjes së internetit"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Po ndan lidhjen e internetit të këtij telefoni nëpërmjet zonës së qasjes së internetit"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Aplikacioni po ndan përmbajtje. Për të ndarë lidhjen e internetit, çaktivizo zonën e qasjes së internetit dhe më pas aktivizoje përsëri."</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Emri i Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> po aktivizohet..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Pajisjet e tjera mund të lidhen me <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Fjalëkalimi i Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Brezi AP"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Përdor zonën e qasjes së internetit për të krijuar një rrjet Wi‑Fi për pajisjet e tua të tjera. Zona e qasjes e internetit ofron internet duke përdorur lidhjen e të dhënave celulare. Mund të zbatohen tarifa shtesë për të dhënat celulare."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacionet mund të krijojnë një zonë qasjeje të internetit për të ndarë përmbajtje me pajisjet në afërsi."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Po aktivizon zonën e qasjes..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Po çaktivizon zonën e qasjes..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> është aktiv"</string>
@@ -895,6 +932,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Kur telefonata me Wi-Fi është e aktivizuar, telefoni mund t\'i kalojë telefonatat nëpërmjet rrjeteve Wi-Fi ose nëpërmjet rrjetit të operatorit celular, në varësi të preferencës dhe se cili sinjal është më i fortë. Para se të aktivizosh këtë funksion, kontakto me operatorin celular në lidhje me tarifat dhe detaje të tjera."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Përditëso adresën e urgjencës"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Adresa përdoret nga shërbimet e urgjencës si vendndodhja jote nëse telefonon në 911 me WiFi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Paraqitja"</string>
@@ -952,6 +990,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nuk ka rezultate"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ekrani"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Ekran me rrotullim automatik"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Ngjyra të gjalla"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Ndërro orientimin automatikisht kur rrotullon tabletin"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Ndrysho automatikisht orientimin kur rrotullon telefonin"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Ndërro orientimin automatikisht kur rrotullon tabletin"</string>
@@ -979,23 +1018,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimizo nivelin e ndriçimit sipas dritës së ambientit. Kur ky funksion është aktiv, mund ta rregullosh përsëri përkohësisht ndriçimin."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Drita e natës"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Drita e natës e ngjyros ekranin në ngjyrë qelibari. Kjo e bën më të lehtë shikimin e ekranit ose leximin në dritë të zbehtë dhe mund të të ndihmojë të flesh gjumë më lehtë."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Orari"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Statusi"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Aktivizo automatikisht"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Asnjëherë"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Personalizo programin"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Nga perëndimi në agim"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Planifikimi"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Asnjë"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Aktivizo në kohë të personalizuar"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Aktivizohet nga perëndimi deri në agim"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Koha e nisjes"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Koha e përfundimit"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Statusi"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensiteti"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Joaktiv. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Nuk do të aktivizohet asnjëherë automatikisht."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Do të aktivizohet automatikisht në <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Do të aktivizohet automatikisht kur të perëndojë dielli."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Aktiv. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nuk do të çaktivizohet asnjëherë automatikisht."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Do të çaktivizohet automatikisht në <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Do të çaktivizohet automatikisht në agim."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Fikur / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Nuk do të aktivizohet asnjëherë automatikisht"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Do të aktivizohet automatikisht në <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Do të aktivizohet automatikisht kur të perëndojë dielli"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Ndezur / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Nuk do të çaktivizohet asnjëherë automatikisht"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Do të çaktivizohet automatikisht në <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Do të çaktivizohet automatikisht në agim"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Në gjendje gjumi"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekrani çaktivizohet"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Kur, <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> pa aktivitet"</string>
@@ -1019,8 +1057,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Cilësimet"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ndriçimi automatik"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ngrije për ta zgjuar"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Shfaqja e ambientit"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Shfaqja e ambientit"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Gjithmonë aktiv"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Njoftimet e reja"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kur të shfaqet"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Njoftimet e reja"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Zgjoje ekranin kur të merren njoftime"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Gjithmonë aktiv"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Shfaq orën, ikonat e njoftimeve dhe informacione të tjera"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Madhësa e shkrimit"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Bëje tekstin më të madh ose më të vogël"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Kyçja e kartës SIM"</string>
@@ -1272,6 +1316,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Rrjeti APN nuk mund të jetë bosh."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Fusha e MCC-së duhet të ketë 3 shifra."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Fusha e MNC-së duhet të ketë 2 ose 3 shifra."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operatori nuk lejon shtimin e APN-ve të llojit %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Po restauron cilësimet e APN-së me parazgjedhje."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Rivendos të parazgjedhurën"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Rivendosja e cilësimeve të APN-së me parazgjedhje përfundoi."</string>
@@ -1301,6 +1346,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Spastroje kartën SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Spastro të gjitha të dhënat në hapësirën ruajtëse të brendshme të USB-së, si muzikën ose fotografitë"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Spastro të gjitha të dhënat në kartën SD, si muzikën ose fotografitë"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Spastro eSIM-et"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Spastro të gjitha kartat eSIM në telefon. Kjo nuk do të anulojë planin tënd të shërbimit celular."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Spastro të gjitha kartat eSIM në tablet. Kjo nuk do të anulojë planin tënd të shërbimit celular."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Rivendos tabletin"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Rivendose telefonin"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Të spastrohen të gjitha informacionet e tua personale dhe aplikacionet e shkarkuara? Ky veprim nuk mund të kthehet mbrapsht!"</string>
@@ -1323,26 +1371,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Nuk mund të ndajë internetin ose të përdorë zonat e qasjes në internet kur \"Kursyesi i të dhënave\" është aktiv"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Ndarje përmes USB-së"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Me t\'u lidhur USB-ja, kontrollo për të ndarë lidhjen"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"E ndarë"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Nuk mund të ndahet kur është në përdorim hapësira ruajtëse e USB-së"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB-ja nuk është e lidhur"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Lidhe për ta aktivizuar"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Gabim në ndarjen përmes USB-së"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Ndaj lidhjen e internetit të telefonit nëpërmjet USB-së"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Ndaj lidhjen e internetit të tabletit nëpërmjet USB-së"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Ndarje interneti përmes Bluetooth-it"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Po ndan lidhjen e internetit të këtij tableti përmes Bluetooth-it"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Po ndan lidhjen e internetit të këtij telefoni përmes Bluetooth-it"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Po ndan lidhjen e internetit të këtij tableti me 1 pajisje përmes Bluetooth-it"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Po ndan lidhjen e internetit të këtij telefoni me 1 pajisje përmes Bluetooth-it"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Po ndan lidhjen e internetit të këtij tableti me <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> pajisje përmes Bluetooth-it"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Po ndan lidhjen e internetit të këtij telefoni me <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> pajisje përmes Bluetooth-it"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Ndaj lidhjen e internetit të tabletit nëpërmjet Bluetooth-it"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Ndaj lidhjen e internetit të telefonit nëpërmjet Bluetooth-it"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Po e ndan lidhjen e internetit të këtij <xliff:g id="DEVICE_NAME">%1$d</xliff:g> përmes Bluetooth-it"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Nuk po e ndan lidhjen e internetit të këtij tableti përmes Bluetooth-it"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Nuk po e ndan lidhjen e internetit të këtij telefoni përmes Bluetooth-it"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Nuk është i ndarë"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Ndarja e internetit nuk mund të bëhet për më shumë se <xliff:g id="MAXCONNECTION">%1$d</xliff:g> pajisje."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Ndarja e internetit do të çaktivizohet për <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Përdor zonën e qasjes dhe ndarjen e internetit për t\'u ofruar internet pajisjeve të tjera përmes lidhjes tënde të të dhënave celulare."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Përdor zonën e qasjes dhe ndarjen e internetit për t\'u ofruar internet pajisjeve të tjera nëpërmjet lidhjes tënde të të dhënave celulare. Aplikacionet mund të krijojnë po ashtu një zonë qasjeje të internetit për të ndarë përmbajtje me pajisjet në afërsi."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ndihma"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Rrjeti celular"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plani celular"</string>
@@ -1375,7 +1412,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Vendndodhja"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Përdor funksionin GPS, Wi‑Fi, Bluetooth ose rrjetet celulare për të përcaktuar vendndodhjen"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Përdor funksionin Wi‑Fi, Bluetooth ose rrjetet celulare për të përcaktuar vendndodhjen"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Përdor GPS-në për të përcaktuar vendndodhjen"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Përdor GPS-në dhe sensorët e pajisjes për të përcaktuar vendndodhjen"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Po skanon"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Skanimi i Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Përmirëso vendndodhjen duke lejuar aplikacionet dhe shërbimet e sistemit të zbulojnë rrjetet Wi-Fi në çdo kohë."</string>
@@ -1420,8 +1457,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Nuk ke një lidhje të dhënash. Për të parë këtë informacion tani, shko te %s nga një kompjuter i lidhur me internetin."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Po ngarkon..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Zgjidh fjalëkalimin"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Për të përdorur gjurmën e gishtit, vendos fjalëkalimin"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Zgjidh motivin"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Për të përdorur gjurmën e gishtit, vendos motivin"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Zgjidh kodin PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Për të përdorur gjurmën e gishtit, vendos kodin PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Konfirmo fjalëkalimin"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Konfirmo motivin"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Konfirmo kodin tënd PIN"</string>
@@ -1490,6 +1530,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Cilësimet e apl."</string>
     <string name="install_applications" msgid="4872012136210802181">"Burime të panjohura"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Lejo të gjitha burimet e apl."</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Aplikacionet e hapura së fundi"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Shiko të <xliff:g id="COUNT">%1$d</xliff:g> aplikacionet"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> më parë"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tableti dhe të dhënat e tua personale janë më të cenueshme për t\'u sulmuar nga aplikacione të panjohura. Duke instaluar aplikacionet nga ky burim, ti pranon se je plotësisht përgjegjës për çdo dëm ndaj tabletit ose çdo humbje të dhënash që mund të rezultojë nga përdorimi i tyre."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefoni dhe të dhënat e tua personale janë më të cenueshme për t\'u sulmuar nga aplikacione të panjohura. Duke instaluar aplikacionet nga ky burim, ti pranon se je plotësisht përgjegjës për çdo dëm ndaj telefonit ose çdo humbje të dhënash që mund të rezultojë nga përdorimi i tyre."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Cilësimet e përparuara"</string>
@@ -1658,6 +1701,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Të ndalohet shërbimi i sistemit?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Nëse e ndalon këtë shërbim, disa funksione të tabletit tënd mund të mos punojnë më si duhet, deri sa ta fikësh dhe më pas ta ndezësh përsëri."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Nëse e ndalon këtë shërbim, disa funksione të telefonit tënd mund të mos punojnë më si duhet deri sa ta fikësh dhe më pas ta ndezësh përsëri."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Gjuhët, hyrja dhe gjestet"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Gjuhët dhe të dhënat"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Gjuhët dhe të dhënat"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Ndihma për hyrjen"</string>
@@ -1872,6 +1919,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> shërbime printimi aktive</item>
       <item quantity="one">1 shërbim printimi aktiv</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> punë printimi</item>
+      <item quantity="one">1 punë printimi</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Shërbimet e printimit"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nuk është instaluar asnjë shërbim"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nuk u gjet asnjë printer"</string>
@@ -1938,6 +1989,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Përdor detajet"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Rregullo përdorimin e energjisë"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Paketat e përfshira"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplikacionet që shkarkojnë baterinë"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Po e mban zgjuar pajisjen"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Po e zgjon pajisjen në sfond"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Po kërkon shpesh vendndodhjen"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplikacione kanë sjellje jonormale"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Të ndalohet aplikacioni?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Telefoni yt nuk mund ta menaxhojë baterinë në mënyrë normale pasi aplikacioni <xliff:g id="APP">%1$s</xliff:g> po e mban zgjuar telefonin tënd.\n\nPër t\'u përpjekur të zgjidhësh këtë problem, mund ta ndalosh me forcë aplikacionin.\n\nNëse kjo vazhdon të ndodhë, mund të jetë e nevojshme ta çinstalosh aplikacionin për të përmirësuar cilësinë e funksionimit të baterisë."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Tableti yt nuk mund ta menaxhojë baterinë në mënyrë normale pasi aplikacioni <xliff:g id="APP">%1$s</xliff:g> po e mban zgjuar tabletin tënd.\n\nPër t\'u përpjekur të zgjidhësh këtë problem, mund ta ndalosh me forcë aplikacionin.\n\nNëse kjo vazhdon të ndodhë, mund të jetë e nevojshme ta çinstalosh aplikacionin për të përmirësuar cilësinë e funksionimit të baterisë."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Pajisja jote nuk mund ta menaxhojë baterinë në mënyrë normale pasi aplikacioni <xliff:g id="APP">%1$s</xliff:g> po e mban zgjuar pajisjen tënde.\n\nPër t\'u përpjekur të zgjidhësh këtë problem, mund ta ndalosh me forcë aplikacionin.\n\nNëse kjo vazhdon të ndodhë, mund të jetë e nevojshme ta çinstalosh aplikacionin për të përmirësuar cilësinë e funksionimit të baterisë."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Ndalo aplikacionin"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Të çaktivizohet përdorimi në sfond?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Telefoni yt nuk mund ta menaxhojë baterinë në mënyrë normale pasi aplikacioni <xliff:g id="APP">%1$s</xliff:g> vazhdon ta zgjojë telefonin.\n\nPër të trajtuar këtë problem, telefoni yt mund të parandalojë që ky aplikacion të mos ekzekutohet në sfond."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Tableti yt nuk mund ta menaxhojë baterinë në mënyrë normale pasi aplikacioni <xliff:g id="APP">%1$s</xliff:g> vazhdon ta zgjojë tabletin.\n\nPër të trajtuar këtë problem, tableti yt mund të parandalojë që ky aplikacion të mos ekzekutohet në sfond."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Pajisja jote nuk mund ta menaxhojë baterinë në mënyrë normale pasi aplikacioni <xliff:g id="APP">%1$s</xliff:g> vazhdon ta zgjojë pajisjen.\n\nPër të trajtuar këtë problem, pajisja jote mund të parandalojë që ky aplikacion të mos ekzekutohet në sfond."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Çaktivizo"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Të çaktivizohet vendndodhja?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Telefoni yt nuk mund ta menaxhojë baterinë në mënyrë normale pasi aplikacioni <xliff:g id="APP">%1$s</xliff:g> vazhdon të kërkojë vendndodhjen kur nuk e përdor aplikacionin.\n\nPër të zgjidhur këtë problem, mund ta çaktivizosh vendndodhjen për këtë aplikacion."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Tableti yt nuk mund ta menaxhojë baterinë në mënyrë normale pasi aplikacioni <xliff:g id="APP">%1$s</xliff:g> vazhdon të kërkojë vendndodhjen kur nuk e përdor aplikacionin.\n\nPër të zgjidhur këtë problem, mund ta çaktivizosh vendndodhjen për këtë aplikacion."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Pajisja jote nuk mund ta menaxhojë baterinë në mënyrë normale pasi aplikacioni <xliff:g id="APP">%1$s</xliff:g> vazhdon të kërkojë vendndodhjen kur nuk e përdor aplikacionin.\n\nPër të zgjidhur këtë problem, mund ta çaktivizosh vendndodhjen për këtë aplikacion."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Çaktivizo"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ekrani"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Blici"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1952,7 +2023,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Aplikacionet"</string>
     <string name="power_service" msgid="1599661212370831780">"Shërbimet"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistemi"</string>
-    <string name="power_user" msgid="1889728099253018005">"Përdoruesi"</string>
+    <string name="power_user" msgid="3706143225319881667">"Përdorues të tjerë"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU-ja në total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-ja në plan të parë"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mbaje të zgjuar"</string>
@@ -2004,6 +2075,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Përdorimi i energjisë i numëruar më shumë sa duhet"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Përdorur për <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktiv për <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Përdorimi i ekranit <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> përdorur nga <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> nga e gjithë bateria"</string>
@@ -2563,7 +2635,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Ndrysho kodin PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Shfaq njoftimet"</string>
     <string name="help_label" msgid="6886837949306318591">"Ndihmë dhe komente"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Artikuj ndihme, mbështetje me telefon dhe bisedë"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Artikuj ndihme, telefoni dhe biseda, fillimi"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Llogaria për përmbajtjen"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID-ja e fotos"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Kërcënimet ekstreme"</string>
@@ -2653,9 +2725,12 @@
       <item quantity="one">Shfaq %d artikull të fshehur</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Rrjeti dhe interneti"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, celular, përdorimi i të dhënave, zona e qasjes në internet"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"celular"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"përdorimi i të dhënave"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"zona e qasjes për internet"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Pajisje të lidhura"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Transmetimi, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Transmetimi"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacionet dhe njoftimet"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Lejet, aplikacionet e parazgjedhura"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Përdoruesit dhe llogaritë"</string>
@@ -2708,6 +2783,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gjesti"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"paguaj, trokit, pagesa"</string>
     <string name="keywords_backup" msgid="470070289135403022">"rezervim, rezervo"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"gjest, skaji, ana, skaji aktiv, shtrydh, kap, ndihmoj, asistenti, shtrydhje, shtrydhja,ok google, asistenti i google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"gjest, zgjoj, njoftime, ekrani, shfaq, ekrani joaktiv, ekrani aktiv, shtrydh, skaji, në gjumë, gjumi, kap"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"gjest, heshtje, shtyj, alarm, telefonatë hyrëse, i qetë, ekrani, ekrani i kyçjes, shtrydh, kap, skaji, ndalo"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Cakto një etiketë NFC për Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Shkruaj"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Trokit te një etiketë për të shkruar..."</string>
@@ -2790,7 +2868,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Mos shfaq asnjë njoftim pune"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kur pajisja jote të jetë e kyçur, si dëshiron të shfaqen njoftimet e profilit?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Njoftimet e profilit"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Njoftimet"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Njoftimet"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Njoftimet e apl."</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategoria e njoftimeve"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Rëndësia"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Lejoje aplikacionin të vendosë"</string>
@@ -2805,6 +2884,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Urgjente"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Lejo tingullin"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Mos lësho tingull, dridhje apo t\'i shfaqësh me shpejtësi në pamje këto njoftime në ekranin aktual."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Rëndësi e ulët"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Rëndësi mesatare"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Rëndësi e lartë"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Rëndësi urgjente"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Asistenti i njoftimeve"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Qasja te njoftimet"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Qasja në njoftimet e profilit të punës është bllokuar"</string>
@@ -2832,8 +2915,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Figurë brenda figurës"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Lejo figurë brenda figurës"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Lejoje këtë aplikacion të krijojë dritare figurë brenda figure ndërkohë që aplikacioni është i hapur ose pasi të dalësh prej tij (për shembull, për të vazhduar shikimin e një videoje). Kjo dritare shfaqet mbi aplikacionet e tjera që po përdor."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Po"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Jo"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Qasja te \"Mos shqetëso\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Asnjë aplikacion i instaluar nuk ka kërkuar qasje te \"Mos shqetëso\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Po ngarkon aplikacionet..."</string>
@@ -2964,11 +3045,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Ky profil pune menaxhohet nga:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"I menaxhuar nga <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentale)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Rrotullimi i pajisjes"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Rrotullo përmbajtjen e ekranit"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Qëndro në pamjen vertikale"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Qëndro në pamjen horizontale"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Qëndro në orientimin aktual"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Nisje e sigurt"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Vazhdo"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar kodin PIN para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, duke përfshirë alarme. \n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet kodi PIN për të nisur pajisjen tënde?"</string>
@@ -2976,7 +3052,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Mund ta mbrosh edhe më tepër këtë pajisje duke kërkuar fjalëkalimin para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, përfshirë alarmet. \n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet një fjalëkalim për të nisur pajisjen?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Përveç përdorimit të shenjave të gishtave për të shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar kodin PIN para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, duke përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet kodi PIN për të nisur pajisjen?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Përveç përdorimit të shenjave të gishtave për të shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar motivin para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, duke përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet motivi për të nisur pajisjen?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Përveç përdorimit të shenjave të gishtave për të shkyçur pajisjen tënde, mund ta mbrosh edhe më tepër këtë pajisje duke kërkuar fjalëkalimin para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Kërko një fjalëkalim për të nisur pajisjen&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Përveç përdorimit të gjurmës të gishtit për të shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar fjalëkalimin tënd para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, duke përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet fjalëkalimi për të nisur pajisjen?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Po"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Jo"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Të kërkohet kodi PIN?"</string>
@@ -3094,6 +3170,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Sinjalizimet për përdorimin"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Shfaq përdorimin e plotë të pajisjes"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Shfaq përdorimin e aplikacionit"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Përdorim i lartë"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacione kanë sjellje jonormale</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> ka sjellje jonormale</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Aplikacionet po shkarkojnë baterinë</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> po shkarkon baterinë</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Jo të optimizuara"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nuk është i optimizuar"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimizojnë përdorimin e baterisë"</string>
@@ -3186,8 +3271,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Shfaq mbi aplikacionet e tjera"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> nga <xliff:g id="COUNT_1">%2$d</xliff:g> gjithsej lejohen të shfaqen mbi aplikacionet e tjera"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacionet me leje"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Po"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Jo"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Lejohet"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Nuk lejohet"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instalo aplikacione nga burime të panjohura"</string>
     <string name="write_settings" msgid="4797457275727195681">"Modifiko cilësimet e sistemit"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"shkruaj modifiko sistem cilësime"</string>
@@ -3277,6 +3362,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekrani është me nuancë qelibari. Kjo mund të të ndihmojë të biesh në gjumë."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Sugjerime"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> të tjera"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> sugjerime</item>
+      <item quantity="one">1 sugjerim</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> sugjerime</item>
+      <item quantity="one">+1 sugjerim</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Hiqe"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Temperatura e ftohtë e ngjyrës"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Përdor ngjyra të ftohta të ekranit"</string>
@@ -3295,8 +3389,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Paralajmërimi i të dhënave <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Paralajmërimi i të dhënave <xliff:g id="ID_1">%1$s</xliff:g> / Kufiri i të dhënave <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Cikli i faturimit"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Cikli muor fillon në datë <xliff:g id="ID_1">%1$s</xliff:g> të çdo muaji"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Çdo muaj duke filluar nga <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Çdo muaj në ditën <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Kufizimet e rrjetit"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> kufizime</item>
@@ -3316,7 +3409,7 @@
       <item quantity="one">1 aplikacion lejohet të përdorë të dhëna të pakufizuara kur \"Kursyesi i të dhënave\" është aktiv</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Kursyesi i të dhënave"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Qasje e pakufizuar te të dhënat"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Të dhënat e pakufizuara"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Të dhënat e sfondit janë të çaktivizuara"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Aktiv"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Joaktiv"</string>
@@ -3380,8 +3473,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrollo njoftimet e ekranit të kyçjes"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Shfaq ose fshih përmbajtjet e njoftimeve"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Të gjitha"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Mbështetja"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Mbështetja dhe këshillat"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Gjerësia më e vogël"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Asnjë aplikacion i instaluar nuk ka kërkuar qasje te mesazhet SMS premium"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Mesazhet SMS premium mund të kushtojnë dhe do të rritin faturat e operatorit tënd celular. Nëse e aktivizon lejen për një aplikacion, do të mund të dërgosh mesazhe SMS premium me atë aplikacion."</string>
@@ -3446,28 +3538,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatike"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liro hapësirën tani"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gjestet"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Shkurtoret e gjesteve"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gjeste të shpejta për të kontrolluar telefonin"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gjestet e shpejta për të kontrolluar tabletin"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gjestet e shpejta për të kontrolluar pajisjen"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kalo te kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Për të hapur me shpejtësi kamerën, shtyp dy herë te butoni i energjisë. Funksionon nga çdo ekran."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Hap kamerën me shpejtësi"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Shtyp dy herë butonin e energjisë për të hapur kamerën"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Rrotulloje kamerën"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Bëj selfi më shpejt"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Rrotullo dy herë telefonin për modalitetin për selfi"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Rrotullo dy herë tabletin për modalitetin për selfi"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Rrotullo dy herë pajisjen për modalitetin për selfi"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Trokit dy herë për të kontrolluar telefonin"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Trokit dy herë për të kontrolluar tabletin"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Trokit dy herë për të kontrolluar pajisjen"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Për të kontrolluar me shpejtësi njoftimet e tua, trokit dy herë tek ekrani."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Për të kontrolluar orën, ikonat e njoftimeve dhe informacione të tjera, trokit dy herë tek ekrani."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Kontrollo njoftimet kur ekrani është joaktiv"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Ngrije për ta kontrolluar telefonin"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Ngrije për ta kontrolluar tabletin"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Ngrije për ta kontrolluar pajisjen"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Për të kontrolluar me shpejtësi njoftimet e tua, merre telefonin në duar."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Për të kontrolluar me shpejtësi njoftimet e tua, merre tabletin në duar."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Për të kontrolluar me shpejtësi njoftimet e tua, merre pajisjen në duar."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Për të kontrolluar orën, ikonat e njoftimeve dhe informacione të tjera, merre në duar telefonin tënd."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Për të kontrolluar orën, ikonat e njoftimeve dhe informacione të tjera, merre në duar tabletin tënd."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Për të kontrolluar orën, ikonat e njoftimeve dhe informacione të tjera, merre në duar pajisjen tënde."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Kontrollo njoftimet kur ekrani është joaktiv"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Rrëshqit shpejt gjurmën e gishtit për njoftimet"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Për të kontrolluar njoftimet, rrëshqit poshtë në sensorin e gjurmës së gishtit në pjesën e pasme të telefonit."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Për të kontrolluar njoftimet, rrëshqit poshtë në sensorin e gjurmës së gishtit në pjesën e pasme të tabletit."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Për të kontrolluar njoftimet, rrëshqit poshtë në sensorin e gjurmës së gishtit në pjesën e pasme të pajisjes."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Shiko njoftimet me shpejtësi"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Rrëshqit shpejt poshtë mbi sensorin e gishtit"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Ngrije për të hapur kamerën"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Për të hapur kamerën automatikisht, ngrije telefonin në një pozicion për shkrepjen e fotografive (vertikalisht ose horizontalisht). Funksionon kur telefoni është në fjetje ose i kyçur."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Shkrep fotografi kur telefoni është në fjetje ose i kyçur"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gjesti ndihmës"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Ndjeshmëria"</string>
@@ -3571,6 +3676,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Dëshiron që ta heqësh këtë aplikacion të çastit?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Lojëra"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Skedarët audio"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Hapësira e përdorur"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(çinstaluar për përdoruesin <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(çaktivizuar për përdoruesin <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Shërbimi i plotësimit automatik"</string>
@@ -3584,5 +3690,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Aplikacioni i çastit"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Të çaktivizohet menaxheri i hapësirës ruajtëse?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplikacionet e filmave dhe shfaqjeve televizive"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Hapësira e përdorur"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Informacionet e përgatitjes së operatorit celular"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivizo përgatitjen e operatorit celular"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Çfarë ka të reja dhe emocionuese?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Shiko 5 funksionet kryesore"</string>
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 6212910..3085397 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Добра"</item>
     <item msgid="8986346415847956850">"Одлична"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Увек"</item>
-    <item msgid="844721238536786870">"Само кад се пуни"</item>
-    <item msgid="1986753720941888596">"Никад"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Увек"</item>
-    <item msgid="7433294150916905997">"Само кад се пуни"</item>
-    <item msgid="1390404486722375028">"Никада"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Последњих 30 дана"</item>
     <item msgid="6600989128423965319">"Подеси циклус потрошње..."</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 126a85b..83c9e0d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -31,6 +31,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Постали сте програмер!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Нема потребе, већ сте програмер."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Прво омогућите опције за програмера."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Бежична веза и мреже"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Везе"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Уређај"</string>
@@ -42,6 +43,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Додељено за VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Видео позивање је додељено"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Позивање преко Wifi везе је додељено"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Додељено присуство"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Напајање за радио на мобилним уређајима"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Прикажи SIM адресар"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Прикажи бројеве за фиксно бирање"</string>
@@ -107,10 +109,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Скенирај за уређаје"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Преименуј овај уређај"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Преименуј"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Желите ли да прекинете везу?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Овим ћете прекинути везу са уређајем:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Прекидате везу са уређајем?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Телефон ће прекинути везу са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Таблет ће прекинути везу са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Уређај ће прекинути везу са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Прекини везу"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Немате дозволу за промену подешавања Bluetooth-а."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Упари нови уређај"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> је видљив уређајима у близини док су Bluetooth подешавања отворена."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Bluetooth адреса телефона: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Bluetooth адреса таблета: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth адреса уређаја: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Желите ли да прекинете везу са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Емитовање"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Желите ли да онемогућите профил?"</string>
@@ -122,7 +131,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Захтев за Bluetooth упаривање"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Захтев за упаривање"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Додирните да бисте упарили са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Приказ примљених датотека"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Примљене датотеке"</string>
     <string name="device_picker" msgid="4978696506172252813">"Изаберите Bluetooth уређај"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> жели да укључи Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> жели да искључи Bluetooth"</string>
@@ -158,6 +167,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s жели да приступи порукама. Желите ли да одобрите приступ за %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Захтев за приступ SIM картици"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> жели да приступа SIM картици. Одобравање приступа SIM картици ће онемогућити везу за пренос података на уређају док траје повезивање. Дајте приступ уређају <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Другим уређајима видљив као „<xliff:g id="DEVICE_NAME">^1</xliff:g>“"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Уређаји"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Упарите нови уређај"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Датум и време"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Избор временске зоне"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -331,7 +343,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Налози"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Локација"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Налози"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Безбедност и локација"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Безбедност и локација"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифровање и акредитиви"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Телефон је шифрован"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Уређај је шифрован"</string>
@@ -357,40 +369,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Откључајте отиском прста"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Користите отисак прста"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Само додирните сензор за отисак прста да бисте откључали телефон, овластили куповине или се пријавили на апликације Ово ће бити могуће помоћу свих отисака прстију које додате, па будите опрезни кога додајете.\n\nНапомена: Отисак прста може да буде мање безбедан од јаког шаблона или PIN-а."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Само додирните сензор отиска прста да бисте одобрили куповину или се пријавили на апликације. Пажљиво бирајте чије отиске прстију додајете. Чак и само један додати отисак може да уради било шта од горенаведеног.\n\nНапомена: Не можете да користите отисак прста за откључавање овог уређаја. За више информација обратите се администратору организације."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Само додирните сензор за отисак прста да бисте откључали телефон, дали овлашћење за куповине или да бисте се пријавили у апликације. Ово ће бити могуће помоћу свих отисака прстију које додате, па будите опрезни чије отиске додајете.\n\nНапомена: Отисак прста може да буде мање безбедан од јаког шаблона или PIN-а."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Откључавајте телефон или одобравајте куповине помоћу отиска прста.\n\nНапомена: Не можете да откључавате овај уређај помоћу отиска прста. Више информација затражите од администратора организације."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Откључавајте телефон или одобравајте куповине помоћу отиска прста.\n\nНапомена: Отисак прста може да буде мање безбедан од јаког шаблона или PIN-а."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Откажи"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Настави"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Прескочи"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Додај отисак прста"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Функције заштите уређаја неће бити активиране. Нећете моћи да спречите друге да користе овај таблет у случају губитка, крађе или брисања."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Функције заштите уређаја неће бити активиране. Нећете моћи да спречите друге да користе овај уређај у случају губитка, крађе или брисања."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Функције заштите уређаја неће бити активиране. Нећете моћи да спречите друге да користе овај телефон у случају губитка, крађе или брисања."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Функције заштите уређаја неће бити активиране. Нећете моћи да спречите друге да користе овај таблет у случају губитка или крађе."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Функције заштите уређаја неће бити активиране. Нећете моћи да спречите друге да користе овај уређај у случају губитка или крађе."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Функције заштите уређаја неће бити активиране. Нећете моћи да спречите друге да користе овај телефон у случају губитка или крађе."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Даље"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Функције заштите уређаја неће бити укључене. Нећете моћи да спречите друге људе да користе овај таблет ако буде изгубљен, украден или ресетован."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Функције заштите уређаја неће бити укључене. Нећете моћи да спречите друге људе да користе овај уређај ако буде изгубљен, украден или ресетован."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Функције заштите уређаја неће бити укључене. Нећете моћи да спречите друге људе да користе овај телефон ако буде изгубљен, украден или ресетован."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Функције заштите уређаја неће бити укључене. Нећете моћи да спречите друге људе да користе овај таблет ако буде изгубљен или украден."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Функције заштите уређаја неће бити укључене. Нећете моћи да спречите друге људе да користе овај уређај ако буде изгубљен или украден."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Функције заштите уређаја неће бити укључене. Нећете моћи да спречите друге људе да користе овај телефон ако буде изгубљен или украден."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ипак прескочи"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Врати се"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Пронађите сензор"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"На полеђини уређаја пронађите сензор за отисак прста."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Додирните сензор"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Налази се на задњој страни телефона. Користите кажипрст."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Илустрација са уређајем и локацијом сензора за отисак прста"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Назив"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Потврди"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Избриши"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Започнимо"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Додирните сензор"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Ставите прст на сензор и подигните га када осетите вибрацију"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Наставите даље"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Мало померите прст да бисте додали различите делове отиска прста"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Отисак прста је додат!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Када год видите ову икону, можете да користите отисак прста ради идентификације или да бисте одобрили куповину."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Само додирните сензор за отисак прста да бисте активирали и откључали уређај."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Када видите ову икону, можете и да одобрите куповине или се пријављујете у апликације."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Подигните, па опет додирните"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Наставите да подижете прст да бисте додали различите делове отиска прста"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Отисак прста је додат"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Када видите ову икону, користите отисак прста ради идентификације или одобравања куповина."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Прескочити подешавање отиска прста?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Изабрали сте да користите отисак прста као један начин за откључавање телефона. Ако сада прескочите, мораћете касније да обавите ово подешавање. За подешавање је потребно само око минут времена."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Подеси закључавање екрана"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Готово"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Упс, то није сензор"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Користите сензор за отисак прста на уређају."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Додирните сензор на задњој страни телефона. Користите кажипрст."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Регистрација није завршена"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Временско ограничење за регистрацију отиска прста је истекло. Пробајте поново."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Регистрација отиска прста није успела. Пробајте поново или користите други прст."</string>
@@ -452,6 +462,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Спречите друге да користе овај уређај без дозволе тако што ћете активирати функције заштите уређаја. Изаберите закључавање екрана које желите да користите."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Спречите друге да користе овај телефон без дозволе тако што ћете активирати функције заштите уређаја. Изаберите закључавање екрана које желите да користите."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Изаберите резервни начин за закључавање екрана"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Опције закључавања екрана"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Опције закључавања екрана"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Закључавање екрана"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/одмах после спавања"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> после спавања"</string>
@@ -522,13 +534,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Промена шаблона за откључавање"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промена PIN-а за откључавање"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Промена лозинке за откључавање"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Пробајте поново. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. покушај од <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Последњи покушај"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Ако у овом покушају унесете нетачан шаблон за Work, са овог уређаја ћемо уклонити профил за Work и повезане податке."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Ако у овом покушају унесете нетачан PIN за Work, са овог уређаја ћемо уклонити профил за Work и повезане податке."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Ако у овом покушају унесете нетачну лозинку за Work, са овог уређаја ћемо уклонити профил за Work и повезане податке."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Превише нетачних покушаја. Уклонићемо профил за Work и повезане податке са овог уређаја."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Одбаци"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Пробајте поново. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. покушај од <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Избрисаћемо податке"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ако у следећем покушају унесете нетачан шаблон, избрисаћемо податке са овог уређаја"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ако у следећем покушају унесете нетачан PIN, избрисаћемо податке са овог уређаја"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ако унесете нетачну лозинку при следећем покушају, избрисаћемо податке са овог уређаја"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ако у следећем покушају унесете нетачан шаблон, избрисаћемо овог корисника"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ако у следећем покушају унесете нетачан PIN, избрисаћемо овог корисника"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ако у следећем покушају унесете нетачну лозинку, избрисаћемо овог корисника"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ако у следећем покушају унесете нетачан шаблон, избрисаћемо профил за Work и његове податке"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ако у следећем покушају унесете нетачан PIN, избрисаћемо профил за Work и његове податке"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ако у следећем покушају унесете нетачну лозинку, избрисаћемо профил за Work и његове податке"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Превише нетачних покушаја. Избрисаћемо податке са овог уређаја."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Превише нетачних покушаја. Избрисаћемо овог корисника."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Превише нетачних покушаја. Избрисаћемо овај профил за Work и његове податке."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Одбаци"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Минималан број знакова је <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Минималан број цифара за PIN је <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Настави"</string>
@@ -637,6 +657,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Напредни Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Када је Bluetooth укључен, уређај може да комуницира са другим Bluetooth уређајима у близини."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Да би побољшале тачност локације, системске апликације и услуге ће и даље препознавати Bluetooth уређаје, чак и када је Bluetooth искључен. Ово можете да промените у <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>подешавањима скенирања<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Повезивање није успело. Покушајте поново."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Детаљи о уређају"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Bluetooth адреса уређаја: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Желите ли да заборавите уређај?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Телефон неће више бити упарен са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Таблет неће више бити упарен са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Уређај неће више бити упарен са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Заборави уређај"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Повезивање са…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Уређај <xliff:g id="DEVICE_NAME">%1$s</xliff:g>неће бити повезан на звука медија."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Уређај <xliff:g id="DEVICE_NAME">%1$s</xliff:g> неће бити повезан на хендсфри звук."</string>
@@ -789,6 +817,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Не пружај"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Не проверавај"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Није наведен никакав сертификат. Веза неће бити приватна."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Назив мреже је предугачак."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Морате да наведете домен."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS је доступан"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS је доступан)"</string>
@@ -821,7 +850,6 @@
       <item quantity="other">%d мрежа</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Напредна Wi-Fi подешавања"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Конфигуришите Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC адреса"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP адреса"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска подмреже"</string>
@@ -858,9 +886,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Желите ли да заборавите ову групу?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Преносни Wi-Fi хотспот"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi хотспот"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Пружа Wi‑Fi мрежу помоћу мобилне везе"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Интернет веза овог таблета се не дели преко хотспота"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Интернет веза овог телефона се не дели преко хотспота"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Ни интернет ни садржај се не деле са другим уређајима"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Интернет веза овог таблета се дели преко хотспота"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Интернет веза овог телефона се дели преко хотспота"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Апликација дели садржај. Да бисте делили интернет везу, искључите, па укључите хотспот"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Назив Wi‑Fi хотспота"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> се укључује..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Други уређаји могу да се повежу са хотспотом <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Лозинка за Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Опсег приступне тачке"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Користите хотспот да бисте направили Wi‑Fi мрежу за друге уређаје. Хотспот пружа интернет помоћу мреже за мобилне податке. Можда ће важити додатне тарифе за мобилне податке."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Апликације могу да праве хотспотове за дељење садржаја са оближњим уређајима."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Укључивање хотспота…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Искључивање хотспота..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> је активан"</string>
@@ -907,6 +943,7 @@
     <item msgid="6200207341126893791">"1."</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Када је Позивање преко Wi-Fi-ја укључено, телефон може да преусмерава позиве преко Wi-Fi мрежа или мреже мобилног оператера у зависности од тога које сте подешавање изабрали и који сигнал је јачи. Пре него што укључите ову функцију, информишите се код мобилног оператера о накнадама и другим детаљима."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Ажурирајте адресу за хитне случајеве"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Адреса коју користе хитне службе као вашу локацију ако позовете такву службу помоћу Wi-Fi мреже."</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Приказ"</string>
@@ -964,6 +1001,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Нема резултата"</string>
     <string name="display_settings" msgid="7965901687241669598">"Екран"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Аутоматско ротирање екрана"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Живописне боје"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Промени положај аутоматски приликом ротирања таблета"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Аутоматска промена положаја приликом ротације телефона"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Промени положај аутоматски приликом ротирања таблета"</string>
@@ -991,23 +1029,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Оптимизујте ниво осветљености према светлу. Можете привремено да подесите осветљеност и кад је ова опција укључена."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Ноћно светло"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Ноћно светло даје екрану жутонаранџасту нијансу. То вам омогућава да лакше прегледате садржај екрана при пригушеном светлу и да лакше заспите."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Закажите"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Статус"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Аутоматски укључи"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Никад"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Прилагођени распоред"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Од заласка до изласка сунца"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Закажите"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ништа"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Укључује се у жељено време"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Укључује се од сутона до свитања"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Време почетка"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Време завршетка"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Статус"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Интензитет"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Искључено. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Никада се не укључује аутоматски."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Укључује се аутоматски у <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Укључује се аутоматски када сунце зађе."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Укључено. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Никада се не искључује аутоматски."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Искључује се аутоматски у <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Искључује се аутоматски када сунце изађе."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Искључено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Никада се не укључује аутоматски"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Укључује се аутоматски у <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Укључује се аутоматски када сунце зађе"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Укључено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Никада се не искључује аутоматски"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Искључује се аутоматски у <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Искључује се аутоматски када сунце изађе"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Спавање"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Екран се искључује"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивности"</string>
@@ -1031,8 +1068,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Подешавања"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Аутоматски ниво осветљености"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Подигни за активацију"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Амбијентални екран"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Амбијентални екран"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Увек укључено"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Нова обавештења"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Када да се приказује"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Нова обавештења"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Пробудите екран када примите обавештења"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Увек укључено"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Приказује време, иконе обавештења и друге информације"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Величина фонта"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Омогућава да текст буде већи или мањи"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Закључавање SIM картице"</string>
@@ -1285,6 +1328,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Поље Назив приступне тачке не сме да буде празно."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Поље MЦК мора да садржи 3 цифре."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC поље мора да садржи 2 или 3 цифре."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Мобилни оператер не дозвољава називе приступних тачака типа %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Враћање подразумеваних подешавања назива приступне тачке."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Ресетуј подразумевано"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Поновно постављање подразумеваних подешавања назива приступне тачке је завршено"</string>
@@ -1315,6 +1359,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Избриши SD картицу"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Обриши све податке из интерне USB меморије, као што су музика и фотографије."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Избриши све податке са SD картице, као што су музика или фотографије"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Обришите eSIM-ове"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Обришите све eSIM-ове на телефону. На тај начин нећете отказати мобилни тарифни пакет."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Обришите све eSIM-ове на таблету. На тај начин нећете отказати мобилни тарифни пакет."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Враћање таблета на подразумеване вредности"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Ресетуј телефон"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Желите ли да обришете све личне податке и преузете апликације? Не можете да опозовете ову радњу!"</string>
@@ -1337,26 +1384,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Није могуће привезивање нити коришћење преносивих хотспотова док је Уштеда података укључена"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB повезивање"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB повезан, проверите за привезивање"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Повезано"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Привезивање није могуће кад се користи USB меморија"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB није повезан"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Повежите да бисте укључили"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Грешка приликом USB повезивања"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Дељење интернет везе телефона преко USB-а"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Дељење интернет везе таблета преко USB-а"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth привезивање"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Интернет веза овог таблета се дели преко Bluetooth-а"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Интернет веза овог телефона се дели преко Bluetooth-а"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Интернет веза овог таблета се дели преко Bluetooth-а са 1 уређајем"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Интернет веза овог телефона се дели преко Bluetooth-а са 1 уређајем"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Интернет веза овог таблета се дели преко Bluetooth-а са <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> уређаја"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Интернет веза овог телефона се дели преко Bluetooth-а са <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> уређаја"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Делите интернет везу таблета преко Bluetooth-а"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Делите интернет везу телефона преко Bluetooth-а"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Интернет веза уређаја <xliff:g id="DEVICE_NAME">%1$d</xliff:g> се дели преко Bluetooth-а"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Интернет веза овог таблета се не дели преко Bluetooth-а"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Интернет веза овог телефона се не дели преко Bluetooth-а"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Није привезано"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Привезивање на више од <xliff:g id="MAXCONNECTION">%1$d</xliff:g> уређаја није могуће."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Интернет веза са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ће бити прекинута."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Користите хотспот и привезивање да бисте обезбедили интернет другим уређајима помоћу везе за пренос података преко мобилног оператера."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Користите хотспот и привезивање да бисте обезбедили интернет другим уређајима помоћу везе за мобилне податке. Апликације могу да праве хотспотове и за дељење садржаја са оближњим уређајима."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Помоћ"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Мобилна мрежа"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Тарифни пакет за мобилни уређај"</string>
@@ -1389,7 +1425,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим локације"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Користи GPS, Wi‑Fi, Bluetooth или мобилне мреже за одређивање локације"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Користи Wi‑Fi, Bluetooth или мобилне мреже за одређивање локације"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Користи GPS за одређивање локације"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Користи GPS и сензоре уређаја за одређивање локације"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Скенирање"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi скенирање"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Унапредите лоцирање тако што ћете дозволити системским апликацијама и услугама да у сваком тренутку препознају Wi‑Fi мреже."</string>
@@ -1434,8 +1470,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Немате везу за пренос података. Да бисте одмах погледали ове информације, идите на %s са било ког рачунара који је повезан са интернетом."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Учитава се…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Одаберите лозинку"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Подесите лозинку да бисте користили отисак"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Изаберите шаблон"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Подесите шаблон да бисте користили отисак"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Одаберите PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Подесите PIN да бисте користили отисак"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Потврдите лозинку"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Потврдите шаблон"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Потврдите PIN"</string>
@@ -1504,6 +1543,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Подешавања апликације"</string>
     <string name="install_applications" msgid="4872012136210802181">"Непознати извори"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Дозволи све изворе апликација"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Недавно отваране апликације"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Прикажи све апликације: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"пре <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Таблет и лични подаци су подложнији нападу непознатих апликација. Инсталирањем апликација из овог извора прихватате да сте одговорни за оштећења телефона или губитак података до којих може да дође због њиховог коришћења."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Телефон и лични подаци су подложнији нападу непознатих апликација. Инсталирањем апликација из овог извора прихватате да сте одговорни за оштећења телефона или губитак података до којих може да дође због њиховог коришћења."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Напредна подешавања"</string>
@@ -1673,6 +1715,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Желите да зауставите системску услугу?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Ако зауставите ову услугу, неке функције таблета ће можда престати исправно да функционишу док не искључите и поново укључите таблет."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ако зауставите ову услугу, неке функције телефона ће можда престати исправно да функционишу док не искључите и поново укључите телефон."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Језици, унос и покрети"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Језици и унос"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Језици и унос"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Помоћ за унос"</string>
@@ -1893,6 +1939,11 @@
       <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="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <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="print_settings_title" msgid="3685449667822217816">"Услуге штампања"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Ниједна услуга није инсталирана"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Није пронађен ниједан штампач"</string>
@@ -1959,6 +2010,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Коришћење детаља"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Прилагођавање коришћења напајања"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Садржани пакети"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Апликације много троше батерију"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Не дозвољавамо да уређај пређе у стање спавања"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Будимо уређај у позадини"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Често тражи локацију"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Неке апликације (<xliff:g id="NUMBER">%1$d</xliff:g>) се чудно понашају"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Заустављате апликацију?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Телефон не може да управља батеријом на уобичајен начин јер му <xliff:g id="APP">%1$s</xliff:g> не дозвољава да пређе у стање спавања.\n\nДа бисте пробали да решите овај проблем, можете принудно да зауставите ту апликацију.\n\nАко се ово дешава и даље, можда треба да деинсталирате апликацију да бисте побољшали перформансе батерије."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Таблет не може да управља батеријом на уобичајен начин јер му <xliff:g id="APP">%1$s</xliff:g> не дозвољава да пређе у стање спавања.\n\nДа бисте пробали да решите овај проблем, можете принудно да зауставите ту апликацију.\n\nАко се ово дешава и даље, можда треба да деинсталирате апликацију да бисте побољшали перформансе батерије."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Уређај не може да управља батеријом на уобичајен начин јер му <xliff:g id="APP">%1$s</xliff:g> не дозвољава да пређе у стање спавања.\n\nДа бисте пробали да решите овај проблем, можете принудно да зауставите ту апликацију.\n\nАко се ово дешава и даље, можда треба да деинсталирате апликацију да бисте побољшали перформансе батерије."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Заустави апликацију"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Желите ли да спречите коришћење у позадини?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Телефон не може да управља батеријом на уобичајен начин јер га <xliff:g id="APP">%1$s</xliff:g> стално буди.\n\nДа би решио овај проблем, телефон може да спречи да ова апликација ради у позадини."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Таблет не може да управља батеријом на уобичајен начин јер га <xliff:g id="APP">%1$s</xliff:g> стално буди.\n\nДа би решио овај проблем, таблет може да спречи да ова апликација ради у позадини."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Уређај не може да управља батеријом на уобичајен начин јер га <xliff:g id="APP">%1$s</xliff:g> стално буди.\n\nДа би решио овај проблем, уређај може да спречи да ова апликација ради у позадини."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Искључи"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Желите ли да искључите локацију?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Телефон не може да управља батеријом на уобичајен начин јер апликација <xliff:g id="APP">%1$s</xliff:g> стално тражи локацију чак и када не користите ту апликацију.\n\nДа бисте решили овај проблем, можете да искључите локацију за ову апликацију."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Таблет не може да управља батеријом на уобичајен начин јер апликација <xliff:g id="APP">%1$s</xliff:g> стално тражи локацију чак и када не користите ту апликацију.\n\nДа бисте решили овај проблем, можете да искључите локацију за ову апликацију."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Уређај не може да управља батеријом на уобичајен начин јер апликација <xliff:g id="APP">%1$s</xliff:g> стално тражи локацију чак и када не користите ту апликацију.\n\nДа бисте решили овај проблем, можете да искључите локацију за ову апликацију."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Искључи"</string>
     <string name="power_screen" msgid="3023346080675904613">"Екран"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Лампа"</string>
     <string name="power_camera" msgid="4976286950934622605">"Камера"</string>
@@ -1973,7 +2044,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Апликације"</string>
     <string name="power_service" msgid="1599661212370831780">"Услуге"</string>
     <string name="power_system" msgid="8290455327965307383">"Систем"</string>
-    <string name="power_user" msgid="1889728099253018005">"Корисник"</string>
+    <string name="power_user" msgid="3706143225319881667">"Остали корисници"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Укупно коришћење процесора"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Процесор у предњем плану"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Задржи ван стања спавања"</string>
@@ -2025,6 +2096,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Прекомерно израчуната потрошња енергије"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Користи се <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Активна <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Коришћење екрана: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> користи <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> укупног капацитета батерије"</string>
@@ -2588,7 +2660,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Промени PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Приказуј обавештења"</string>
     <string name="help_label" msgid="6886837949306318591">"Помоћ и повратне инф."</string>
-    <string name="support_summary" msgid="8276116616493882830">"Чланци помоћи, подршка телефоном и ћаскањем"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Чланци помоћи, подршка телефоном и ћаскањем, почетни кораци"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Налог за садржај"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ИД слике"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Екстремне опасности"</string>
@@ -2679,9 +2751,12 @@
       <item quantity="other">Прикажи %d скривених ставки</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Мрежа и интернет"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, мобилна мрежа, потрошња података, хотспот"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобилна мрежа"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"потрошња података"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"хотспот"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Повезани уређаји"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, пребацивање, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, пребацивање"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aпликације и обавештења"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Дозволе, подразумеване апликације"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Корисници и налози"</string>
@@ -2734,6 +2809,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"покрет"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"платите, додирните, плаћања"</string>
     <string name="keywords_backup" msgid="470070289135403022">"резервна копија, правити резервну копију"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"покрет, ивица, страна, активна ивица, стиснути, стисак, помоћи, помоћник, squeezy, squeezie, squeezey, squeezee, ок google, google помоћник"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"покрет, будити, обавештења, екран, приказ, искључивање екрана, укључивање екрана, стиснути, ивица, спава, спавати, стисак"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"покрет, потпуно утишати, одложити, аларм, долазни позив, тихо, приказ, закључани екран, стиснути, стисак, ивица, зауставити"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Подесите Wi-Fi NFC ознаку"</string>
     <string name="write_tag" msgid="8571858602896222537">"Напиши"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Додирните ознаку да бисте писали..."</string>
@@ -2817,7 +2895,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Не приказуј никаква обавештења о профилу за Work"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Када је уређај закључан, како желите да се приказују обавештења о профилу?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Обавештења о профилу"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Обавештења"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Обавештења"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Обавештења апликација"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Категорија обавештења"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Важност"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Нека апликација одлучи"</string>
@@ -2832,6 +2911,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Хитан"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Дозволи звук"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Нема никаквог звука ни вибрације нити се ова обавештења накратко приказују на актуелном екрану."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Важност: ниска"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Важност: средња"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Важност: велика"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Важност: хитно"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Помоћник за обавештења"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Приступ обавештењима"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Приступ обавештењима профила за Work је блокиран"</string>
@@ -2860,8 +2943,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Слика у слици"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Дозволи слику у слици"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Дозволите овој апликацији да прави прозор слике у слици док је отворена или када изађете из ње (на пример, да бисте наставили да гледате неки видео). Овај прозор се приказује преко других апликација које користите."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Да"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Не"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Приступ опцији Не узнемиравај"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ниједна инсталирана апликација није захтевала приступ опцији Не узнемиравај"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Учитавају се апликације..."</string>
@@ -2996,11 +3077,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Овим профилом за Work управља:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Управља <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментално)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Ротација уређаја"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Ротирај садржај екрана"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Задржи усправни приказ"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Задржи водоравни приказ"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Задржи актуелни положај"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Безбедно покретање"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Настави"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Можете додатно да заштитите овај уређај тако што ћете га подесити да тражи PIN пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме. \n\nТо омогућава заштиту података на изгубљеним или украденим уређајима. Желите захтев за PIN при покретању уређаја?"</string>
@@ -3008,7 +3084,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Можете додатно да заштитите уређај тако што ћете га подесити да тражи лозинку пре покретања. Док се уређај не покрене, не може да прима позиве, поруке или обавештења, укључујући аларме. \n\nТо омогућава заштиту података на изгубљеним или украденим уређајима. Захтевати лозинку при покретању уређаја?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Поред тога што можете да откључавате уређај отиском прста, можете додатно да га заштитите тако што ћете га подесити да тражи PIN пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Желите захтев за PIN при покретању уређаја?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Поред тога што можете да откључавате уређај отиском прста, можете додатно да га заштитите тако што ћете га подесити да тражи шаблон пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Захтевати шаблон при покретању уређаја?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Поред тога што можете да откључавате уређај отиском прста, можете додатно да га заштитите тако што ћете га подесити да тражи лозинку пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Захтевати лозинку при покретању уређаја?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Поред тога што можете да откључавате уређај отиском прста, можете додатно да га заштитите тако што ћете га подесити да тражи лозинке пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Захтевати лозинку при покретању уређаја?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Да"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Не"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Тражити PIN?"</string>
@@ -3130,6 +3206,17 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Обавештења о коришћењу"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Прикажи комплетно коришћење уређаја"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Прикажи коришћење апликације"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Интензивно коришћење"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> апликација се понаша на неуобичајен начин</item>
+      <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> апликације се понашају на неуобичајен начин</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> апликација се понаша на неуобичајен начин</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Апликације много троше батерију</item>
+      <item quantity="few">Апликације много троше батерију</item>
+      <item quantity="other">Апликације много троше батерију</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Без оптимизације"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Без оптимизације"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Оптимизација коришћења батерије"</string>
@@ -3223,8 +3310,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Приказ преко других апликација"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"Апликације са дозволом за приказ преко других: <xliff:g id="COUNT_0">%1$d</xliff:g> од <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Апликације са дозволом"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Да"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Не"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Дозвољено"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Није дозвољено"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"инсталирање апликације непознати извори"</string>
     <string name="write_settings" msgid="4797457275727195681">"Мењање подешавања система"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"уписивати мењати систем подешавања"</string>
@@ -3315,6 +3402,17 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Екран има жутонаранџасту нијансу. То може да вам помогне да заспите."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Предлози"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"и још <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <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="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <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="suggestion_remove" msgid="904627293892092439">"Уклони"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Хладна температура боје"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Користи хладније боје екрана"</string>
@@ -3333,8 +3431,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Упозорење за потрошњу података: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Упозорење за потрошњу података: <xliff:g id="ID_1">%1$s</xliff:g>/Ограничење за потрошњу података: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Обрачунски циклус"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Месечни циклус почиње сваког <xliff:g id="ID_1">%1$s</xliff:g>. у месецу"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Сваког месеца од <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Сваког <xliff:g id="ID_1">%1$s</xliff:g>. у месецу"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Мрежна ограничења"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> ограничење</item>
@@ -3356,7 +3453,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> апликација има дозволу да користи неограничену количину података када је Уштеда података укључена</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Уштеда података"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Неограничени приступ подацима"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Неограничен приступ подацима"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Пренос података у позадини је искључен"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Укључено"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Искључено"</string>
@@ -3421,8 +3518,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Контролишите обавештења на закљ. екрану"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Прегледајте или сакријте садржај обавештења"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Све"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Подршка"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Подршка и савети"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Најмања ширина"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ниједна инсталирана апликација није захтевала приступ премијум SMS-овима"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Премијум SMS-ови могу да коштају и повећаће рачуне код мобилног оператера. Ако омогућите дозволу за неку апликацију, моћи ћете да шаљете премијум SMS-ове помоћу те апликације."</string>
@@ -3490,28 +3586,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Аутоматска"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ручна"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Ослободи простор"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Покрети"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Пречице покретима"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Брзи покрети за контролу телефона"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Брзи покрети за контролу таблета"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Брзи покрети за контролу уређаја"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Прелазак на камеру"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Да бисте брзо отворили камеру, двапут притисните дугме за напајање. Ово функционише на сваком екрану."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Брзо отворите камеру"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Притисните дугме за напајање двапут да бисте отворили камеру"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Окретање камере"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Брже снимајте селфије"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Двапут заокрените телефон за режим за селфије"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Двапут заокрените таблет за режим за селфије"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Двапут заокрените уређај за режим за селфије"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Двапут додирните телефон да бисте га проверили"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Двапут додирните таблет да бисте га проверили"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Двапут додирните уређај да бисте га проверили"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Двапут додирните екран да бисте брзо прегледали обавештења."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Да бисте проверили време, иконе обавештења и друге информације, двапут додирните екран."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Проверавајте обавештења када је екран искључен"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Подигните телефон да га проверите"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Подигните таблет да бисте га проверили"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Подигните уређај да бисте га проверили"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Узмите телефон да бисте брзо прегледали обавештења."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Узмите таблет да бисте брзо прегледали обавештења."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Узмите уређај да бисте брзо прегледали обавештења."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Да бисте проверили време, иконе обавештења и друге информације, узмите телефон."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Да бисте проверили време, иконе обавештења и друге информације, узмите таблет."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Да бисте проверили време, иконе обавештења и друге информације, узмите уређај."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Проверавајте обавештења када је екран искључен"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Превуците прстом за обавештења"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Да бисте проверили обавештења, превуците прстом надоле по сензору за отисак прста на задњој страни телефона."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Да бисте проверили обавештења, превуците прстом надоле по сензору за отисак прста на задњој страни таблета."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Да бисте проверили обавештења, превуците прстом надоле по сензору за отисак прста на задњој страни уређаја."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Брзо прегледајте обавештења"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Превуците надоле на сензору за отисак прста"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Подигните телефон да бисте отворили камеру"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Да бисте аутоматски отворили камеру, поставите телефон у положај за сликање (пејзаж или портрет). Функционише када је телефон у стању спавања или је закључан."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Сликајте када је телефон у стању спавања или је закључан"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Покрет за помоћ"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Осетљивост"</string>
@@ -3622,6 +3731,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Желите ли да уклоните ову инстант апликацију?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Игре"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудио датотеке"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Искоришћен простор"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(деинсталирано за корисника <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(онемогућено за корисника <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Услуга аутоматског попуњавања"</string>
@@ -3635,5 +3745,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Инстант апликација"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Желите ли да искључите менаџер меморијског простора?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Апликације за филмове и ТВ"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Искоришћен простор"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Информације о додели мобилног оператера"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Покретање доделе мобилног оператера"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Шта је ново и узбудљиво?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Погледајте 5 најпопуларнијих функција"</string>
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 26e17f8..7f3847c 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Bra"</item>
     <item msgid="8986346415847956850">"Utmärkt"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Alltid"</item>
-    <item msgid="844721238536786870">"Endast när den är inkopplad"</item>
-    <item msgid="1986753720941888596">"Aldrig"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Alltid"</item>
-    <item msgid="7433294150916905997">"Endast när den är inkopplad"</item>
-    <item msgid="1390404486722375028">"Aldrig"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Senaste 30 dagarna"</item>
     <item msgid="6600989128423965319">"Ange användningscykel ..."</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a2a1680..4f6f02c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Nu är du en utvecklare!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Det behövs inte. Du är redan utvecklare."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Aktivera utvecklaralternativ först"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Trådlöst och nätverk"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Anslutningar"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Enhet"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE-administrerad"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videosamtal tillhandahålls"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wi-Fi-samtal tillhandahålls"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presence tillhandahålls"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Strömförsörjning för mobilradio"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Visa SIM-adressbok"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Visa Fasta nummer"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Sök efter enheter"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Byt namn på den här enheten"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Byt namn"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vill du koppla från?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Detta avslutar din anslutning till:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Ska enheten kopplas från?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Mobilen kopplas bort från <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Surfplattan kopplas bort från <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Enheten kopplas bort från <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Frånkoppla"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Du saknar behörighet att ändra Bluetooth-inställningarna."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Koppla en ny enhet"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Enheter i närheten kan se <xliff:g id="DEVICE_NAME">%1$s</xliff:g> när Bluetooth är på."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Mobilens Bluetooth-adress: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Surfplattans Bluetooth-adress: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Enhetens Bluetooth-adress: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vill du koppla från <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Bluetooth-sändning"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vill du inaktivera profilen?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Begäran om parkoppling för Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Begäran om parkoppling"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Tryck om du vill koppla till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Visa mottagna filer"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Mottagna filer"</string>
     <string name="device_picker" msgid="4978696506172252813">"Välj Bluetooth-enhet"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> vill aktivera Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> vill inaktivera Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vill ha åtkomst till dina meddelanden. Vill du ge %2$s åtkomst?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Begäran om åtkomst till SIM-kort"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vill ha åtkomst till ditt SIM-kort. Om du ger den åtkomst till SIM-kortet inaktiveras dataanslutningen på enheten under tiden som anslutningen är upprättad. Ge <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> åtkomst"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Synlig för andra enheter som <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Dina enheter"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Koppla en ny enhet"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Datum och tid"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Välj tidszon"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Konton"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Plats"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konton"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Säkerhet och plats"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Säkerhet och plats"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Kryptering och användaruppgifter"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Mobilen är krypterad"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Enheten har krypterats"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Lås upp med fingeravtryck"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Använda ditt fingeravtryck"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Tryck bara på fingeravtryckssensorn när du vill låsa upp mobilen, auktorisera köp eller logga in i appar. Tänk efter innan du lägger till någons fingeravtryck, eftersom alla som du lägger till kan utföra alla dessa åtgärder.\n\nObs! 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="4193477159493347679">"Tryck på fingeravtryckssensorn för att godkänna köp eller logga in i appar. Var försiktig med vems fingeravtryck du lägger till eftersom även den personen kan göra detta.\n\nObs! Det går inte att låsa upp den här enheten med ett fingeravtryck. Kontakta administratören för din organisation om du vill veta mer."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Tryck bara på fingeravtryckssensorn när du vill låsa upp mobilen, auktorisera köp eller logga in i appar. Tänk efter innan du lägger till någons fingeravtryck, eftersom alla som du lägger till kan utföra alla dessa åtgärder.\n\nObs! 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="1550756694054944874">"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="6817326798834882531">"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_cancel" msgid="3199351118385606526">"Avbryt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Fortsätt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Hoppa över"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Nya fingeravtryck"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funktioner för enhetsskydd aktiveras inte. Det innebär att du inte kan hindra andra från att använda surfplattan om du tappar den eller om den blir stulen eller rensad."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funktioner för enhetsskydd aktiveras inte. Det innebär att du inte kan hindra andra från att använda enheten om du tappar den eller om den blir stulen eller rensad."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funktioner för enhetsskydd aktiveras inte. Det innebär att du inte kan hindra andra från att använda mobilen om du tappar den eller om den blir stulen eller rensad."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funktionerna för enhetsskydd aktiveras inte. Det innebär att du inte kan hindra andra från att använda surfplattan om du tappar den eller om den blir stulen."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funktionerna för enhetsskydd aktiveras inte. Det innebär att du inte kan hindra andra från att använda enheten om du tappar den eller om den blir stulen."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funktionerna för enhetsskydd aktiveras inte. Det innebär att du inte kan hindra andra från att använda mobilen om du tappar den eller om den blir stulen."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Nästa"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Enhetens skyddsfunktioner aktiveras inte. Du kan inte hindra andra från att använda surfplattan om den blir stulen, tappas bort eller återställs."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Enhetens skyddsfunktioner aktiveras inte. Du kan inte hindra andra från att använda enheten om den blir stulen, tappas bort eller återställs."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Enhetens skyddsfunktioner aktiveras inte. Du kan inte hindra andra från att använda mobilen om den blir stulen, tappas bort eller återställs."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Enhetens skyddsfunktioner aktiveras inte. Du kan inte hindra andra från att använda surfplattan om den blir stulen eller tappas bort."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Enhetens skyddsfunktioner aktiveras inte. Du kan inte hindra andra från att använda enheten om den blir stulen eller tappas bort."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Enhetens skyddsfunktioner aktiveras inte. Du kan inte hindra andra från att använda mobilen om den blir stulen eller tappas bort."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Hoppa över ändå"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Tillbaka"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Hitta sensorn"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Leta reda på fingeravtryckssensorn på baksidan av mobilen."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Tryck på sensorn"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Den sitter på mobilens baksida. Använd pekfingret."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustration med enheten och fingeravtryckssensorns plats"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Namn"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Radera"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Sätt igång"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Tryck på sensorn"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Lägg fingret på sensorn och ta bort det när den vibrerar till"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Fortsätt"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Rör lite på fingret så att hela fingeravtrycket läggs till"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Fingeravtrycket har lagts till!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"När du ser den här ikonen kan du identifiera dig eller auktorisera ett köp med hjälp av ditt fingeravtryck."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Väck och lås upp enheten genom att trycka på fingeravtryckssensorn."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"När den här ikonen visas kan du även auktorisera köp eller logga in i appar."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Lyft och tryck sedan igen"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Lyft fingret flera gånger för att lägga till hela fingeravtrycket"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Fingeravtrycket är tillagt"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"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="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Hoppa över fingeravtryckskonfigurering?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Du har valt att låsa upp mobilen med hjälp av ditt fingeravtryck. Om du hoppar över konfigureringen nu måste du slutföra den senare. Konfigureringen tar bara en minut eller två."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ställ in skärmlåset"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Klar"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hoppsan! Det där är inte sensorn"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Använd fingeravtryckssensorn på enheten."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Tryck på sensorn på mobilens baksida. Använd pekfingret."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registreringen slutfördes inte"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Tidsgränsen för registreringen av fingeravtryck har uppnåtts. Försök igen."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Det gick inte att registrera fingeravtrycket. Försök igen eller använd ett annat finger."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Hindra andra från att använda enheten utan ditt medgivande genom att aktivera funktioner för enhetsskydd. Välj vilket skärmlås du vill använda."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Hindra andra från att använda mobilen utan ditt medgivande genom att aktivera funktioner för enhetsskydd. Välj vilket skärmlås du vill använda."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Välj en reservmetod för skärmlås"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Alternativ för skärmlås"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Alternativ för skärmlås"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skärmlås"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/omedelbart efter viloläge"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> efter viloläge"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Byt grafiskt lösenord"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Ändra PIN-kod för upplåsning"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ändra lösenord för upplåsning"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Försök igen. Försök <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> av <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Sista försöket"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Om du anger fel grafiskt lösenord under det här försöket kommer jobbprofilen och den data som har kopplats till profilen att tas bort från enheten."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Om du anger fel pinkod under det här försöket kommer jobbprofilen och den data som har kopplats till profilen att tas bort från enheten."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Om du anger fel lösenord under det här försöket kommer jobbprofilen och den data som har kopplats till profilen att tas bort från enheten."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"För många felaktiga försök. Jobbprofilen och data som har kopplats till den tas bort från enheten."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Ignorera"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Försök igen. Försök <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> av <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Din data raderas."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Enhetens data raderas om du anger fel grafiskt lösenord vid nästa försök"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Enhetens data raderas om du anger fel pinkod vid nästa försök"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Enhetens data raderas om du anger fel lösenord vid nästa försök"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Användaren raderas om du anger fel grafiskt lösenord vid nästa försök"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Användaren raderas om du anger fel pinkod vid nästa försök"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Den här användaren raderas om du anger fel lösenord vid nästa försök"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Jobbprofilen och dess data raders om du anger fel grafiskt lösenord vid nästa försök"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Jobbprofilen och dess data raderas om du anger fel pinkod vid nästa försök"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Din jobbprofil och dess data raderas om du anger fel lösenord vid nästa försök"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"För många felaktiga försök. Enhetens data raderas"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"För många felaktiga försök. Den här användaren raderas."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"För många felaktiga försök. Den här jobbprofilen och dess data raderas."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ignorera"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Lösenordet måste innehålla minst <xliff:g id="COUNT">%d</xliff:g> tecken"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Pinkoden måste innehålla minst <xliff:g id="COUNT">%d</xliff:g> siffror"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsätt"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Avancerad Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"När Bluetooth har aktiverats kan enheten kommunicera med andra Bluetooth-enheter i närheten."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"I syfte att förbättra platsangivelserna kan systemtjänster och -appar fortfarande upptäcka Bluetooth-enheter. Du kan ändra detta i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>sökinställningarna<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Det gick inte att ansluta. Försök igen."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Enhetsinformation"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Enhetens Bluetooth-adress: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Vill du glömma enheten?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Mobilen kopplas bort från <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Surfplattan kopplas bort från <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Enheten kopplas bort från <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Glöm enhet"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Anslut till…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån medialjud."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån handsfree."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Tillhandahåll inte"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Validera inte"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Inget certifikat är specificerat. Anslutningen blir inte privat."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Nätverkets namn är för långt."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Domän måste specificeras."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tillgängligt"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tillgängligt)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 nätverk</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Avancerat för Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfigurera Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Mac-adress"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-adress"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Nätmask"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vill du glömma den här gruppen?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Mobil Wi-Fi-surfzon"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi-surfzon"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Använd mobilanslutning för Wi-Fi-nätverk"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Surfplattans internetanslutning delas inte via en trådlös surfzon"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Mobilens internetanslutning delas inte via en trådlös surfzon"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Varken internet eller innehåll delas med andra enheter"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Surfplattans internetanslutning delas via en trådlös surfzon"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Mobilens internetanslutning delas via en trådlös surfzon"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Appen delar innehåll. Om du vill dela internetanslutningen inaktiverar du den trådlösa surfzonen och aktiverar den igen"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi-Fi-namn"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Aktiverar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Andra enheter kan ansluta till <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi-lösenord"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-band"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Använd trådlösa surfzoner för att skapa ett Wi-Fi-nätverk för andra enheter. Med hjälp av surfzonerna ansluts enheterna till internet via din mobils dataanslutning. Ytterligare dataavgifter kan tillkomma."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Trådlösa surfzoner kan också skapas i appar för att dela innehåll med enheter i närheten."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Aktiverar trådlös surfzon ..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Trådlös surfzon inaktiveras ..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> är aktiv"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"När Wi-Fi-samtal har aktiverats kan mobilen dirigera samtal via Wi-Fi-nätverk eller operatörens nätverk, beroende på dina inställningar och vilken signal som är starkast. Innan du aktiverar funktionen frågar du operatören om eventuella avgifter och annan information."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Uppdatera adressen för nödfall"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Adress som ska användas som din plats om du ringer 112 i en nödsituation med Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skärm"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Inga resultat"</string>
     <string name="display_settings" msgid="7965901687241669598">"Skärm"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotera skärmen automatiskt"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Starka färger"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Växla riktning automatiskt när du roterar surfplattan"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Växla riktning automatiskt när du roterar telefonen"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Växla riktning automatiskt när du roterar surfplattan"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimera ljusstyrka efter tillgängligt ljus. Du kan justera ljusstyrkan tillfälligt om funktionen är aktiverad."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Nattljus"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Med nattljus blir skärmen gultonad. Då ser du bättre i svagt ljus och det kan bli lite lättare att somna."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Schemalägga"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Aktivera automatiskt"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Aldrig"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Anpassat schema"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Soluppgång till solnedgång"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Schemalägg"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Aldrig"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Aktiveras vid anpassad tid"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"På fr. soluppgång t. solnedgång"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Starttid"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Sluttid"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensitet"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Av. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Aktiveras aldrig automatiskt."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Aktiveras automatiskt kl. <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Aktiveras automatiskt när solen går ned."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"På. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Inaktiveras aldrig automatiskt."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Inaktiveras automatiskt kl. <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Inaktiveras automatiskt när solen går upp."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Av/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Aktiveras aldrig automatiskt"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Aktiveras automatiskt kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Aktiveras automatiskt när solen går ned"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"På/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Inaktiveras aldrig automatiskt"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Inaktiveras automatiskt kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Inaktiveras automatiskt när solen går upp"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Viloläge"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skärmen stängs av"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Inställningar"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk ljusstyrka"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Gå ur viloläget vid lyft"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Aktiv låsskärm"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Inaktiv låsskärm"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Alltid på"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nya aviseringar"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"När den ska visas"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nya aviseringar"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktivera skärmen när du får aviseringar"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Alltid på"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Visa tid, aviseringsikoner och annan information"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Teckenstorlek"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Gör texten större eller mindre."</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Låsinställningar för SIM-kort"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN får inte vara tomt."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC-fältet måste bestå av 3 siffror."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC-fältet måste vara 2 eller 3 siffror"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operatören tillåter inte att du lägger till APN:er av typen %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Återställer standardinställningar för APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Återställ standardinst."</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Återställning av standardinställningar för APN har slutförts."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Radera SD-kort"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Radera alla data på den interna USB-lagringsenheten, som musik och foton."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Radera all data på SD-kortet, som musik och foton."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Rensa eSIM-kort"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Rensa alla eSIM-kort på mobilen. Detta innebär inte att serviceavtalet avslutas."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Rensa alla eSIM-kort på surfplattan. Detta innebär inte att serviceavtalet avslutas."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Återställ surfplattan"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Återställ telefonen"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Vill du radera alla personliga uppgifter och alla nedladdade appar? Det går inte att ångra den här åtgärden."</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Det går inte att använda internetdelning eller trådlösa surfzoner när Databesparing är aktiverat."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-sammanlänkning"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB-ansluten, markera för att sammanlänka"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Sammanlänkad"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Det går inte att aktivera Internetdelning när USB-lagringsenheten används"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Ingen USB-enhet är ansluten"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Anslut om du vill aktivera"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB-sammanlänkningsfel"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Dela mobilens internetanslutning via USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Dela surfplattans internetanslutning via USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Delning via Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Surfplattans internetanslutning delas via Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Mobilens internetanslutning delas via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Surfplattans internetanslutning delas till 1 enhet via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Mobilens internetanslutning delas till 1 enhet via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Surfplattans internetanslutning delas till <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> enheter via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Mobilens internetanslutning delas till <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> enheter via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Dela surfplattans internetanslutning via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Dela mobilens internetanslutning via Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g>s internetanslutning delas via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Surfplattans internetanslutning delas inte via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Mobilens internetanslutning delas inte via Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Ingen Internetdelning"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Det går inte att dela med mer än <xliff:g id="MAXCONNECTION">%1$d</xliff:g> enheter."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas från."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Anslut andra enheter till internet via mobildataanslutningen med hjälp av trådlös surfzon och internetdelning"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Med hjälp av trådlösa surfzoner och internetdelning kan andra enheter anslutas till internet via mobildataanslutningen. Trådlösa surfzoner kan också skapas i appar för att dela innehåll med enheter i närheten."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjälp"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobilnätverk"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilplan"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Platsläge"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Använd GPS, Wi-Fi, Bluetooth eller mobilnätverk för att fastställa platsen"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Använd Wi-Fi, Bluetooth eller mobilnätverk för att fastställa platsen"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Avgör plats med hjälp av GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Fastställ plats med hjälp av GPS och enhetssensorer"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Genomsöker"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi-sökning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Förbättra platsangivelserna genom att alltid låta systemtjänster och -appar upptäcka WI-Fi-nätverk."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Du har inte någon dataanslutning. Besök %s på en dator som är ansluten till Internet om du vill visa informationen nu."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Läser in …"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Välj ett lösenord"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Lösenord krävs för fingeravtryck"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Välj grafiskt lösenord"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Grafiskt lösenord krävs för fingeravtryck"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Välj en PIN-kod"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Pinkod krävs för fingeravtryck"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Bekräfta ditt lösenord"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bekräfta grafiskt lösenord"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bekräfta din PIN-kod"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Appinställningar"</string>
     <string name="install_applications" msgid="4872012136210802181">"Okända källor"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Tillåt alla appkällor"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Senast öppnade apparna"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Visa alla <xliff:g id="COUNT">%1$d</xliff:g> appar"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> sedan"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Surfplattan och dina personliga uppgifter är mer sårbara när attackerna kommer från okända appar. Genom att installera appar från den här källan accepterar du att du är ansvarig för eventuella skador på surfplattan eller förlust av data som kan uppstå när du använder dessa appar."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Mobilen och dina personliga uppgifter är mer sårbara när attackerna kommer från okända appar. Genom att installera appar från den här källan accepterar du att du är ansvarig för eventuella skador på mobilen eller förlust av data som kan uppstå när du använder dessa appar."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Avancerade inställningar"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Avsluta systemtjänst?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Om du avslutar tjänsten kanske vissa funktioner i surfplattan inte fungerar korrekt förrän du stänger av och slår på den igen."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Om du avslutar tjänsten kanske vissa funktioner i mobilen inte fungerar korrekt förrän du stänger av och slår på den igen."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Språk, inmatning och rörelser"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Språk och inmatning"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Språk och inmatning"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Inmatningshjälp"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> utskriftstjänster är aktiverade</item>
       <item quantity="one">1 utskriftstjänst är aktiverad</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> utskriftsjobb</item>
+      <item quantity="one">1 utskriftsjobb</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Utskriftstjänster"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Inga tjänster är installerade"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Det gick inte att hitta några skrivare"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Information om användning"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Justera strömförbrukningen"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Inkluderade paket"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Appar förbrukar batteriet"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Enheten hålls aktiv"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Enheten aktiveras i bakgrunden"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Begär platsinformation för ofta"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> appar beter sig inte som de ska"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Vill du stoppa appen?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Batterihanteringen på mobilen fungerar inte som den ska eftersom <xliff:g id="APP">%1$s</xliff:g> håller mobilen aktiv.\n\nTesta att tvinga appen att avslutas för att lösa problemet.\n\nOm det här fortsätter hända kan du behöva avinstallera appen för att förbättra batteriets prestanda."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Batterihanteringen på surfplattan fungerar inte som den ska eftersom <xliff:g id="APP">%1$s</xliff:g> håller surfplattan aktiv.\n\nTesta att tvinga appen att avslutas för att lösa problemet.\n\nOm det här fortsätter hända kan du behöva avinstallera appen för att förbättra batteriets prestanda."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Batterihanteringen på enheten fungerar inte som den ska eftersom <xliff:g id="APP">%1$s</xliff:g> håller enheten aktiv.\n\nTesta att tvinga appen att avslutas för att lösa problemet.\n\nOm det här fortsätter hända kan du behöva avinstallera appen för att förbättra batteriets prestanda."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Stoppa appen"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Vill du inaktivera bakgrundsanvändningen?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Batterihanteringen på mobilen fungerar inte som den ska eftersom <xliff:g id="APP">%1$s</xliff:g> håller mobilen aktiv.\n\nLös problemet genom att se till att mobilen hindrar appen från att köras i bakgrunden."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Batterihanteringen på surfplattan fungerar inte som den ska eftersom <xliff:g id="APP">%1$s</xliff:g> håller surfplattan aktiv.\n\nLös problemet genom att se till att surfplattan hindrar appen från att köras i bakgrunden."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Batterihanteringen på enheten fungerar inte som den ska eftersom <xliff:g id="APP">%1$s</xliff:g> håller enheten aktiv.\n\nLös problemet genom att se till att enheten hindrar appen från att köras i bakgrunden."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Inaktivera"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Vill du inaktivera plats?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Batterihanteringen på mobilen fungerar inte som den ska eftersom <xliff:g id="APP">%1$s</xliff:g> begär platsinformation när du inte använder appen.\n\nLös problemet genom att inaktivera plats för appen."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Batterihanteringen på surfplattan fungerar inte som den ska eftersom <xliff:g id="APP">%1$s</xliff:g> begär platsinformation när du inte använder appen.\n\nLös problemet genom att inaktivera plats för appen."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Batterihanteringen på enheten fungerar inte som den ska eftersom <xliff:g id="APP">%1$s</xliff:g> begär platsinformation när du inte använder appen.\n\nLös problemet genom att inaktivera plats för appen."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Inaktivera"</string>
     <string name="power_screen" msgid="3023346080675904613">"Skärm"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Ficklampa"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Appar"</string>
     <string name="power_service" msgid="1599661212370831780">"Tjänster"</string>
     <string name="power_system" msgid="8290455327965307383">"System"</string>
-    <string name="power_user" msgid="1889728099253018005">"Användare"</string>
+    <string name="power_user" msgid="3706143225319881667">"Andra användare"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU totalt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU i förgrunden"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Behåll aktiv"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"För högt räknad strömförbrukning"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Har använts i <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktiv i <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Skärmanvändning <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> har använts av <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> av den totala batterianvändningen"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Ändra PIN-koden"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Visa meddelanden"</string>
     <string name="help_label" msgid="6886837949306318591">"Hjälp och feedback"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Hjälpartiklar, support via telefon och chatt"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Hjälpartiklar, telefon och chatt, kom igång"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Konto för innehåll"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Extrema hot"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Visa %d dolt objekt</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Nätverk och internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobil, dataanvändning, hotspot, trådlös surfzon"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilnätverk"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"dataanvändning"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"trådlös surfzon"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Anslutna enheter"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, casta, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, casta"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Appar och aviseringar"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Behörigheter, standardappar"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Användare och konton"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"rörelse"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"betala, tryck, betalningar"</string>
     <string name="keywords_backup" msgid="470070289135403022">"säkerhetskopia, säkerhets kopia"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"rörelse, kant, sida, aktiv kant, klämma, grepp, assistera, assistent, squeezy, squeezie, squeezey, squeezee, ok google, google assistent"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"rörelse, aktivera, aviseringar, skärm, visa, skärm av, skärm på, klämma, kant, inaktiv, inaktiverad, grepp"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"rörelse, tystnad, snooza, inkommande samtal, tyst, visa, låsskärm, klämma, grepp, kant, stopp"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Ange en NFC-tagg för Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tryck på en etikett för att skriva ..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Visa inga jobbaviseringar alls"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Hur vill du att profilaviseringar visas när enheten är låst?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profilaviseringar"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Aviseringar"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Aviseringar"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Appaviseringar"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Aviseringskategori"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Relevans"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Låt appen bestämma"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Brådskande"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Tillåt ljud"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Inga ljud, ingen vibration och inga aviseringar som visas som snabbtitt på skärmen."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Oviktig avisering"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Mindre viktig avisering"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Viktig avisering"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Brådskande avisering"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Aviseringsassistent"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Åtkomst till aviseringar"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Åtkomsten till aviseringar för jobbprofilen har blockerats"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Bild-i-bild"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Tillåt bild-i-bild"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Tillåt att ett bild-i-bild-fönster skapas av appen medan den är öppen eller när du har slutat att använda den (till exempel när du fortsätter att titta på en video). Detta fönster visas ovanpå andra appar du använder."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Ja"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Nej"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Stör ej-åtkomst"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Inga installerade appar har begärt Stör ej-åtkomst"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Läser in appar ..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Den här jobbprofilen hanteras av:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Hanteras av <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(experimentellt)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Rotera enhet"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Rotera skärmens innehåll"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Fortsätt använda stående riktning"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Fortsätt använda liggande riktning"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Fortsätt använda aktuell riktning"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Säker start"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Fortsätt"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Du kan skydda enheten ytterligare genom att kräva att pinkoden måste anges när den startas. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm. \n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att pinkoden ska krävas när enheten startar?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Du kan skydda enheten ytterligare genom att kräva att lösenordet måste anges när den startas. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm. \n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att lösenordet ska krävas när enheten startar?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Förutom att använda fingeravtryck kan du skydda enheten ytterligare genom att kräva att pinkoden måste anges när den startas. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att pinkoden ska krävas när enheten startar?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Förutom att använda fingeravtryck kan du skydda enheten ytterligare genom att kräva att det grafiska lösenordet måste anges när den startas. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att det grafiska lösenordet ska krävas när enheten startar?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Förutom att använda fingeravtryck kan du skydda enheten ytterligare genom att kräva att lösenordet måste anges när den startas. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Kräv att lösenord anges när enheten startar&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Förutom att låsa upp enheten med fingeravtryck kan du skydda den med ett lösenord som måste anges vid start. Enheten kan inte ta emot samtal, meddelanden eller aviseringar (inklusive alarm) innan den har startats.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att lösenordet ska krävas när enheten startas?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ja"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nej"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Ska pinkod krävas?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Aviseringar om användning"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Visa fullständig enhetsanvändning"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Visa appanvändning"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Hög förbrukning"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> appar fungerar inte normalt</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> fungerar inte normalt</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Appar förbrukar batteriet</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> förbrukar batteriet</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Inte optimerade"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Inte optimerad"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Använder optimerad batteriförbrukning"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Visa ovanpå andra appar"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> av <xliff:g id="COUNT_1">%2$d</xliff:g> appar får visas ovanpå andra appar"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Appar med behörighet"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Ja"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Nej"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Tillåts"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Tillåts inte"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"installera appar okända källor"</string>
     <string name="write_settings" msgid="4797457275727195681">"Ändra systeminställningar"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"skriva ändra systeminställningar"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Skärmen har en gul ton, vilket kan göra det lättare för dig att somna."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Förslag"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> till"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> förslag</item>
+      <item quantity="one">1 förslag</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> förslag</item>
+      <item quantity="one">+1 förslag</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Ta bort"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Sval färgtemperatur"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Använd svalare färger på skärmen"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Datavarning vid <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Datavarning vid <xliff:g id="ID_1">%1$s</xliff:g>/datagräns på <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Faktureringsperiod"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Faktureringsperioden startar varje månad den <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Startar varje månad den <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Den <xliff:g id="ID_1">%1$s</xliff:g> varje månad"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Nätverksbegränsningar"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> begränsningar</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 app har obegränsad dataåtkomst när Databesparing är aktiverat</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Databesparing"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Obegränsad dataåtkomst"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Obegränsad dataåtkomst"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Bakgrundsdata har inaktiverats"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Aktiverat"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Inaktiverat"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Hantera aviseringar på låsskärmen"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Visa eller dölja innehåll i aviseringar"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Alla"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Support"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Support och tips"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Minsta bredd"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Inga installerade appar har begärt åtkomst till premium-sms"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Det kan hända att premium-sms kostar pengar och läggs till på dina fakturor från operatören. Om du ger en app åtkomst kan du skicka premium-sms med den appen."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatiskt"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuellt"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Frigör utrymme nu"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Rörelser"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Kortkommandon för rörelse"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Styr mobilen med snabba rörelser"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Styr surfplattan med snabba rörelser"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Styr enheten med snabba rörelser"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Hoppa till kameran"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Tryck två gånger på strömbrytaren för att snabbt öppna kameran. Du kan göra det på alla skärmar."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Öppna kameran snabbt"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Öppna kameran med två tryck på strömbrytaren."</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Vänd kameran"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Ta selfies snabbare"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Öppna selfieläget genom att vrida mobilen snabbt två gånger"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Öppna selfieläget genom att vrida enheten snabbt två gånger"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Öppna selfieläget genom att vrida enheten snabbt två gånger"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tryck snabbt två gånger för att kolla mobilen"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tryck snabbt två gånger för att kolla surfplattan"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tryck snabbt två gånger för att kolla enheten"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Tryck snabbt två gånger på skärmen för att snabbt visa aviseringar."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Visa tid, aviseringsikoner och annan information genom att trycka snabbt två gånger på skärmen."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Kolla aviseringar när skärmen är avstängd"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Lyft för att kolla mobilen"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Plocka upp för att kolla surfplattan"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Plocka upp för att kolla enheten"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Plocka upp mobilen för att snabbt visa aviseringar."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Plocka upp surfplattan för att snabbt visa aviseringar."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Plocka upp enheten för att snabbt visa aviseringar."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Visa tid, aviseringsikoner och annan information genom att plocka upp mobilen."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Visa tid, aviseringsikoner och annan information genom att plocka upp surfplattan."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Visa tid, aviseringsikoner och annan information genom att plocka upp enheten."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Kolla aviseringar när skärmen är avstängd"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Visa aviseringar genom att svepa med fingret"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Visa aviseringar genom att svepa nedåt på fingeravtryckssensorn på baksidan av mobilen."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Visa aviseringar genom att svepa nedåt på fingeravtryckssensorn på baksidan av surfplattan."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Visa aviseringar genom att svepa nedåt på fingeravtryckssensorn på baksidan av enheten."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Visa aviseringar snabbt"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Svep nedåt på fingeravtryckssensorn"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Höj mobilen för att öppna kameran"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Öppna kameran automatiskt genom att lyfta mobilen som om du skulle ta ett foto (liggande eller stående). Fungerar när mobilen är i viloläge eller låst."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Ta foton när mobilen är i viloläge eller låst"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Assistentrörelse"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Känslighet"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Vill du ta bort den här snabbappen?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Spel"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Ljudfiler"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Använt lagringsutrymme"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(har avinstallerats för <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(har inaktiverats för <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Tjänsten Autofyll"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Snabbapp"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Vill du inaktivera lagringshanteraren?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Fil- och TV-appar"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Använt lagringsutrymme"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Information om operatörsadministration"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivera operatörsadministration"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Vad är nytt?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Kolla in de fem populäraste funktionerna"</string>
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 7d6eba4..3a04de1 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Thabiti"</item>
     <item msgid="8986346415847956850">"Bora zaidi"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Daima"</item>
-    <item msgid="844721238536786870">"Wakati inachaji pekee"</item>
-    <item msgid="1986753720941888596">"Katu"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Daima"</item>
-    <item msgid="7433294150916905997">"Wakati inachaji pekee"</item>
-    <item msgid="1390404486722375028">"kamwe"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Siku 30 zilizopita"</item>
     <item msgid="6600989128423965319">"Weka mzunguko wa matumizi..."</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7c6cde8..ac20ad0 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Sasa wewe ni msanidi programu!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Hakuna haja, tayari wewe ni msanidi programu."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Tafadhali washa chaguo za wasanidi programu kwanza."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Wi-Fi na mitandao mingine"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Miunganisho"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Kifaa"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE Inayotumika"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Inaruhusu Hangout ya Video"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Inaruhusu Kupiga Simu kupitia Wi-Fi"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Inaruhusu EAB"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Nishati ya Redio ya Simu"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Angalia Kitabu cha Anwani katika SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ona nambari za simu zilizobainishwa"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Chuja kupata vifaa"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Badilisha jina la kifaa hiki"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Ipe jina jipya"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Tenganisha?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Hii ikakata muunganisho wako na:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Ungependa kuondoa kifaa?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Muunganisho wa simu yako utaondolewa kwenye <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Muunganisho wa kompyuta yako kibao utaondolewa kwenye <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Muunganisho wa kifaa chako utaondolewa kwenye <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Ondoa"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Huna ruhusa ya kubadilisha mipangilio ya Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Oanisha kifaa kipya"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> inaonekana kwenye vifaa vya karibu wakati mipangilio ya Bluetooth imewashwa."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Anwani ya Bluetooth ya simu: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Anwani ya Bluetooth ya kompyuta kibao: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Anwani ya Bluetooth ya Kifaa chako: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Ungependa kuondoa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Inasambaza"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Wasifu ulemazwe?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Ombi la kuoanisha Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Ombi la ulinganishaji"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Gonga ili uoanishe na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Onyesha faili zilizopokewa"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Faili zilizopokewa"</string>
     <string name="device_picker" msgid="4978696506172252813">"Chagua kifaa cha Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> inataka kuwasha Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> inataka kuzima Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s inataka kufikia ujumbe wako. Ruhusu ufikiaji kwa %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Ombi la idhini ya kufikia SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> inataka idhini ya kufikia kadi yako ya SIM. Ukiipa idhini ya kufikia kadi ya SIM, itazima muunganisho wa data kwenye kifaa chako katika kipindi ambacho imeunganishwa. Ipe <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> idhini ya ufikiaji"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Inaonekana kama \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' kwenye vifaa vingine"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vifaa vyako"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Oanisha kifaa kipya"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Tarehe na saa"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Chagua saa za eneo"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Akaunti"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Kutambua Eneo"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Akaunti"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Mahali na Usalama"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Mahali na; usalama"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Vitambulisho na usimbaji fiche"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Simu imesimbwa kwa njia fiche"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Kifaa kimesimbwa kwa njia fiche"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Fungua kwa kitambulisho"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Tumia alama ya kidole chako"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"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 kidole unayoongeza inaweza kufanya shughuli hizi.\n\nKumbuka: Huenda PIN au mchoro thabiti ukawa salama zaidi kuliko alama ya kidole."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Ili kuidhinisha ununuzi, gusa kitambua alama ya kidole au uingie katika akaunti ya programu. Kuwa mwangalifu unapoongeza alama za vidole. Alama moja ya kidole unayoongeza inaweza kufanya mambo haya.\n\nKumbuka: Huwezi kutumia alama ya kidole chako kufungua kifaa hiki. Wasiliana na msimamizi wa shirika lako kwa maelezo zaidi."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Gusa tu kitambua alama ya kidole ili ufungue simu yako, uthibitishe ununuzi au uingie katika programu. Kuwa makini unapoongeza alama ya kidole . Alama yoyote ya kidole unayoongeza inaweza kufanya shughuli hizi. \n\nKumbuka: Huenda PIN au mchoro thabiti ukawa salama zaidi kuliko alama ya kidole."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Tumia alama yako ya kidole kufunga simu yako au kuidhinisha ununuzi.\n\nKumbuka: Huwezi kutumia alama yako ya kidole kufungua kifaa hiki. Kwa maelezo zaidi, wasiliana na msimamizi wa shirika lako."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Tumia alama yako ya kidole kufungua simu yako au kuidhinisha ununuzi.\n\nKumbuka: Usalama wa alama yako ya kidole unaweza kuwa wa chini ukilinganishwa na wa mchoro au PIN thabiti."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Ghairi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Endelea"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Ruka"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Ongeza alama ya kidole"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Vipengele vya ulinzi wa kifaa havitaanza kutumiwa. Hutaweza kuzuia watu wengine kutumia kompyuta kibao hii iwapo itapotea, kuibwa au data iliyomo kufutwa."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Vipengele vya ulinzi wa kifaa havitaanza kutumiwa. Hutaweza kuzuia watu wengine kutumia kifaa hiki iwapo kitapotea, kuibwa au data iliyomo kufutwa."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Vipengele vya ulinzi wa kifaa havitaanza kutumiwa. Hutaweza kuzuia watu wengine kutumia simu hii iwapo itapotea, kuibwa au data iliyomo kufutwa."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Vipengele vya ulinzi wa kifaa havitaanza kutumika. Hutaweza kuzuia watu wengine kutumia kompyuta hii kibao iwapo itapotea au kuibwa."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Vipengele vya ulinzi wa kifaa havitaanza kutumika. Hutaweza kuzuia watu wengine kutumia kifaa hiki iwapo kitapotea au kuibwa."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Vipengele vya ulinzi wa kifaa havitaanza kutumika. Hutaweza kuzuia watu wengine kutumia simu hii iwapo itapotea au kuibwa."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Endelea"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Vipengele vya ulinzi wa kifaa havitawashwa. Hutaweza kuwazuia watu wengine kutumia kompyuta kibao hii ikiwa itapotea, itaibiwa au itawekewa mipangilio iliyotoka nayo kiwandani."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Vipengele vya ulinzi wa kifaa havitawashwa. Hutakuwa na uwezo wa kuzuia watu wengine kutumia kifaa hiki iwapo kitapotea, kitaibiwa au kitawekewa mipangilio kilichotoka nayo kiwandani."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Vipengele vya ulinzi wa kifaa havitawashwa. Hutaweza kuzuia watu wengine kutumia simu hii iwapo itapotea, itaibiwa au itawekewa mipangilio iliyotoka nayo kiwandani"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Vipengele vya ulinzi wa kifaa havitawashwa. Hutaweza kuzuia watu wengine kutumia kompyuta kibao hii iwapo itapotea au itaibiwa."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Vipengele vya ulinzi wa kifaa havitawashwa. Hutaweza kuwazuia wengine kutumia kifaa hiki iwapo kitapotea au kitaibiwa."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Vipengele vya ulinzi wa kifaa havitawashwa. Hutaweza kuzuia watu wengine kutumia simu hii iwapo itapotea au itaibiwa."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ruka"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Rudi nyuma"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Tafuta kitambuzi"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Tafuta kitambuzi cha kitambulisho upande wa nyuma wa simu yako."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Gusa kitambua alama ya kidole"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Kinapatikana nyuma ya simu yako. Tumia kidole chako cha shahada."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Mchoro unaooyesha mahali kitambuzi cha kitambulisho kilipo kwenye kifaa"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Jina"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"SAWA"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Futa"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Tuanze"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Gusa kitambua alama ya kidole"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Weka kidole chako juu ya kitambuzi kisha ukiinue baada ya kuhisi mtetemo"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Endelea"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Sogeza kidole chako taratibu ili uongeze sehemu zote za alama za kidole chako"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Kitambulisho kimeongezwa!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kila unapoona aikoni hii, unaweza kutumia kitambulisho chako kujitambulisha au kuidhinisha ununuzi."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Gusa tu kitambuzi cha alama za vidole ili uanzishe na kufungua kifaa chako."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Unapoona aikoni hii, unaweza pia kuidhinisha ununuzi au kuingia katika akaunti za programu."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Inua, kisha uguse tena"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Endelea kuinua kidole chako ili uongeze sehemu tofauti za alama yako ya kidole"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Alama ya kidole imeongezwa"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Ukiona aikoni hii, tumia alama yako ya kidole kujitambulisha au kuidhinisha ununuzi."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ungependa kuruka kusanidi kitambulisho?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Umechagua kutumia kitambulisho kama njia ya kufungua simu yako. Ukiruka sasa, utahitajika kusanidi hii baadaye. Usanidi huchukua takriban dakika moja."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Weka mbinu ya kufunga skrini"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Nimemaliza"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Lo, hicho si kitambuzi"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Tumia kitambuzi cha kitambulisho kwenye kifaa chako."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Gusa kitambua alama ya kidole kilicho nyuma ya simu yako. Tumia kidole chako cha shahada."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Hukukamilisha kujiandikishaji"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Muda wa uandikishaji wa kitambulisho umefikia kikomo. Jaribu tena."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Uandikishaji wa kitambulisho haukufanya kazi. Jaribu tena au utumie kitambulisho tofauti."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Wazuie watu wengine kutumia kifaa hiki bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Wazuie watu wengine kutumia simu hii bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Chagua njia mbadala ya kufunga skrini yako"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Chaguo za kufunga skrini"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Chaguo za kufunga skrini"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Kufunga skrini"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Mara baada tu ya hali tuli"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> baada ya hali tuli"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Badilisha umbo la kufungua"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Badilisha PIN ya kufungua"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Badilisha nenosiri la kufungua"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Jaribu tena. Inajaribu mara ya <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> kati ya <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Jaribio la mwisho"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Ukiweka mchoro wa kazini usiofaa mara hii, wasifu wako wa kazini na data inayohusiana nao itaondolewa kwenye kifaa hiki."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Ukiweka PIN ya kazini isiyo sahihi mara hii, wasifu wako wa kazini na data inayohusiana nao itaondolewa kwenye kifaa hiki."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Ukiweka nenosiri la kazini lisilo sahihi mara hii, wasifu wako wa kazini na data inayohusiana nao itaondolewa kwenye kifaa hiki."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Umejaribu mara nyingi mno bila kufaulu. Wasifu wako wa kazini na data inayohusiana nao itaondolewa kwenye kifaa hiki."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Ondoa"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Jaribu tena. Jaribio la <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> kati ya <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> zinazoruhusiwa."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Data yako itafutwa"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ukiweka mchoro usio sahihi utakapojaribu tena, data iliyo kwenye kifaa hiki itafutwa"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ukiweka PIN isiyo sahihi utakapojaribu tena, data iliyo kwenye kifaa hiki itafutwa"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ukiweka nenosiri lisilo sahihi utakapojaribu tena, data iliyo kwenye kifaa hiki itafutwa"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ukiweka mchoro usio sahihi utakapojaribu tena, maelezo ya mtumiaji huyu yatafutwa"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ukiweka PIN isiyo sahihi utakapojaribu tena, maelezo ya mtumiaji huyu yatafutwa"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ukiweka nenosiri lisilo sahihi utakapojaribu tena, maelezo ya mtumiaji huyu yatafutwa"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ukiweka mchoro usio sahihi utakapojaribu tena, wasifu wako wa kazini utafutwa pamoja na data yake"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ukiweka PIN isiyo sahihi utakapojaribu tena, wasifu wako wa kazini utafutwa pamoja na data yake"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ukiweka nenosiri lisilo sahihi utakapojaribu tena, wasifu wako wa kazini utafutwa pamoja na data yake"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Umejaribu kufungua mara nyingi mno kwa njia isiyo sahihi. Data iliyo kwenye kifaa hiki itafutwa."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Umejaribu kufungua mara nyingi mno kwa njia isiyo sahihi. Maelezo ya mtumiaji huyu yatafutwa."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Umejaribu kufungua mara nyingi mno kwa njia isiyo sahihi. Wasifu huu wa kazini utafutwa pamoja na data yake."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ondoa"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Ni lazima liwe na angalau herufi <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Ni lazima PIN iwe na angalau tarakimu <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Endelea"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth mahiri"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth ikiwa imewashwa, kifaa chako kinaweza kuwasiliana na vifaa vingine vyenye Bluetooth vilivyo karibu."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Ili kuboresha usahihi wa kutambua mahali, programu na huduma za mfumo bado zinaweza kutambua vifaa vyenye Bluetooth. Unaweza kubadilisha hali hii katika <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mipangilio ya kutafuta<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Haikuweza kuunganisha. Jaribu tena."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Maelezo ya kifaa"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Anwani ya Bluetooth ya kifaa chako: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Ungependa kusahau kifaa?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Simu yako haitaoanishwa tena na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Kompyuta yako kibao haitaoanishwa tena na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Kifaa chako hakitaoanishwa tena na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Sahau kifaa"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Unganisha kwa..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itatenganishwa kutoka kwa sauti ya media."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itatenganishwa kutoka kwa sauti ya kifaa kisichotumia mikono."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Usitoe"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Usithibitishe"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Hakuna cheti kilichobainishwa. Muunganisho wako hautakuwa wa faragha."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Jina la mtandao ni refu sana."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Lazima ubainishe kikoa."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS inapatikana"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS inapatikana"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">Mtandao 1</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi mahiri"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Weka mipangilio ya Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Anwani ya MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Anwani ya IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Mfano wa kijimtandao"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Sahau kikundi hiki?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Sambaza intaneti ya Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Mtandao-hewa wa Wi-Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Tumia data ya simu kutoa mtandao wa Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Intaneti ya kompyuta kibao hii haishirikiwi kupitia mtandao-hewa"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Intaneti ya simu hii haishirikiwi kupitia mtandao-hewa"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Haishiriki Intaneti au maudhui na vifaa vingine"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Inashiriki muunganisho wa Intaneti wa kompyuta hii kibao kupitia mtandao-hewa"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Inashiriki muunganisho wa Intaneti wa simu hii kupitia mtandao-hewa"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Programu inashiriki maudhui. Ili kushiriki muunganisho wa Intaneti, zima mtandao-hewa, kisha uuwashe"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Jina la WiFi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Inawasha <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Vifaa vingine vinaweza kuunganisha kwenye <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Nenosiri la Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Bendi ya AP"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Tumia huduma ya mtandao-hewa kuunda mtandao wa Wi-Fi kwa vifaa vyako vingine. Mtandao-hewa hutoa huduma za Intaneti ikitumia muunganisho wako wa data ya kifaa cha mkononi. Ada za ziada za data ya kifaa cha mkononi huenda zikatozwa."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Programu zinaweza kuunda mtandao-hewa ili kushiriki maudhui na vifaa vilivyo karibu."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Inawezesha mtandao-hewa…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Inazima intaneti..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> inatumika"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wakati kipengele cha upigaji simu kwa Wi-Fi kimewashwa, simu yako inaweza kuelekeza simu kupitia mitandao ya Wi-Fi au mtandao wa mtoa huduma wako, kutegemea na mapendeleo yako na ni mawimbi yapi yaliyo thabiti. Kabla ya kuwasha kipengele hiki, angalia ada na maelezo mengine kwa mtoa huduma wako."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Sasisha Anwani ya Dharura"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Anwani inayotumiwa na huduma za dharura kama mahali ulipo ikiwa utapiga simu ya 911 ukitumia Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skrini"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Haikupata matokeo"</string>
     <string name="display_settings" msgid="7965901687241669598">"Kwenye Skrini"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Skrini ijizungushe kiotomatiki"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Rangi dhahiri"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Badilisha uelekezo kiotomatiki wakati unazungusha kompyuta ndogo"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Badili uelekezaji kiotomatiki wakati wa kuzungusha simu"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Badilisha uelekezo kiotomatiki wakati unazungusha kompyuta ndogo"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Imarisha kiwango cha ung\'avu kulingana na mwangaza uliopo. Kipengele hiki kikiwa kimewashwa, bado unaweza kubadilisha ung\'avu kwa muda."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Mwanga wa Usiku"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Mwanga wa Usiku hugeuza rangi ya skrini yako kuwa manjano. Hali hii inafanya kuwa rahisi kuangalia skrini yako au kusoma katika mwangaza hafifu, na inaweza kukusaidia ulale kwa urahisi sana."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Ratiba"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Hali"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Washa kiotomatiki"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Usiwahi"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Ratiba maalum"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Mapambazuko hadi machweo"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Ratiba"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Hamna"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Huwashwa wakati maalum"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Huwashwa usiku kucha"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Litawashwa"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Litazimwa"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Hali"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Ukolezaji"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Imezimwa. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Haitawahi kuwashwa kiotomatiki."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Itawashwa kiotomatiki saa <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Itawashwa kiotomatiki jua litakapotua."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Imewashwa. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Haitawahi kuzimwa kiotomatiki."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Itazimwa kiotomatiki saa <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Itazima kiotomatiki kutakapopambazuka."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Limezimwa / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Haitawahi kuwashwa kiotomatiki"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Itawashwa kiotomatiki saa <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Itawashwa kiotomatiki jua litakapotua"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Limewashwa / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Haitawahi kuzimwa kiotomatiki"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Itazimwa kiotomatiki saa <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Itazima kiotomatiki kutakapopambazuka"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Zima skrini"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skrini huzima"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> za kutokuwa na shughuli"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Mipangilio"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Mwangaza wa kiotomatiki"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Inua ili uondoe kifaa katika hali tuli"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Onyesho la vipengele vyote"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Onyesho tulivu"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Imewashwa kila wakati"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Arifa mpya"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Wakati wa kuonyesha"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Arifa mpya"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Washa skrini arifa zinapoingia"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Imewashwa kila wakati"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Onyesha saa, aikoni za arifa na maelezo mengine"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Ukubwa wa fonti"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Kuongeza au kupunguza ukubwa wa maandishi"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Mipangilio ya kuzima SIM"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Lazima APN ijazwe."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Sehemu ya MCC lazima iwe na nambari 3."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Sehemu ya MNC lazima iwe na nambari 2 au 3."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Mtoa huduma haruhusu kuongeza APN za aina ya %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Inarejesha mipangilio mbadala ya APN"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Rudisha kwenye chaguo-msingi"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Kuweka upya kwa mipangilio mbadala ya APN kumekamilika"</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Futa kadi ya SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Futa data zote kwenye hifadhi ya ndani ya USB, kama vile muziki au picha"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Futa data zote kwenye kadi ya SD, kama vile muziki au picha."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Futa eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Futa eSIM zote kwenye simu. Kufanya hivi hakutaghairi mpango wako wa huduma ya simu ya mkononi."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Futa eSIM zote kwenye kompyuta kibao. Kufanya hivi hakutaghairi mpango wako wa huduma za kifaa cha mkononi."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Rejesha mipangilio ambayo kompyuta kibao ilitoka nayo kiwandani"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Rejesha mipangilio ya mwanzoni ya simu"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Ungependa kufuta maelezo yako yote ya kibinafsi na programu zilizopakuliwa? Huwezi kutendua hatua hii!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Haiwezi kusambaza mtandao au kutumia mitandao hewa wakati umewasha Kiokoa Data"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Shiriki intaneti kwa USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB imeunganishwa, washa ili ushiriki"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Imezuia"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Haiwezi kuzuia wakati uhifadhi wa USB inatumika"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB haijaunganishwa"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Unganisha ili uwashe"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Hitilafu ya kushiriki intaneti kwa USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Shiriki muunganisho wa Intaneti ya simu yako kupitia USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Shiriki muunganisho wa Intaneti ya kompyuta kibao kupitia USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Shiriki intaneti kwa Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Inashiriki muunganisho wa Intaneti wa kompyuta kibao hii kupitia Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Inashiriki muunganisho wa Intaneti wa simu hii kupitia Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Inashiriki muunganisho wa Intaneti wa kompyuta kibao hii kwenye kifaa 1 kupitia Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Inashiriki muunganisho wa Intaneti wa simu hii kwenye kifaa 1 kupitia Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Inashiriki muunganisho wa Intaneti wa kompyuta kibao hii kwenye vifaa <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> kupitia Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Inashiriki muunganisho wa Intaneti wa simu hii kwenye vifaa <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> kupitia Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Shiriki muunganisho wa Intaneti ya kompyuta kibao kupitia Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Shiriki muunganisho wa Intaneti ya simu kupitia Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Inashiriki muunganisho wa Intaneti wa <xliff:g id="DEVICE_NAME">%1$d</xliff:g> hii kupitia Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Intaneti ya kompyuta kibao hii haishirikiwi kupitia Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Intaneti ya simu hii haishirikiwi kupitia Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Haijafungwa"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Haiwezi kuzuia kwa zaidi kuliko vifaa <xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>itazuiwa"</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Tumia huduma ya kusambaza mtandao au mtandao-hewa ili usambazie vifaa vingine Intaneti kupitia muunganisho wa data ya simu."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Tumia huduma za mtandao-hewa na kusambaza mtandao ili kusambaza Intaneti kwenye vifaa vingine kupitia muunganisho wako wa kifaa cha mkononi. Programu pia zinaweza kuunda mtandao-hewa ili kushiriki maudhui na vifaa vilivyo karibu."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Usaidizi"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mtandao wa simu"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mpango wa vifaa vya mkononi"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Hali ya eneo"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Tumia GPS, Wi‑Fi, Bluetooth au mitandao ya simu ili kutambua mahali"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Tumia Wi-Fi, Bluetooth au mitandao ya simu ili kutambua mahali"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Tumia GPS kutambua eneo"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Tumia GPS na vitambuzi vya vifaa ili kutambua mahali kifaa kilipo"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Kuchanganua"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Kuchanganua Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Boresha utambuzi wa mahali kwa kuruhusu programu na huduma za mifumo zitambue mitandao ya Wi-Fi wakati wowote."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Hauna muunganisho wa data. Ili kutazama taarifa hii sasa, nenda kwa %s kutoka kwa kompyuta yoyote iliyounganishwa kwa mtandao."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Inapakia…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Chagua nenosiri lako"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Weka nenosiri ili utumie alama ya kidole"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Chagua mchoro wako"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Weka mchoro ili utumie alama ya kidole"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Chagua PIN yako"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Weka PIN ili utumie alama ya kidole"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Thibitisha nenosiri lako"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Thibitisha mchoro wako"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Thibitisha PIN yako"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Mipangilio ya programu"</string>
     <string name="install_applications" msgid="4872012136210802181">"Vyanzo visivyojulikana"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Ruhusu vyanzo vyote vya programu"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Programu zilizofunguliwa hivi majuzi"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Angalia programu zote <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> zilizopita"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Data yako ya binafsi na ya kompyuta kibao yako zinaweza kuathiriwa na programu ambazo hazijulikani. Kwa kusakinisha programu kutoka chanzo hiki, unakubali kuwajibika kila wakati kutokana na uharibifu wowote kwenye simu yako au kupotea kwa data kutokana na matumizi yake."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Data yako ya binafsi na ya simu yako zinaweza kuathiriwa na programu ambazo hazijulikani. Kwa kusakinisha programu kutoka chanzo hiki, unakubali kuwajibika kila wakati kutokana na uharibifu wowote kwenye simu yako au kupotea kwa data kutokana na matumizi yake."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Mipangilio ya kina"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Komesha huduma ya mfumo?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Ukisitisha huduma hii, baadhi ya vipengele vya kompyuta yako ndogo vinaweza kuwacha kufanya kazi kwa usahihi mpaka uizime na kisha uwashe tena."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ukisitisha huduma hii, baadhi ya vipengele vya simu yako vinaweza kuwacha kufanya kazi kwa usahihi mpaka uizime na kisha uwashe tena."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Lugha, vifaa vya kuingiza data na ishara"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Lugha na uingizaji wa data"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Lugha na uingizaji wa data"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Usaidizi wa kuweka maudhui"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other">Huduma <xliff:g id="COUNT">%1$d</xliff:g> za kuchapisha zimewashwa</item>
       <item quantity="one">Huduma 1 ya kuchapisha imewashwa</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other">Kazi <xliff:g id="COUNT">%1$d</xliff:g> za kuchapisha</item>
+      <item quantity="one">Kazi 1 ya kuchapisha</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Huduma za uchapishaji"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Hakuna huduma zilizosakinishwa"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Hakuna printa zilizopatikana"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Tumia maelezo"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Rekebisha utumiaji wa nishati"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Furushi zilizojumuishwa"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Programu zinatumia betri sana"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Kuweka kifaa kikiwa kimewashwa"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Kuwasha kifaa chini chini"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Inaomba eneo mara kwa mara"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Programu <xliff:g id="NUMBER">%1$d</xliff:g> hazifanyi kazi vizuri"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Unataka kusimamisha programu?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Simu yako haiwezi kudhibiti betri ipasavyo kwa sababu <xliff:g id="APP">%1$s</xliff:g> inazuia simu yako isiingie katika hali tuli.\n\nIli kujaribu kutatua tatizo hili, unaweza kulazimisha kuzima programu.\n\nIkiwa jambo hili linaendelea kufanyika, huenda ukalazimika kuondoa programu ili uboreshe utendaji wa betri."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Kompyuta yako kibao haiwezi kudhibiti betri ipasavyo kwa sababu <xliff:g id="APP">%1$s</xliff:g> inazuia kompyuta yako kibao isiingie katika hali tuli.\n\nIli kujaribu kutatua tatizo hili, unaweza kulazimisha kuzima programu.\n\nIkiwa jambo hili linaendelea kufanyika, huenda ukalazimika kuondoa programu ili uboreshe utendaji wa betri."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Kifaa chako hakiwezi kudhibiti betri ipasavyo kwa sababu <xliff:g id="APP">%1$s</xliff:g> inazuia kifaa chako kisiingie katika hali tuli.\n\nIli kujaribu kutatua tatizo hili, unaweza kulazimisha kuzima programu.\n\nIkiwa jambo hili linaendelea kufanyika, huenda ukalazimika kuondoa programu ili uboreshe utendaji wa betri."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Simamisha programu"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Ungependa kuzima matumizi ya chinichini?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Simu yako haiwezi kudhibiti betri ipasavyo kwa sababu <xliff:g id="APP">%1$s</xliff:g> inawasha kifaa chako kila wakati.\n\nIli kushughulikia tatizo hili, simu yako inaweza kuzuia programu hii kufanya kazi chini chini."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Kompyuta yako kibao haiwezi kudhibiti betri ipasavyo kwa sababu <xliff:g id="APP">%1$s</xliff:g> inawasha kifaa chako kila wakati.\n\nIli kushughulikia tatizo hili, kompyuta yako kibao inaweza kuzuia programu hii kufanya kazi chini chini."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Kifaa chako hakiwezi kudhibiti betri ipasavyo kwa sababu <xliff:g id="APP">%1$s</xliff:g> inawasha kifaa chako kila wakati.\n\nIli kushughulikia tatizo hili, kifaa chako kinaweza kuzuia programu hii kufanya kazi chini chini."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Zima"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Ungependa kuzima kipengele cha kutambua mahali?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Simu yako haiwezi kudhibiti betri ipasavyo kwa sababu <xliff:g id="APP">%1$s</xliff:g> huendelea kuomba maelezo ya mahali ulipo wakati hutumii programu.\n\nIli kushughulikia tatizo hili, unaweza kuzima kipengele cha mahali ulipo kwenye programu."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Kompyuta yako kibao haiwezi kudhibiti betri ipasavyo kwa sababu <xliff:g id="APP">%1$s</xliff:g> huendelea kuomba maelezo ya mahali ulipo wakati hutumii programu.\n\nIli kushughulikia tatizo hili, unaweza kuzima kipengele cha mahali ulipo kwenye programu."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Kifaa chako hakiwezi kudhibiti betri ipasavyo kwa sababu <xliff:g id="APP">%1$s</xliff:g> huendelea kuomba maelezo ya mahali ulipo wakati hutumii programu.\n\nIli kushughulikia tatizo hili, unaweza kuzima kipengele cha mahali kwenye programu hii."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Zima"</string>
     <string name="power_screen" msgid="3023346080675904613">"Skrini"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Tochi"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Programu"</string>
     <string name="power_service" msgid="1599661212370831780">"Huduma"</string>
     <string name="power_system" msgid="8290455327965307383">"Mfumo"</string>
-    <string name="power_user" msgid="1889728099253018005">"Mtumiaji"</string>
+    <string name="power_user" msgid="3706143225319881667">"Watumiaji wengine"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU kwa jumla"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Mandharimbele ya CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Weka chonjo"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Hesabu ya matumizi ya nishati iliyopitiliza"</string>
     <string name="mah" msgid="95245196971239711">"mAh <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Imetumika kwa <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Inatumika kwa <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Matumizi ya skrini <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> imetumiwa na <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Imetumia <xliff:g id="PERCENT">%1$s</xliff:g> ya chaji ya betri"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Badilisha PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Onyesha arifa"</string>
     <string name="help_label" msgid="6886837949306318591">"Usaidizi na maoni"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Makala ya usaidizi, simu na usaidizi kupitia gumzo"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Makala ya usaidizi, simu na gumzo, kuanza"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Akaunti ya maudhui"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Kitambulisho cha Picha"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Vitishio vikali"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Onyesha kipengee %d kilichofichwa</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Mtandao na Intaneti"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, simu ya mkononi, matumizi ya data, mtandao-hewa"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"kifaa cha mkononi"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"matumizi ya data"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"mtandao-hewa"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Vifaa vilivyounganishwa"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Programu na arifa"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Ruhusa, programu chaguo msingi"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Akaunti na watumiaji"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"ishara"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"lipa, gonga, malipo"</string>
     <string name="keywords_backup" msgid="470070289135403022">"hifadhi rudufu, hifadhi nakala"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"ishara, ukingo, upande, ukingo unaotumika, bana, shikilia, saidia, mratibu, inayobanwa, ya kubanwa, inayobanwa, ok google, mratibu wa google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"ishara, washa skrini, arifa, skrini, onyesho, skrini imezimwa, skrini imewashwa, bana, ukingo, imezimwa, zima, shikilia"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"ishara, kimya, ahirisha, kengele, simu inayoingia, utulivu, onyesho, kufunga skrini, bana, shikilia, ukingo, simamisha"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Sanidi tagi ya NFC ya Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Andika"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Gonga tagi ya NFC ili uandike..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Usionyeshe arifa zozote za kazi"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Ungependa arifa za wasifu wako zionekane aje wakati kifaa chako kimefungwa?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Arifa za wasifu"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Arifa"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Arifa"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Arifa za programu"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Aina ya arifa"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Umuhimu"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Ruhusu programu iamue"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Dharura"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Ruhusu sauti"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Usiruhusu sauti, mtetemo au onyesho la kuchungulia kwenye skrini ya sasa."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Umuhimu wa kiwango cha chini"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Umuhimu wa wastani"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Umuhimu wa kiwango cha juu"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Umuhimu wa hali ya dharura"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Mratibu wa arifa"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Kufikia arifa"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Ufikiaji kwenye arifa za wasifu wa kazi umezuiwa"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picha ndani ya picha"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Ruhusu picha ndani ya picha"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Ruhusu programu hii iunde kidirisha cha picha ndani ya picha wakati programu imefunguka au baada ya kuiacha (kwa mfano, ukiendelea kutazama video). Kidirisha hiki kitaonekana  juu ya programu zingine unazotumia."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Ndiyo"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Hapana"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Kufikia kipengele cha Usinisumbue"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Hakuna programu zilizosakinishwa ambazo zimeomba kufikia kipengele cha Usinisumbue"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Inapakia programu ..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Wasifu huu wa kazini unasimamiwa na:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Inasimamiwa na <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Majaribio)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Kuzunguka kwenye skrini ya kifaa"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Zungusha maudhui ya skrini"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Skrini ibaki katika onyesho la wima"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Baki katika onyesho la mlalo"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Baki katika mkao wa sasa"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Uanzishaji salama"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Endelea"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Unaweza kulinda kifaa hiki zaidi kwa kuweka mipangilio ya kuomba PIN yako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe PIN kabla ya kufunguka?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Unaweza kulinda kifaa hiki zaidi kwa kuweka mipangilio ya kuomba nenosiri lako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe nenosiri kabla ya kufunguka?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Mbali na kutumia alama yako ya kidole, unaweza kukilinda zaidi kwa kuweka mipangilio ya kuomba PIN yako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe PIN kabla ya kufunguka?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Mbali na kutumia alama yako ya kidole kufungua kifaa chako, unaweza kukilinda zaidi kwa kuweka mipangilio ya kuomba mchoro wako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe mchoro kabla ya kufunguka?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Mbali na kutumia alama ya kidole ili kufungua kifaa chako, unaweza kukilinda zaidi kwa kuweka mipangilio ya kuomba nenosiri lako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe nenosiri kabla ya kufunguka?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Mbali na kutumia alama ya kidole chako kufungua kifaa, unaweza kulinda kifaa hiki zaidi kwa kuweka nenosiri lako kabla ya kukifungua. Kifaa hakiwezi kupokea simu, ujumbe au arifa, ikiwa ni pamoja na kengele, hadi utakapokifungua.\n\nHii husaidia kulinda data kwenye vifaa vilivyopotea au vilivyoibwa. Ungependa kifaa kiombe nenosiri kabla ya kuanza kukitumia?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ndiyo"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Hapana"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Je, inahitaji PIN?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Arifa za matumizi"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Onyesha matumizi ya kifaa tangu kilipojaa chaji"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Onyesha matumizi ya programu"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Inatumia chaji nyingi"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other">Programu <xliff:g id="NUMBER">%2$d</xliff:g> hazifanyi kazi vizuri</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> haifanyi kazi vizuri</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Programu zinatumia betri sana</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> inatumia betri sana</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Haijaboreshwa"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Haijaboreshwa"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Kuboresha matumizi ya betri"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Onyesha juu ya programu zingine"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"Programu <xliff:g id="COUNT_0">%1$d</xliff:g> kati ya <xliff:g id="COUNT_1">%2$d</xliff:g> zimeruhusiwa kuonekana juu ya programu zingine"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Programu zilizo na ruhusa"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Ndiyo"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Hapana"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Imeruhusiwa"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Hairuhusiwi"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"sakinisha programu kutoka vyanzo visivyojulikana"</string>
     <string name="write_settings" msgid="4797457275727195681">"Badilisha mipangilio ya mfumo"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"andika rekebisha mipangilio ya mfumo"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Skrini imewekewa rangi ya manjano. Hii inaweza kukusaidia kulala kwa urahisi."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Mapendekezo"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> zaidi"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other">Mapendekezo <xliff:g id="COUNT">%1$d</xliff:g></item>
+      <item quantity="one">Pendekezo 1</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+ mapendekezo <xliff:g id="COUNT">%1$d</xliff:g></item>
+      <item quantity="one">+ pendekezo 1</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Ondoa"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Halijoto ya rangi ya baridi"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Tumia rangi yenye halijoto ya baridi zaidi kwenye onyesho"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Onyo la matumizi ya data la <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Onyo la matumizi ya data la <xliff:g id="ID_1">%1$s</xliff:g> / Kikomo cha data cha <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Kipindi cha kutuma bili"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Kipindi cha kila mwezi huanza tarehe <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Hutozwa kila mwezi kuanzia tarehe <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Kila mwezi tarehe <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Vizuizi vya mtandao"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other">Vizuizi <xliff:g id="COUNT">%1$d</xliff:g></item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">Programu 1 imeruhusiwa kutumia data bila kudhibitiwa wakati Kiokoa Data kimewashwa</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Kiokoa data"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Kufikia data bila vikwazo"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Data isiyo na kikomo"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Data ya chini chini imezimwa"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Kimewashwa"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Kimezimwa"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Dhibiti arifa za kufunga skrini"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Onyesha au ufiche maudhui ya arifa"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Zote"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Usaidizi"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"Dp <xliff:g id="ID_1">%d</xliff:g>"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Usaidizi na vidokezo"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Upana mdogo zaidi"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Hakuna programu zilizosakinishwa ambazo zimeomba kufikia huduma ya SMS zinazolipiwa"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Gharama ya huduma ya SMS zinazolipiwa itajumuishwa kwenye bili yako ya mtoa huduma. Ikiwa utatoa ruhusa ya programu fulani, utaweza kutuma SMS zinazolipiwa ukitumia programu hiyo."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Otomatiki"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Mwongozo"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Futa ili uongeze nafasi sasa"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Ishara"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Njia za mkato za ishara"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Ishara za kutekelezwa kwa haraka ili kudhibiti simu yako"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Ishara za haraka za kudhibiti kompyuta yako kibao"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Ishara za haraka za kudhibiti kifaa chako"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Nenda kwenye kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Ili ufungue kamera haraka, bofya kitufe cha kuwasha/kuzima mara mbili. Hufanya kazi katika skrini yoyote."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Fungua kamera haraka"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Bonyeza kitufe cha kuwasha/kuzima mara mbili ili ufungue kamera"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Geuza kamera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Piga picha za kujipiga mwenyewe kwa haraka zaidi"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Geuza simu mara mbili ili uweke picha ya kujipiga mwenyewe"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Geuza kompyuta kibao mara mbili ili uweke picha ya kujipiga mwenyewe"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Geuza kifaa mara mbili ili uweke picha ya kujipiga mwenyewe"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Gonga mara mbili ili uangalie simu"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Gonga mara mbili ili uangalie kompyuta kibao"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Gonga mara mbili ili uangalie kifaa"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Ili uangalie arifa zako kwa haraka, gonga mara mbili skrini yako."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Ili uangalie wakati, aikoni za arifa na maelezo mengine, gonga skrini yako mara mbili."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Angalia arifa wakati skrini imezimwa"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Inua ili uangalie simu"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Inua ili uangalie kompyuta kibao"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Inua ili uangalie kifaa"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Ili uangalie arifa zako kwa haraka, chukua simu yako"</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Ili uangalie arifa zako kwa haraka, chukua kompyuta yako kibao."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"ili uangalie arifa zako kwa haraka, chukua kifaa chako."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Ili uangalie wakati, aikoni za arifa na maelezo mengine, chukua simu yako."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ili uangalie wakati, arifa za aikoni na maelezo mengine, chukua kompyuta yako kibao."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ili uangalie wakati, aikoni za arifa na maelezo mengine, chukua kifaa chako."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Angalia arifa wakati skrini imezimwa"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Telezesha kidole ili upate arifa"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Ili uangalie arifa zako, telezesha kidole kuelekea chini kwenye kitambua alama ya kidole kilicho upande wa nyuma wa simu yako."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Ili uangalie arifa zako, telezesha kidole kuelekea chini kwenye kitambua alama ya kidole kilicho upande wa nyuma wa kompyuta yako kibao."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Ili uangalie arifa zako, telezesha kidole kuelekea chini kwenye kitambua alama ya kidole nyuma ya kifaa chako."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Angalia arifa haraka"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Telezesha kidole chini kwenye kitambua alama ya kidole"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Inua simu ili ufungue kamera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Ili ufungue kamera kiotomatiki, inua simu yako iwe tayari kupiga picha (mlalo au wima). Hufanya kazi wakati simu yako iko kwenye hali tulivu au imefungwa."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Piga picha simu ikiwa katika hali tuli au ikiwa imefungwa"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Ishara ya usaidizi"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Utambuzi"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Ungependa kuondoa programu hii inayofunguka papo hapo?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Michezo"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Faili za sauti"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Nafasi iliyotumiwa"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(imeondolewa kwa mtumiaji <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(imezimwa kwa mtumiaji <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Huduma ya kujaza kiotomatiki"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Programu inayofunguka papo hapo"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Ungependa kuzima kidhibiti cha hifadhi?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Programu za Filamu na TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Nafasi iliyotumiwa"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Maelezo ya Utaratibu wa Mtoa Huduma"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Anzisha Utaratibu wa Mtoa Huduma"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Ni nini kipya na cha kusisimua?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Angalia vipengele 5 vikuu"</string>
 </resources>
diff --git a/res/values-sw400dp/dimens.xml b/res/values-sw400dp/dimens.xml
index 7ae4061..0c35d84 100755
--- a/res/values-sw400dp/dimens.xml
+++ b/res/values-sw400dp/dimens.xml
@@ -17,7 +17,6 @@
 
 <resources>
     <dimen name="fingerprint_enrolling_content_margin_top">56dp</dimen>
-    <dimen name="fingerprint_in_app_indicator_size">176dp</dimen>
     <dimen name="fingerprint_find_sensor_graphic_size">240dp</dimen>
 
     <dimen name="support_escalation_card_padding_start">56dp</dimen>
diff --git a/res/values-sw400dp/styles.xml b/res/values-sw400dp/styles.xml
new file mode 100755
index 0000000..f69f7c3
--- /dev/null
+++ b/res/values-sw400dp/styles.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    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.
+-->
+
+<resources>
+
+    <!-- Unhide the icon on bigger screens -->
+    <style name="LockPatternIconStyle" parent="SuwGlifIcon" />
+
+</resources>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index 87a941d..e9fe8f7 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"நன்று"</item>
     <item msgid="8986346415847956850">"பிரமாதம்"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"எப்போதும்"</item>
-    <item msgid="844721238536786870">"செருகப்பட்டிருக்கும்போது மட்டும்"</item>
-    <item msgid="1986753720941888596">"எப்போதும் வேண்டாம்"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"எப்போதும்"</item>
-    <item msgid="7433294150916905997">"செருகப்பட்டிருக்கும்போது மட்டும்"</item>
-    <item msgid="1390404486722375028">"ஒருபோதும் வேண்டாம்"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"கடந்த 30 நாட்கள்"</item>
     <item msgid="6600989128423965319">"பயன்பாட்டு சுழற்சியை அமை..."</item>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index dfde054..9738855 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"இப்போது டெவெலப்பராகிவிட்டீர்கள்!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"தேவையில்லை, நீங்கள் ஏற்கனவே ஒரு டெவெலப்பர்."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"முதலில் டெவெலப்பர் விருப்பங்களை இயக்கவும்."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"வயர்லெஸ் &amp; நெட்வொர்க்குகள்"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"இணைப்புகள்"</string>
     <string name="header_category_device" msgid="4544026001618307754">"சாதனம்"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ஒதுக்கீட்டுக் கொடி இயக்கத்தில்"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"வீடியோ அழைப்பு அமைக்கப்பட்டது"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"வைஃபை அழைப்பு அமைக்கப்பட்டது"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/பிரசென்ஸ் அமைக்கப்பட்டது"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"மொபைல் ரேடியோ பவர்"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"சிம் முகவரிப் புத்தகத்தைக் காட்டு"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"நிலையான அழைப்பு எண்களைக் காட்டு"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"சாதனங்களுக்கு ஸ்கேன் செய்"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"சாதனத்தை மறுபெயரிடுக"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"மறுபெயரிடு"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"துண்டிக்கவா?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"இது, பின்வருவதுடனான உங்கள் இணைப்பைத் துண்டிக்கும்:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"சாதனத்தைத் துண்டிக்கவா?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> இலிருந்து உங்கள் மொபைலின் இணைப்பு துண்டிக்கப்படும்."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> இலிருந்து உங்கள் டேப்லெட்டின் இணைப்பு துண்டிக்கப்படும்."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> இலிருந்து உங்கள் சாதனத்தின் இணைப்பு துண்டிக்கப்படும்."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"துண்டி"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"புளுடூத் அமைப்புகளை மாற்ற உங்களுக்கு அனுமதியில்லை."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"புதிய சாதனத்தை இணை"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"புளூடூத் அமைப்புகள் இயக்கப்பட்டிருக்கும்போது, அருகிலுள்ள சாதனங்களுக்கு <xliff:g id="DEVICE_NAME">%1$s</xliff:g> தெரியும்."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"மொபைலின் புளூடூத் முகவரி: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"டேப்லெட்டின் புளூடூத் முகவரி: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"சாதனத்தின் புளூடூத் முகவரி: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ஐ துண்டிக்கவா?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"அலைபரப்புதல்"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"சுயவிவரத்தை முடக்கவா?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"புளூடூத் இணைப்பிற்கான கோரிக்கை"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"இணைப்பிற்கான கோரிக்கை"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> உடன் இணைக்க, தட்டவும்."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"பெற்ற கோப்புகளைக் காட்டு"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"பெற்ற கோப்புகள்"</string>
     <string name="device_picker" msgid="4978696506172252813">"புளூடூத் சாதனத்தைத் தேர்வுசெய்க"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"புளூடூத்தை இயக்க <xliff:g id="APP_NAME">%1$s</xliff:g> விரும்புகிறது"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"புளூடூத்தை முடக்க <xliff:g id="APP_NAME">%1$s</xliff:g> விரும்புகிறது"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"உங்கள் செய்திகளை %1$s அணுக விரும்புகிறது. %2$s க்கு அணுகலை வழங்கவா?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM அணுகல் கோரிக்கை"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> உங்கள் சிம் கார்டை அணுக விரும்புகிறது. சிம் கார்டிற்கு அணுகல் வழங்குவது இணைப்பின் போது, உங்கள் சாதனத்தின் தரவு இணைப்பை முடக்கும். <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>க்கு அணுகல் வழங்கவும்"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"பிற சாதனங்களில் \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' எனத் தெரியும்"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"உங்கள் சாதனங்கள்"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"புதிய சாதனத்தை இணை"</string>
     <string name="date_and_time" msgid="9062980487860757694">"தேதி &amp; நேரம்"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"நேரமண்டலத்தைத் தேர்வுசெய்க"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"கணக்குகள்"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"இருப்பிடம்"</string>
     <string name="account_settings_title" msgid="626177544686329806">"கணக்குகள்"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"பாதுகாப்பு &amp; இருப்பிடம்"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"என்கிரிப்ஷன் &amp; அனுமதிச் சான்றுகள்"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ஃபோன் என்கிரிப்ட் செய்யப்பட்டது"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"சாதனம் என்கிரிப்ட் செய்யப்பட்டது"</string>
@@ -354,40 +367,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"கைரேகை மூலம் திறக்கலாம்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"கைரேகையைப் பயன்படுத்தவும்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"மொபைலைத் திறக்க, வாங்குவதை அங்கீகரிக்க அல்லது பயன்பாடுகளில் உள்நுழைய, கைரேகை உணர்வியைத் தொட்டால் போதும். யாருடைய கைரேகையைச் சேர்க்கிறீர்கள் என்பதில் கவனமாக இருக்கவும். சேர்க்கப்பட்ட எந்தக் கைரேகையைப் பயன்படுத்தியும் முன்னர் கூறிய எல்லா செயல்களையும் செய்ய முடியும்.\n\nகுறிப்பு: வலிமையான பேட்டர்ன் அல்லது பின்னை விட, கைரேகையானது பாதுகாப்பு குறைவானதாக இருக்கக்கூடும்."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"வாங்குவதை அங்கீகரிக்க அல்லது பயன்பாடுகளில் உள்நுழைய, கைரேகை உணர்வியைத் தொட்டால் போதும். சேர்க்கப்பட்ட ஒரு கைரேகையைப் பயன்படுத்தியும் கூட மேலே குறிப்பிட்ட செயல்களைச் செய்ய முடியும் என்பதால், யாருடைய கைரேகையைச் சேர்க்கிறீர்கள் என்பதில் கவனமாக இருக்கவும்.\n\nகுறிப்பு: இந்தச் சாதனத்தைத் திறக்க, உங்கள் கைரேகையைப் பயன்படுத்த முடியாது. மேலும் தகவலுக்கு, உங்கள் நிறுவனத்தின் நிர்வாகியைத் தொடர்புகொள்ளவும்."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"மொபைலைத் திறக்க, வாங்குவதை அங்கீகரிக்க அல்லது பயன்பாடுகளில் உள்நுழைய, கைரேகை உணர்வியைத் தொட்டால் போதும். சேர்க்கப்பட்ட ஒரு கைரேகையைப் பயன்படுத்தியும் கூட மேலே குறிப்பிட்ட செயல்களைச் செய்ய முடியும் என்பதால், யாருடைய கைரேகையைச் சேர்க்கிறீர்கள் என்பதில் கவனமாக இருக்கவும்.\n\nகுறிப்பு: வலிமையான பேட்டர்ன் அல்லது பின்னை விட, கைரேகையானது பாதுகாப்பு குறைவானதாக இருக்கக்கூடும்."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"மொபைலைத் திறக்க அல்லது வாங்குவதை அங்கீகரிக்க, உங்கள் கைரேகையைப் பயன்படுத்தவும்.\n\n குறிப்பு: இந்தச் சாதனத்தைத் திறக்க, கைரேகையைப் பயன்படுத்த முடியாது. மேலும் தகவலுக்கு, உங்கள் நிறுவனத்தின் நிர்வாகியைத் தொடர்புகொள்ளவும்."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"மொபைலைத் திறக்க அல்லது வாங்குவதை அங்கீகரிக்க, உங்கள் கைரேகையைப் பயன்படுத்தவும்.\nகுறிப்பு: உங்கள் கைரேகையானது வலுவான பேட்டர்ன் அல்லது பின்னை விட குறைந்த பாதுகாப்புடையதாக இருக்கக்கூடும்.\n"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ரத்துசெய்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"தொடரவும்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"தவிர்"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"கைரேகையைச் சேர்"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"சாதனப் பாதுகாப்பு அம்சங்கள் செயல்படுத்தப்படாது. டேப்லெட் தொலைந்துவிட்டாலோ, யாரேனும் திருடிவிட்டாலோ அல்லது அதில் உள்ள தரவை அழித்துவிட்டாலோ, பிறர் இதைப் பயன்படுத்துவதை நீங்கள் தடுக்க முடியாது."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"சாதனப் பாதுகாப்பு அம்சங்கள் செயல்படுத்தப்படாது. சாதனம் தொலைந்துவிட்டாலோ, யாரேனும் திருடிவிட்டாலோ அல்லது அதில் உள்ள தரவை அழித்துவிட்டாலோ, பிறர் இதைப் பயன்படுத்துவதை நீங்கள் தடுக்க முடியாது."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"சாதனப் பாதுகாப்பு அம்சங்கள் செயல்படுத்தப்படாது. ஃபோன் தொலைந்துவிட்டாலோ, யாரேனும் திருடிவிட்டாலோ அல்லது அதில் உள்ள தரவை அழித்துவிட்டாலோ, பிறர் இதைப் பயன்படுத்துவதை நீங்கள் தடுக்க முடியாது."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"சாதனப் பாதுகாப்பு அம்சங்கள் செயல்படுத்தப்படாது. டேப்லெட் தொலைந்துவிட்டாலோ, திருடப்பட்டாலோ, பிறர் இதைப் பயன்படுத்துவதை நீங்கள் தடுக்க முடியாது."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"சாதனப் பாதுகாப்பு அம்சங்கள் செயல்படுத்தப்படாது. சாதனம் தொலைந்துவிட்டாலோ, திருடப்பட்டாலோ பிறர் இதைப் பயன்படுத்துவதை நீங்கள் தடுக்க முடியாது."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"சாதனப் பாதுகாப்பு அம்சங்கள் செயல்படுத்தப்படாது. ஃபோன் தொலைந்துவிட்டாலோ, திருடப்பட்டாலோ, பிறர் இதைப் பயன்படுத்துவதை நீங்கள் தடுக்க முடியாது."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"அடுத்து"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"சாதனப் பாதுகாப்பு அம்சங்களை இயக்க முடியாது. இந்த டேப்லெட்டைத் தொலைத்தாலோ, திருடப்பட்டாலோ அல்லது மீட்டமைத்தாலோ, பிறர் இதைப் பயன்படுத்துவதைத் தடுக்க முடியாது."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"சாதனப் பாதுகாப்பு அம்சங்களை இயக்க முடியாது. இந்தச் சாதனத்தைத் தொலைத்தாலோ, திருடப்பட்டாலோ அல்லது மீட்டமைத்தாலோ, பிறர் இதைப் பயன்படுத்துவதைத் தடுக்க முடியாது."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"சாதனப் பாதுகாப்பு அம்சங்களை இயக்க முடியாது. இந்த மொபைலைத் தொலைத்தாலோ, திருடப்பட்டாலோ அல்லது மீட்டமைத்தாலோ, பிறர் இதைப் பயன்படுத்துவதைத் தடுக்க முடியாது."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"சாதனப் பாதுகாப்பு அம்சங்களை இயக்க முடியாது. இந்த டேப்லெட்டைத் தொலைத்தாலோ அல்லது திருடப்பட்டாலோ, பிறர் இதைப் பயன்படுத்துவதைத் தடுக்க முடியாது."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"சாதனப் பாதுகாப்பு அம்சங்களை இயக்க முடியாது. இந்தச் சாதனத்தைத் தொலைத்தாலோ அல்லது திருடப்பட்டாலோ, பிறர் இதைப் பயன்படுத்துவதைத் தடுக்க முடியாது."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"சாதனப் பாதுகாப்பு அம்சங்களை இயக்க முடியாது. இந்த மொபைலைத் தொலைத்தாலோ அல்லது திருடப்பட்டாலோ, பிறர் இதைப் பயன்படுத்துவதைத் தடுக்க முடியாது."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"பரவாயில்லை, தவிர்"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"முந்தையது"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"உணர்வியைக் கண்டறிக"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"உங்கள் ஃபோனின் பின்புறம் இருக்கும் கைரேகை உணர்வியைக் கண்டறியுங்கள்"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"உணர்வியைத் தொடவும்"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"இது மொபைலின் பின்புறம் இருக்கும். ஆள்காட்டி விரலைப் பயன்படுத்தவும்."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"சாதனத்தில் கைரேகை உணர்வி அமைந்துள்ள இடத்தின் விளக்கப்படம்"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"பெயர்"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"சரி"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"நீக்கு"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"தொடங்குவோம்"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"உணர்வியைத் தொடவும்"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"விரலை உணர்வியில் வைத்து, அதிர்வை உணர்ந்த பின்னர் விரலை எடுக்கவும்"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"தொடரவும்"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"கைரேகையின் வெவ்வேறு பகுதிகளைச் சேர்க்க, விரலை சற்று நகர்த்தவும்"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"கைரேகை சேர்க்கப்பட்டது!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"இந்த ஐகானைப் பார்க்கும்போதெல்லாம், அடையாளப்படுத்தலுக்காக அல்லது வாங்குதலை அங்கீகரிக்க, நீங்கள் கைரேகையைப் பயன்படுத்தலாம்."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"சாதனத்தைச் செயல்படச் செய்து, அதைத் திறக்க, கைரேகை உணர்வியைத் தொட்டால் போதும்."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"இந்த ஐகானைப் பார்க்கும் போது, நீங்கள் வாங்குதல்களை அனுமதிக்கலாம் அல்லது பயன்பாடுகளில் உள்நுழையலாம்."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"விரலை தூக்கி, மீண்டும் தொடுக"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"கைரேகையின் வெவ்வேறு பகுதிகளைச் சேர்க்க, விரலைத் தூக்கவும்"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"கைரேகை சேர்க்கப்பட்டது"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"இந்த ஐகானைப் பார்க்கும் போது, அடையாளப்படுத்தலுக்கு அல்லது வாங்குவதை அங்கீகரிக்க, உங்கள் கைரேகையைப் பயன்படுத்தவும்."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"கைரேகை அமைவைத் தவிர்க்கவா?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"கைரேகையை மட்டும் பயன்படுத்தி மொபைலைத் திறக்கும் முறையைத் தேர்வுசெய்துள்ளீர்கள். இப்போது தவிர்த்தால், இதைப் பின்னர் அமைக்க வேண்டியிருக்கும். அமைவுக்குத் தோராயமாக ஒரு நிமிடம் மட்டுமே எடுக்கும்."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"திரைப் பூட்டை அமை"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"முடிந்தது"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"அச்சச்சோ, அது உணர்வி இல்லை"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"சாதனத்தின் கைரேகை உணர்வியைப் பயன்படுத்தவும்."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"ஆள்காட்டி விரலால், பின்புற உணர்வியை தொடவும்."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"பதிவுசெய்ய முடியவில்லை"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"கைரேகையைப் பதிவுசெய்வதற்கான நேரம் முடிந்தது. மீண்டும் முயற்சிக்கவும்."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"கைரேகையைப் பதிவுசெய்ய முடியவில்லை. மீண்டும் முயற்சிக்கவும் அல்லது வேறு விரலைப் பயன்படுத்தவும்."</string>
@@ -449,6 +460,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"சாதனப் பாதுகாப்பு அம்சங்களைச் செயல்படுத்தினால், உங்கள் அனுமதியின்றி பிறர் இந்தச் சாதனத்தைப் பயன்படுத்த முடியாது. பயன்படுத்த விரும்பும் திரைப் பூட்டைத் தேர்வுசெய்யவும்."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"சாதனப் பாதுகாப்பு அம்சங்களைச் செயல்படுத்தினால், உங்கள் அனுமதியின்றி பிறர் உங்கள் ஃபோனைப் பயன்படுத்த முடியாது. பயன்படுத்த விரும்பும் திரைப் பூட்டைத் தேர்வுசெய்யவும்."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"மாற்றுத் திரைப் பூட்டு முறையைத் தேர்வுசெய்க"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"திரைப் பூட்டு விருப்பங்கள்"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"திரைப் பூட்டு விருப்பங்கள்"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"திரைப் பூட்டு"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / உறக்கத்திற்குப் பின் உடனடியாக"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / உறக்கத்திற்குப் பின் <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g>"</string>
@@ -519,13 +532,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"திறப்பதற்கான வடிவத்தை மாற்று"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"திறக்கும் பின்னை மாற்று"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"திறப்பதற்கான கடவுச்சொல்லை மாற்று"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"மீண்டும் முயலவும். <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> / <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> முயற்சி."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"கடைசி முயற்சி"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"இந்த முயற்சியில் தவறான பணிப் பேட்டர்னை உள்ளிட்டால், உங்கள் பணிச் சுயவிவரமும் தொடர்புடைய தரவும் இந்தச் சாதனத்திலிருந்து அகற்றப்படும்."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"இந்த முயற்சியில் தவறான பணிப் பின்னை உள்ளிட்டால், உங்கள் பணிச் சுயவிவரமும் தொடர்புடைய தரவும் இந்தச் சாதனத்திலிருந்து அகற்றப்படும்."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"இந்த முயற்சியில் தவறான பணிக் கடவுச்சொல்லை உள்ளிட்டால், உங்கள் பணிச் சுயவிவரமும் தொடர்புடைய தரவும் இந்தச் சாதனத்திலிருந்து அகற்றப்படும்."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"அதிகப்படியான தவறான முயற்சிகள். உங்கள் பணி சுயவிவரமும் தொடர்புடைய தரவும் இந்தச் சாதனத்திலிருந்து அகற்றப்படும்."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"நிராகரி"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"மீண்டும் முயலவும். <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> இல் <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> முறை முயன்றுவிட்டீர்கள்."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"உங்கள் தரவு நீக்கப்படும்"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"அடுத்த முறை தவறான பேட்டர்னை வரைந்தால், இந்தச் சாதனங்களின் தரவு நீக்கப்படும்"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"அடுத்த முறை தவறான பின்னை உள்ளிட்டால், இந்தச் சாதனங்களின் தரவு நீக்கப்படும்"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"அடுத்த முறை தவறான கடவுச்சொல்லை உள்ளிட்டால், இந்தச் சாதனங்களின் தரவு நீக்கப்படும்"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"அடுத்த முறை தவறான பேட்டர்னை வரைந்தால், இந்தப் பயனர் நீக்கப்படுவார்"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"அடுத்த முறை தவறான பின்னை வழங்கினால், இந்தப் பயனர் நீக்கப்படுவார்"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"அடுத்த முறை தவறான கடவுச்சொல்லை உள்ளிட்டால், இந்தப் பயனர் நீக்கப்படுவார்"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"அடுத்த முறை தவறான பேட்டர்னை வரைந்தால், உங்கள் பணி விவரமும் அதன் தரவும் நீக்கப்படும்"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"அடுத்த முறை தவறான பின்னை உள்ளிட்டால், உங்கள் பணி விவரமும் அதன் தரவும் நீக்கப்படும்"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"அடுத்த முறை தவறான கடவுச்சொல்லை உள்ளிட்டால், உங்கள் பணி விவரமும் அதன் தரவும் நீக்கப்படும்"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"பலமுறை தவறாக முயன்றதால், இந்தச் சாதனங்களின் தரவு நீக்கப்படும்."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"பலமுறை தவறாக முயன்றதால், இந்தப் பயனர் நீக்கப்படுவார்."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"பலமுறை தவறாக முயன்றதால், இந்தப் பணி விவரமும் அதன் தரவும் நீக்கப்படும்."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"நிராகரி"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"குறைந்தது <xliff:g id="COUNT">%d</xliff:g> எழுத்துகள் இருக்க வேண்டும்"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"பின்னானது குறைந்தது <xliff:g id="COUNT">%d</xliff:g> இலக்கங்கள் இருக்க வேண்டும்"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"தொடர்க"</string>
@@ -626,6 +647,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"மேம்பட்ட புளூடூத்"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"புளூடூத் இயக்கத்தில் இருக்கும்போது, உங்கள் சாதனம் அருகிலுள்ள பிற புளூடூத் சாதனங்களைத் தொடர்புகொள்ளலாம்."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"இருப்பிடத்தைத் துல்லியமாக அறிவதை மேம்படுத்த, முறைமையின் பயன்பாடுகளும் சேவைகளும் புளூடூத் முடக்கத்தில் இருக்கும் போதும் புளூடூத் சாதனங்களைக் கண்டறியும். இதை <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ஸ்கேன் செய்தல் அமைப்புகளில்<xliff:g id="LINK_END_1">LINK_END</xliff:g> மாற்றலாம்."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"இணைக்க முடியவில்லை. மீண்டும் முயலவும்."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"சாதன விவரங்கள்"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"சாதனத்தின் புளூடூத் முகவரி: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"சாதனத்தை அகற்றவா?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"உங்கள் மொபைல் இனி <xliff:g id="DEVICE_NAME">%1$s</xliff:g> உடன் இணைக்கப்பட்டிருக்காது"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"உங்கள் டேப்லெட் இனி <xliff:g id="DEVICE_NAME">%1$s</xliff:g> உடன் இணைக்கப்பட்டிருக்காது"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"உங்கள் சாதனம் இனி <xliff:g id="DEVICE_NAME">%1$s</xliff:g> உடன் இணைக்கப்பட்டிருக்காது"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"சாதனத்தை அகற்று"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"இதனுடன் இணை..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"மீடியா ஆடியோவிலிருந்து <xliff:g id="DEVICE_NAME">%1$s</xliff:g> துண்டிக்கப்படும்."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"ஹாண்ட்ஸ்ஃப்ரீ ஆடியோவிலிருந்து <xliff:g id="DEVICE_NAME">%1$s</xliff:g> இன் தொடர்பு துண்டிக்கப்படும்."</string>
@@ -778,6 +807,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"வழங்காதே"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"சரிபார்க்காதே"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"சான்றிதழ் எதுவும் குறிப்பிடப்படவில்லை. உங்கள் இணைப்பு தனிப்பட்டதாக இருக்காது."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"நெட்வொர்க்கின் பெயர் மிகவும் நீளமாக உள்ளது."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"டொமைனைக் குறிப்பிட வேண்டும்."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS கிடைக்கிறது"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS கிடைக்கிறது)"</string>
@@ -809,7 +839,6 @@
       <item quantity="one">1 நெட்வொர்க்</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"மேம்பட்ட வைஃபை"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"வைஃபையை உள்ளமைத்தல்"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC முகவரி"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP முகவரி"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"சப்நெட் மாஸ்க்"</string>
@@ -846,9 +875,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"இந்தக் குழுவை மறக்கவா?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"போர்ட்டபில் வைஃபை ஹாட்ஸ்பாட்"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"வைஃபை ஹாட்ஸ்பாட்"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"வைஃபை நெட்வொர்க்கை வழங்க மொபைல் இணைப்பைப் பயன்படுத்து"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"ஹாட்ஸ்பாட் மூலம் டேப்லெட்டின் இணைய இணைப்பைப் பகிரவில்லை"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"ஹாட்ஸ்பாட் மூலம் மொபைலின் இணைய இணைப்பைப் பகிரவில்லை"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"பிற சாதனங்களுடன் இணையம் அல்லது உள்ளடக்கத்தைப் பகிரவில்லை"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ஹாட்ஸ்பாட் மூலம் டேப்லெட்டின் இணைய இணைப்பைப் பகிர்கிறது"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ஹாட்ஸ்பாட் மூலம் மொபைலின் இணைய இணைப்பைப் பகிர்கிறது"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"பயன்பாடானது உள்ளடக்கத்தைப் பகிர்கிறது. இணைய இணைப்பைப் பகிர, ஹாட்ஸ்பாட்டை முடக்கி, பின்னர் இயக்கவும்"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"வைஃபையின் பெயர்"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ஐ இயக்குகிறது..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> உடன் பிற சாதனங்களை இணைக்கலாம்"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"வைஃபை கடவுச்சொல்"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP பேண்ட்"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"உங்கள் பிற சாதனங்களுக்கு வைஃபை நெட்வொர்க்கை உருவாக்க, ஹாட்ஸ்பாட்டைப் பயன்படுத்தவும். ஹாட்ஸ்பாட்டானது உங்கள் மொபைல் தரவு இணைப்பைப் பயன்படுத்தி இணையத்தை வழங்கும். கூடுதல் மொபைல் தரவுக் கட்டணங்கள் விதிக்கப்படலாம்."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"அருகிலுள்ள சாதனங்களுடன் உள்ளடக்கத்தைப் பகிர, பயன்பாடுகள் ஹாட்ஸ்பாட்டையும் உருவாக்கலாம்."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"ஹாட்ஸ்பாட்டை இயக்குகிறது…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"ஹாட்ஸ்பாட்டை முடக்குகிறது…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> செயலில் உள்ளது"</string>
@@ -895,6 +932,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"வைஃபை அழைப்பு இயக்கத்தில் இருக்கும் போது, முன்னுரிமை மற்றும் வலிமையாக இருக்கிற சிக்னலைப் பொறுத்து வைஃபை நெட்வொர்க்குகள் அல்லது மொபைல் நிறுவன நெட்வொர்க்குக்கு அழைப்புகளை உங்கள் ஃபோன் திசைதிருப்பும். இந்த அம்சத்தை இயக்குவதற்கு முன், கட்டணங்கள் மற்றும் பிற விவரங்கள் குறித்து உங்கள் மொபைல் நிறுவனத்திடமிருந்து தெரிந்துகொள்ளவும்."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"எமர்ஜென்சி முகவரியை மாற்று"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"வைஃபையைப் பயன்படுத்தி 911 என்ற எண்ணிற்கு அழைத்தால், அவசர சேவைகள் உங்கள் இருப்பிடத்தை முகவரியாகப் பயன்படுத்தும்"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"தோற்றம்"</string>
@@ -952,6 +990,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"முடிவுகள் இல்லை"</string>
     <string name="display_settings" msgid="7965901687241669598">"தோற்றம்"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"திரையைத் தானாகச் சுழற்று"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"ஒளிமிக்க நிறங்கள்"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"டேப்லெட்டைச் சுழற்றும்போது திசையமைவையும் தானாக மாற்று"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"மொபைலைச் சுழற்றும்போது திசையமைவைத் தானாக மாற்று"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"டேப்லெட்டைச் சுழற்றும்போது திசையமைவையும் தானாக மாற்று"</string>
@@ -979,23 +1018,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"கிடைக்கும் ஒளிக்கேற்ப ஒளிர்வை மேம்படுத்து. இதை இயக்கியிருந்தால், தற்காலிகமாக ஒளிர்வைச் சரிசெய்யலாம்."</string>
     <string name="night_display_title" msgid="2626451512200357686">"இரவு ஒளி"</string>
     <string name="night_display_text" msgid="1837277457033025056">"இரவு ஒளி அம்சமானது உங்கள் திரையை மஞ்சளும் ஆரஞ்சும் கலந்த நிறத்திற்கு மாற்றும். இது மங்கலான ஒளியில் திரையைப் பார்ப்பதை அல்லது படிப்பதை எளிதாக்குவதோடு, விரைவாக உறங்க உதவக்கூடும்."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"திட்ட அட்டவணை"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"நிலை"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"தானாகவே இயக்கு"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"ஒருபோதும் வேண்டாம்"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"தனிப்பயன் திட்ட அட்டவணை"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"சூரிய அஸ்தமனம் - சூரிய உதயம்"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"திட்டமிடு"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"ஏதுமில்லை"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"தனிப்பயன் நேரத்தில் இயக்கும்"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"இயக்கும்: சூரிய அஸ்தமனம் - உதயம்"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"தொடக்க நேரம்"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"முடிவு நேரம்"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"நிலை"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"ஒளிச்செறிவு"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"முடக்கத்தில் உள்ளது. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"ஒருபோதும் தானாக இயக்கப்படாது."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g>க்குத் தானாக இயக்கப்படும்."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"சூரிய அஸ்தமனத்தின் போது தானாக இயக்கப்படும்."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"இயக்கத்தில் உள்ளது. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"ஒருபோதும் தானாக முடக்கப்படாது."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g>க்குத் தானாக முடக்கப்படும்."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"சூரிய உதயத்தின் போது தானாக முடக்கப்படும்."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"முடக்கத்தில் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"ஒருபோதும் தானாக இயக்கப்படாது"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g>க்குத் தானாக இயக்கப்படும்"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"சூரிய அஸ்தமனத்தின் போது தானாக இயக்கப்படும்"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"இயக்கத்தில் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"ஒருபோதும் தானாக முடக்கப்படாது"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g>க்குத் தானாக முடக்கப்படும்"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"சூரிய உதயத்தின் போது தானாக முடக்கப்படும்"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"உறக்கநிலையிலிரு"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"திரை முடக்கப்படும்"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> செயல்படாமல் இருப்பின்"</string>
@@ -1019,8 +1057,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"அமைப்பு"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"தானாக ஒளிர்வைச் சரிசெய்தல்"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"விரலை எடுக்கும் போது இயங்கு"</string>
-    <string name="doze_title" msgid="2259176504273878294">"சூழல்சார் திரை"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"சூழல்சார் திரை"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"எப்போதும் இயக்கத்தில் வை"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"புதிய அறிவிப்புகள்"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"காட்டுவதற்கான நேரம்"</string>
+    <string name="doze_title" msgid="2375510714460456687">"புதிய அறிவிப்புகள்"</string>
     <string name="doze_summary" msgid="3846219936142814032">"அறிவிப்புகளைப் பெறும் போது திரையை இயக்கு"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"எப்போதும் இயக்கத்தில் வை"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"நேரம், அறிவிப்பு ஐகான்கள் மற்றும் பிற தகவலைக் காட்டும்"</string>
     <string name="title_font_size" msgid="4405544325522105222">"எழுத்துரு அளவு"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"உரையைப் பெரிதாக்கும் அல்லது சிறிதாக்கும்"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"சிம் கார்டின் பூட்டு அமைப்பு"</string>
@@ -1272,6 +1316,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN வெறுமையாக இருக்கக்கூடாது."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC புலத்தில் 3 இலக்கங்களாவது இருக்க வேண்டும்."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC புலம் கண்டிப்பாக 2 அல்லது 3 இலக்கங்களில் இருக்க வேண்டும்."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"%s வகை APNகளைச் சேர்க்க, தொலைத்தொடர்பு நிறுவனம் அனுமதிக்கவில்லை."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"இயல்புநிலை APN அமைப்புகளை மீட்டமைக்கிறது."</string>
     <string name="menu_restore" msgid="8260067415075573273">"இயல்புநிலைக்கு மீட்டமை"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"இயல்புநிலை APN அமைப்புகளை மீட்டமைப்பது முடிந்தது."</string>
@@ -1301,6 +1346,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD கார்டை அழி"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"இசை அல்லது படங்கள் போன்று அக USB சேமிப்பிடத்தில் உள்ள எல்லா தரவையும் அழி"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"இசை அல்லது படங்கள் போன்று SD கார்டில் உள்ள எல்லா தரவையும் அழி"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"இ-சிம்களை அழி"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"மொபைலில் உள்ள எல்லா இ-சிம்களும் அழிக்கப்படும். ஆனால், உங்கள் மொபைல் சேவைத் திட்டம் ரத்துசெய்யப்படாது."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"டேப்லெட்டில் உள்ள எல்லா இ-சிம்களும் அழிக்கப்படும். ஆனால், உங்கள் மொபைல் சேவைத் திட்டம் ரத்துசெய்யப்படாது."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"டேப்லெட்டை மீட்டமை"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"மொபைலை மீட்டமை"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"உங்களின் தனிப்பட்ட தகவல், பதிவிறக்கிய பயன்பாடுகள் எல்லாவற்றையும் அழிக்கவா? இதைச் செயல்தவிர்க்க முடியாது!"</string>
@@ -1323,26 +1371,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"தரவு சேமிப்பான் இயக்கப்பட்டிருக்கும் போது, இணைக்கவோ போர்ட்டபிள் ஹாட்ஸ்பாட்டுகளைப் பயன்படுத்தவோ முடியாது"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB டெதெரிங்"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB இணைக்கப்பட்டது, இணைக்க தேர்வுசெய்க"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"இணைக்கப்பட்டது"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USB சேமிப்பிடம் பயன்பாட்டில் இருக்கும்போது இணைப்பை அகற்ற முடியாது"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB இணைக்கப்படவில்லை"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"இயக்க இணைக்கவும்"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB டெதெரிங் பிழை"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"USB மூலம் மொபைலின் இணைய இணைப்பைப் பகிர்"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"USB மூலம் டேப்லெட்டின் இணைய இணைப்பைப் பகிர்"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"புளூடூத் டெதெரிங்"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"புளூடூத் மூலம் டேப்லெட்டின் இணைய இணைப்பை பகிர்கிறது"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"புளூடூத் மூலம் மொபைலின் இணைய இணைப்பைப் பகிர்கிறது"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"புளூடூத் மூலம் டேப்லெட்டின் இணைய இணைப்பை 1 சாதனத்துடன் பகிர்கிறது"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"புளூடூத் மூலம் மொபைலின் இணைய இணைப்பை 1 சாதனத்துடன் பகிர்கிறது"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"புளூடூத் மூலம் டேப்லெட்டின் இணைய இணைப்பை <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> சாதனங்களுடன் பகிர்கிறது"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"புளூடூத் மூலம் மொபைலின் இணைய இணைப்பை <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> சாதனங்களுடன் பகிர்கிறது"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"புளூடூத் மூலம் டேப்லெட்டின் இணைய இணைப்பைப் பகிர்"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"புளூடூத் மூலம் மொபைலின் இணைய இணைப்பைப் பகிர்"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"புளூடூத் மூலம் <xliff:g id="DEVICE_NAME">%1$d</xliff:g> இன் இணைய இணைப்பைப் பகிரவில்லை"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"புளூடூத் மூலம் டேப்லெட்டின் இணைய இணைப்பை பகிரவில்லை"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"புளூடூத் மூலம் மொபைலின் இணைய இணைப்பைப் பகிரவில்லை"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"இணைக்கப்படவில்லை"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> சாதனங்களுக்கு மேல் இணைக்க முடியாது."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> இன் இணைப்புமுறை நீக்கப்படும்."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"மொபைல் தரவு இணைப்பு வழியாக பிற சாதனங்களுக்கு இணையத்தை வழங்க, ஹாட்ஸ்பாட் மற்றும் இணைப்பு முறையைப் பயன்படுத்தவும்."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"மொபைல் தரவு இணைப்பு மூலமாக, பிற சாதனங்களுக்கு இணைப்பை வழங்க, ஹாட்ஸ்பாட்டையும் இணைப்பு முறையையும் பயன்படுத்தவும். அருகிலுள்ள சாதனங்களுடன் உள்ளடக்கத்தைப் பகிர, பயன்பாடுகள் ஹாட்ஸ்பாட்டையும் உருவாக்கலாம்."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"உதவி"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"மொபைல் நெட்வொர்க்"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"மொபைல் திட்டம்"</string>
@@ -1375,7 +1412,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"இருப்பிடப் பயன்முறை"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"இருப்பிடத்தைக் கண்டறிய GPS, வைஃபை, புளூடூத் அல்லது மொபைல் நெட்வொர்க்குகளைப் பயன்படுத்தும்"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"இருப்பிடத்தைக் கண்டறிய வைஃபை, புளூடூத் அல்லது மொபைல் நெட்வொர்க்குகளைப் பயன்படுத்தும்"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"இருப்பிடத்தைக் கண்டறிய, GPSஐப் பயன்படுத்தவும்"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"இருப்பிடத்தைக் கண்டறிய, GPS மற்றும் சாதன உணர்விகளைப் பயன்படுத்து"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"ஸ்கேன் செய்தல்"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"வைஃபை ஸ்கேன் செய்தல்"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"முறைமையின் பயன்பாடுகளும் சேவைகளும் எந்த நேரத்திலும் வைஃபை நெட்வொர்க்குகளைக் கண்டறிய அனுமதிப்பதன் மூலம், இருப்பிட அறிதலை மேம்படுத்தவும்."</string>
@@ -1420,8 +1457,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"உங்களுக்குத் தரவு இணைப்பு இல்லை. இப்போது இந்தத் தகவலைப் பார்க்க இணையத்துடன் இணைக்கப்பட்ட எந்தக் கணினியிலிருந்தும் %s க்குச் செல்லவும்."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ஏற்றுகிறது..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"உங்கள் கடவுச்சொல்லைத் தேர்வுசெய்க"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"கைரேகைக்கு, கடவுச்சொல்லை அமை"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"உங்கள் வடிவத்தைத் தேர்வுசெய்யவும்"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"கைரேகைக்கு, பேட்டர்னை அமை"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"உங்கள் பின் ஐத் தேர்வுசெய்யவும்"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"கைரேகைக்கு, பின்னை அமை"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"உங்கள் கடவுச்சொல்லை உறுதிப்படுத்தவும்"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"உங்கள் வடிவத்தை உறுதிப்படுத்தவும்"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"உங்கள் பின்னை உறுதிசெய்யவும்"</string>
@@ -1490,6 +1530,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"பயன்பாட்டு அமைப்பு"</string>
     <string name="install_applications" msgid="4872012136210802181">"அறியப்படாத மூலங்கள்"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"எல்லா பயன்பாட்டு ஆதாரங்களையும் அனுமதி"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"சமீபத்தில் திறந்த பயன்பாடுகள்"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"<xliff:g id="COUNT">%1$d</xliff:g> பயன்பாடுகளையும் பார்க்கவும்"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> முன்பு"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"அறியப்படாத பயன்பாடுகளால் உங்கள் டேப்லெட்டும் தனிப்பட்ட தரவும் அதிகம் பாதிப்பிற்கு உள்ளாகும். இந்த மூலத்திலிருந்து பயன்பாடுகளை நிறுவுவதால், அவற்றைப் பயன்படுத்தும் போது உங்கள் டேப்லெட்டுக்கு ஏதேனும் சேதம் ஏற்பட்டாலோ அல்லது தரவை இழந்தாலோ, அதற்கு நீங்கள்தான் பொறுப்பாவீர்கள் என்பதை ஏற்கிறீர்கள்."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"அறியப்படாத பயன்பாடுககளால் உங்கள் மொபைலும் தனிப்பட்ட தரவும் அதிகம் பாதிப்பிற்கு உள்ளாகும். இந்த மூலத்திலிருந்து பயன்பாடுகளை நிறுவுவதால், அவற்றைப் பயன்படுத்தும் போது உங்கள் மொபைலுக்கு ஏதேனும் சேதம் ஏற்பட்டாலோ அல்லது தரவை இழந்தாலோ, அதற்கு நீங்கள்தான் பொறுப்பாவீர்கள் என்பதை ஏற்கிறீர்கள்."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"மேம்பட்ட அமைப்பு"</string>
@@ -1658,6 +1701,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"அமைப்பின் சேவையை நிறுத்தவா?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"இந்தச் சேவையை நீங்கள் நிறுத்தினால், உங்கள் டேப்லெட்டை முடக்கி மீண்டும் இயக்கும் வரை அதன் சில அம்சங்கள் சரியாக வேலைசெய்வதை நிறுத்திவிடும்."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"இந்தச் சேவையை நீங்கள் நிறுத்தினால், உங்கள் மொபைலை ஸ்விட்ச் ஆஃப் செய்து ஸ்டார்ட் செய்யும் வரை அதன் அம்சங்களில் சில வேலைசெய்யாமல் போகலாம்."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"மொழிகள், உள்ளீடு &amp; சைகைகள்"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"மொழிகள் &amp; உள்ளீடு"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"மொழிகள் &amp; உள்ளீடு"</string>
     <string name="input_assistance" msgid="7577795275222555487">"உள்ளிடுவதற்கான உதவி"</string>
@@ -1872,6 +1919,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> அச்சிடல் சேவைகள் இயக்கத்தில் உள்ளன</item>
       <item quantity="one">1 அச்சிடல் சேவை இயக்கத்தில் உள்ளது</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> அச்சுப் பணிகள்</item>
+      <item quantity="one">1 அச்சுப் பணி</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"அச்சுப் பொறிகள்"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"சேவைகள் எதுவும் நிறுவப்படவில்லை"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"அச்சுப்பொறிகள் எதுவுமில்லை"</string>
@@ -1938,6 +1989,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"விவரங்களைப் பயன்படுத்து"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"ஆற்றல் பயன்பாட்டைச் சரிசெய்க"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"உள்ளடங்கும் தொகுப்புகள்"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"பேட்டரியை அதிகமாகப் பயன்படுத்தும் பயன்பாடுகள்"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"சாதனத்தைச் செயல்பாட்டில் வைத்திருக்கிறது"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"பின்னணியில் சாதனத்தை எழுப்புகிறது"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"இருப்பிடத்தை அடிக்கடிக் கோருகிறது"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> பயன்பாடுகள், வழக்கத்திற்கு மாறாகச் செயல்படுகின்றன"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"பயன்பாட்டை நிறுத்தவா?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"<xliff:g id="APP">%1$s</xliff:g> உங்கள் மொபைலைத் தொடர்ந்து செயல்பாட்டில் வைப்பதால், மொபைலால் எப்போதும் போல் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலைத் தீர்க்க, பயன்பாட்டை உடனடியாக நிறுத்தலாம்.\n\nதொடர்ந்து சிக்கல் ஏற்பட்டால், பேட்டரிச் செயல்திறனை மேம்படுத்த, பயன்பாட்டை நிறுவல்நீக்க வேண்டியிருக்கும்."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"<xliff:g id="APP">%1$s</xliff:g> உங்கள் டேப்லெட்டைத் தொடர்ந்து செயல்பாட்டில் வைப்பதால், டேப்லெட்டால் எப்போதும் போல் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலைத் தீர்க்க, பயன்பாட்டை உடனடியாக நிறுத்தலாம்.\n\nதொடர்ந்து சிக்கல் ஏற்பட்டால், பேட்டரிச் செயல்திறனை மேம்படுத்த, பயன்பாட்டை நிறுவல்நீக்க வேண்டியிருக்கும்."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"<xliff:g id="APP">%1$s</xliff:g> உங்கள் சாதனத்தைத் தொடர்ந்து செயல்பாட்டில் வைப்பதால், சாதனத்தால் எப்போதும் போல் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலைத் தீர்க்க, பயன்பாட்டை உடனடியாக நிறுத்தலாம்.\n\nதொடர்ந்து சிக்கல் ஏற்பட்டால், பேட்டரிச் செயல்திறனை மேம்படுத்த, பயன்பாட்டை நிறுவல்நீக்க வேண்டியிருக்கும்."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"பயன்பாட்டை நிறுத்து"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"பின்னணி உபயோகத்தை முடக்கவா?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"<xliff:g id="APP">%1$s</xliff:g> உங்கள் மொபைலைத் தொடர்ந்து செயல்பாட்டில் வைத்திருக்கும் என்பதால், மொபைலால் எப்போதும் போல் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலுக்குத் தீர்வு காண, பின்னணியில் இந்தப் பயன்பாடு இயங்குவதைத் தடுக்கலாம்."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"<xliff:g id="APP">%1$s</xliff:g> உங்கள் டேப்லெட்டைத் தொடர்ந்து செயல்பாட்டில் வைத்திருக்கும் என்பதால், டேப்லெட்டால் எப்போதும் போல் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலுக்குத் தீர்வு காண, பின்னணியில் இந்தப் பயன்பாடு இயங்குவதைத் தடுக்கலாம்."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"<xliff:g id="APP">%1$s</xliff:g> உங்கள் சாதனத்தைத் தொடர்ந்து செயல்பாட்டில் வைத்திருக்கும் என்பதால், சாதனத்தால் எப்போதும் போல் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலுக்குத் தீர்வு காண, பின்னணியில் இந்தப் பயன்பாடு இயங்குவதைத் தடுக்கலாம்."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"முடக்கு"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"இருப்பிடத்தை முடக்கவா?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"<xliff:g id="APP">%1$s</xliff:g>ஐப் பயன்படுத்தாத போதும், அது உங்கள் இருப்பிடத்தை அடிக்கடிக் கோருவதால், மொபைலால் எப்போதும் போல் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலைத் தீர்க்க, இந்தப் பயன்பாட்டிற்கு இருப்பிடத்தை முடக்கலாம்."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"<xliff:g id="APP">%1$s</xliff:g>ஐப் பயன்படுத்தாத போதும், அது உங்கள் இருப்பிடத்தை அடிக்கடிக் கோருவதால், டேப்லெட்டால் எப்போதும் போல் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலைத் தீர்க்க, இந்தப் பயன்பாட்டிற்கு இருப்பிடத்தை முடக்கலாம்."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"<xliff:g id="APP">%1$s</xliff:g>ஐப் பயன்படுத்தாத போதும், அது உங்கள் இருப்பிடத்தை அடிக்கடிக் கோருவதால், சாதனத்தால் எப்போதும் போல் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலைத் தீர்க்க, இந்தப் பயன்பாட்டிற்கு இருப்பிடத்தை முடக்கலாம்."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"முடக்கு"</string>
     <string name="power_screen" msgid="3023346080675904613">"திரை"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"டார்ச் லைட்"</string>
     <string name="power_camera" msgid="4976286950934622605">"கேமரா"</string>
@@ -1952,7 +2023,7 @@
     <string name="power_apps" msgid="2043554781293951327">"பயன்பாடுகள்"</string>
     <string name="power_service" msgid="1599661212370831780">"சேவைகள்"</string>
     <string name="power_system" msgid="8290455327965307383">"சாதனம்"</string>
-    <string name="power_user" msgid="1889728099253018005">"பயனர்"</string>
+    <string name="power_user" msgid="3706143225319881667">"பிற பயனர்கள்"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU மொத்தம்"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU முன்புறம்"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"எப்போதும் விழிப்பில்"</string>
@@ -2004,6 +2075,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ஆற்றல் பயன்பாடு அதிகமாகப் பயன்படுத்தப்பட்டது"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>க்குப் பயன்படுத்தியது"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"<xliff:g id="TIME">^1</xliff:g>க்குச் செயல்பாட்டில் இருந்தது"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"திரை உபயோகம்: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> பயன்படுத்துவது: <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"ஒட்டுமொத்த பேட்டரியில் <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2563,7 +2635,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"பின்னை மாற்று"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"அறிவிப்புகளைக் காட்டு"</string>
     <string name="help_label" msgid="6886837949306318591">"உதவி &amp; கருத்து"</string>
-    <string name="support_summary" msgid="8276116616493882830">"உதவிக் கட்டுரைகள், மொபைல் &amp; அரட்டை ஆதரவு"</string>
+    <string name="support_summary" msgid="2705726826263742491">"உதவிக் கட்டுரைகள், மொபைல் &amp; அரட்டை, தொடங்குதல்"</string>
     <string name="user_account_title" msgid="1127193807312271167">"உள்ளடக்கத்திற்கான கணக்கு"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"பட ஐடி"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"அதீத அச்சுறுத்தல்கள்"</string>
@@ -2653,9 +2725,12 @@
       <item quantity="one">மறைந்துள்ள %d உருப்படியைக் காட்டு</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"நெட்வொர்க் &amp; இணையம்"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"வைஃபை, மொபைல், தரவு உபயோகம், ஹாட்ஸ்பாட்"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"மொபைல்"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"தரவு உபயோகம்"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ஹாட்ஸ்பாட்"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"இணைத்த சாதனங்கள்"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"புளூடூத், Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"புளூடூத், அனுப்புதல்"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"பயன்பாடுகள் &amp; அறிவிப்புகள்"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"அனுமதிகள், இயல்புப் பயன்பாடுகள்"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"பயனர்களும் கணக்குகளும்"</string>
@@ -2708,6 +2783,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"சைகை"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"கட்டணம் செலுத்தவும், தட்டவும், கட்டணம் செலுத்துதல்"</string>
     <string name="keywords_backup" msgid="470070289135403022">"காப்புப்பிரதி, காப்புப் பிரதி"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"சைகை, முனை, பக்கம், செயலில் உள்ள முனை, அழுத்து, பிடி, உதவி, அசிஸ்டண்ட், அழுத்தத்தக்கது, ஸ்கூஜி, அழுத்துக, அழுத்துதல், ok google, google அசிஸ்டண்ட்"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"சைகை, எழுப்பு, அறிவிப்புகள், திரை, காட்சி, திரை அணைக்கப்பட்டது, திரை இயக்கப்பட்டது, அழுத்து, முனை, உறக்கநிலையில், உறக்கநிலையிலிரு, பிடி"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"சைகை, நிசப்தம், உறக்கநிலை, அலாரம், உள்வரும் அழைப்பு, அமைதி, காட்சி, பூட்டுத் திரை, அழுத்து, பிடி, முனை, நிறுத்து"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"வைஃபை NFC குறியை அமை"</string>
     <string name="write_tag" msgid="8571858602896222537">"எழுது"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"எழுத, குறியைத் தட்டவும்..."</string>
@@ -2790,7 +2868,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"ஒருபோதும் பணி அறிவிப்புகளைக் காட்டாதே"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"சாதனம் பூட்டப்பட்டிருக்கும் போது, சுயவிவர அறிவிப்புகளை எப்படிக் காட்ட வேண்டும்?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"சுயவிவர அறிவிப்புகள்"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"அறிவிப்புகள்"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"அறிவிப்புகள்"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"பயன்பாடு அறிவிப்புகள்"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"அறிவிப்பு வகை"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"முக்கியத்துவம்"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"பயன்பாடு முடிவு செய்யட்டும்"</string>
@@ -2805,6 +2884,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"மிக அதிக முக்கியத்துவம்"</string>
     <string name="allow_sound" msgid="1820188704793497324">"ஒலியை அனுமதிக்கவும்"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"இந்த அறிவிப்புகளை நடப்புத் திரையில் காட்டும் போது ஒலி, அதிர்வை ஏற்படுத்தாது அல்லது திரையின் மேல் பகுதியில் காட்டாது."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"குறைவான முக்கியத்துவம்"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"நடுத்தர முக்கியத்துவம்"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"அதிக முக்கியத்துவம்"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"மிக அதிக முக்கியத்துவம்"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"அறிவிப்பு உதவி"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"அறிவிப்பு அணுகல்"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"பணி விவர அறிவிப்புகளுக்கான அணுகல் தடுக்கப்பட்டுள்ளது"</string>
@@ -2832,8 +2915,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"பிக்ச்சர் இன் பிக்ச்சர்"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"பிக்ச்சர் இன் பிக்ச்சரை அனுமதி"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"பயன்பாடு திறந்திருக்கும் போது அல்லது அதிலிருந்து வெளியேறும் போது (எடுத்துக்காட்டாக, வீடியோவைத் தொடர்ந்து பார்க்க), பிக்ச்சர் இன் பிக்ச்சர் சாளரத்தை உருவாக்க, இந்தப் பயன்பாட்டை அனுமதிக்கும். இந்தச் சாளரம் நீங்கள் பயன்படுத்தும் பிற பயன்பாடுகளின் மேல் காட்டப்படும்."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"ஆம்"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"வேண்டாம்"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"தொந்தரவு செய்ய வேண்டாம் என்பதன் அணுகல்"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"தொந்தரவு செய்ய வேண்டாம் என்பதன் அணுகலை நிறுவப்பட்ட பயன்பாடுகள் எதுவும் கோரவில்லை"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"பயன்பாடுகளை ஏற்றுகிறது..."</string>
@@ -2964,11 +3045,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"இந்தப் பணி சுயவிவரத்தை நிர்வகிப்பது:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"நிர்வகிப்பது: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(சோதனை முயற்சி)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"சாதனச் சுழற்சி"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"திரை உள்ளடக்கத்தைச் சுழற்று"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"நீளவாக்கில் வை"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"அகலவாக்கில் வை"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"தற்போதைய திசையமைப்பில் வை"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"பாதுகாப்பான தொடக்கம்"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"தொடர்"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"இந்தச் சாதனத்தைத் துவக்கும் முன், பின் தேவைப்படுமாறு அமைத்து, மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும் வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஇந்த அம்சம், தொலைந்த அல்லது திருடப்பட்ட சாதனங்களில் தரவைப் பாதுகாக்க உதவும். சாதனத்தைத் தொடங்கும் போது, பின்னைக் கேட்பதை அமைக்கவா?"</string>
@@ -2976,7 +3052,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"இந்தச் சாதனத்தைத் துவக்கும் முன், கடவுச்சொல் தேவைப்படுமாறு அமைத்து, மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும் வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஇந்த அம்சம், தொலைந்த அல்லது திருடப்பட்ட சாதனங்களில் தரவைப் பாதுகாக்க உதவும். சாதனத்தைத் தொடங்கும் போது, கடவுச்சொல்லைக் கேட்பதை அமைக்கவா?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"சாதனத்தைத் திறக்க உங்கள் கைரேகையைப் பயன்படுத்துவதுடன் சேர்த்து, இந்தச் சாதனத்தைத் துவக்கும் முன், பின் தேவைப்படுமாறு அமைத்து, மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும் வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஇந்த அம்சம், தொலைந்த அல்லது திருடப்பட்ட சாதனங்களில் தரவைப் பாதுகாக்க உதவும். சாதனத்தைத் தொடங்கும் போது, பின்னைக் கேட்பதை அமைக்கவா?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"சாதனத்தைத் திறக்க உங்கள் கைரேகையைப் பயன்படுத்துவதுடன் சேர்த்து, இந்தச் சாதனத்தைத் துவக்கும் முன், பேட்டர்ன் தேவைப்படுமாறு அமைத்து, மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும் வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஇந்த அம்சம், தொலைந்த அல்லது திருடப்பட்ட சாதனங்களில் தரவைப் பாதுகாக்க உதவும். சாதனத்தைத் தொடங்கும் போது, பேட்டர்னைக் கேட்பதை அமைக்கவா?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"சாதனத்தைத் திறக்க உங்கள் கைரேகையைப் பயன்படுத்துவதுடன் சேர்த்து, இந்தச் சாதனத்தைத் துவக்கும் முன், கடவுச்சொல் தேவைப்படுமாறு அமைத்து, மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும் வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஇந்த அம்சம், தொலைந்த அல்லது திருடப்பட்ட சாதனங்களில் தரவைப் பாதுகாக்க உதவும். சாதனத்தைத் தொடங்கும் போது, கடவுச்சொல்லைக் கேட்பதை அமைக்க&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"சாதனத்தைத் திறக்க உங்கள் கைரேகையைப் பயன்படுத்துவதுடன் சேர்த்து, இந்தச் சாதனத்தைத் தொடங்கும் முன், கடவுச்சொல் கேட்குமாறு அமைத்து, மேலும் பாதுகாக்கலாம். சாதனம் தொடங்கும் வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஇந்த அம்சம், தொலைந்த அல்லது திருடப்பட்ட சாதனங்களில் தரவைப் பாதுகாக்க உதவும். சாதனத்தைத் தொடங்கும் போது, கடவுச்சொல்லைக் கேட்பதை அமைக்கவா?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"ஆம்"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"வேண்டாம்"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"பின் தேவையா?"</string>
@@ -3094,6 +3170,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"உபயோகம் குறித்த எச்சரிக்கைகள்"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"சாதனத்தின் முழு உபயோகத்தைக் காட்டு"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"பயன்பாட்டின் உபயோகத்தை காட்டு"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"அதிக உபயோகம்"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other">வழக்கத்திற்கு மாறாக <xliff:g id="NUMBER">%2$d</xliff:g> பயன்பாடுகள் செயல்படுகின்றன</item>
+      <item quantity="one">வழக்கத்திற்கு மாறாக <xliff:g id="APP">%1$s</xliff:g> செயல்படுகிறது</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">பேட்டரியை அதிகமாகப் பயன்படுத்தும் பயன்பாடுகள்</item>
+      <item quantity="one">பேட்டரியை அதிகமாகப் பயன்படுத்தும் <xliff:g id="APP">%1$s</xliff:g> பயன்பாடு</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"மேம்படுத்தப்படாதவை"</string>
     <string name="high_power_on" msgid="6216293998227583810">"மேம்படுத்தப்படாதது"</string>
     <string name="high_power_off" msgid="3393904131961263278">"பேட்டரி உபயோகத்தை மேம்படுத்தும்"</string>
@@ -3186,8 +3271,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"பிற பயன்பாடுகளின் மேலே காட்டு"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"பிற பயன்பாடுகளின் மேலே காட்டுவதற்கு <xliff:g id="COUNT_1">%2$d</xliff:g> இல் <xliff:g id="COUNT_0">%1$d</xliff:g> பயன்பாடுகள் அனுமதிக்கப்பட்டுள்ளன"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"அனுமதி பெற்ற பயன்பாடுகள்"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"அனுமதிக்கப்பட்டது"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"அனுமதிக்கப்படவில்லை"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"அனுமதிக்கப்பட்டது"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"அனுமதிக்கப்படவில்லை"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"நிறுவு பயன்பாடுகள் அறியப்படாத மூலங்கள்"</string>
     <string name="write_settings" msgid="4797457275727195681">"முறைமை அமைப்புகளை மாற்று"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"முறைமை அமைப்புகளை எழுது மாற்று"</string>
@@ -3277,6 +3362,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"மென்னிற மஞ்சளும் ஆரஞ்சும் கலந்த நிறத்தில் திரை இருப்பது நீங்கள் உறங்குவதற்கு உதவக்கூடும்."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"பரிந்துரைகள்"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+மேலும் <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> பரிந்துரைகள்</item>
+      <item quantity="one">1 பரிந்துரை</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> பரிந்துரைகள்</item>
+      <item quantity="one">+1 பரிந்துரை</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"அகற்று"</string>
     <string name="color_temperature" msgid="2070126836910615605">"நீல நிற வெப்பநிலை"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"நீல வண்ணங்களைத் திரைக்குப் பயன்படுத்து"</string>
@@ -3295,8 +3389,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> தரவு எச்சரிக்கை"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> தரவு எச்சரிக்கை / <xliff:g id="ID_2">%2$s</xliff:g> தரவு வரம்பு"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"பில்லிங் சுழற்சி"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"மாதாந்திரச் சுழற்சி தொடங்கும் தேதி: ஒவ்வொரு மாதத்தின் <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"மாதந்தோறும் தொடங்கும் தேதி: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"மாதந்தோறும், <xliff:g id="ID_1">%1$s</xliff:g>வது நாள்"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"நெட்வொர்க் கட்டுப்பாடுகள்"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> கட்டுப்பாடுகள்</item>
@@ -3316,7 +3409,7 @@
       <item quantity="one">தரவு சேமிப்பான் இயக்கப்பட்டிருக்கும் போது, வரம்பற்ற தரவைப் பயன்படுத்த 1 பயன்பாடு அனுமதிக்கப்பட்டது</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"தரவுச் சேமிப்பான்"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"வரம்பற்ற தரவு அணுகல்"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"வரம்பற்ற தரவு"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"பின்புலத் தரவு முடக்கப்பட்டது"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"இயக்கத்தில்"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"முடக்கத்தில்"</string>
@@ -3380,8 +3473,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"பூட்டு திரை அறிவிப்புகளை கட்டுப்படுத்து"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"அறிவிப்பு உள்ளடக்கத்தைக் காட்டும் அல்லது மறைக்கும்"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"எல்லாம்"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"ஆதரவு"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"ஆதரவு &amp; டிப்ஸ்"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"மிகக் குறைந்த அகலம்"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"பிரீமிய SMS அணுகலைக் கோரும் பயன்பாடுகள் எதுவும் நிறுவப்படவில்லை"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"பிரீமிய SMSக்குக் கட்டணம் விதிக்கப்படலாம், அது மொபைல் நிறுவன பில்களில் சேர்க்கப்படும். பயன்பாட்டிற்கான அனுமதியை இயக்கினால், அந்தப் பயன்பாட்டைப் பயன்படுத்தி பிரீமிய SMSஐ அனுப்ப முடியும்."</string>
@@ -3446,28 +3538,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"தானியங்கு"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"கைமுறை"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"இப்போதே இடத்தைக் காலியாக்கு"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"சைகைகள்"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"சைகைக் குறுக்குவழிகள்"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"உங்கள் மொபைலைக் கட்டுப்படுத்துவதற்கான உடனடி சைகைகள்"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"டேப்லெட்டைக் கட்டுப்படுத்துவதற்கான உடனடி சைகைகள்"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"சாதனத்தைக் கட்டுப்படுத்துவதற்கான உடனடி சைகைகள்"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"கேமராவிற்கு மாறவும்"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"கேமராவை விரைவாகத் திறக்க, பவர் பொத்தானை இருமுறை அழுத்தவும். எந்தத் திரையிலும் கேமரா இயங்கும்."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"கேமராவை உடனடியாகத் திறக்கவும்"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"கேமராவைத் திறக்க, பவர் பொத்தானை இருமுறை அழுத்தவும்"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"கேமராவை மாற்றுதல்"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"வேகமாக செல்ஃபிகளை எடுக்கவும்"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"செல்ஃபிப் பயன்முறைக்கு, மொபைலை இருமுறை திருப்பவும்"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"செல்ஃபிப் பயன்முறைக்கு, டேப்லெட்டை இருமுறை திருப்பவும்"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"செல்ஃபிப் பயன்முறைக்கு, சாதனத்தை இருமுறை திருப்பவும்"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"மொபைல் திரையில் அறிவிப்புகளைப் பார்க்க, இருமுறை தட்டவும்"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"டேப்லெட் திரையில் அறிவிப்புகளைப் பார்க்க, இருமுறை தட்டவும்"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"சாதனத் திரையில் அறிவிப்புகளைப் பார்க்க, இருமுறை தட்டவும்"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"அறிவிப்புகளை விரைவாகப் பார்க்க, திரையில் இருமுறை தட்டவும்."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"நேரம், அறிவிப்பு ஐகான்கள் மற்றும் பிற தகவலைப் பார்க்க, திரையை இருமுறை தட்டவும்."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"திரை அணைக்கப்பட்டிருக்கும் போது, அறிவிப்புகளைப் பார்க்கலாம்"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"திரையில் அறிவிப்புகளைப் பார்க்க, மொபைலை கையில் எடுக்கவும்"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"திரையில் அறிவிப்புகளை பார்க்க, டேப்லெட்டை கையில் எடுக்கவும்"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"திரையில் அறிவிப்புகளைப் பார்க்க, சாதனத்தை கையில் எடுக்கவும்"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"அறிவிப்புகளை விரைவாகப் பார்க்க, மொபைலைக் கையில் எடுக்கவும்."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"அறிவிப்புகளை விரைவாகப் பார்க்க, டேப்லெட்டைக் கையில் எடுக்கவும்."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"அறிவிப்புகளை விரைவாகப் பார்க்க, சாதனத்தைக் கையில் எடுக்கவும்."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"நேரம், அறிவிப்பு ஐகான்கள் மற்றும் பிற தகவலைப் பார்க்க, மொபைலைக் கையில் எடுக்கவும்."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"நேரம், அறிவிப்பு ஐகான்கள் மற்றும் பிற தகவலைப் பார்க்க, டேப்லெட்டைக் கையில் எடுக்கவும்."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"நேரம், அறிவிப்பு ஐகான்கள் மற்றும் பிற தகவலைப் பார்க்க, சாதனத்தைக் கையில் எடுக்கவும்."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"திரை அணைக்கப்பட்டிருக்கும் போது, அறிவிப்புகளைப் பார்க்கலாம்"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"அறிவிப்புகளுக்கு, உணர்வியின் மீது ஸ்வைப் செய்க"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"அறிவிப்புகளைப் பார்க்க, மொபைலின் பின்புறத்தில் உள்ள கைரேகை உணர்வியில் கீழே ஸ்வைப் செய்யவும்."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"அறிவிப்புகளைப் பார்க்க, டேப்லெட்டின் பின்புறத்தில் உள்ள கைரேகை உணர்வியில் கீழே ஸ்வைப் செய்யவும்."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"அறிவிப்புகளைப் பார்க்க, சாதனத்தின் பின்புறத்தில் உள்ள கைரேகை உணர்வியில் கீழே ஸ்வைப் செய்யவும்."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"அறிவிப்புகளை உடனடியாகப் பார்க்கவும்"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"கைரேகை உணர்வியில் கீழே ஸ்வைப் செய்யவும்"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"கேமராவைத் திறக்க, மொபைலை எடுக்கவும்"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"கேமராவைத் தானாகத் திறக்க, படமெடுக்கும் நிலையில் (நீளவாக்கில் அல்லது அகலவாக்கில்) மொபைலை எடுக்கவும். மொபைல் உறக்கநிலையில் அல்லது பூட்டப்பட்டிருக்கும் நிலையில் இருக்கும் போது இந்த அம்சம் வேலைசெய்யும்."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"ஃபோன் உறக்கநிலையில் (அ) பூட்டியிருக்கும் போது படமெடுக்கவும்"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"அசிஸ்ட் சைகை"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"உணர்திறன்"</string>
@@ -3571,6 +3676,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"இந்த இன்ஸ்டண்ட் பயன்பாட்டை அகற்றவா?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"கேம்கள்"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ஆடியோ கோப்புகள்"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"பயன்படுத்திய இட அளவு"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g>க்கு நிறுவல்நீக்கப்பட்டது)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g>க்கு முடக்கப்பட்டது)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"தன்னிரப்பிச் சேவை"</string>
@@ -3584,5 +3690,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"இன்ஸ்டண்ட் பயன்பாடு"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"சேமிப்பக நிர்வாகியை முடக்கவா?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"திரைப்படம் &amp; டிவி பயன்பாடுகள்"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"பயன்படுத்திய இட அளவு"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Carrier Provisioning Info"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"புதியதாகவும் உற்சாகமூட்டும் விதமாகவும் என்ன உள்ளது?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"சிறந்த 5 அம்சங்களைப் பார்க்கவும்"</string>
 </resources>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index 1dc9f03..d0c965a 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"బాగుంది"</item>
     <item msgid="8986346415847956850">"అద్భుతం"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"ఎల్లప్పుడూ"</item>
-    <item msgid="844721238536786870">"ప్లగిన్ చేయబడినప్పుడు మాత్రమే"</item>
-    <item msgid="1986753720941888596">"ఎప్పటికీ వద్దు"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"ఎల్లప్పుడూ"</item>
-    <item msgid="7433294150916905997">"ప్లగిన్ చేయబడినప్పుడు మాత్రమే"</item>
-    <item msgid="1390404486722375028">"ఎప్పటికీ వద్దు"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"గత 30 రోజులు"</item>
     <item msgid="6600989128423965319">"విని. పునరా. సెట్ చేయి..."</item>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index fe6e19b..0e43740 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"మీరు ఇప్పుడు డెవలపర్!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"అవసరం లేదు, మీరు ఇప్పటికే డెవలపర్‌గా ఉన్నారు."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"దయచేసి మొదట డెవలపర్ ఎంపికలను ప్రారంభించండి."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"వైర్‌లెస్ &amp; నెట్‌వర్క్‌లు"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"కనెక్షన్‌లు"</string>
     <string name="header_category_device" msgid="4544026001618307754">"పరికరం"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE సదుపాయం ఉంది"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"వీడియో కాలింగ్ సదుపాయం ఉంది"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi కాలింగ్ సదుపాయం ఉంది"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/ఉనికి సక్రియం చేయబడింది"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"మొబైల్ రేడియో పవర్"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM చిరునామా పుస్తకాన్ని వీక్షించండి"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ఫిక్స్‌డ్ డయలింగ్ నంబర్‌లను వీక్షించండి"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"పరికరాల కోసం స్కాన్ చేయి"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"ఈ పరికరం పేరు మార్చు"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"పేరు మార్చు"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"డిస్‌కనెక్ట్ చేయాలా?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ఇందువలన దీనితో మీరు ఏర్పాటు చేసుకున్న కనెక్షన్ ముగుస్తుంది:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"పరికరం డిస్‌కనెక్ట్ చేయాలా?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> నుండి మీ ఫోన్ డిస్‌కనెక్ట్ చేయబడుతుంది."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> నుండి మీ టాబ్లెట్ డిస్‌కనెక్ట్ చేయబడుతుంది."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> నుండి మీ పరికరం డిస్‌కనెక్ట్ చేయబడుతుంది."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"డిస్‌కనెక్ట్"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"మీకు బ్లూటూత్ సెట్టింగ్‌లను మార్చడానికి అనుమతి లేదు."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"కొత్త పరికరాన్ని జత చేయండి"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"బ్లూటూత్ సెట్టింగ్‌లను తెరిచి ఉన్నప్పుడు <xliff:g id="DEVICE_NAME">%1$s</xliff:g> సమీప పరికరాలకు కనిపిస్తుంది."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"ఫోన్ యొక్క బ్లూటూత్ చిరునామా: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"టాబ్లెట్ యొక్క బ్లూటూత్ చిరునామా: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"పరికరం యొక్క బ్లూటూత్ చిరునామా: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ను డిస్‌కనెక్ట్ చేయాలా?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ప్రసారం"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ప్రొఫైల్‌ను నిలిపివేయాలా?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"బ్లూటూత్ జత చేయడానికి అభ్యర్థన"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"జత చేయడానికి అభ్యర్థన"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>తో జత చేయడానికి నొక్కండి."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"స్వీకరించబడిన ఫైల్‌లను చూపు"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"స్వీకరించిన ఫైల్‌లు"</string>
     <string name="device_picker" msgid="4978696506172252813">"బ్లూటూత్ పరికరాన్ని ఎంచుకోండి"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> బ్లూటూత్‌ను ఆన్ చేయాలనుకుంటోంది"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> బ్లూటూత్‌ను ఆఫ్ చేయాలనుకుంటోంది"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s మీ సందేశాలను ప్రాప్యత చేయాలనుకుంటోంది. %2$sకు ప్రాప్యత అందించాలా?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM ప్రాప్యత అభ్యర్థన"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> మీ SIM కార్డ్‌ను ప్రాప్యత చేయాలనుకుంటోంది. SIM కార్డ్‌కి ప్రాప్యత మంజూరు చేయడం వలన మీ పరికరంలో కనెక్షన్ కాలంలో డేటా కనెక్టివిటీ నిలిపివేయబడుతుంది. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>కి ప్రాప్యత మంజూరు చేయండి"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"ఇతర పరికరాలకు \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' వలె కనిపిస్తుంది"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"మీ పరికరాలు"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"కొత్త పరికరాన్ని జత చేయండి"</string>
     <string name="date_and_time" msgid="9062980487860757694">"తేదీ &amp; సమయం"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"సమయ మండలిని ఎంచుకోండి"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ఖాతాలు"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"స్థానం"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ఖాతాలు"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"భద్రత &amp; స్థానం"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"గుప్తీకరణ &amp; ఆధారాలు"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ఫోన్ గుప్తీకరించబడింది"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"డివైజ్ గుప్తీకరించబడింది"</string>
@@ -354,40 +367,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"వేలిముద్రతో అన్‌లాక్ చేయండి"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"మీ వేలిముద్రను ఉపయోగించండి"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి, కొనుగోళ్లను ప్రామాణీకరించడానికి లేదా అనువర్తనాలకు సైన్ ఇన్ చేయడానికి వేలిముద్ర సెన్సార్‌ను తాకండి. మీరు ఎవరి వేలిముద్రలు జోడిస్తున్నారనే విషయంలో జాగ్రత్త వహించండి. వేలిముద్ర జోడించబడిన ఎవరైనా వీటిని చేయగలరు.\n\nగమనిక: మీ వేలిముద్ర శక్తివంతమైన నమూనా లేదా పిన్ కంటే తక్కువ సురక్షితం కావచ్చు."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"కొనుగోళ్లను ఆమోదించడానికి లేదా అనువర్తనాలకు సైన్ ఇన్ చేయడానికి వేలిముద్ర సెన్సార్‌ను తాకండి. మీరు ఎవరి వేలిముద్రలు జోడిస్తున్నారనే విషయంలో జాగ్రత్త వహించండి. వేలిముద్రలు జోడించబడిన ఎవరైనా వీటిలో ఏదైనా చేయగలరు.\n\nగమనిక: ఈ పరికరాన్ని అన్‌లాక్ చేయడానికి మీరు మీ వేలిముద్రను ఉపయోగించలేరు. మరింత సమాచారం కోసం, మీ సంస్థ నిర్వాహకులను సంప్రదించండి."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి, కొనుగోళ్లకు అధికారం ఇవ్వడానికి లేదా అనువర్తనాలకు సైన్ ఇన్ చేయడానికి వేలిముద్ర సెన్సార్‌ను తాకండి. మీరు ఎవరి వేలిముద్రలు జోడిస్తున్నారనే విషయంలో జాగ్రత్త వహించండి. వేలిముద్ర జోడించబడిన ఎవరైనా వీటిని చేయగలరు.\n\nగమనిక: మీ వేలిముద్ర శక్తివంతమైన నమూనా లేదా పిన్ కంటే తక్కువ సురక్షితం కావచ్చు."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"మీ ఫోన్‌ని అన్‌లాక్ చేయడం లేదా కొనుగోళ్లను ఆమోదించడం కోసం మీ వేలిముద్రను ఉపయోగించండి.\n\nగమనించండి: మీరు మీ వేలిముద్రను ఉపయోగించి ఈ పరికరాన్ని అన్‌లాక్ చేయలేరు. మరింత సమాచారం కావాలంటే మీ నిర్వాహకులను సంప్రదించండి."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"మీ ఫోన్‌ని అన్‌లాక్ చేయడం లేదా కొనుగోళ్లను ఆమోదించడం కోసం మీ వేలిముద్రను ఉపయోగించండి.\n\nగమనిక: నమూనా లేదా పిన్ కంటే మీ వేలిముద్ర తక్కువ సురక్షితం కావచ్చు."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"రద్దు చేయి"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"కొనసాగించు"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"దాటవేయి"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"వేలిముద్రను జోడించు"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"పరికర సంరక్షణ లక్షణాలు సక్రియం చేయబడవు. మీరు ఈ టాబ్లెట్‌ను పోగొట్టుకున్న, దొంగిలించబడిన లేదా ఇందులోని డేటా తొలగించబడిన సందర్భాల్లో, దీన్ని ఉపయోగించనీయకుండా ఇతరులను నిరోధించలేరు."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"పరికర సంరక్షణ లక్షణాలు సక్రియం కావు. మీరు ఈ పరికరాన్ని పోగొట్టుకున్న, దొంగిలించబడిన లేదా ఇందులోని డేటా తొలగించబడిన సందర్భాల్లో, దీన్ని ఉపయోగించనీయకుండా ఇతరులను నిరోధించలేరు."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"పరికర సంరక్షణ లక్షణాలు సక్రియం కావు. మీరు ఈ ఫోన్‌ను పోగొట్టుకున్న, దొంగిలించబడిన లేదా ఇందులోని డేటా తొలగించబడిన సందర్భాల్లో, దీన్ని ఉపయోగించనీయకుండా ఇతరులను నిరోధించలేరు."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"పరికర సంరక్షణ లక్షణాలు సక్రియం కావు. మీరు ఈ టాబ్లెట్ పోగొట్టుకున్న లేదా దొంగిలించబడిన సందర్భాల్లో దీన్ని ఉపయోగించనీయకుండా ఇతరులను నిరోధించలేరు."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"పరికర సంరక్షణ లక్షణాలు సక్రియం కావు. మీరు ఈ పరికరం పోగొట్టుకున్న లేదా దొంగిలించబడిన సందర్భాల్లో దీన్ని ఉపయోగించనీయకుండా ఇతరులను నిరోధించలేరు."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"పరికర సంరక్షణ లక్షణాలు సక్రియం కావు. మీరు ఈ ఫోన్ పోగొట్టుకున్న లేదా దొంగిలించబడిన సందర్భాల్లో దీన్ని ఉపయోగించనీయకుండా ఇతరులను నిరోధించలేరు."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"తదుపరి"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"పరికర రక్షణ ఫీచర్‌లు ఆన్ చేయబడవు. ఈ టాబ్లెట్ పోయినా, దొంగిలించబడినా లేదా రీసెట్ చేయబడినా, దీనిని ఉపయోగించకుండా మీరు ఇతరులను నివారించలేరు."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"పరికర రక్షణ ఫీచర్‌లు ఆన్ చేయబడవు. ఈ పరికరం పోయినా, దొంగిలించబడినా లేదా రీసెట్ చేయబడినా, దీనిని ఉపయోగించకుండా మీరు ఇతరులను నివారించలేరు."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"పరికర రక్షణ ఫీచర్‌లు ఆన్ చేయబడవు. ఈ ఫోన్ పోయినా, దొంగిలించబడినా లేదా రీసెట్ చేయబడినా, దీనిని ఉపయోగించకుండా మీరు ఇతరులను నివారించలేరు."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"పరికర రక్షణ ఫీచర్‌లు ఆన్ చేయబడవు. ఈ టాబ్లెట్ పోయినా లేదా దొంగిలించబడినా, దీనిని ఉపయోగించకుండా మీరు ఇతరులను నివారించలేరు."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"పరికర రక్షణ ఫీచర్‌లు ఆన్ చేయబడవు. ఈ పరికరం పోయినా లేదా దొంగిలించబడినా, దీనిని ఉపయోగించకుండా మీరు ఇతరులను నివారించలేరు."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"పరికర రక్షణ ఫీచర్‌లు ఆన్ చేయబడవు. ఈ ఫోన్ పోయినా లేదా దొంగిలించబడినా, దీనిని ఉపయోగించకుండా మీరు ఇతరులను నివారించలేరు."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"ఏదేమైనా దాటవేయి"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"వెనుకకు వెళ్లు"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"సెన్సార్‌ని కనుగొనండి"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"మీ ఫోన్ వెనుకవైపున వేలిముద్ర సెన్సార్‌ని గుర్తించండి."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"సెన్సార్‌ని తాకండి"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"ఇది మీ ఫోన్ వెనుక భాగంలో ఉంది. మీ చూపుడు వేలిని ఉపయోగించండి."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"పరికరం మరియు వేలిముద్ర సెన్సార్ స్థానంతో చిత్రపటం"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"పేరు"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"సరే"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"తొలగించు"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"ప్రారంభించండి"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"సెన్సార్‌ని తాకండి"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"మీ వేలిని సెన్సార్‌పై ఉంచి, మీకు వైబ్రేషన్ అనుభూతి కలిగిన తర్వాత దాన్ని తీసివేయండి"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"కొనసాగించండి"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"మీ వేలిముద్రలోని వివిధ భాగాలన్నింటినీ జోడించడానికి మీ వేలిని కొద్దిగా అటూ ఇటూ జరపండి"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"వేలిముద్ర జోడించబడింది.!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"మీకు ఈ చిహ్నం కనిపించినప్పుడల్లా, మీరు గుర్తింపు కోసం లేదా కొనుగోలు ప్రామాణీకరణ కోసం మీ వేలిముద్రను ఉపయోగించవచ్చు."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"మీ పరికరం సక్రియం చేయడానికి మరియు అన్‌లాక్ చేయడానికి వేలిముద్ర సెన్సార్‌ను తాకితే సరిపోతుంది."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"మీకు ఈ చిహ్నం కనిపించినప్పుడు, కొనుగోళ్లు చేయడానికి లేదా అనువర్తనాలకు సైన్ ఇన్ చేయడానికి కూడా మీకు అధికారం ఉంటుంది."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"పైకి ఎత్తి, మళ్లీ తాకండి"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"మీ వేలిముద్ర యొక్క వివిధ భాగాలను జోడించడం కోసం మీ వేలిని అనేకసార్లు పైకి ఎత్తండి"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"వేలిముద్ర జోడించబడింది"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"మీకు ఈ చిహ్నం కనిపించినప్పుడు, గుర్తింపు లేదా కొనుగోళ్ల ఆమోదం కోసం మీ వేలిముద్రను ఉపయోగించండి."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"వేలిముద్ర సెటప్‌ను దాటవేయాలా?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"మీరు మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి మీ వేలిముద్రను ఒక మార్గంగా ఎంచుకున్నారు. ఇప్పుడు దాటవేసినా, దీన్ని తర్వాత సెటప్ చేయాల్సి ఉంటుంది. కేవలం ఒక నిమిషంలో సెటప్‌ను పూర్తి చేయవచ్చు."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"స్క్రీన్ లాక్‌ను సెటప్ చేయి"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"పూర్తయింది"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"అయ్యో, అది సెన్సార్ కాదు"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"మీ పరికరం వేలిముద్ర సెన్సార్‌ను ఉపయోగించండి."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"మీ ఫోన్ వెనుక ఉన్న సెన్సార్‌ని తాకండి. మీ చూపుడు వేలిని వాడండి."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"నమోదు పూర్తి కాలేదు"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"వేలిముద్ర నమోదు సమయ పరిమితి చేరుకుంది. మళ్లీ ప్రయత్నించండి."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"వేలిముద్ర నమోదు పని చేయలేదు. మళ్లీ ప్రయత్నించండి లేదా మరొక వేలిని ఉపయోగించండి."</string>
@@ -449,6 +460,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ పరికరాన్ని ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ ఫోన్‌ను ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"మీ బ్యాకప్ స్క్రీన్ లాక్ పద్ధతిని ఎంచుకోండి"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"స్క్రీన్ లాక్ ఎంపికలు"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"స్క్రీన్ లాక్ ఎంపికలు"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"స్క్రీన్ లాక్"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / నిద్రావస్థలోకి వెళ్లిన వెంటనే"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / నిద్రావస్థలోకి వెళ్లిన <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> తర్వాత"</string>
@@ -519,13 +532,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"అన్‌లాక్ నమూనాను మార్చు"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"అన్‌లాక్ పిన్‌ను మార్చండి"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"అన్‌లాక్ పాస్‌వర్డ్‌ను మార్చు"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"మళ్లీ ప్రయత్నించండి. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>లో <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>వ ప్రయత్నం చేసారు."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"చివరి ప్రయత్నం"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"మీరు ఈ ప్రయత్నంలో తప్పు కార్యాలయ నమూనాను నమోదు చేస్తే, ఈ పరికరం నుండి మీ కార్యాలయ ప్రొఫైల్ మరియు అనుబంధిత డేటా తీసివేయబడతాయి."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"మీరు ఈ ప్రయత్నంలో తప్పు కార్యాలయ పిన్‌ను నమోదు చేస్తే, ఈ పరికరం నుండి మీ కార్యాలయ ప్రొఫైల్ మరియు అనుబంధిత డేటా తీసివేయబడతాయి."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"మీరు ఈ ప్రయత్నంలో తప్పు కార్యాలయ పాస్‌వర్డ్‌ను నమోదు చేస్తే, ఈ పరికరం నుండి మీ కార్యాలయ ప్రొఫైల్ మరియు అనుబంధిత డేటా తీసివేయబడతాయి."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"చాలా ఎక్కువ తప్పు ప్రయత్నాలు చేసారు. ఈ పరికరం నుండి మీ కార్యాలయ ప్రొఫైల్ మరియు అనుబంధిత డేటా తీసివేయబడతాయి."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"తీసివేయి"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"మళ్లీ ప్రయత్నించండి. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>లో <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ప్రయత్నం చేసారు."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"మీ డేటా తొలగించబడుతుంది"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"మీరు తదుపరి ప్రయత్నంలో తప్పు నమూనాను నమోదు చేస్తే, ఈ పరికరం యొక్క డేటా తొలగించబడుతుంది"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"మీరు తదుపరి ప్రయత్నంలో తప్పు PINను నమోదు చేస్తే, ఈ పరికరం యొక్క డేటా తొలగించబడుతుంది"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"మీరు తదుపరి ప్రయత్నంలో తప్పు పాస్‌వర్డ్‌ను నమోదు చేస్తే, ఈ పరికరం యొక్క డేటా తొలగించబడుతుంది"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"మీరు తదుపరి ప్రయత్నంలో తప్పు నమూనాను నమోదు చేస్తే, ఈ వినియోగదారు తొలగించబడతారు"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"మీరు తదుపరి ప్రయత్నంలో తప్పు PINను నమోదు చేస్తే, ఈ వినియోగదారు తొలగించబడతారు"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"మీరు తదుపరి ప్రయత్నంలో తప్పు పాస్‌వర్డ్‌ను నమోదు చేస్తే, ఈ వినియోగదారు తొలగించబడతారు"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"మీరు తదుపరి ప్రయత్నంలో తప్పు నమూనాను నమోదు చేస్తే, మీ కార్యాలయ ప్రొఫైల్‌ మరియు దీని డేటా తొలగించబడతాయి"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"మీరు తదుపరి ప్రయత్నంలో తప్పు PINను నమోదు చేస్తే, మీ కార్యాలయ ప్రొఫైల్‌ మరియు దీని డేటా తొలగించబడతాయి"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"మీరు తదుపరి ప్రయత్నంలో తప్పు పాస్‌వర్డ్‌ను నమోదు చేస్తే, మీ కార్యాలయ ప్రొఫైల్‌ మరియు దీని డేటా తొలగించబడతాయి"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"చాలా ఎక్కువ తప్పు ప్రయత్నాలు చేసారు. ఈ పరికరం యొక్క డేటా తొలగించబడుతుంది."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"చాలా ఎక్కువ తప్పు ప్రయత్నాలు చేసారు. ఈ వినియోగదారు తొలగించబడతారు."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"చాలా ఎక్కువ తప్పు ప్రయత్నాలు చేసారు. ఈ కార్యాలయ ప్రొఫైల్ మరియు దీని డేటా తొలగించబడతాయి."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"తీసివేయండి"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"తప్పనిసరిగా కనీసం <xliff:g id="COUNT">%d</xliff:g> అక్షరాలను కలిగి ఉండాలి"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"పిన్ తప్పనిసరిగా కనీసం <xliff:g id="COUNT">%d</xliff:g> అంకెలను కలిగి ఉండాలి"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"కొనసాగించండి"</string>
@@ -626,6 +647,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"అధునాతన బ్లూటూత్"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"బ్లూటూత్ ప్రారంభించబడినప్పుడు, మీ పరికరం ఇతర సమీప బ్లూటూత్ పరికరాలతో కమ్యూనికేట్ చేయగలదు."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"స్థాన ఖచ్చితత్వాన్ని మెరుగుపరచడానికి, సిస్టమ్ అనువర్తనాలు మరియు సేవలు ఇప్పటికీ బ్లూటూత్ పరికరాలను గుర్తించగలవు. మీరు దీన్ని <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>స్కానింగ్ సెట్టింగ్‌లు<xliff:g id="LINK_END_1">LINK_END</xliff:g>లో మార్చవచ్చు."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"కనెక్ట్ చేయడం సాధ్యం కాలేదు. మళ్లీ ప్రయత్నించండి."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"పరికర వివరాలు"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"పరికరం యొక్క బ్లూటూత్ చిరునామా: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"పరికరాన్ని మర్చిపోవాలా?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"మీ ఫోన్ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>తో జత చేయబడి లేదు"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"మీ టాబ్లెట్ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>తో జత చేయబడి లేదు"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"మీ పరికరం <xliff:g id="DEVICE_NAME">%1$s</xliff:g>తో జత చేయబడి లేదు"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"పరికరాన్ని మర్చిపో"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"దీనికి కనెక్ట్ చేయి…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> మీడియా ఆడియో నుండి డిస్‌కనెక్ట్ చేయబడుతుంది."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> హ్యాండ్స్‌ఫ్రీ ఆడియో నుండి డిస్‌కనెక్ట్ చేయబడుతుంది."</string>
@@ -778,6 +807,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"అందించవద్దు"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"ప్రామాణీకరించవద్దు"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"ప్రమాణపత్రం ఏదీ పేర్కొనబడలేదు. మీ కనెక్షన్ ప్రైవేట్‌గా ఉండదు."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"నెట్‌వర్క్ పేరు చాలా పొడవుగా ఉంది."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"తప్పనిసరిగా డొమైన్‌ను పేర్కొనాలి."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS అందుబాటులో ఉంది"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS అందుబాటులో ఉంది)"</string>
@@ -809,7 +839,6 @@
       <item quantity="one">1 నెట్‌వర్క్</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"అధునాతన Wi‑Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wi‑Fiని కాన్ఫిగర్ చేయండి"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC చిరునామా"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP చిరునామా"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"సబ్‌నెట్ మాస్క్"</string>
@@ -846,9 +875,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ఈ సమూహాన్ని ఉపేక్షించాలా?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"పోర్టబుల్ Wi‑Fi హాట్‌స్పాట్"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi హాట్‌స్పాట్"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Wi‑Fi నెట్‌వర్క్‌ను అందించడానికి మొబైల్ కనెక్షన్‌ను ఉపయోగించు"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"హాట్‌స్పాట్ ద్వారా ఈ టాబ్లెట్ యొక్క ఇంటర్నెట్ కనెక్షన్ భాగస్వామ్యం చేయడం లేదు"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"హాట్‌స్పాట్ ద్వారా ఈ ఫోన్ యొక్క ఇంటర్నెట్ కనెక్షన్ భాగస్వామ్యం చేయడం లేదు"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"ఇంటర్నెట్ లేదా కంటెంట్‌ని ఇతర పరికరాలతో షేర్ చేయడం లేదు"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"హాట్‌స్పాట్ ద్వారా ఈ టాబ్లెట్ యొక్క ఇంటర్నెట్ కనెక్షన్ షేర్ చేయబడుతోంది"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"హాట్‌స్పాట్ ద్వారా ఈ ఫోన్ యొక్క ఇంటర్నెట్ కనెక్షన్ షేర్ చేయబడుతోంది"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"యాప్ కంటెంట్‌ని షేర్ చేస్తోంది. ఇంటర్నెట్ కనెక్షన్‌ని షేర్ చేయాలంటే, హాట్‌స్పాట్‌ని ఆఫ్ చేసి, ఆన్ చేయండి"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi పేరు"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ని ఆన్ చేస్తోంది..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"ఇతర పరికరాలు <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>కు కనెక్ట్ కావచ్చు"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi పాస్‌వర్డ్"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP బ్యాండ్"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"మీ ఇతర పరికరాల కోసం Wi-Fi నెట్‌వర్క్‌ని సృష్టించడానికి హాట్‌స్పాట్‌ని ఉపయోగించండి. హాట్‌స్పాట్ అనేది మీ మొబైల్ డేటా కనెక్షన్‌ని ఉపయోగించి ఇంటర్నెట్‌ని అందిస్తుంది. అదనపు మొబైల్ డేటా ఛార్జీలు చెల్లించాల్సి రావచ్చు."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"యాప్‌లు సమీప పరికరాలతో కంటెంట్‌ని షేర్ చేయడం కోసం హాట్‌స్పాట్‌ని సృష్టించవచ్చు."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"హాట్‌స్పాట్‌ను ప్రారంభిస్తోంది…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"హాట్‌స్పాట్‌ను ఆపివేస్తోంది…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> సక్రియంగా ఉంది"</string>
@@ -895,6 +932,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi కాలింగ్ ఆన్‌లో ఉన్నప్పుడు, మీ ఫోన్ మీ ప్రాధాన్యత మరియు ఏ సిగ్నల్ సామర్థ్యం ఎక్కువగా ఉంది వంటి అంశాల ఆధారంగా Wi-Fi నెట్‌వర్క్‌లు లేదా మీ క్యారియర్ నెట్‌వర్క్ ద్వారా కాల్‌లు వెళ్లేలా చేస్తుంది. ఈ లక్షణాన్ని ఆన్ చేయడానికి ముందు, రుసుములు మరియు ఇతర వివరాల గురించి తెలుసుకోవడానికి మీ క్యారియర్‌ను సంప్రదించండి."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"అత్యవసర చిరునామాను నవీకరించండి"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"మీరు WiFiని ఉపయోగించి 911 కాల్ చేస్తే, అత్యవసర సేవలు మీ స్థానంగా వినియోగించే చిరునామా"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ప్రదర్శన"</string>
@@ -952,6 +990,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"ఫలితాలు లేవు"</string>
     <string name="display_settings" msgid="7965901687241669598">"ప్రదర్శన"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"స్క్రీన్‌ను స్వయంచాలకంగా తిప్పు"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"ప్రకాశవంతమైన రంగులు"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"టాబ్లెట్ తిప్పుతున్నప్పుడు దృగ్విన్యాసాన్ని స్వయంచాలకంగా మార్చు"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ఫోన్‌ను తిప్పుతున్నప్పుడు దృగ్విన్యాసాన్ని స్వయంచాలకంగా మార్చు"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"టాబ్లెట్ తిప్పుతున్నప్పుడు దృగ్విన్యాసాన్ని స్వయంచాలకంగా మార్చు"</string>
@@ -979,23 +1018,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"అందుబాటులో ఉన్న కాంతికి తగ్గట్లు ప్రకాశం స్థాయిని ఆప్టిమైజ్ చేస్తుంది. ఈ లక్షణాన్ని ఆన్ చేసినప్పుడు కూడా మీరు తాత్కాలికంగా ప్రకాశాన్ని సర్దుబాటు చేయవచ్చు."</string>
     <string name="night_display_title" msgid="2626451512200357686">"రాత్రి కాంతి"</string>
     <string name="night_display_text" msgid="1837277457033025056">"రాత్రి కాంతి మీ స్క్రీన్‌ను లేత కాషాయ రంగులో ఉండేలా మారుస్తుంది. దీని వలన తక్కువ కాంతి ఉన్నప్పుడు మీ స్క్రీన్‌ని చూడటం లేదా తక్కువ వెలుగులో చదవటం సులభం అవుతుంది, అలాగే మీరు మరింత సులభంగా నిద్రలోకి జారుకోవడంలో సహాయకరంగా ఉండవచ్చు."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"షెడ్యూల్"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"స్థితి"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"స్వయంచాలకంగా ఆన్ చేయి"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"ఎప్పుడూ వద్దు"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"అనుకూల షెడ్యూల్"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"సూర్యాస్తమయం నుండి సూర్యోదయం వరకు"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"షెడ్యూల్"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"ఏదీ కాదు"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"అనుకూల సమయంలో ఆన్ చేయబడుతుంది"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"సూర్యాస్తమయం నుండి సూర్యోదయం వరకు ఆన్ అవుతుంది"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"ప్రారంభ సమయం"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"ముగింపు సమయం"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"స్థితి"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"తీవ్రత"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"ఆఫ్‌లో ఉంది. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"ఎప్పటికీ స్వయంచాలకంగా ఆన్ కాదు."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g>కి స్వయంచాలకంగా ఆన్ అవుతుంది."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"సూర్యాస్తమయ సమయానికి స్వయంచాలకంగా ఆన్ అవుతుంది."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"ఆన్‌లో ఉంది. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"ఎప్పటికీ స్వయంచాలకంగా ఆఫ్ కాదు."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g>కి స్వయంచాలకంగా ఆఫ్ అవుతుంది."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"సూర్యోదయ సమయానికి స్వయంచాలకంగా ఆఫ్ అవుతుంది."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"ఆఫ్‌లో ఉంది / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"ఎప్పటికీ స్వయంచాలకంగా ఆన్ కాదు"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g>కి స్వయంచాలకంగా ఆన్ అవుతుంది"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"సూర్యాస్తమయ సమయానికి స్వయంచాలకంగా ఆన్ అవుతుంది"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"ఆన్‌లో ఉంది / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"ఎప్పటికీ స్వయంచాలకంగా ఆఫ్ కాదు"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g>కి స్వయంచాలకంగా ఆఫ్ అవుతుంది"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"సూర్యోదయ సమయానికి స్వయంచాలకంగా ఆఫ్ అవుతుంది"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"నిద్రావస్థ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"స్క్రీన్‌ను ఆఫ్ చేయాల్సిన సమయం"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"నిష్క్రియంగా ఉన్న <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> తర్వాత"</string>
@@ -1019,8 +1057,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"సెట్టింగ్‌లు"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"స్వయంచాలక ప్రకాశం"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"సక్రియం చేయడానికి వేళ్లను తీసివేయండి"</string>
-    <string name="doze_title" msgid="2259176504273878294">"యాంబియెంట్ డిస్‌ప్లే"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"యాంబియంట్ డిస్‌ప్లే"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"ఎల్లప్పుడూ ఆన్‌లో ఉంచు"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"కొత్త నోటిఫికేషన్‌లు"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"ఎప్పుడు చూపాలి"</string>
+    <string name="doze_title" msgid="2375510714460456687">"కొత్త నోటిఫికేషన్‌లు"</string>
     <string name="doze_summary" msgid="3846219936142814032">"మీరు నోటిఫికేషన్‌లను స్వీకరించినప్పుడు స్క్రీన్‌ను సక్రియం చేస్తుంది"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"ఎల్లప్పుడూ ఆన్‌లో ఉంచు"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"ప్రదర్శన సమయం, నోటిఫికేషన్ చిహ్నాలు మరియు ఇతర సమాచారం"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ఫాంట్ పరిమాణం"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"వచనాన్ని పెద్దదిగా లేదా చిన్నదిగా చేస్తుంది"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"సిమ్ కార్డు లాక్ సెట్టింగ్‌లు"</string>
@@ -1272,6 +1316,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN ఖాళీగా ఉండకూడదు."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC ఫీల్డ్ తప్పనిసరిగా 3 అంకెలు కలిగి ఉండాలి."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC ఫీల్డ్‌లో తప్పనిసరిగా 2 లేదా 3 అంకెలు ఉండాలి."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"క్యారియర్ %s రకమైన APNలను జోడించడాన్ని అనుమతించదు."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"డిఫాల్ట్ APN సెట్టింగ్‌లను పునరుద్ధరిస్తోంది."</string>
     <string name="menu_restore" msgid="8260067415075573273">"డిఫాల్ట్‌కు రీసెట్ చేయి"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"డిఫాల్ట్ APN సెట్టింగ్‌లను రీసెట్ చేయడం పూర్తయింది."</string>
@@ -1301,6 +1346,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD కార్డుని ఎరేజ్ చేయి"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"అంతర్గత USB నిల్వలోని డేటా అంతటినీ అనగా సంగీతం లేదా ఫోటోల వంటివి ఎరేజ్ చేయి"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD కార్డు‌లో సంగీతం లేదా ఫోటోల వంటి మొత్తం డేటాను ఎరేజ్ చేయి"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIMలను తొలగించండి"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"ఫోన్‌లో అన్ని eSIMలను తుడిచివేయండి. దీని కారణంగా మీ మొబైైల్ సేవా ప్లాన్ రద్దు చేయబడదు."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"టాబ్లెట్‌లో అన్ని eSIMలను తుడిచివేయండి. దీని కారణంగా మీ మొబైైల్ సేవా ప్లాన్ రద్దు చేయబడదు."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"టాబ్లెట్‌ను రీసెట్ చేయి"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ఫోన్‌ను రీసెట్ చేయి"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"మీ వ్యక్తిగత సమాచారం మరియు డౌన్‌లోడ్ చేసిన అనువర్తనాలు అన్నింటినీ తొలగించాలా? మీరు ఈ చర్యను తిరిగి రద్దు చేయలేరు!"</string>
@@ -1323,26 +1371,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"డేటా సేవర్ ఆన్‌లో ఉన్నప్పుడు టీథర్ చేయలేరు లేదా పోర్టబుల్ హాట్‌స్పాట్‌లను ఉపయోగించలేరు"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB టీథరింగ్"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB కనెక్ట్ చేయబడింది, టీథర్ చేయడం కోసం తనిఖీ చేయండి"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"టీథర్ చేయబడింది"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USB నిల్వ ఉపయోగంలో ఉన్నప్పుడు టీథర్ చేయడం సాధ్యపడదు"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB కనెక్ట్ చేయబడలేదు"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"ఆన్ చేయడానికి కనెక్ట్ చేయండి"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB టీథరింగ్ లోపం"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"ఫోన్ యొక్క ఇంటర్నెట్ కనెక్షన్‌ని USB ద్వారా షేర్ చేయండి"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"టాబ్లెట్ యొక్క ఇంటర్నెట్ కనెక్షన్‌ని USB ద్వారా షేర్ చేయండి"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"బ్లూటూత్ టీథరింగ్"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"బ్లూటూత్‌తో ఈ టాబ్లెట్ ఇంటర్నెట్ కనెక్షన్ భాగస్వామ్యం అవుతోంది"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"బ్లూటూత్‌తో ఈ ఫోన్ ఇంటర్నెట్ కనెక్షన్ భాగస్వామ్యం అవుతోంది"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"బ్లూటూత్‌తో ఈ టాబ్లెట్ ఇంటర్నెట్ కనెక్షన్ 1 పరికరంతో భాగస్వామ్యం అవుతోంది"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"బ్లూటూత్‌తో ఈ ఫోన్ ఇంటర్నెట్ కనెక్షన్ 1 పరికరంతో భాగస్వామ్యం అవుతోంది"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"బ్లూటూత్‌తో ఈ టాబ్లెట్ ఇంటర్నెట్ కనెక్షన్ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> పరికరాలతో భాగస్వామ్యం అవుతోంది"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"బ్లూటూత్‌తో ఈ ఫోన్ ఇంటర్నెట్ కనెక్షన్ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> పరికరాలతో భాగస్వామ్యం అవుతోంది"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"టాబ్లెట్ యొక్క ఇంటర్నెట్ కనెక్షన్‌ని బ్లూటూత్ ద్వారా షేర్ చేయండి"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"ఫోన్ యొక్క ఇంటర్నెట్ కనెక్షన్‌ని బ్లూటూత్ ద్వారా షేర్ చేయండి"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"బ్లూటూత్‌తో ఈ <xliff:g id="DEVICE_NAME">%1$d</xliff:g> ఇంటర్నెట్ కనెక్షన్ భాగస్వామ్యం అవుతోంది"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"బ్లూటూత్‌తో ఈ టాబ్లెట్ ఇంటర్నెట్ కనెక్షన్ భాగస్వామ్యం చేయడం లేదు"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"బ్లూటూత్‌తో ఈ ఫోన్ ఇంటర్నెట్ కనెక్షన్ భాగస్వామ్యం చేయడం లేదు"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"టీథర్ చేయబడలేదు"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> కంటే ఎక్కువ పరికరాలకు టీథర్ చేయబడవు."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> అన్‌టీథెర్ చేయబడుతుంది."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"హాట్‌స్పాట్ మరియు టీథరింగ్‌ని ఉపయోగించి మీ మొబైల్ డేటా కనెక్షన్ ద్వారా ఇతర పరికరాలకు ఇంటర్నెట్‌ని అందించండి."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"మీ మొబైల్ డేటా కనెక్షన్ ద్వారా ఇతర పరికరాలకు ఇంటర్నెట్‌ని అందించడం కోసం హాట్‌స్పాట్ మరియు టీథెరింగ్‌ని ఉపయోగించండి. ఇంకా, యాప్‌లు సమీప పరికరాలతో కంటెంట్‌ని షేర్ చేయడం కోసం హాట్‌స్పాట్‌ని సృష్టించవచ్చు."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"సహాయం"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"మొబైల్ నెట్‌వర్క్"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"మొబైల్ ప్లాన్"</string>
@@ -1375,7 +1412,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"స్థానం మోడ్"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"స్థానాన్ని కనుగొనడానికి GPS, Wi‑Fi, బ్లూటూత్ లేదా మొబైల్ నెట్‌వర్క్‌లను ఉపయోగిస్తుంది"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"స్థానాన్ని కనుగొనడానికి Wi‑Fi, బ్లూటూత్ లేదా మొబైల్ నెట్‌వర్క్‌లను ఉపయోగిస్తుంది"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"స్థానాన్ని గుర్తించడానికి GPSని ఉపయోగిస్తుంది"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"స్థానాన్ని గుర్తించడానికి GPS మరియు పరికర సెన్సార్‌లను ఉపయోగిస్తుంది"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"స్కానింగ్"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi స్కానింగ్"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ఏ సమయంలోనైనా Wi‑Fi నెట్‌వర్క్‌లను గుర్తించడానికి సిస్టమ్ అనువర్తనాలు మరియు సేవలను అనుమతించడం ద్వారా స్థానాన్ని మెరుగుపరుస్తుంది."</string>
@@ -1420,8 +1457,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"మీకు డేటా కనెక్షన్ లేదు. ఈ సమాచారాన్ని ఇప్పుడే వీక్షించడానికి, ఇంటర్నెట్ కనెక్షన్ సౌకర్యం ఉన్న ఏదైనా కంప్యూటర్ నుండి %sకి వెళ్లండి."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"లోడ్ చేస్తోంది…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"మీ పాస్‌వర్డ్‌ను ఎంచుకోండి"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"వేలిముద్రను ఉపయోగించడానికి, పాస్‌వర్డ్‌ని సెట్ చేయండి"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"మీ నమూనాను ఎంచుకోండి"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"వేలిముద్రను ఉపయోగించడానికి, నమూనాని సెట్ చేయండి"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"మీ పిన్‌ను ఎంచుకోండి"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"వేలిముద్రను ఉపయోగించడానికి, PINని సెట్ చేయండి"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"మీ పాస్‌వర్డ్‌ను నిర్ధారించండి"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"మీ నమూనాను నిర్ధారించండి"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"మీ పిన్‌ను నిర్ధారించండి"</string>
@@ -1490,6 +1530,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"అనువర్తన సెట్టింగ్‌లు"</string>
     <string name="install_applications" msgid="4872012136210802181">"తెలియని మూలాలు"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"అన్ని అనువ. మూలాలను అనుమతించు"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"ఇటీవల తెరిచిన యాప్‌లు"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"మొత్తం <xliff:g id="COUNT">%1$d</xliff:g> అనువర్తనాలను చూడండి"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> క్రితం"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"మీ టాబ్లెట్ మరియు వ్యక్తిగత డేటా తెలియని మూలాల్లోని అనువర్తనాల ద్వారా దాడికి గురి కావడానికి ఎక్కువ అవకాశం ఉంటుంది. ఈ మూలం నుండి అనువర్తనాలను ఇన్‌స్టాల్ చేయడం ద్వారా, ఈ అనువర్తనాలను ఉపయోగించడం ద్వారా మీ టాబ్లెట్‌కు సంభవించే ఏదైనా నష్టానికి లేదా కోల్పోయే డేటాకి బాధ్యత వహించడానికి మీరు అంగీకరిస్తున్నారు."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"మీ ఫోన్ మరియు వ్యక్తిగత డేటా తెలియని మూలాల్లోని అనువర్తనాల ద్వారా దాడికి గురి కావడానికి ఎక్కువ అవకాశం ఉంటుంది. ఈ మూలం నుండి అనువర్తనాలను ఇన్‌స్టాల్ చేయడం ద్వారా, ఈ అనువర్తనాలను ఉపయోగించడం వలన మీ ఫోన్‌కు సంభవించే ఏదైనా నష్టానికి లేదా కోల్పోయే డేటాకి బాధ్యత వహించడానికి మీరు అంగీకరిస్తున్నారు."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"అధునాతన సెట్టింగ్‌లు"</string>
@@ -1658,6 +1701,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"సిస్టమ్ సేవను ఆపివేయాలా?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"మీరు ఈ సేవను ఆపివేస్తే, మీ టాబ్లెట్‌ను పవర్ ఆఫ్ చేసి, ఆపై మళ్లీ ఆన్ చేసే వరకు దీనిలో కొన్ని లక్షణాలు సరిగ్గా పని చేయకుండాపోవచ్చు."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"మీరు ఈ సేవను ఆపివేస్తే, మీ ఫోన్‌ను పవర్ ఆఫ్ చేసి, మళ్లీ ఆన్ చేసే వరకు అందులోని కొన్ని లక్షణాలు సరిగ్గా పని చేయకపోవచ్చు."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"భాషలు, ఇన్‌పుట్ &amp; సంజ్ఞలు"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"భాషలు &amp; ఇన్‌పుట్"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"భాషలు &amp; ఇన్‌పుట్"</string>
     <string name="input_assistance" msgid="7577795275222555487">"ఇన్‌పుట్ సహాయకం"</string>
@@ -1872,6 +1919,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ముద్రణ సేవలు ఆన్ చేయబడ్డాయి</item>
       <item quantity="one">1 ముద్రణ సేవ ఆన్ చేయబడింది</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ముద్రణ జాబ్‌లు</item>
+      <item quantity="one">1 ముద్రణ జాబ్</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"ముద్రణ సేవలు"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"సేవలు ఇన్‌స్టాల్ చేయబడలేదు"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"ప్రింటర్‌లు కనుగొనబడలేదు"</string>
@@ -1938,6 +1989,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"వినియోగ వివరాలు"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"శక్తి వినియోగాన్ని సర్దుబాటు చేయండి"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"చేర్చబడిన ప్యాకేజీలు"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"యాప్‌ల కారణంగా బ్యాటరీ ఖాళీ అవుతోంది"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"పరికరాన్ని మేల్కొల్పి ఉంచుతుంది"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"పరికరాన్ని నేపథ్యంలో మేల్కొల్పి ఉంచుతుంది"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"తరచుగా స్థానాన్ని అభ్యర్థిస్తుంది"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> యాప్‌లు సరిగ్గా ప్రవర్తించడం లేదు"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"యాప్‌ని ఆపివేయాలా?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"<xliff:g id="APP">%1$s</xliff:g> మీ ఫోన్‌ని మేల్కొల్పి ఉంచుతోంది, కనుక బ్యాటరీని మీ ఫోన్ సాధారణంగా నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించడం కోసం, యాప్‌ని నిర్బంధంగా మూసివేయడానికి ప్రయత్నించండి.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు యాప్‌ని అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"<xliff:g id="APP">%1$s</xliff:g> మీ టాబ్లెట్‌ని మేల్కొల్పి ఉంచుతోంది, కనుక బ్యాటరీని మీ టాబ్లెట్ సాధారణంగా నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించడం కోసం, యాప్‌ని నిర్బంధంగా మూసివేయడానికి ప్రయత్నించండి.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు యాప్‌ని అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"<xliff:g id="APP">%1$s</xliff:g> మీ పరికరాన్ని మేల్కొల్పి ఉంచుతోంది, కనుక బ్యాటరీని మీ పరికరం సాధారణంగా నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించడం కోసం, యాప్‌ని నిర్బంధంగా మూసివేయడానికి ప్రయత్నించండి.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు యాప్‌ని అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"యాప్‌ని ఆపివేయి"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"నేపథ్య వినియోగాన్ని ఆఫ్ చేయాలా?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"<xliff:g id="APP">%1$s</xliff:g> మీ ఫోన్‌ని మేల్కొల్పి ఉంచుతోంది, కనుక బ్యాటరీని మీ ఫోన్ సాధారణంగా నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించడం కోసం, ఈ యాప్ నేపథ్యంలో అమలు కాకుండా మీ ఫోన్ నివారించగలదు."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"<xliff:g id="APP">%1$s</xliff:g> మీ టాబ్లెట్‌ని మేల్కొల్పి ఉంచుతోంది, కనుక బ్యాటరీని మీ టాబ్లెట్ సాధారణంగా నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించడం కోసం, ఈ యాప్ నేపథ్యంలో అమలు కాకుండా మీ టాబ్లెట్ నివారించగలదు."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"<xliff:g id="APP">%1$s</xliff:g> మీ పరికరాన్ని మేల్కొల్పి ఉంచుతోంది, కనుక బ్యాటరీని మీ పరికరం సాధారణంగా నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించడం కోసం, ఈ యాప్ నేపథ్యంలో అమలు కాకుండా మీ పరికరం నివారించగలదు."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"ఆఫ్ చేయి"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"స్థానాన్ని ఆఫ్ చేయాలా?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"మీరు యాప్‌ని ఉపయోగించని సమయంలో కూడా <xliff:g id="APP">%1$s</xliff:g> మీ స్థానాన్ని అభ్యర్థిస్తోంది, కనుక బ్యాటరీని మీ ఫోన్ సాధారణంగా నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించడం కోసం, ఈ యాప్‌లో మీరు స్థానాన్ని ఆఫ్ చేయవచ్చు."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"మీరు యాప్‌ని ఉపయోగించని సమయంలో కూడా <xliff:g id="APP">%1$s</xliff:g> మీ స్థానాన్ని అభ్యర్థిస్తోంది, కనుక బ్యాటరీని మీ టాబ్లెట్ సాధారణంగా నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించడం కోసం, ఈ యాప్‌లో మీరు స్థానాన్ని ఆఫ్ చేయవచ్చు."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"మీరు యాప్‌ని ఉపయోగించని సమయంలో కూడా <xliff:g id="APP">%1$s</xliff:g> మీ స్థానాన్ని అభ్యర్థిస్తోంది, కనుక బ్యాటరీని మీ పరికరం సాధారణంగా నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించడం కోసం, ఈ యాప్‌లో మీరు స్థానాన్ని ఆఫ్ చేయవచ్చు."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"ఆఫ్ చేయి"</string>
     <string name="power_screen" msgid="3023346080675904613">"స్క్రీన్"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"ఫ్లాష్‌లైట్"</string>
     <string name="power_camera" msgid="4976286950934622605">"కెమెరా"</string>
@@ -1952,7 +2023,7 @@
     <string name="power_apps" msgid="2043554781293951327">"అనువర్తనాలు"</string>
     <string name="power_service" msgid="1599661212370831780">"సేవలు"</string>
     <string name="power_system" msgid="8290455327965307383">"సిస్టమ్"</string>
-    <string name="power_user" msgid="1889728099253018005">"వినియోగదారు"</string>
+    <string name="power_user" msgid="3706143225319881667">"ఇతర వినియోగదారులు"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU మొత్తం"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ముందుభాగం"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"సక్రియంగా ఉంచండి"</string>
@@ -2004,6 +2075,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"అధిక గణన విద్యుత్ శక్తి వినియోగం"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> పాటు ఉపయోగించబడింది"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"సక్రియంగా ఉండే సమయం <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"స్క్రీన్ వాడుక <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g> ఉపయోగించింది"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"మొత్తం బ్యాటరీలో <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2563,7 +2635,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"పిన్‌ను మార్చు"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"నోటిఫికేషన్‌లను చూపు"</string>
     <string name="help_label" msgid="6886837949306318591">"సహాయం &amp; అభిప్రాయం"</string>
-    <string name="support_summary" msgid="8276116616493882830">"సహాయక కథనాలు, ఫోన్ &amp; చాట్ మద్దతు"</string>
+    <string name="support_summary" msgid="2705726826263742491">"సహాయక కథనాలు, ఫోన్ &amp; చాట్, ప్రారంభించండి"</string>
     <string name="user_account_title" msgid="1127193807312271167">"కంటెంట్ కోసం ఖాతా"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ఫోటో ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"అత్యంత తీవ్ర నష్టాలు"</string>
@@ -2653,9 +2725,12 @@
       <item quantity="one">%d దాచబడిన అంశాన్ని చూపుతుంది</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"నెట్‌వర్క్ &amp; ఇంటర్నెట్"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, మొబైల్, డేటా వినియోగం, హాట్‌స్పాట్"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"మొబైల్‌"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"డేటా వినియోగం"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"హాట్‌స్పాట్"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"కనెక్ట్ చేసిన పరికరాలు"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"బ్లూటూత్, ప్రసారం చేయి, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"బ్లూటూత్, ప్రసారం"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"అనువర్తనాలు &amp; నోటిఫికేషన్‌లు"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"అనుమతులు, డిఫాల్ట్ అనువర్తనాలు"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"వినియోగదారులు &amp; ఖాతాలు"</string>
@@ -2708,6 +2783,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"సంజ్ఞ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"చెల్లించడం, నొక్కడం, చెల్లింపులు"</string>
     <string name="keywords_backup" msgid="470070289135403022">"బ్యాకప్, బ్యాకప్"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"సంజ్ఞ, అంచు, పక్కన, సక్రియ అంచు, గట్టిగా నొక్కండి, గ్రిప్, సహాయం, సహాయకరం, స్క్వీజీ, స్క్వీజీ, స్క్వీజీ, స్క్వీజీ, ok google, google సహాయకం"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"సంజ్ఞ, మేల్కొల్పు, నోటిఫికేషన్‌లు, స్క్రీన్, డిస్‌ప్లే, స్క్రీన్ ఆఫ్, స్క్రీన్ ఆన్, గట్టిగా నొక్కండి, అంచు, నిద్రావస్థ, నిద్రావస్థలోకి వెళ్లు, గ్రిప్"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"సంజ్ఞ, నిశ్శబ్దం, తాత్కాలిక ఆపివేత, అలారం, ఇన్‌కింగ్ కాల్, నిశ్శబ్దం, డిస్‌ప్లే, లాక్‌స్క్రీన్, గట్టిగా నొక్కండి, గ్రిప్, అంచు, ఆపివేయి"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ట్యాగ్‌ను సెటప్ చేయండి"</string>
     <string name="write_tag" msgid="8571858602896222537">"వ్రాయి"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"వ్రాయడానికి ట్యాగ్‌ను నొక్కండి..."</string>
@@ -2790,7 +2868,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"కార్యాలయ నోటిఫికేషన్‌లను ఎప్పుడూ చూపవద్దు"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"మీరు మీ పరికరాన్ని లాక్ చేసినప్పుడు, ప్రొఫైల్ నోటిఫికేషన్‌లు ఎలా కనిపించాలనుకుంటున్నారు?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"ప్రొఫైల్ నోటిఫికేషన్‌లు"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"నోటిఫికేషన్‌లు"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"నోటిఫికేషన్‌లు"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"అనువర్తన నోటిఫికేషన్‌లు"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"నోటిఫికేషన్ వర్గం"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"ప్రాముఖ్యత"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"నిర్ణయం తీసుకోవడానికి అనువర్తనాన్ని అనుమతించు"</string>
@@ -2805,6 +2884,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"అత్యవసరం"</string>
     <string name="allow_sound" msgid="1820188704793497324">"ధ్వనిని అనుమతించండి"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"శబ్దం చేయదు, వైబ్రేట్ చేయదు లేదా ప్రస్తుత స్క్రీన్‌పై కనిపించేలా ఈ నోటిఫికేషన్‌లను శీఘ్రంగా చూపదు."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"తక్కువ ప్రాముఖ్యత"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"మధ్యస్థ ప్రాముఖ్యత"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"అధిక ప్రాముఖ్యత"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"అత్యవసర ప్రాముఖ్యత"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"నోటిఫికేషన్ సహాయకం"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"నోటిఫికేషన్ ప్రాప్యత"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"కార్యాలయ ప్రొఫైల్‌ నోటిఫికేషన్‌లకు ప్రాప్యత బ్లాక్ చేయబడింది"</string>
@@ -2832,8 +2915,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"చిత్రంలో చిత్రం"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"చిత్రంలో చిత్రాన్ని అనుమతించు"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"అనువర్తనం తెరవబడి ఉన్నప్పుడు లేదా మీరు దాని నుండి నిష్క్రమించినప్పుడు (ఉదాహరణకు, వీడియోని చూడటం కొనసాగించడానికి) చిత్రంలో చిత్రం విండోని సృష్టించడానికి ఈ అనువర్తనాన్ని అనుమతిస్తుంది. మీరు ఉపయోగించే ఇతర అనువర్తనాల ఎగువన ఈ విండో ప్రదర్శితమవుతుంది."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"అనుమతించబడింది"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"అనుమతించలేదు"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"అంతరాయం కలిగించవద్దు ప్రాప్యత"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ఇన్‌స్టాల్ చేసిన అనువర్తనాలేవీ అంతరాయం కలిగించవద్దు ప్రాప్యత అభ్యర్థించలేదు"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"అనువర్తనాలను లోడ్ చేస్తోంది..."</string>
@@ -2964,11 +3045,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ఈ కార్యాలయ ప్రొఫైల్ వీరి నిర్వహణలో ఉంది:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"నిర్వహిస్తున్నది <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ప్రయోగాత్మకం)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"పరికర భ్రమణం"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"స్క్రీన్‌లోని కంటెంట్‌లను తిప్పు"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"పోర్ట్రెయిట్ వీక్షణలో ఉంచు"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ల్యాండ్‌స్కేప్ వీక్షణలో ఉంచు"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ప్రస్తుత దృగ్విన్యాసంలో ఉంచు"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"సురక్షిత ప్రారంభం"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"కొనసాగించండి"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"ఈ పరికరాన్ని ప్రారంభించిన వెంటనే మీ పిన్‌ని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలో ఉన్న డేటాని రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడం కోసం పిన్‌ని అడగాలా?"</string>
@@ -2978,7 +3054,7 @@
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ వేలిముద్రను ఉపయోగించడంతో పాటు, దీనిని ప్రారంభించిన వెంటనే మీ పిన్‌ని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలో ఉన్న డేటాని రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడం కోసం పిన్‌ని అడగాలా&amp;gt;"</string>
     <!-- unknown quoting pattern: original -1, translation 1 -->
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ వేలిముద్రను ఉపయోగించడంతో పాటు, దీనిని ప్రారంభించిన వెంటనే మీ నమూనాని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలో ఉన్న డేటాని రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడం కోసం నమూనాని అడగాలా&amp;gt;"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ వేలిముద్రను ఉపయోగించడంతో పాటు, దీనిని ప్రారంభించిన వెంటనే మీ పాస్‌వర్డ్‌ని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలో ఉన్న డేటాని రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడం కోసం పాస్‌వర్డ్‌ని అడగాలా&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ వేలిముద్రను ఉపయోగించడంతో పాటు, దీనిని ప్రారంభించిన వెంటనే మీ పాస్‌వర్డ్‌ని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలో ఉన్న డేటాని రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడం కోసం పాస్‌వర్డ్‌ని అడగాలా?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"అవును"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"వద్దు"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"పిన్ అవసరమా?"</string>
@@ -3096,6 +3172,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"వినియోగ హెచ్చరికలు"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"పూర్తి పరికర వినియోగాన్నిచూపండి"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"అనువర్తన వినియోగాన్ని చూపండి"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"అధిక వినియోగం"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> యాప్‌లు అసాధారణంగా ప్రవర్తిస్తున్నాయి</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> యాప్ అసాధారణంగా ప్రవర్తిస్తోంది</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">యాప్‌ల కారణంగా బ్యాటరీ ఖాళీ అవుతోంది</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> కారణంగా బ్యాటరీ ఖాళీ అవుతోంది</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"అనుకూలీకరించనివి"</string>
     <string name="high_power_on" msgid="6216293998227583810">"అనుకూలీకరించబడలేదు"</string>
     <string name="high_power_off" msgid="3393904131961263278">"బ్యాటరీ వినియోగాన్ని అనుకూలీకరిస్తోంది"</string>
@@ -3188,8 +3273,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"ఇతర అనువర్తనాల ఎగువన ప్రదర్శన"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g>లో <xliff:g id="COUNT_0">%1$d</xliff:g> అనువర్తనాలు ఇతర అనువర్తనాల ఎగువన కనిపించడానికి అనుమతించబడ్డాయి"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"అనుమతి ఉన్న అనువర్తనాలు"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"అవును"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"లేదు"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"అనుమతించబడింది"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"అనుమతించబడలేదు"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"తెలియని అనువర్తనాలను ఇన్‌స్టాల్ చేయి"</string>
     <string name="write_settings" msgid="4797457275727195681">"సిస్టమ్ సెట్టింగ్‌ల సవరణ"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"వ్రాయండి సవరించండి సిస్టమ్ సెట్టింగ్‌లు"</string>
@@ -3279,6 +3364,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"స్క్రీన్ లేత కాషాయ రంగులో ఉంది. మీరు నిద్రలోకి జారుకోవడంలో ఇది సహాయకరంగా ఉండవచ్చు."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"సూచనలు"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> మరిన్ని"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> సూచనలు</item>
+      <item quantity="one">1 సూచన</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> సూచనలు</item>
+      <item quantity="one">+1 సూచన</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"తీసివేయి"</string>
     <string name="color_temperature" msgid="2070126836910615605">"ప్రశాంత వర్ణము ఉష్ణోగ్రత"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ప్రశాంత భావనను కలిగించే ప్రదర్శన రంగులను ఉపయోగిస్తుంది"</string>
@@ -3297,8 +3391,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> డేటా హెచ్చరిక"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> డేటా హెచ్చరిక / <xliff:g id="ID_2">%2$s</xliff:g> డేటా పరిమితి"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"బిల్లింగ్ సైకిల్"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"నెలవారీ సైకిల్ ప్రతి నెలా <xliff:g id="ID_1">%1$s</xliff:g>వ తేదీన మొదలవుతుంది"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"ప్రతి నెలా <xliff:g id="ID_1">%1$s</xliff:g>వ తేదీన మొదలవుతుంది"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"ప్రతి నెల <xliff:g id="ID_1">%1$s</xliff:g>వ తేదీన"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"నెట్‌వర్క్ పరిమితులు"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> పరిమితులు</item>
@@ -3318,7 +3411,7 @@
       <item quantity="one">డేటా సేవర్ ఆన్‌లో ఉన్నప్పుడు అనియంత్రిత డేటాను ఉపయోగించడానికి 1 అనువర్తనం అనుమతించబడింది</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"డేటా సేవర్"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"అనియంత్రిత డేటా ప్రాప్యత"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"అనియంత్రిత డేటా"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"నేపథ్య డేటా ఆఫ్ చేయబడింది"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"ఆన్‌లో ఉంది"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"ఆఫ్‌లో ఉంది"</string>
@@ -3382,8 +3475,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"లాక్ స్క్రీన్ నోటిఫికేషన్‌లను నియంత్రించండి"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"నోటిఫికేషన్ కంటెంట్‌ను చూపు లేదా దాచు"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"అన్నీ"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"మద్దతు"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"మద్దతు &amp; చిట్కాలు"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"అతితక్కువ వెడల్పు"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ఇన్‌స్టాల్ చేసిన అనువర్తనాలు ఏవీ ప్రీమియం SMS ప్రాప్యతను అభ్యర్థించలేదు"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ప్రీమియం SMSతో మీకు డబ్బు ఖర్చు కావచ్చు, ఈ ఛార్జీ మీ క్యారియర్ బిల్లుల్లో విధించబడుతుంది. మీరు ఒక అనువర్తనానికి అనుమతిని అందిస్తే, ఆ అనువర్తనాన్ని ఉపయోగించి ప్రీమియం SMSను పంపగలరు."</string>
@@ -3448,28 +3540,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"స్వయంచాలకం"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"మాన్యువల్"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"ఇప్పుడు స్థలాన్ని ఖాళీ చేయి"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"సంజ్ఞలు"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"సంజ్ఞ సత్వరమార్గాలు"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"మీ ఫోన్‌ను నియంత్రించడానికి త్వరిత సంజ్ఞలు"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"మీ టాబ్లెట్‌ను నియంత్రించడానికి త్వరిత సంజ్ఞలు"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"మీ పరికరాన్ని నియంత్రించడానికి త్వరిత సంజ్ఞలు"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"తక్షణమే కెమెరా మోడ్‌కు వెళ్లండి"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"కెమెరాను త్వరగా తెరవడానికి, పవర్ బటన్‌ను రెండుసార్లు నొక్కండి. ఏ స్క్రీన్‌పైన అయినా పని చేస్తుంది."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"కెమెరాని త్వరగా తెరవండి"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"కెమెరాని తెరవడం కోసం పవర్ బటన్‌ని రెండుసార్లు నొక్కండి"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"కెమెరాను ముందు/వెనుకకు మార్చడం"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"మరింత వేగంగా సెల్ఫీలు తీసుకోండి"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"సెల్ఫీ మోడ్ కోసం ఫోన్‌ని రెండుసార్లు ముందుకు వెనుకకు కదపండి"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"సెల్ఫీ మోడ్ కోసం టాబ్లెట్‌ని రెండుసార్లు ముందుకు వెనుకకు కదపండి"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"సెల్ఫీ మోడ్ కోసం పరికరాన్ని రెండుసార్లు ముందుకు వెనుకకు కదపండి"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"ఫోన్‌ను తరచి చూడటానికి రెండుసార్లు నొక్కండి"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"టాబ్లెట్‌ను తరచి చూడటానికి రెండుసార్లు నొక్కండి"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"పరికరాన్ని తరచి చూడటానికి రెండుసార్లు నొక్కండి"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"మీ నోటిఫికేషన్‌లను త్వరగా చూడటానికి, మీ స్క్రీన్‌పై రెండుసార్లు నొక్కండి."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"సమయం, నోటిఫికేషన్ చిహ్నాలు మరియు ఇతర సమాచారాన్ని తనిఖీ చేయడం కోసం, మీ స్క్రీన్‌ని రెండుసార్లు నొక్కండి."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"స్క్రీన్ ఆఫ్ చేయబడినప్పుడు నోటిఫికేషన్‌ల కోసం తనిఖీ చేయి"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ఫోన్‌ను తరచి చూడటానికి పైకి ఎత్తండి"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"టాబ్లెట్‌ను తరచి చూడటానికి పైకి ఎత్తండి"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"పరికరాన్ని తరచి చూడటానికి పైకి ఎత్తండి"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"మీ నోటిఫికేషన్‌లను త్వరగా చూడటానికి, మీ ఫోన్‌ను చేతుల్లోకి తీసుకోండి."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"మీ నోటిఫికేషన్‌లను త్వరగా చూడటానికి, మీ టాబ్లెట్‌ను చేతుల్లోకి తీసుకోండి."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"మీ నోటిఫికేషన్‌లను త్వరగా చూడటానికి, మీ పరికరాన్ని చేతుల్లోకి తీసుకోండి."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"సమయం, నోటిఫికేషన్ చిహ్నాలు మరియు ఇతర సమాచారాన్ని తనిఖీ చేయడం కోసం, మీ ఫోన్‌ని పైకి ఎత్తండి."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"సమయం, నోటిఫికేషన్ చిహ్నాలు మరియు ఇతర సమాచారాన్ని తనిఖీ చేయడం కోసం, మీ టాబ్లెట్‌ని పైకి ఎత్తండి."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"సమయం, నోటిఫికేషన్ చిహ్నాలు మరియు ఇతర సమాచారాన్ని తనిఖీ చేయడం కోసం, మీ పరికరాన్ని పైకి ఎత్తండి."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"స్క్రీన్ ఆఫ్ చేయబడినప్పుడు నోటిఫికేషన్‌ల కోసం తనిఖీ చేయి"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"నోటిఫికేషన్‌ల కోసం వేలిముద్రతో స్వైప్ చేయండి"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"మీ నోటిఫికేషన్‌లను తనిఖీ చేయడానికి, మీ ఫోన్ వెనుకవైపు ఉన్న వేలిముద్ర సెన్సార్‌పై క్రిందికి స్వైప్ చేయండి."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"మీ నోటిఫికేషన్‌లను తనిఖీ చేయడానికి, మీ టాబ్లెట్ వెనుకవైపు ఉన్న వేలిముద్ర సెన్సార్‌పై క్రిందికి స్వైప్ చేయండి."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"మీ నోటిఫికేషన్‌లను తనిఖీ చేయడానికి, మీ పరికరం వెనుకవైపు ఉన్న వేలిముద్ర సెన్సార్‌పై క్రిందికి స్వైప్ చేయండి."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"నోటిఫికేషన్‌లను త్వరగా చూడండి"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"వేలిముద్ర సెన్సార్‌పై దిగువకు స్వైప్ చేయండి"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"కెమెరాని తెరవడం కోసం పైకి ఎత్తండి"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"స్వయంచాలకంగా కెమెరా తెరవడానికి, ఫోటో తీసుకునే స్థానానికి మీ ఫోన్‌ను ఎత్తండి (ల్యాండ్‍స్కేప్ లేదా పోర్ట్రెయిట్). మీ ఫోన్ నిద్రావస్థలో లేదా లాక్ చేయబడి ఉన్నప్పుడు పని చేస్తుంది."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"ఫోన్ నిద్రావస్థలో లేదా లాక్ చేయబడి ఉన్నప్పుడు ఫోటోలను తీయండి"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"సహాయక సంజ్ఞ"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"సున్నితత్వం"</string>
@@ -3573,6 +3678,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"మీరు ఈ తక్షణ అనువర్తనాన్ని తీసివేయాలనుకుంటున్నారా?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"గేమ్‌లు"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ఆడియో ఫైల్‌లు"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"ఉపయోగించబడిన నిల్వ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g>కు అన్ఇన్‌స్టాల్ చేయబడింది)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g>కు నిలిపివేయబడింది)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"స్వీయ పూరింపు సేవ"</string>
@@ -3586,5 +3692,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"తక్షణ అనువర్తనం"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"నిల్వ నిర్వాహికిని ఆఫ్ చేయాలా?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"చలన చిత్రం &amp; టీవీ అనువర్తనాలు"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"ఉపయోగించబడిన నిల్వ"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"క్యారియర్ కేటాయింపు సమాచారం"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"క్యారియర్ కేటాయింపు సక్రియం చేయండి"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"కొత్తవి మరియు అద్భుతమైనవి ఏమిటి?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"అగ్ర 5 ఫీచర్‌‌లను పరిశీలించండి"</string>
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 3794809..2e88fe9 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"ดี"</item>
     <item msgid="8986346415847956850">"ยอดเยี่ยม"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"ทุกครั้ง"</item>
-    <item msgid="844721238536786870">"เมื่อเสียบปลั๊กเท่านั้น"</item>
-    <item msgid="1986753720941888596">"ไม่ต้องเลย"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"ทุกครั้ง"</item>
-    <item msgid="7433294150916905997">"เมื่อเสียบปลั๊กเท่านั้น"</item>
-    <item msgid="1390404486722375028">"ไม่เลย"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 วันที่ผ่านมา"</item>
     <item msgid="6600989128423965319">"ตั้งรอบการใช้..."</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index d0711cc..6c95f2d 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ตอนนี้คุณเป็นนักพัฒนาซอฟต์แวร์แล้ว!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"ไม่จำเป็น คุณเป็นนักพัฒนาซอฟต์แวร์อยู่แล้ว"</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"โปรดเปิดใช้ตัวเลือกสำหรับนักพัฒนาซอฟต์แวร์ก่อน"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"ระบบไร้สายและเครือข่าย"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"การเชื่อมต่อ"</string>
     <string name="header_category_device" msgid="4544026001618307754">"อุปกรณ์"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ที่จัดสรรแล้ว"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"จัดสรรแฮงเอาท์วิดีโอแล้ว"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"จัดสรรการโทรผ่าน Wi-Fi แล้ว"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"จัดสรร EAB/Presence แล้ว"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"กำลังส่งของวิทยุเครือข่ายมือถือ"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"ดูสมุดที่อยู่ของซิม"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ดูการจำกัดหมายเลขโทรออก"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"สแกนหาอุปกรณ์"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"เปลี่ยนชื่ออุปกรณ์นี้"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"เปลี่ยนชื่อ"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ตัดการเชื่อมต่อหรือไม่"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"การดำเนินการนี้จะจบการเชื่อมต่อของคุณกับ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"เลิกเชื่อมต่ออุปกรณ์ไหม"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"โทรศัพท์ของคุณจะยกเลิกการเชื่อมต่อจาก <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"แท็บเล็ตของคุณจะยกเลิกการเชื่อมต่อจาก <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"อุปกรณ์ของคุณจะยกเลิกการเชื่อมต่อจาก <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"เลิกต่อ"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"คุณไม่มีสิทธิ์ในการเปลี่ยนการตั้งค่าบลูทูธ"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"จับคู่อุปกรณ์ใหม่"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"อุปกรณ์ใกล้เคียงจะสามารถมองเห็น <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ได้เมื่อเปิดการตั้งค่าบลูทูธ"</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"ที่อยู่บลูทูธของโทรศัพท์: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"ที่อยู่บลูทูธของแท็บเล็ต: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"ที่อยู่บลูทูธของอุปกรณ์: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"ยกเลิกการเชื่อมต่อ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ใช่ไหม"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"การแพร่สัญญาณ"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ปิดใช้งานโปรไฟล์หรือไม่"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"คำขอจับคู่อุปกรณ์ผ่านบลูทูธ"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"คำขอจับคู่อุปกรณ์"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"แตะเพื่อจับคู่กับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"แสดงไฟล์ที่ได้รับ"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"ไฟล์ที่ได้รับ"</string>
     <string name="device_picker" msgid="4978696506172252813">"เลือกอุปกรณ์บลูทูธ"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ต้องการเปิดบลูทูธ"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ต้องการปิดบลูทูธ"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ต้องการเข้าถึงข้อความของคุณ ให้สิทธิ์เข้าถึงแก่ %2$s ไหม"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"ส่งคำขอการเข้าถึงซิม"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ต้องการเข้าถึงซิมการ์ด การให้สิทธิ์เข้าถึงซิมการ์ดจะปิดการเชื่อมต่อข้อมูลบนอุปกรณ์ในระหว่างที่มีการเชื่อมต่อ โปรดให้สิทธิ์เข้าถึงแก่ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"ปรากฏเป็น \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" ในอุปกรณ์อื่นๆ"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"อุปกรณ์ของคุณ"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"จับคู่อุปกรณ์ใหม่"</string>
     <string name="date_and_time" msgid="9062980487860757694">"วันที่และเวลา"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"เลือกเขตเวลา"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"บัญชี"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ตำแหน่ง"</string>
     <string name="account_settings_title" msgid="626177544686329806">"บัญชี"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"ความปลอดภัยและตำแหน่ง"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"ความปลอดภัยและตำแหน่ง"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"การเข้ารหัสลับและข้อมูลรับรอง"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"โทรศัพท์ที่เข้ารหัส"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"อุปกรณ์ที่เข้ารหัส"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"ปลดล็อกด้วยลายนิ้วมือ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"การใช้ลายนิ้วมือ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"เพียงแตะเซ็นเซอร์ลายนิ้วมือเพื่อปลดล็อกโทรศัพท์ อนุมัติการซื้อ หรือลงชื่อเข้าใช้แอป โปรดใช้ความระมัดระวังในการเพิ่มลายนิ้วมือคนอื่น ลายนิ้วมือที่เพิ่มแม้เพียงลายเดียวก็สามารถทำสิ่งต่างๆ เหล่านี้ได้\n\nหมายเหตุ: ลายนิ้วมือของคุณอาจไม่ปลอดภัยเท่ารูปแบบหรือ PIN ที่เดายาก"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"เพียงแตะเซ็นเซอร์ลายนิ้วมือก็อนุมัติการซื้อหรือลงชื่อเข้าใช้แอปได้แล้ว โปรดตรวจสอบลายนิ้วมือที่เพิ่มให้ดี เพราะแค่เพิ่มลายนิ้วมือเพียงนิ้วเดียวก็ทำสิ่งเหล่านี้ได้ทั้งหมด\n\nหมายเหตุ: คุณไม่สามารถใช้ลายนิ้วมือเพื่อปลดล็อกอุปกรณ์นี้ โปรดติดต่อผู้ดูแลระบบขององค์กรสำหรับข้อมูลเพิ่มเติม"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"เพียงแตะเซ็นเซอร์ลายนิ้วมือเพื่อปลดล็อกโทรศัพท์ อนุมัติการซื้อ หรือลงชื่อเข้าใช้แอป โปรดระวังหากจะเพิ่มลายนิ้วมือผู้อื่น เพราะลายนิ้วมือที่เพิ่มเข้ามาจะดำเนินการข้างต้นได้ทั้งหมด\n\nหมายเหตุ: ลายนิ้วมืออาจมีความปลอดภัยน้อยกว่ารูปแบบหรือ PIN ที่เดายาก"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"ใช้ลายนิ้วมือเพื่อปลดล็อกโทรศัพท์หรืออนุมัติการซื้อ\n\nหมายเหตุ: คุณไม่สามารถใช้ลายนิ้วมือเพื่อปลดล็อกอุปกรณ์นี้ โปรดติดต่อผู้ดูแลระบบขององค์กรสำหรับข้อมูลเพิ่มเติม"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"ใช้ลายนิ้วมือเพื่อปลดล็อกโทรศัพท์หรืออนุมัติการซื้อ\n\nหมายเหตุ: ลายนิ้วมืออาจปลอดภัยน้อยกว่ารูปแบบหรือ PIN ที่เดายาก"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ยกเลิก"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ต่อไป"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"ข้าม"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"เพิ่มลายนิ้วมือ"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"จะไม่มีการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้งานแท็บเล็ตนี้ได้หากแท็บเล็ตสูญหาย ถูกขโมย หรือถูกล้างข้อมูล"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"จะไม่มีการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้งานอุปกรณ์เครื่องนี้ได้หากอุปกรณ์สูญหาย ถูกขโมย หรือถูกล้างข้อมูล"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"จะไม่มีการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้งานโทรศัพท์เครื่องนี้ได้หากโทรศัพท์สูญหาย ถูกขโมย หรือถูกล้างข้อมูล"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"จะไม่มีการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้คนอื่นใช้แท็บเล็ตนี้ได้หากแท็บเล็ตสูญหายหรือถูกขโมย"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"จะไม่มีการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้คนอื่นใช้อุปกรณ์นี้ได้หากอุปกรณ์สูญหายหรือถูกขโมย"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"จะไม่มีการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้คนอื่นใช้โทรศัพท์นี้ได้หากโทรศัพท์สูญหายหรือถูกขโมย"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"ถัดไป"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"ระบบจะไม่เปิดฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้แท็บเล็ตนี้หากทำอุปกรณ์หาย ถูกขโมย หรือถูกรีเซ็ต"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"ระบบจะไม่เปิดฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้อุปกรณ์นี้หากทำอุปกรณ์หาย ถูกขโมย หรือถูกรีเซ็ต"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"ระบบจะไม่เปิดฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้โทรศัพท์นี้หากทำอุปกรณ์หาย ถูกขโมย หรือถูกรีเซ็ต"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"ระบบจะไม่เปิดฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้แท็บเล็ตนี้หากทำอุปกรณ์หายหรือถูกขโมย"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"ระบบจะไม่เปิดฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้อุปกรณ์นี้หากทำอุปกรณ์หายหรือถูกขโมย"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"ระบบจะไม่เปิดฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้โทรศัพท์นี้หากทำอุปกรณ์หายหรือถูกขโมย"</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"ข้ามไปก่อน"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"ย้อนกลับ"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ค้นหาเซ็นเซอร์"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ค้นหาเซ็นเซอร์ลายนิ้วมือที่ด้านหลังโทรศัพท์"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"แตะเซ็นเซอร์"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"เซ็นเซอร์อยู่ที่ด้านหลังโทรศัพท์ โปรดใช้นิ้วขี้"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ภาพประกอบที่มีตำแหน่งของอุปกรณ์และเซ็นเซอร์ลายนิ้วมือ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"ชื่อ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ตกลง"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ลบ"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"มาเริ่มกันเลย"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"แตะเซ็นเซอร์"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"วางนิ้วบนเซ็นเซอร์และยกขึ้นหลังจากรู้สึกถึงการสั่น"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"แตะเซ็นเซอร์ซ้ำ"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"เลื่อนนิ้วเล็กน้อยเพื่อเพิ่มส่วนต่างๆ ทั้งหมดของลายนิ้วมือ"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"เพิ่มลายนิ้วมือแล้ว!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"เมื่อใดก็ตามที่คุณเห็นไอคอนนี้ คุณสามารถใช้ลายนิ้วมือเพื่อระบุตัวตนหรือเพื่ออนุญาตการซื้อได้"</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"เพียงแค่แตะเซ็นเซอร์ลายนิ้วมือเพื่อปลุกและปลดล็อกอุปกรณ์"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"เมื่อเห็นไอคอนนี้ คุณยังให้สิทธิ์การซื้อหรือลงชื่อเข้าใช้แอปได้อีกด้วย"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"ยกนิ้วขึ้นแล้วแตะอีกครั้ง"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"ยกนิ้วมือเรื่อยๆ เพิ่มส่วนต่างๆ ของลายนิ้วมือ"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"เพิ่มลายนิ้วมือแล้ว"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"เมื่อเห็นไอคอนนี้ ให้ใช้ลายนิ้วมือเพื่อระบุตัวตนหรือเพื่ออนุมัติการซื้อ"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ข้ามการตั้งค่าลายนิ้วมือไหม"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"คุณได้เลือกที่จะใช้ลายนิ้วมือเป็นวิธีการหนึ่งในการปลดล็อกโทรศัพท์ หากคุณข้ามในตอนนี้ คุณจะต้องตั้งค่าฟีเจอร์นี้ในภายหลัง การตั้งค่าจะใช้เวลาราว 1 นาทีเท่านั้น"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ตั้งค่าการล็อกหน้าจอ"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"เสร็จสิ้น"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"อ๊ะ นั่นไม่ใช่เซ็นเซอร์"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"ใช้เซ็นเซอร์ลายนิ้วมือบนอุปกรณ์"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"แตะเซ็นเซอร์ที่ด้านหลังโทรศัพท์โดยใช้นิ้วชี้"</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"การลงทะเบียนยังไม่เสร็จสมบูรณ์"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"หมดเวลาลงทะเบียนลายนิ้วมือ โปรดลองอีกครั้ง"</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"การลงทะเบียนลายนิ้วมือไม่ทำงาน โปรดลองอีกครั้งหรือใช้นิ้วอื่น"</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ป้องกันไม่ให้ผู้ใช้อื่นใช้อุปกรณ์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ป้องกันไม่ให้ผู้อื่นใช้โทรศัพท์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"เลือกวิธีสำรองในการล็อกหน้าจอ"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"ตัวเลือกการล็อกหน้าจอ"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"ตัวเลือกการล็อกหน้าจอ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ล็อกหน้าจอ"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/ทันทีหลังจากเข้าสู่โหมดสลีป"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/หลังจากเข้าสู่โหมดสลีป <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g>"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"เปลี่ยนรูปแบบการปลดล็อก"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"เปลี่ยน PIN สำหรับปลดล็อก"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"เปลี่ยนรหัสผ่านสำหรับปลดล็อก"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"ลองอีกครั้ง ความพยายามครั้งที่ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> จาก <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"การลองครั้งสุดท้าย"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"หากคุณป้อนรูปแบบการทำงานที่ไม่ถูกต้องในความพยายามครั้งนี้ ระบบจะนำโปรไฟล์งานของคุณและข้อมูลที่เชื่อมโยงออกจากอุปกรณ์นี้"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"หากคุณป้อน PIN การทำงานที่ไม่ถูกต้องในความพยายามครั้งนี้ ระบบจะนำโปรไฟล์งานของคุณและข้อมูลที่เชื่อมโยงออกจากอุปกรณ์นี้"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"หากคุณป้อนรหัสผ่านการทำงานที่ไม่ถูกต้องในความพยายามครั้งนี้ ระบบจะนำโปรไฟล์งานของคุณและข้อมูลที่เชื่อมโยงออกจากอุปกรณ์นี้"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"ใช้ความพยายามหลายครัั้งเกินไป ระบบจะนำโปรไฟล์งานของคุณและข้อมูลที่เชื่อมโยงออกจากอุปกรณ์นี้"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ปิด"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"ลองอีกครั้ง ความพยายามครั้งที่ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> จาก <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"ระบบจะลบข้อมูลของคุณ"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"หากคุณป้อนรูปแบบไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบข้อมูลในอุปกรณ์เครื่องนี้"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"หากคุณป้อน PIN ไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบข้อมูลในอุปกรณ์เครื่องนี้"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"หากคุณป้อนรหัสผ่านไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบข้อมูลในอุปกรณ์เครื่องนี้"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"หากคุณป้อนรูปแบบไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบผู้ใช้รายนี้"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"หากคุณป้อน PIN ไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบผู้ใช้รายนี้"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"หากคุณป้อนรหัสผ่านไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบผู้ใช้รายนี้"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"หากคุณป้อนรูปแบบไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบโปรไฟล์งานนี้และข้อมูลในโปรไฟล์"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"หากคุณป้อน PIN ไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบโปรไฟล์งานนี้และข้อมูลในโปรไฟล์"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"หากคุณป้อนรหัสผ่านไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบโปรไฟล์งานนี้และข้อมูลในโปรไฟล์"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"ใช้ความพยายามหลายครั้งเกินไป ระบบจะลบข้อมูลในอุปกรณ์เครื่องนี้"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"ใช้ความพยายามหลายครั้งเกินไป ระบบจะลบผู้ใช้รายนี้"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"ใช้ความพยายามหลายครั้งเกินไป ระบบจะลบโปรไฟล์งานนี้และข้อมูลในโปรไฟล์"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"ปิด"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"ต้องมีอักขระอย่างน้อย <xliff:g id="COUNT">%d</xliff:g> ตัว"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN ต้องมีตัวเลขอย่างน้อย <xliff:g id="COUNT">%d</xliff:g> ตัว"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ดำเนินการต่อ"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"บลูทูธขั้นสูง"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"เมื่อเปิดบลูทูธ อุปกรณ์ของคุณจะสื่อสารกับอุปกรณ์บลูทูธที่อยู่ใกล้ๆ ได้"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"แอปและบริการของระบบจะยังสามารถตรวจหาอุปกรณ์บลูทูธได้อยู่เพื่อปรับปรุงความแม่นยำของตำแหน่ง คุณสามารถเปลี่ยนแปลงฟีเจอร์นี้ได้ใน<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>การตั้งค่าการสแกน<xliff:g id="LINK_END_1">LINK_END</xliff:g>"</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"ไม่สามารถเชื่อมต่อ โปรดลองอีกครั้ง"</string>
+    <string name="device_details_title" msgid="6576953269221085300">"รายละเอียดอุปกรณ์"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"ที่อยู่บลูทูธของอุปกรณ์: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"ไม่จำอุปกรณ์ใช่ไหม"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"โทรศัพท์ของคุณจะไม่จับคู่กับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> อีกต่อไป"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"แท็บเล็ตของคุณจะไม่จับคู่กับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> อีกต่อไป"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"อุปกรณ์ของคุณจะไม่จับคู่กับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> อีกต่อไป"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"ไม่จำอุปกรณ์"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"เชื่อมต่อกับ…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกตัดการเชื่อมต่อจากเสียงของสื่อ"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกตัดการเชื่อมต่อจากเสียงแฮนด์ฟรี"</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"ไม่ต้องระบุ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"ไม่ต้องตรวจสอบ"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"ไม่ได้ระบุใบรับรอง การเชื่อมต่อของคุณจะไม่เป็นส่วนตัว"</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"ชื่อเครือข่ายยาวเกินไป"</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"ต้องระบุโดเมน"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ใช้งานได้"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ใช้งานได้)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 เครือข่าย</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"WiFi ขั้นสูง"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"กำหนดค่า Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"ที่อยู่ Mac"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"ที่อยู่ IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"ซับเน็ตมาสก์"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ไม่จำกลุ่มนี้ใช่หรือไม่"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"WiFi ฮอตสปอตแบบพกพา"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi ฮอตสปอต"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"ใช้เครือข่ายมือถือเพื่อปล่อยสัญญาณเครือข่าย Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"ไม่แชร์อินเทอร์เน็ตของแท็บเล็ตนี้ผ่านฮอตสปอต"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"ไม่แชร์อินเทอร์เน็ตของโทรศัพท์นี้ผ่านฮอตสปอต"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"ไม่ได้แชร์อินเทอร์เน็ตหรือเนื้อหากับอุปกรณ์อื่นๆ อยู่"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"กำลังแชร์การเชื่อมต่ออินเทอร์เน็ตของแท็บเล็ตนี้ผ่านฮอตสปอตอยู่"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"กำลังแชร์การเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์นี้ผ่านฮอตสปอตอยู่"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"แอปไม่ได้แชร์เนื้อหาอยู่ หากต้องการแชร์การเชื่อมต่ออินเทอร์เน็ต ให้ปิดฮอตสปอตแล้วเปิดใหม่"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"ชื่อ Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"กำลังเปิด <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"อุปกรณ์อื่นๆ สามารถเชื่อมต่อกับ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"รหัสผ่าน Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"ย่านความถี่ AP"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"ใช้ฮอตสปอตเพื่อสร้างเครือข่าย Wi‑Fi สำหรับอุปกรณ์อื่นๆ ของคุณ ฮอตสปอตสามารถให้บริการอินเทอร์เน็ตโดยใช้การเชื่อมต่ออินเทอร์เน็ตมือถือ อาจมีค่าบริการอินเทอร์เน็ตมือถือเพิ่มเติม"</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"แอปสามารถสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"กำลังเปิดฮอตสปอต…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"กำลังปิดฮอตสปอต…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ใช้งานอยู่"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"เมื่อเปิดการโทรผ่าน Wi-Fi โทรศัพท์จะสามารถวางเส้นทางสายเรียกผ่านเครือข่าย Wi-Fi หรือเครือข่ายของผู้ให้บริการของคุณได้ ทั้งนี้ขึ้นอยู่กับค่ากำหนดของคุณและสัญญาณฝั่งที่แรงกว่า โปรดสอบถามค่าธรรมเนียมและรายละเอียดอื่นๆ กับผู้ให้บริการก่อนที่จะเปิดฟีเจอร์นี้"</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"อัปเดตที่อยู่ฉุกเฉิน"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"ที่อยู่ที่บริการฉุกเฉินจะใช้เป็นตำแหน่งของคุณถ้าคุณโทรหมายเลข 911 ด้วย Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"แสดง"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"ไม่พบผลลัพธ์"</string>
     <string name="display_settings" msgid="7965901687241669598">"การแสดงผล"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"หมุนหน้าจออัตโนมัติ"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"สีสันสดใส"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"เปลี่ยนการวางแนวโดยอัตโนมัติเมื่อหมุนแท็บเล็ต"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"สลับแนวหน้าจออัตโนมัติเมื่อหมุนโทรศัพท์"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"เปลี่ยนการวางแนวโดยอัตโนมัติเมื่อหมุนแท็บเล็ต"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"เพิ่มประสิทธิภาพระดับความสว่างสำหรับแสงที่มี เมื่อเปิดฟีเจอร์นี้ คุณจะยังปรับความสว่างชั่วคราวได้"</string>
     <string name="night_display_title" msgid="2626451512200357686">"แสงตอนกลางคืน"</string>
     <string name="night_display_text" msgid="1837277457033025056">"แสงตอนกลางคืนแต้มสีเหลืองอำพันบนหน้าจอ ซึ่งจะทำให้ดูหรืออ่านหน้าจอในแสงสลัวได้ง่ายขึ้น และอาจช่วยให้คุณนอนหลับได้ง่ายขึ้นด้วย"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"กำหนดการ"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"สถานะ"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"เปิดอัตโนมัติ"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"ไม่ใช้"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"กำหนดการที่กำหนดเอง"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"พระอาทิตย์ตกถึงพระอาทิตย์ขึ้น"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"กำหนดการ"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"ไม่มี"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"เปิดในเวลาที่กำหนด"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"เปิดตั้งแต่พระอาทิตย์ตกจนขึ้น"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"เวลาเริ่มต้น"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"เวลาสิ้นสุด"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"สถานะ"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"ความเข้ม"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"ปิด <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"จะไม่เปิดโดยอัตโนมัติ"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"จะเปิดโดยอัตโนมัติในเวลา <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"จะเปิดโดยอัตโนมัติเมื่อพระอาทิตย์ตก"</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"เปิด <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"จะไม่ปิดโดยอัตโนมัติ"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"จะปิดโดยอัตโนมัติในเวลา <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"จะปิดโดยอัตโนมัติเมื่อพระอาทิตย์ขึ้น"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"ปิด / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"จะไม่เปิดโดยอัตโนมัติ"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"จะเปิดโดยอัตโนมัติในเวลา <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"จะเปิดโดยอัตโนมัติเมื่อพระอาทิตย์ตก"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"เปิด / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"จะไม่ปิดโดยอัตโนมัติ"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"จะปิดโดยอัตโนมัติในเวลา <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"จะปิดโดยอัตโนมัติเมื่อพระอาทิตย์ขึ้น"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"สลีป"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"หน้าจอปิด"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"หลังจากไม่ได้ทำงานเป็นเวลา <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"การตั้งค่า"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ปรับความสว่างอัตโนมัติ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ยกขึ้นเพื่อเวก"</string>
-    <string name="doze_title" msgid="2259176504273878294">"หน้าจอแบบแอมเบียนท์"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"หน้าจอแอมเบียนท์"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"เปิดอยู่เสมอ"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"การแจ้งเตือนใหม่"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"แสดงเมื่อใด"</string>
+    <string name="doze_title" msgid="2375510714460456687">"การแจ้งเตือนใหม่"</string>
     <string name="doze_summary" msgid="3846219936142814032">"เปิดหน้าจอเมื่อได้รับการแจ้งเตือน"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"เปิดใช้เสมอ"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"แสดงเวลา ไอคอนการแจ้งเตือน และข้อมูลอื่นๆ"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ขนาดอักษร"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ทำให้ข้อความมีขนาดใหญ่ขึ้นหรือเล็กลง"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"การตั้งค่าการล็อกซิมการ์ด"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"ต้องใส่ข้อมูล APN"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"ช่อง MCC ต้องเป็นเลข 3 หลัก"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"ช่อง MNC ต้องมีเลขอย่างน้อย 2 หรือ 3 หลัก"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"ผู้ให้บริการไม่อนุญาตให้เพิ่ม APN ประเภท %s"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"กำลังเรียกคืนการตั้งค่า APN เริ่มต้น"</string>
     <string name="menu_restore" msgid="8260067415075573273">"รีเซ็ตเป็นค่าเริ่มต้น"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"รีเซ็ตการตั้งค่า APN กลับเป็นค่าเริ่มต้นเรียบร้อยแล้ว"</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"ลบการ์ด SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"ลบข้อมูลทั้งหมดในที่จัดเก็บข้อมูล USB ภายใน เช่น เพลงหรือรูปภาพ"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"ลบข้อมูลทั้งหมดในการ์ด SD เช่น เพลงหรือรูปภาพ"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"ลบข้อมูลใน eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"ลบซิมอิเล็กทรอนิกส์ทั้งหมดในโทรศัพท์ การดำเนินการนี้ไม่ได้เป็นการยกเลิกแพ็กเกจอินเทอร์เน็ตของคุณ"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"ลบซิมอิเล็กทรอนิกส์ทั้งหมดในแท็บเล็ต การดำเนินการนี้ไม่ได้เป็นการยกเลิกแพ็กเกจอินเทอร์เน็ตของคุณ"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"รีเซ็ตแท็บเล็ต"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"รีเซ็ตโทรศัพท์"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"หากลบข้อมูลส่วนบุคคลและแอ⁠⁠ปที่ดาวน์โหลดทั้งหมด คุณจะไม่สามารถยกเลิกการทำงานนี้ได้"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ไม่สามารถเชื่อมต่ออินเทอร์เน็ตผ่านมือถือหรือใช้โหมดฮอตสปอตแบบพกพาขณะที่การประหยัดอินเทอร์เน็ตเปิดอยู่"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"ปล่อยสัญญาณผ่าน USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"เชื่อมต่อ USB แล้ว ตรวจสอบเพื่อปล่อยสัญญาณ"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"ปล่อยสัญญาณแล้ว"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"ไม่สามารถเชื่อมต่อได้หากใช้ที่จัดเก็บข้อมูล USB อยู่"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"ไม่ได้เชื่อมต่อ USB"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"เชื่อมต่อเพื่อเปิด"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"ข้อผิดพลาดในการปล่อยสัญญาณของ USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"แชร์การเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์ผ่าน USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"แชร์การเชื่อมต่ออินเทอร์เน็ตของแท็บเล็ตผ่าน USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ปล่อยสัญญาณบลูทูธ"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"กำลังแชร์อินเทอร์เน็ตของแท็บเล็ตนี้ผ่านบลูทูธ"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"กำลังแชร์อินเทอร์เน็ตของโทรศัพท์นี้ผ่านบลูทูธ"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"แชร์อินเทอร์เน็ตของแท็บเล็ตนี้กับอุปกรณ์ 1 ชิ้นผ่านบลูทูธ"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"แชร์อินเทอร์เน็ตของโทรศัพท์นี้กับอุปกรณ์ 1 ชิ้นผ่านบลูทูธ"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"แชร์อินเทอร์เน็ตของแท็บเล็ตนี้กับอุปกรณ์ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ชิ้นผ่านบลูทูธอยู่"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"แชร์อินเทอร์เน็ตของโทรศัพท์นี้กับอุปกรณ์ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ชิ้นผ่านบลูทูธอยู่"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"แชร์การเชื่อมต่ออินเทอร์เน็ตของแท็บเล็ตผ่านบลูทูธ"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"แชร์การเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์ผ่านบลูทูธ"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"กำลังแชร์อินเทอร์เน็ตของ <xliff:g id="DEVICE_NAME">%1$d</xliff:g> นี้ผ่านบลูทูธ"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"ไม่แชร์อินเทอร์เน็ตของแท็บเล็ตนี้ผ่านบลูทูธ"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"ไม่แชร์อินเทอร์เน็ตของโทรศัพท์นี้ผ่านบลูทูธ"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"ไม่สามารถเชื่อมต่อ"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"ไม่สามารถปล่อยการเชื่อมต่อมากกว่า <xliff:g id="MAXCONNECTION">%1$d</xliff:g> อุปกรณ์"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกยกเลิกการปล่อยสัญญาณ"</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"ใช้ฮอตสปอตและการเชื่อมต่อผ่านมือถือเพื่อให้อุปกรณ์อื่นๆ ใช้อินเทอร์เน็ตผ่านการเชื่อมต่ออินเทอร์เน็ตมือถือ"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"ใช้ฮอตสปอตและการเชื่อมต่อผ่านมือถือเพื่อให้อุปกรณ์อื่นๆ ใช้อินเทอร์เน็ตผ่านการเชื่อมต่ออินเทอร์เน็ตมือถือ และแอปยังสามารถสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้ได้ด้วย"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ความช่วยเหลือ"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"เครือข่ายมือถือ"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"แผนบริการอุปกรณ์เคลื่อนที่"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"โหมดตำแหน่ง"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"ใช้ GPS, Wi-Fi, บลูทูธ หรือเครือข่ายมือถือเพื่อระบุตำแหน่ง"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"ใช้ Wi‑Fi, บลูทูธ หรือเครือข่ายมือถือเพื่อระบุตำแหน่ง"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ใช้ GPS เพื่อระบุตำแหน่ง"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"ใช้ GPS และเซ็นเซอร์ของอุปกรณ์เพื่อระบุตำแหน่ง"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"การสแกน"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"การสแกนหา Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ปรับปรุงตำแหน่งโดยอนุญาตให้แอปและบริการของระบบตรวจหาเครือข่าย Wi‑Fi ได้ทุกเมื่อ"</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"คุณไม่มีการเชื่อมต่อข้อมูล หากต้องการดูข้อมูลนี้ในขณะนี้ ให้ไปที่ %s จากคอมพิวเตอร์เครื่องใดก็ได้ที่เชื่อมต่อกับอินเทอร์เน็ต"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"กำลังโหลด…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"เลือกรหัสผ่านของคุณ"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"หากต้องการใช้ลายนิ้วมือ ให้ตั้งรหัสผ่าน"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"เลือกรูปแบบของคุณ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"หากต้องการใช้ลายนิ้วมือ ให้ตั้งค่ารูปแบบ"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"เลือก PIN ของคุณ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"หากต้องการใช้ลายนิ้วมือ ให้ตั้งค่า PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"ยืนยันรหัสผ่านของคุณ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ยืนยันรูปแบบของคุณ"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"ยืนยัน PIN"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"การตั้งค่าแอปพลิเคชัน"</string>
     <string name="install_applications" msgid="4872012136210802181">"ไม่รู้จักที่มา"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"อนุญาตให้ติดตั้งแอปจากทุกแห่ง"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"แอปที่เปิดล่าสุด"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"ดูทั้ง <xliff:g id="COUNT">%1$d</xliff:g> แอป"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g>ที่ผ่านมา"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"แท็บเล็ตและข้อมูลส่วนตัวของคุณมีความเสี่ยงมากขึ้นที่จะถูกโจมตีจากแอปที่ไม่รู้จัก การติดตั้งแอปจากแหล่งที่มานี้แสดงว่าคุณยอมรับว่าจะรับผิดชอบต่อความเสียหายใดๆ ที่มีต่อแท็บเล็ตหรือการสูญเสียข้อมูลที่อาจเกิดจากการใช้งานแอปดังกล่าว"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"โทรศัพท์และข้อมูลส่วนตัวของคุณมีความเสี่ยงมากขึ้นที่จะถูกโจมตีจากแอปที่ไม่รู้จัก การติดตั้งแอปจากแหล่งที่มานี้แสดงว่าคุณยอมรับว่าจะรับผิดชอบต่อความเสียหายใดๆ ที่มีต่อโทรศัพท์หรือการสูญเสียข้อมูลที่อาจเกิดจากการใช้งานแอปดังกล่าว"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"การตั้งค่าขั้นสูง"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"หยุดบริการของระบบหรือไม่"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"หากคุณหยุดบริการนี้ ฟีเจอร์บางอย่างของแท็บเล็ตอาจทำงานได้ไม่ถูกต้องจนกว่าคุณจะปิดเครื่องแล้วเปิดใหม่อีกครั้ง"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"หากคุณหยุดบริการนี้ ฟีเจอร์บางอย่างของโทรศัพท์อาจทำงานได้ไม่ถูกต้องจนกว่าคุณปิดจะเครื่องแล้วเปิดใหม่อีกครั้ง"</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"ภาษา การป้อนข้อมูล และท่าทางสัมผัส"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"ภาษาและการป้อนข้อมูล"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ภาษาและการป้อนข้อมูล"</string>
     <string name="input_assistance" msgid="7577795275222555487">"ความช่วยเหลือในการป้อนข้อมูล"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other">บริการการพิมพ์เปิดอยู่ <xliff:g id="COUNT">%1$d</xliff:g> รายการ</item>
       <item quantity="one">บริการการพิมพ์เปิดอยู่ 1 รายการ</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other">งานพิมพ์ <xliff:g id="COUNT">%1$d</xliff:g> รายการ</item>
+      <item quantity="one">งานพิมพ์ 1 รายการ</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"บริการการพิมพ์"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"ไม่ได้ติดตั้งบริการใดไว้"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"ไม่พบเครื่องพิมพ์"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"ใช้รายละเอียด"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"ปรับการใช้พลังงาน"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"แพ็คเก็จที่รวมมาด้วย"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"แอปทำให้แบตเตอรี่หมดเร็ว"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"ปลุกให้อุปกรณ์ตื่นอยู่เสมอ"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ปลุกให้อุปกรณ์ตื่นในพื้นหลัง"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ขอตำแหน่งบ่อย"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"แอป <xliff:g id="NUMBER">%1$d</xliff:g> แอปทำงานผิดปกติ"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"หยุดแอปไหม"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"โทรศัพท์ไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP">%1$s</xliff:g> ปลุกให้โทรศัพท์ตื่นอยู่เสมอ\n\nคุณสามารถบังคับให้แอปหยุดเพื่อลองแก้ไขปัญหานี้\n\nหากปัญหายังคงอยู่ คุณอาจต้องถอนการติดตั้งแอปเพื่อปรับปรุงประสิทธิภาพของแบตเตอรี่"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"แท็บเล็ตไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP">%1$s</xliff:g> ปลุกให้แท็บเล็ตตื่นอยู่เสมอ\n\nคุณสามารถบังคับให้แอปหยุดเพื่อลองแก้ไขปัญหานี้\n\nหากปัญหายังคงอยู่ คุณอาจต้องถอนการติดตั้งแอปเพื่อปรับปรุงประสิทธิภาพของแบตเตอรี่"</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"อุปกรณ์ไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP">%1$s</xliff:g> ปลุกให้อุปกรณ์ตื่นอยู่เสมอ\n\nคุณสามารถบังคับให้แอปหยุดเพื่อลองแก้ไขปัญหานี้\n\nหากปัญหายังคงอยู่ คุณอาจต้องถอนการติดตั้งแอปเพื่อปรับปรุงประสิทธิภาพของแบตเตอรี่"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"หยุดแอป"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"ปิดการใช้งานในพื้นหลังไหม"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"โทรศัพท์ไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP">%1$s</xliff:g> ปลุกให้โทรศัพท์ตื่นอยู่เสมอ\n\nโทรศัพท์สามารถป้องกันไม่ให้แอปนี้ทำงานในพื้นหลังเพื่อจัดการกับปัญหานี้"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"แท็บเล็ตไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP">%1$s</xliff:g> ปลุกให้แท็บเล็ตตื่นอยู่เสมอ\n\nแท็บเล็ตสามารถป้องกันไม่ให้แอปนี้ทำงานในพื้นหลังเพื่อจัดการกับปัญหานี้"</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"อุปกรณ์ไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP">%1$s</xliff:g> ปลุกให้อุปกรณ์ตื่นอยู่เสมอ\n\nอุปกรณ์สามารถป้องกันไม่ให้แอปนี้ทำงานในพื้นหลังเพื่อจัดการกับปัญหานี้"</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"ปิด"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"ปิดตำแหน่งไหม"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"โทรศัพท์ไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP">%1$s</xliff:g> ขอตำแหน่งของคุณอยู่เสมอเมื่อคุณไม่ได้ใช้แอป\n\nคุณสามารถปิดตำแหน่งสำหรับแอปนี้เพื่อแก้ปัญหานี้"</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"แท็บเล็ตไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP">%1$s</xliff:g> ขอตำแหน่งของคุณอยู่เสมอเมื่อคุณไม่ได้ใช้แอป\n\nคุณสามารถปิดตำแหน่งสำหรับแอปนี้เพื่อแก้ปัญหานี้"</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"อุปกรณ์ไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP">%1$s</xliff:g> ขอตำแหน่งของคุณอยู่เสมอเมื่อคุณไม่ได้ใช้แอป\n\nคุณสามารถปิดตำแหน่งสำหรับแอปนี้เพื่อแก้ปัญหานี้"</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"ปิด"</string>
     <string name="power_screen" msgid="3023346080675904613">"หน้าจอ"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"ไฟฉาย"</string>
     <string name="power_camera" msgid="4976286950934622605">"กล้องถ่ายรูป"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"แอป"</string>
     <string name="power_service" msgid="1599661212370831780">"บริการ"</string>
     <string name="power_system" msgid="8290455327965307383">"ระบบ"</string>
-    <string name="power_user" msgid="1889728099253018005">"ผู้ใช้"</string>
+    <string name="power_user" msgid="3706143225319881667">"ผู้ใช้รายอื่นๆ"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU รวม"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ส่วนหน้าของ CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ทำงานตลอดเวลา"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"การใช้พลังงานที่คำนวณมากเกินไป"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"ใช้ไป <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"มีการใช้งานเป็นเวลา <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"การใช้งานหน้าจอ <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ใช้ไป <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ของแบตเตอรี่ทั้งหมด"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"เปลี่ยน PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"แสดงการแจ้งเตือน"</string>
     <string name="help_label" msgid="6886837949306318591">"ช่วยเหลือและความเห็น"</string>
-    <string name="support_summary" msgid="8276116616493882830">"บทความช่วยเหลือ การสนับสนุนผ่านทางโทรศัพท์และแชท"</string>
+    <string name="support_summary" msgid="2705726826263742491">"บทความช่วยเหลือ โทรศัพท์และแชท การเริ่มต้นใช้งาน"</string>
     <string name="user_account_title" msgid="1127193807312271167">"บัญชีสำหรับเนื้อหา"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID รูปภาพ"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"ภัยคุกคามระดับสูงสุด"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">แสดงรายการที่ซ่อน %d รายการ</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"เครือข่ายและอินเทอร์เน็ต"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, อุปกรณ์เคลื่อนที่, ปริมาณการใช้อินเทอร์เน็ต, ฮอตสปอต"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"มือถือ"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ปริมาณการใช้อินเทอร์เน็ต"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ฮอตสปอต"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"อุปกรณ์ที่เชื่อมต่อ"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"บลูทูธ, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"บลูทูธ แคสต์"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"แอปและการแจ้งเตือน"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"สิทธิ์ แอปเริ่มต้น"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"ผู้ใช้และบัญชี"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"ท่าทางสัมผัส"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ชำระเงิน แตะ การชำระเงิน"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ข้อมูลสำรอง, สำรองข้อมูล"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"ท่าทางสัมผัส, ขอบ, ด้านข้าง, ขอบแบบแอ็กทีฟ, บีบ, กำแน่น, ช่วยเหลือ, assistant, squeezy, squeezie, squeezey, squeezee, ok google, google assistant"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"ท่าทางสัมผัส, ปลุก, การแจ้งเตือน, หน้าจอ, การแสดงผล, หน้าจอปิดอยู่, หน้าจอเปิดอยู่, บีบ, ขอบ, อยู่ในโหมดสลีป, โหมดสลีป, กำแน่น"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"ท่าทางสัมผัส, ปิดเสียง, ปิดเสียงเตือนชั่วคราว, การปลุก, สายเรียกเข้า, เงียบ, การแสดงผล, หน้าจอล็อก, บีบ, กำแน่น, ขอบ, หยุด"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ตั้งค่าแท็ก NFC สำหรับ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"เขียน"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"แตะแท็กเพื่อเขียน..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"ไม่ต้องแสดงการแจ้งเตือนงานเลย"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"เมื่ออุปกรณ์ล็อกอยู่ คุณต้องการให้แสดงการแจ้งเตือนโปรไฟล์อย่างไร"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"การแจ้งเตือนโปรไฟล์"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"การแจ้งเตือน"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"การแจ้งเตือน"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"การแจ้งเตือนของแอป"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"หมวดหมู่การแจ้งเตือน"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"ความสำคัญ"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"ให้แอปตัดสินใจ"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"ด่วน"</string>
     <string name="allow_sound" msgid="1820188704793497324">"อนุญาตให้ส่งเสียง"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"ไม่ส่งเสียงเตือน สั่น หรือแสดงชั่วครู่ในมุมมองหน้าจอปัจจุบันสำหรับการแจ้งเตือนเหล่านี้"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"ความสำคัญต่ำ"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"ความสำคัญปานกลาง"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"ความสำคัญสูง"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"ความสำคัญเร่งด่วน"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"ผู้ช่วยการแจ้งเตือน"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"การเข้าถึงการแจ้งเตือน"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"การเข้าถึงการแจ้งเตือนโปรไฟล์งานถูกบล็อก"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"การแสดงผลหลายแหล่งพร้อมกัน"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"อนุญาตการแสดงผลหลายแหล่งพร้อมกัน"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"อนุญาตให้แอปนี้สร้างหน้าต่างการแสดงผลหลายแหล่งพร้อมกันในขณะที่แอปเปิดอยู่หรือหลังจากที่คุณปล่อยทิ้งไว้ (เช่น เพื่อดูวิดีโอต่อ) หน้าต่างนี้จะแสดงทับแอปอื่นๆ ที่คุณกำลังใช้"</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"ใช่"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"ไม่"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"การเข้าถึง \"ห้ามรบกวน\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ไม่มีแอปที่ติดตั้งใดๆ ส่งคำขอสิทธิ์เข้าถึง \"ห้ามรบกวน\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"กำลังโหลดแอป..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"โปรไฟล์งานนี้ได้รับการจัดการโดย:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"จัดการโดย <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ทดลอง)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"การหมุนอุปกรณ์"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"หมุนเนื้อหาของหน้าจอ"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"ใช้มุมมองแนวตั้ง"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ใช้มุมมองแนวนอน"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ใช้การวางแนวเดิม"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"รักษาความปลอดภัยเมื่อเปิดขึ้น"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ต่อไป"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"คุณสามารถปกป้องอุปกรณ์นี้เพิ่มเติมโดยกำหนดให้ป้อน PIN ก่อนอุปกรณ์จะเริ่มทำงาน อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือนซึ่งรวมถึงการปลุก จนกว่าจะเริ่มทำงาน \n\nวิธีนี้ช่วยปกป้องข้อมูลในอุปกรณ์ที่สูญหายหรือถูกขโมย กำหนดให้ป้อน PIN เพื่อเริ่มต้นอุปกรณ์ไหม"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"คุณสามารถปกป้องอุปกรณ์นี้เพิ่มเติมโดยกำหนดให้ป้อนรหัสผ่านก่อนอุปกรณ์จะเริ่มทำงาน อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือนซึ่งรวมถึงการปลุก จนกว่าจะเริ่มทำงาน \n\nวิธีนี้ช่วยปกป้องข้อมูลในอุปกรณ์ที่สูญหายหรือถูกขโมย กำหนดให้ป้อนรหัสผ่านเพื่อเริ่มต้นอุปกรณ์ไหม"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"นอกเหนือจากการใช้ลายนิ้วมือเพื่อปลดล็อกอุปกรณ์ คุณยังสามารถปกป้องอุปกรณ์นี้เพิ่มเติมโดยกำหนดให้ป้อน PIN ก่อนอุปกรณ์จะเริ่มทำงาน อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือนซึ่งรวมถึงการปลุก จนกว่าจะเริ่มทำงาน\n\nวิธีนี้ช่วยปกป้องข้อมูลในอุปกรณ์ที่สูญหายหรือถูกขโมย กำหนดให้ป้อน PIN เพื่อเริ่มต้นอุปกรณ์ไหม"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"นอกเหนือจากการใช้ลายนิ้วมือเพื่อปลดล็อกอุปกรณ์ คุณยังสามารถปกป้องอุปกรณ์นี้เพิ่มเติมโดยกำหนดให้ใช้รูปแบบก่อนที่อุปกรณ์จะเริ่มทำงาน อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือนซึ่งรวมถึงการปลุก จนกว่าจะเริ่มทำงาน\n\nวิธีนี้ช่วยปกป้องข้อมูลในอุปกรณ์ที่สูญหายหรือถูกขโมย กำหนดให้ใช้รูปแบบเพื่อเริ่มต้นอุปกรณ์ไหม"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"นอกเหนือจากการใช้ลายนิ้วมือเพื่อปลดล็อกอุปกรณ์ คุณยังสามารถปกป้องอุปกรณ์นี้เพิ่มเติมโดยกำหนดให้ป้อนรหัสผ่านก่อนอุปกรณ์จะเริ่มทำงาน อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือนซึ่งรวมถึงการปลุก จนกว่าจะเริ่มทำงาน\n\nวิธีนี้ช่วยปกป้องข้อมูลในอุปกรณ์ที่สูญหายหรือถูกขโมย กำหนดให้ป้อนรหัสผ่านเพื่อเริ่มต้นอุปกรณ์ไหม"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"นอกเหนือจากการใช้ลายนิ้วมือเพื่อปลดล็อกอุปกรณ์แล้ว คุณสามารถปกป้องอุปกรณ์นี้ให้รัดกุมมากขึ้นโดยการกำหนดให้ขอรหัสผ่านก่อนเริ่มต้นระบบ อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงการปลุกได้จนกว่าจะเริ่มต้นระบบ\n\nซึ่งจะช่วยปกป้องข้อมูลในกรณีที่อุปกรณ์สูญหายหรือถูกขโมย กำหนดให้ขอรหัสผ่านเพื่อเริ่มต้นระบบอุปกรณ์ไหม"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"ใช่"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"ไม่"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"ต้องใช้ PIN ใช่ไหม"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"การแจ้งเตือนการใช้งาน"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"แสดงการใช้งานอุปกรณ์แบบเต็ม"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"แสดงการใช้งานแอป"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"การใช้งานแบตเตอรี่สูง"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> แอปมีลักษณะการทำงานผิดปกติ</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> มีลักษณะการทำงานผิดปกติ</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">แอปหลายแอปทำให้แบตเตอรี่หมดเร็ว</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> ทำให้แบตเตอรี่หมดเร็ว</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ไม่ได้เพิ่มประสิทธิภาพ"</string>
     <string name="high_power_on" msgid="6216293998227583810">"ไม่ได้เพิ่มประสิทธิภาพ"</string>
     <string name="high_power_off" msgid="3393904131961263278">"เพิ่มประสิทธิภาพการใช้แบตเตอรี"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"แสดงทับแอปอื่นๆ"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> จาก <xliff:g id="COUNT_1">%2$d</xliff:g> แอปได้รับอนุญาตให้แสดงทับแอปอื่นๆ"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"แอปที่มีสิทธิ์"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"ใช่"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"ไม่"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"อนุญาต"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"ไม่อนุญาต"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"ติดตั้งแอปจากแหล่งที่มาที่ไม่รู้จัก"</string>
     <string name="write_settings" msgid="4797457275727195681">"แก้ไขการตั้งค่าระบบ"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"เขียน แก้ไข ระบบ การตั้งค่า"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"แต้มสีเหลืองอำพันบนหน้าจอ ซึ่งอาจช่วยให้คุณนอนหลับได้ง่ายขึ้น"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"คำแนะนำ"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+อีก <xliff:g id="ID_1">%1$d</xliff:g> รายการ"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> คำแนะนำ</item>
+      <item quantity="one">1 คำแนะนำ</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> คำแนะนำ</item>
+      <item quantity="one">+1 คำแนะนำ</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"นำออก"</string>
     <string name="color_temperature" msgid="2070126836910615605">"อุณหภูมิสีเย็น"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ใช้สีแสดงผลที่เย็นกว่านี้"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"เตือนปริมาณอินเทอร์เน็ต <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"เตือนปริมาณอินเทอร์เน็ต <xliff:g id="ID_1">%1$s</xliff:g>/ขีดจำกัดอินเทอร์เน็ต <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"รอบการเรียกเก็บเงิน"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"รอบรายเดือนเริ่มวันที่ <xliff:g id="ID_1">%1$s</xliff:g> ของทุกเดือน"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"รายเดือน เริ่มวันที่ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"ทุกเดือนในวันที่ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"ข้อจำกัดของเครือข่าย"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other">ข้อจำกัด <xliff:g id="COUNT">%1$d</xliff:g> ข้อ</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 แอปได้รับอนุญาตให้ใช้อินเทอร์เน็ตได้ไม่จำกัดเมื่อเปิดโปรแกรมประหยัดอินเทอร์เน็ต</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"การประหยัดอินเทอร์เน็ต"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"เข้าถึงข้อมูลได้ไม่จำกัด"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"เข้าถึงข้อมูลได้ไม่จำกัด"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"ปิดใช้ข้อมูลแบ็กกราวด์"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"เปิด"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"ปิด"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"ควบคุมการแจ้งเตือนบนหน้าจอล็อก"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"แสดงหรือซ่อนเนื้อหาการแจ้งเตือน"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"ทั้งหมด"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"การสนับสนุน"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"การสนับสนุนและเคล็ดลับ"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"ความกว้างที่เล็กที่สุด"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ไม่มีแอปใดที่ติดตั้งไว้ขอเข้าถึง SMS แบบพรีเมียม"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS แบบพรีเมียมอาจมีค่าใช้จ่ายและจะเพิ่มเข้าไปในใบเรียกเก็บเงินจากผู้ให้บริการ หากคุณให้สิทธิ์แอปหนึ่งๆ คุณจะใช้แอปนั้นส่ง SMS แบบพรีเมียมได้"</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"อัตโนมัติ"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"คู่มือ"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"เพิ่มพื้นที่ว่างเลย"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"ท่าทางสัมผัส"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"ทางลัดของท่าทางสัมผัส"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"ท่าทางสัมผัสด่วนสำหรับการควบคุมโทรศัพท์"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"ท่าทางสัมผัสด่วนสำหรับการควบคุมแท็บเล็ต"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"ท่าทางสัมผัสด่วนสำหรับการควบคุมอุปกรณ์"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"ข้ามไปที่กล้อง"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"หากต้องการเปิดกล้องอย่างรวดเร็ว ให้กดปุ่มเปิดปิด 2 ครั้ง ใช้ได้กับหน้าจอทุกรุ่น"</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"เปิดกล้องถ่ายรูปได้อย่างรวดเร็ว"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"กดปุ่ม \"เปิด/ปิด\" 2 ครั้งเพื่อเปิดกล้องถ่ายรูป"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"พลิกกล้อง"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"ถ่ายเซลฟีได้เร็วขึ้น"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"บิดโทรศัพท์ 2 ครั้งเพื่อใช้โหมดเซลฟี"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"บิดแท็บเล็ต 2 ครั้งเพื่อใช้โหมดเซลฟี"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"บิดอุปกรณ์ 2 ครั้งเพื่อใช้โหมดเซลฟี"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"แตะ 2 ครั้งเพื่อตรวจสอบโทรศัพท์"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"แตะ 2 ครั้งเพื่อตรวจสอบแท็บเล็ต"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"แตะ 2 ครั้งเพื่อตรวจสอบอุปกรณ์"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"หากต้องการตรวจสอบการแจ้งเตือนอย่างรวดเร็ว ให้แตะหน้าจอ 2 ครั้ง"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"หากต้องการดูเวลา ไอคอนการแจ้งเตือน และข้อมูลอื่นๆ ให้แตะหน้าจอ 2 ครั้ง"</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"ดูการแจ้งเตือนเมื่อหน้าจอปิดอยู่"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ยกขึ้นเพื่อตรวจสอบโทรศัพท์"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ยกขึ้นเพื่อตรวจสอบแท็บเล็ต"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"ยกขึ้นเพื่อตรวจสอบอุปกรณ์"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"หากต้องการตรวจสอบการแจ้งเตือนอย่างรวดเร็ว ให้หยิบโทรศัพท์ขึ้นมา"</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"หากต้องการตรวจสอบการแจ้งเตือนอย่างรวดเร็ว ให้หยิบแท็บเล็ตขึ้นมา"</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"หากต้องการตรวจสอบการแจ้งเตือนอย่างรวดเร็ว ให้หยิบอุปกรณ์ขึ้นมา"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"หากต้องการดูเวลา ไอคอนการแจ้งเตือน และข้อมูลอื่นๆ ให้หยิบโทรศัพท์ขึ้นมา"</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"หากต้องการดูเวลา ไอคอนการแจ้งเตือน และข้อมูลอื่นๆ ให้หยิบแท็บเล็ตขึ้นมา"</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"หากต้องการดูเวลา ไอคอนการแจ้งเตือน และข้อมูลอื่นๆ ให้หยิบอุปกรณ์ขึ้นมา"</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"ดูการแจ้งเตือนเมื่อหน้าจอปิดอยู่"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"ใช้ลายนิ้วมือแสดงการแจ้งเตือน"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"ในการตรวจสอบการแจ้งเตือน ให้เลื่อนนิ้วลงผ่านเซ็นเซอร์ลายนิ้วมือที่ด้านหลังโทรศัพท์"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"ในการตรวจสอบการแจ้งเตือน ให้เลื่อนนิ้วลงผ่านเซ็นเซอร์ลายนิ้วมือที่ด้านหลังแท็บเล็ต"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"ในการตรวจสอบการแจ้งเตือน ให้เลื่อนนิ้วลงผ่านเซ็นเซอร์ลายนิ้วมือที่ด้านหลังอุปกรณ์"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"ดูการแจ้งเตือนได้อย่างรวดเร็ว"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"เลื่อนนิ้วลงบนเซ็นเซอร์ลายนิ้วมือ"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"ยกเพื่อเปิดกล้อง"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"หากต้องการเปิดกล้องถ่ายรูปโดยอัตโนมัติ ให้ยกโทรศัพท์ขึ้นมาในท่าถ่ายภาพ (แนวนอนหรือแนวตั้ง) ฟีเจอร์นี้จะทำงานเมื่อโทรศัพท์อยู่ในโหมดสลีปหรือล็อกอยู่"</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"ถ่ายรูปเมื่อโทรศัพท์อยู่ในโหมดสลีปหรือล็อกอยู่"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"ท่าทางสัมผัสการช่วยเหลือ"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"ความละเอียดอ่อน"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"คุณต้องการนำ Instant App นี้ออกไหม"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"เกม"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ไฟล์เสียง"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"พื้นที่ที่ใช้ไป"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ถอนการติดตั้งแล้วสำหรับ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ปิดใช้อยู่สำหรับ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"บริการป้อนอัตโนมัติ"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Instant App"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"ปิดตัวจัดการพื้นที่เก็บข้อมูลใช่ไหม"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"แอป Movie &amp; TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"พื้นที่ที่ใช้ไป"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"ข้อมูลการจัดสรรผู้ให้บริการ"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ทริกเกอร์การจัดสรรผู้ให้บริการ"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"มีอะไรใหม่และน่าสนใจบ้าง"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ดูฟีเจอร์เด่น 5 อันดับแรก"</string>
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 0b9b2f0..23b0c1a 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Malakas"</item>
     <item msgid="8986346415847956850">"Napakalakas"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Palagi"</item>
-    <item msgid="844721238536786870">"Kapag naka-plug in lamang"</item>
-    <item msgid="1986753720941888596">"Hindi Kailanman"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Palagi"</item>
-    <item msgid="7433294150916905997">"Kapag naka-plug in lamang"</item>
-    <item msgid="1390404486722375028">"Hindi Kailanman"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Nakalipas na 30 araw"</item>
     <item msgid="6600989128423965319">"Itakda ang usage cycle..."</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 7bafcba..ecb689c 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Isa ka nang developer!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Hindi na kailangan, isa ka nang developer."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Paki-enable muna ang mga opsyon ng developer."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Wireless at mga network"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Mga Koneksyon"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Device"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE Provisioned"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Naka-provision ang Pag-video Call"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Naka-provision ang Pagtawag gamit ang Wifi"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Naka-provision ang EAB/Presence"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Mobile Radio Power"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Tingnan ang Address Book ng SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Tingnan ang Mga Fixed Dialing Number"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Mag-scan para sa mga device"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Palitan ang pangalan ng device"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Palitan ang pangalan"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Idiskonekta?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tatapusin nito ang iyong koneksyon sa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"I-diskonekta ang device?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Madidiskonekta ang iyong telepono sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Madidiskonekta ang iyong tablet sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Madidiskonekta ang iyong device sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Idiskonekta"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Wala kang pahintulot na palitan ang mga setting ng Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Magpares ng bagong device"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Nakikita ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sa mga kalapit na device habang nakabukas ang mga setting ng Bluetooth."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Bluetooth address ng telepono: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Bluetooth address ng tablet: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth address ng device: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"I-disconnect ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Pagbo-broadcast"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Huwag paganahin ang profile?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Kahilingan sa pagpapares ng bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Kahilingan sa pagpares"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"I-tap upang makipagpares sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Ipakita ang mga natanggap na file"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Mga natanggap na file"</string>
     <string name="device_picker" msgid="4978696506172252813">"Pumili ng Bluetooth device"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"Gustong i-on ng <xliff:g id="APP_NAME">%1$s</xliff:g> ang Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"Gustong i-off ng <xliff:g id="APP_NAME">%1$s</xliff:g> ang Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Gustong i-access ni %1$s ang iyong mga mensahe. Bigyan ng access si %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Kahilingan sa pag-access sa SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Gustong i-access ng <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ang iyong SIM card. Idi-disable ng pagbibigay ng access sa SIM ang connectivity ng data sa iyong device habang nakakonekta. Bigyan ng access ang <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Nakikita bilang \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' sa iba pang device"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ang iyong mga device"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Magpares ng bagong device"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Petsa at oras"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pumili ng time zone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Mga Account"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokasyon"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Mga Account"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Seguridad at Lokasyon"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Seguridad at lokasyon"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Pag-encrypt at mga kredensyal"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Naka-encrypt ang telepono"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Device ay naka-encrypt"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"I-unlock ng fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Gamitin ang iyong fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Pindutin lang ang sensor ng fingerprint upang i-unlock ang iyong telepono, pahintulutan ang mga pagbili, o mag-sign in sa mga app. Huwag basta-basta magdagdag ng mga fingerprint ng ibang tao. Kahit isang fingerprint lang ang idagdag, magagawa ang alinman sa mga bagay na ito.\n\nTandaan: Maaaring mas hindi ligtas ang iyong fingerprint kaysa sa isang mahirap hulaang pattern o PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Pindutin lang ang sensor para sa fingerprint upang pahintulutan ang mga pagbili, o mag-sign in sa mga app. Mag-ingat sa pagdaragdag ng mga fingerprint. Magagawa ng idaragdag na fingerprint ng sinuman ang alinman sa mga bagay na ito.\n\nTandaan: Hindi mo magagamit ang iyong fingerprint upang ma-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="3635924459027832861">"Pindutin lang ang sensor para sa fingerprint upang i-unlock ang iyong telepono, pahintulutan ang mga pagbili, o mag-sign in sa mga app. Huwag basta-basta magdagdag ng mga fingerprint ng ibang tao. Magagawa ng alinmang idinagdag na mga fingerprint ang mga bagay na ito.\n\nTandaan: Maaaring mas hindi ligtas ang iyong fingerprint kaysa sa isang mahirap hulaang pattern o PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"Gamitin ang iyong fingerprint upang i-unlock ang telepono mo o aprubahan ang mga pagbili.\n\nTandaan: Maaaring mas hindi ligtas ang iyong fingerprint kaysa sa isang mahirap hulaang pattern o PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Kanselahin"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Magpatuloy"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Laktawan"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Magdagdag: fingerprint"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Hindi ia-activate ang mga feature para sa proteksyon ng device. Hindi mo mapipigilan ang ibang tao na gamitin ang iyong tablet kung mawala, manakaw o ma-wipe ito."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Hindi ia-activate ang mga feature para sa proteksyon ng device. Hindi mo mapipigilan ang ibang tao na gamitin ang device na ito kung mawala, manakaw o ma-wipe ito."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Hindi ia-activate ang mga feature para sa proteksyon ng device. Hindi mo mapipigilan ang ibang tao na gamitin ang teleponong ito kung mawala, manakaw o ma-wipe ito."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Hindi ia-activate ang mga feature para sa proteksyon ng device. Hindi mo mapipigilan ang iba pang mga tao na gamitin ang tablet na ito kung nawala o nanakaw ito."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Hindi ia-activate ang mga feature para sa proteksyon ng device. Hindi mo mapipigilan ang iba pang mga tao na gamitin ang device na ito kung nawala o nanakaw ito."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Hindi ia-activate ang mga feature para sa proteksyon ng device. Hindi mo mapipigilan ang iba pang mga tao na gamitin ang teleponong ito kung nawala o nanakaw ito."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Susunod"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Hindi mao-on ang mga feature sa pagprotekta ng device. Hindi mo mapipigilan ang ibang tao na gamitin ang tablet na ito kung mawala, manakaw, o ma-reset ito."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Hindi mao-on ang mga feature sa pagprotekta ng device. Hindi mo mapipigilan ang ibang tao na gamitin ang device na ito kung mawala, manakaw, o ma-reset ito."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Hindi mao-on ang mga feature sa pagprotekta ng device. Hindi mo mapipigilan ang ibang tao na gamitin ang teleponong ito kung mawala, manakaw, o ma-reset ito."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Hindi mao-on ang mga feature sa pagprotekta ng device. Hindi mo mapipigilan ang ibang tao na gamitin ang tablet na ito kung mawala o manakaw ito."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Hindi mao-on ang mga feature sa pagprotekta ng device. Hindi mo mapipigilan ang ibang tao na gamitin ang device na ito kung mawala o manakaw ito."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Hindi mao-on ang mga feature sa pagprotekta ng device. Hindi mo mapipigilan ang ibang tao na gamitin ang teleponong ito kung mawala o manakaw ito."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Laktawan pa rin"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Bumalik"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Hanapin ang sensor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Hanapin ang fingerprint sensor sa likod ng iyong telepono."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Pindutin ang sensor"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Nasa likod ito ng iyong telepono. Gamitin ang hintuturo mo."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Larawan kung saan ipinapakita ang lokasyon ng device at fingerprint sensor"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Pangalan"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"I-delete"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Magsimula na tayo"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Pindutin ang sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Ilagay ang iyong daliri sa sensor at iangat pagkatapos mong makaramdam ng pag-vibrate"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Magpatuloy"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Bahagyang ilipat ang iyong daliri upang idagdag ang lahat ng iba\'t ibang bahagi ng iyong fingerprint"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Na-add ang fingerprint!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kapag nakikita mo ang icon na ito, maaari mong gamitin ang iyong fingerprint para sa pagkakakilanlan o upang pahintulutan ang isang pagbili."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Hawakan lang ang sensor ng fingerprint upang i-wake at i-unlock ang iyong device."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Kapag nakita mo ang icon na ito, maaari mo ring pahintulutan ang mga pagbili o pag-sign in sa mga app."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Iangat, pinduting muli"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Panatilihing nakaangat ang iyong daliri upang idagdag ang iba\'t ibang bahagi ng fingerprint mo"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Naidagdag ang fingerprint"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Kapag nakita mo ang icon na ito, gamitin ang iyong fingerprint para sa pagkakakilanlan o upang aprubahan ang mga pagbili."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Laktawan ang pag-set up ng fingerprint?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Pinili mong gamitin ang iyong fingerprint bilang isang paraan upang i-unlock ang iyong telepono. Kung lalaktaw ka ngayon, kakailanganin mo itong i-set up sa ibang pagkakataon. Tumatagal lang nang isang minuto o higit pa ang pag-setup."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"I-set up ang screen lock"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Tapos na"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Naku, hindi iyan ang sensor"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Gamitin ang fingerprint sensor sa device mo."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Pindutin ang sensor sa likod ng iyong telepono. Gamitin ang hintuturo mo."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Hindi nakumpleto ang pagpapatala"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Naabot na ang limitasyon sa oras ng pagpapatala ng fingerprint. Subukang muli."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Hindi gumana ang pagpapatala ng fingerprint. Subukang muli o gumamit ng ibang daliri."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Pigilan ang ibang taong magamit ang device na ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang screen lock na gusto mong gamitin."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Pigilan ang ibang taong magamit ang teleponong ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang screen lock na gusto mong gamitin."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Piliin ang iyong backup na paraan ng pag-screen lock"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Mga opsyon sa lock ng screen"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Mga opsyon sa lock ng screen"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Screen lock"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Kaagad pagkatapos ng sleep"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> pagkatapos ng sleep"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Baguhin ang naka-unlock na pattern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Palitan ang PIN na pang-unlock"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Baguhin ang naka-unlock na password"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Subukang muli. Pagsubok <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ng <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Huling pagsubok"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Kung maling pattern sa trabaho ang mailalagay mo sa pagsubok na ito, maaalis sa device na ito ang iyong profile sa trabaho at ang nauugnay na data dito."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Kung maling PIN sa trabaho ang mailalagay mo sa pagsubok na ito, maaalis sa device na ito ang iyong profile sa trabaho at ang nauugnay na data dito."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Kung maling password sa trabaho ang mailalagay mo sa pagsubok na ito, maaalis sa device na ito ang iyong profile sa trabaho at ang nauugnay na data dito."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Masyadong maraming maling pagsubok. Maaalis sa device na ito ang iyong profile sa trabaho at ang nauugnay na data dito."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"I-dismiss"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Subukang muli. Pagsubok <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ng <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Made-delete ang iyong data"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Kung maling pattern ang mailalagay mo sa susunod na pagsubok, made-delete ang data ng mga device na ito"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Kung maling PIN ang mailalagay mo sa susunod na pagsubok, made-delete ang data ng mga device na ito"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Kung maling password ang mailalagay mo sa susunod na pagsubok, made-delete ang data ng mga device na ito"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Kung maling pattern ang mailalagay mo sa susunod na pagsubok, made-delete ang user na ito"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Kung maling PIN ang mailalagay mo sa susunod na pagsubok, made-delete ang user na ito"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Kung maling password ang mailalagay mo sa susunod na pagsubok, made-delete ang user na ito"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Kung maling pattern ang mailalagay mo sa susunod na pagsubok, made-delete ang iyong profile sa trabaho at ang data nito"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Kung maling PIN ang mailalagay mo sa susunod na pagsubok, made-delete ang iyong profile sa trabaho at ang data nito"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Kung maling password ang mailalagay mo sa susunod na pagsubok, made-delete ang iyong profile sa trabaho at ang data nito"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Masyadong maraming maling pagsubok. Made-delete ang data ng mga device na ito."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Masyadong maraming maling pagsubok. Made-delete ang user na ito."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Masyadong maraming maling pagsubok. Made-delete ang profile sa trabaho na ito at ang data nito."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"I-dismiss"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Dapat ay binubuo ng kahit <xliff:g id="COUNT">%d</xliff:g> (na) character lang"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Dapat ay binubuo ng kahit <xliff:g id="COUNT">%d</xliff:g> (na) digit lang ang PIN"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Magpatuloy"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Advanced na Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kapag naka-on ang Bluetooth, maaaring makipag-ugnayan ang device mo sa ibang kalapit na Bluetooth device."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Upang pahusayin ang katumpakan ng lokasyon, maaari pa ring tumukoy ng mga Bluetooth device ang mga app at serbisyo ng system. Maaari mo itong baguhin sa <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mga setting ng pag-i-scan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Hindi makakonekta. Subukang muli."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Mga detalye ng device"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Bluetooth address ng device: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Kalimutan ang device?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Hindi na ipapares ang iyong telepono sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Hindi na ipapares ang iyong tablet sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Hindi na ipapares ang iyong device sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Kalimutan ang device"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Kumonekta sa…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Maaalis sa pagkakakonekta ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g> mula sa audio ng media."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Maaalis ang koneksyon ng <xliff:g id="DEVICE_NAME">%1$s</xliff:g> mula sa handsfree na audio."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Huwag ibigay"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Huwag patotohanan"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Walang natukoy na certificate. Hindi magiging pribado ang iyong koneksyon."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Masyadong mahaba ang pangalan ng network."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Dapat tumukoy ng domain."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Available ang WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Available ang WPS)"</string>
@@ -809,7 +838,6 @@
       <item quantity="other">%d na network</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Advanced na Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"I-configure ang Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC address"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP address"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Kalimutan ang pangkat na ito?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Portable na Wi-Fi hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi hotspot"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Gumamit ng koneksyon sa mobile upang magbigay ng Wi-Fi network"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Hindi ibinabahagi ang koneksyon ng tablet na ito sa Internet sa pamamagitan ng hotspot"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Hindi ibinabahagi ang koneksyon ng teleponong ito sa Internet sa pamamagitan ng hotspot"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Hindi nagbabahagi ng Internet o content sa iba pang device"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Ibinabahagi ang koneksyon sa Internet ng tablet na ito sa pamamagitan ng hotspot"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Ibinabahagi ang koneksyon sa Internet ng teleponong ito sa pamamagitan ng hotspot"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Nagbabahagi ng content ang app. Upang magbahagi ng koneksyon sa Internet, i-off ang hotspot, pagkatapos ay i-on"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Pangalan ng Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Ino-on ang <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Maaaring kumonekta ang iba pang device sa <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Password ng Wi‑Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Gamitin ang hotspot upang gumawa ng Wi-Fi network para sa iyong iba pang device. Nagbibigay ang Hotspot ng Internet gamit ang iyong koneksyon sa mobile data. May nalalapat na mga karagdagang singil sa mobile data."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Maaaring gumawa ang mga app ng hotspot upang magbahagi ng content sa mga kalapit na device."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Pag-on sa hotspot…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Pag-off sa hotspot…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"Aktibo ang <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Kapag naka-on ang pagtawag sa Wi-Fi, maaaring magruta ng mga tawag ang iyong telepono sa pamamagitan ng mga Wi-Fi network o network ng iyong carrier, depende sa iyong kagustuhan at kung aling signal ang mas malakas. Bago i-on ang feature na ito, sumangguni sa iyong carrier hinggil sa mga bayarin at iba pang mga detalye."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"I-update ang Address na Pang-emergency"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Address na ginamit ng mga serbisyong pang-emergency bilang iyong lokasyon kung tumawag ka sa 911 gamit ang WiFi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ipakita"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Walang resulta"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"I-auto rotate ang screen"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Matitingkad na kulay"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Awtomatikong ilipat ang oryentasyon kapag iniikot ang tablet"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Ilipat nang awtomatiko ang oryentasyon kapag niro-rotate ang telepono"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Awtomatikong ilipat ang oryentasyon kapag iniikot ang tablet"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"I-optimize ang liwanag ayon sa ilaw. Kapag naka-on, pansamantala mo pa ring maisasaayos ang liwanag."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Night Light"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Dahil sa Night Light, nagiging kulay amber ang iyong screen. Mas pinapadali nitong matingnan ang iyong screen o makapagbasa sa dim light, at maaaring makatulong sa iyong mas mabilis na makatulog."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Iskedyul"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Status"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Awtomatikong i-on"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Hindi Kailanman"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Custom na iskedyul"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Sunset hanggang sunrise"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Iskedyul"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Wala"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Ino-on sa custom na oras"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Ino-on mula sunset hanggang sunrise"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Oras ng pagsisimula"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Oras ng pagtatapos"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensity"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Naka-off. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Hindi awtomatikong mag-o-on kailanman."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Awtomatikong mag-o-on nang <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Awtomatikong mag-o-on sa sunset."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Naka-on. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Hindi awtomatikong mag-o-off kailanman."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Awtomatikong mag-o-off nang <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Awtomatikong mag-o-off sa sunrise."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Naka-off / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Hindi awtomatikong mag-o-on kailanman"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Awtomatikong mag-o-on nang <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Awtomatikong mag-o-on sa paglubog ng araw"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Naka-on / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Hindi awtomatikong mag-o-off kailanman"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Awtomatikong mag-o-off nang <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Awtomatikong mag-o-off sa pagsikat ng araw"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Pag-off ng screen"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ng kawalan ng aktibidad"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Mga Setting"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Awtomatikong pagliwanag"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Angatin upang paganahin"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Ambient na display"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ambient na display"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Palaging naka-on"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Mga bagong notification"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kailan ipapakita"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Mga bagong notification"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Paganahin ang screen kapag nakatanggap ka ng mga notification"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Palaging naka-on"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Ipakita ang oras, mga icon ng notification, at iba pang impormasyon"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Laki ng font"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Palakihin o paliitin ang text"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setting ng lock ng SIM card"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Hindi maaaring walang laman ang APN."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Dapat na 3 digit ang field na MCC."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Dapat na 2 o 3 digit ang field ng MNC."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Hindi pinapayagan ng carrier ang pagdaragdag ng mga APN na %s ang uri."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Nire-restore ang default na mga setting ng APN"</string>
     <string name="menu_restore" msgid="8260067415075573273">"I-reset sa default"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Nakumpleto ang pag-reset sa default na mga setting ng APN."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Burahin ang SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Burahin ang lahat ng data sa panloob na USB storage, gaya ng musika o mga larawan"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Burahin ang lahat ng data sa SD card, gaya ng musika o mga larawan"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Burahin ang mga eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Burahin ang lahat ng eSIM sa telepono. Hindi nito kakanselahin ang iyong mobile service plan."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Burahin ang lahat ng eSIM sa tablet. Hindi nito kakanselahin ang iyong mobile service plan."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"I-reset ang tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"I-reset ang telepono"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Burahin ang lahat ng iyong personal na impormasyon at na-download na app? Hindi mo maaaring i-undo ang pagkilos na ito!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Hindi makapag-tether o makagamit ng mga portable hotspot habang naka-on ang Data Saver"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Pag-tether ng USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Nakakonekta ang USB, tingnan upang ma-tether"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Na-tether"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Hindi ma-tether kapag ginagamit ang USB storage"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Hindi nakakonekta ang USB"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Kumonekta upang mag-on"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Error sa pag-tether ng USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Ibahagi ang koneksyon sa Internet ng telepono sa pamamagitan ng USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Ibahagi ang koneksyon sa Internet ng tablet sa pamamagitan ng USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Pag-tether ng Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Ibinabahagi ang koneksyon ng tablet sa Internet via Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Ibinabahagi ang koneksyon ng telepono sa Internet via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Ibinabahagi ang koneksyon ng tablet sa Internet sa 1 device via Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Ibinabahagi ang koneksyon ng telepono sa Internet sa 1 device via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Ibinabahagi ang koneksyon ng tablet sa Internet sa <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> (na) device via Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Ibinabahagi ang koneksyon ng telepono sa Internet sa <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> (na) device via Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Ibahagi ang koneksyon sa Internet ng tablet gamit ang Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Ibahagi ang koneksyon sa Internet ng telepono gamit ang Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Ibinabahagi ang koneksyon ng <xliff:g id="DEVICE_NAME">%1$d</xliff:g> sa Internet via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Hindi ibinabahagi ang koneksyon ng tablet sa Internet via Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Hindi ibinabahagi ang koneksyon ng telepono sa Internet via Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Hindi na-tether"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Hindi ma-tether sa higit sa <xliff:g id="MAXCONNECTION">%1$d</xliff:g> (na) device."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Maa-untether ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Gumamit ng hotspot at pag-tether upang magbigay ng Internet sa iba pang device gamit ang iyong koneksyon sa mobile data."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Gamitin ang hotspot at pag-tether upang makapagbigay ng Internet sa iba pang device sa pamamagitan ng iyong koneksyon sa mobile data. Maaari ding gumawa ang mga app ng hotspot upang magbahagi ng content sa mga kalapit na device."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Tulong"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobile network"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobile plan"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Location mode"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Gumamit ng GPS, Wi‑Fi, Bluetooth, o mga mobile network upang matukoy ang lokasyon"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Gumamit ng Wi‑Fi, Bluetooth, o mga mobile network upang matukoy ang lokasyon"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Gamitin ang GPS upang matukoy ang lokasyon"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Gamitin ang GPS at mga sensor ng device upang tukuyin ang lokasyon"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Nagsa-scan"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Pagsa-scan para sa Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Pahusayin ang lokasyon sa pamamagitan ng pagpayag sa mga app at serbisyo ng system na tumukoy ng mga Wi-Fi network anumang oras."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Wala kang koneksyon ng data. Upang tingnan ang impormasyong ito ngayon, pumunta sa %s mula sa anumang computer na nakakonekta sa Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Naglo-load…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Piliin ang iyong password"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Para magamit ang fingerprint, i-set ang pw"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Piliin ang iyong pattern"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Para magamit ang fingerprint, i-set ang pattern"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Piliin ang iyong PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Para magamit ang fingerprint, i-set ang PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Kumpirmahin ang iyong password"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Kumpirmahin ang iyong pattern"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Kumpirmahin ang iyong PIN"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Mga setting ng app"</string>
     <string name="install_applications" msgid="4872012136210802181">"Hindi kilalang pinagmumulan"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Payagan lahat ng source ng app"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Mga app na binuksan kamakailan"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Tingnan ang lahat ng <xliff:g id="COUNT">%1$d</xliff:g> (na) app"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> na ang nakalipas"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Mas nanganganib ang iyong tablet at personal na data sa pag-atake ng mga hindi alam na app. Sa pamamagitan ng pag-install ng mga app mula sa pinagmulang ito, sumasang-ayon kang ikaw ang mananagot para sa anumang pinsala sa iyong tablet o pagkawala ng data na maaaring maging resulta ng paggamit sa mga ito."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Mas nanganganib ang iyong telepono at personal na data sa pag-atake ng mga hindi alam na app. Sa pamamagitan ng pag-install ng mga app mula sa pinagmulang ito, sumasang-ayon kang ikaw ang mananagot para sa anumang pinsala sa iyong telepono o pagkawala ng data na maaaring maging resulta ng paggamit sa mga ito."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Mga advanced na setting"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Itigil ang serbisyo ng system?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Kung ihihinto mo ang serbisyong ito, maaaring huminto sa paggana nang tama ang ilang mga tampok ng iyong tablet hanggang sa i-off mo ito at pagkatapos ay i-on muli."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Kung ihihinto mo ang serbisyong ito, maaaring huminto sa paggana nang tama ang ilang mga tampok ng iyong telepono hanggang sa i-off mo ito at pagkatapos ay i-on muli."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Mga wika, input at galaw"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Mga wika at input"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Mga wika at input"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Tulong sa pag-input"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="one">May <xliff:g id="COUNT">%1$d</xliff:g> serbisyo ng pag-print na naka-on</item>
       <item quantity="other">May <xliff:g id="COUNT">%1$d</xliff:g> na serbisyo ng pag-print na naka-on</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> pag-print</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> na pag-print</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Mga serbisyo ng pag-print"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Walang mga naka-install na serbisyo"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Walang mga natagpuang printer"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Mga detalye ng paggamit"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Isaayos ang paggamit ng power"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Mga kasamang package"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Mga app na umuubos ng baterya"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Panatilihing gumagana ang device"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Pinapagana ang device sa background"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Madalas humiling ng lokasyon"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> (na) app na hindi normal na gumagana"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Ihinto ang app?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Hindi mapamahalaan nang normal ng iyong telepono ang baterya dahil pinapanatili ng <xliff:g id="APP">%1$s</xliff:g> na gumagana ang iyong telepono.\n\nUpang subukang ayusin ang isyung ito, maaari mong sapilitang ihinto ang app.\n\nKung patuloy pa rin itong nangyayari, maaaring kailanganin mong i-uninstall ang app upang mapahusay ang performance ng baterya."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Hindi mapamahalaan nang normal ng iyong tablet ang baterya dahil pinapanatili ng <xliff:g id="APP">%1$s</xliff:g> na gumagana ang iyong tablet.\n\nUpang subukang ayusin ang isyung ito, maaari mong sapilitang ihinto ang app.\n\nKung patuloy pa rin itong nangyayari, maaaring kailanganin mong i-uninstall ang app upang mapahusay ang performance ng baterya."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Hindi mapamahalaan nang normal ng iyong device ang baterya dahil pinapanatili ng <xliff:g id="APP">%1$s</xliff:g> na gumagana ang iyong device.\n\nUpang subukang ayusin ang isyung ito, maaari mong sapilitang ihinto ang app.\n\nKung patuloy pa rin itong nangyayari, maaaring kailanganin mong i-uninstall ang app upang mapahusay ang performance ng baterya."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Ihinto ang app"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"I-off ang paggamit sa background?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Hindi mapamahalaan nang normal ng iyong telepono ang baterya dahil pinapanatili ng <xliff:g id="APP">%1$s</xliff:g> na gumagana ang telepono mo.\n\nUpang matugunan ang isyung ito, maaaring pigilan ng telepono mo ang pagtakbo ng app sa background."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Hindi mapamahalaan nang normal ng iyong tablet ang baterya dahil pinapanatili ng <xliff:g id="APP">%1$s</xliff:g> na gumagana ang tablet mo.\n\nUpang matugunan ang isyung ito, maaaring pigilan ng tablet mo ang pagtakbo ng app sa background."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Hindi mapamahalaan nang normal ng iyong device ang baterya dahil pinapanatili ng <xliff:g id="APP">%1$s</xliff:g> na gumagana ang device mo.\n\nUpang matugunan ang isyung ito, maaaring pigilan ng device mo ang pagtakbo ng app sa background."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"I-off"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"I-off ang lokasyon?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Hindi mapamahalaan nang normal ng iyong telepono ang baterya dahil patuloy ang paghiling ng <xliff:g id="APP">%1$s</xliff:g> ng iyong lokasyon kapag hindi mo ginagamit ang app.\n\nUpang ayusin ang isyung ito, maaari mong i-off ang lokasyon para sa app na ito."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Hindi mapamahalaan nang normal ng iyong tablet ang baterya dahil patuloy ang paghiling ng <xliff:g id="APP">%1$s</xliff:g> ng iyong lokasyon kapag hindi mo ginagamit ang app.\n\nUpang ayusin ang isyung ito, maaari mong i-off ang lokasyon para sa app na ito."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Hindi mapamahalaan nang normal ng iyong device ang baterya dahil patuloy ang paghiling ng <xliff:g id="APP">%1$s</xliff:g> ng iyong lokasyon kapag hindi mo ginagamit ang app.\n\nUpang ayusin ang isyung ito, maaari mong i-off ang lokasyon para sa app na ito."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"I-off"</string>
     <string name="power_screen" msgid="3023346080675904613">"Screen"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Flashlight"</string>
     <string name="power_camera" msgid="4976286950934622605">"Camera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Mga App"</string>
     <string name="power_service" msgid="1599661212370831780">"Mga Serbisyo"</string>
     <string name="power_system" msgid="8290455327965307383">"System"</string>
-    <string name="power_user" msgid="1889728099253018005">"User"</string>
+    <string name="power_user" msgid="3706143225319881667">"Iba pang user"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Kabuuan ng CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Panatilihing bukas"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Sobrang nakalkulang paggamit ng power"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> (na) mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Ginamit nang <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Aktibo sa loob ng <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Paggamit ng screen <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> ang ginagamit ng <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ng kabuuang baterya"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Palitan ang PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Ipakita notification"</string>
     <string name="help_label" msgid="6886837949306318591">"Tulong at feedback"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Mga artikulo ng tulong, suporta sa telepono at chat"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Mga artikulo ng tulong, telepono at pakikipag-chat, pagsisimula"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Account para sa nilalaman"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Photo ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Matitinding banta"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="other">Ipakita ang %d na nakatagong item</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Network at Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobile, paggamit ng data, hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobile"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"paggamit ng data"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Mga nakakonektang device"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Mga app at notification"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Mga pahintulot, mga default na app"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Mga user at account"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"galaw"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"magbayad, mag-tap, mga pagbabayad"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup, i-back up"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"galaw, edge, gilid, aktibong edge, i-squeeze, i-grip, tulong, assistant, squeezy, squeezie, squeezey, squeezee, ok google, google assistant"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"galaw, i-wake, mga notification, screen, display, naka-off ang screen, naka-on ang screen, i-squeeze, edge, naka-sleep, i-sleep, i-grip"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"galaw, katahimikan, i-snooze, alarm, papasok na tawag, tahimik, display, lockscreen, i-squeeze, i-grip, edge, ihinto"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"I-set up ang Tag ng NFC sa Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Magsulat"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Mag-tap ng tag upang magsulat..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Huwag nang magpakita ng notification sa trabaho"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kapag naka-lock ang iyong device, paano mo gustong lumabas ang mga notification tungkol sa profile?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Mga notification sa profile"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Mga Notification"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Mga Notification"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Notification sa app"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorya ng notification"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Kahalagahan"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Hayaang ang app ang magpasya"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Kinakailangan"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Payagan ang tunog"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Huwag tumunog, mag-vibrate, o ilabas ang mga notification na ito sa view sa kasalukuyang screen."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Hindi masyadong mahalaga"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Medyo mahalaga"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Napakahalaga"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Mahalagang-mahalaga"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Assistant para sa notification"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Access sa notification"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Naka-block ang access sa mga notification ng profile sa trabaho"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Payagan ang picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Payagan ang app na ito na gumawa ng isang picture-in-picture na window habang nakabukas ang app o pagkatapos mo itong iwan (halimbawa, upang magpatuloy sa panonood ng isang video). Lumalabas ang window na ito sa ibabaw ng iba pang ginagamit mong app."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Oo"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Hindi"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Access na Huwag Istorbohin"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Walang mga naka-install na app ang humiling ng access na Huwag Istorbohin"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Naglo-load ng mga app..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Ang profile sa trabahong ito ay pinapamahalaan ng:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Pinapamahalaan ng <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Pang-eksperimento)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Pag-rotate ng device"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"ikutin ang mga content ng screen"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Manatili sa portrait na view"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Manatili sa landscape na view"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Manatili sa kasalukuyang oryentasyon"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Secure na pagsisimula"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Magpatuloy"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng iyong PIN bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm. \n\nNakakatulong ito na protektahan ang data ng mga nawawala o ninakaw na device. Humingi ng PIN upang simulan ang device mo?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng iyong password bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm. \n\nNakakatulong ito na protektahan ang data ng mga nawawala o ninakaw na device. Humingi ng password upang simulan ang device mo?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Bukod sa paggamit ng iyong fingerprint upang i-unlock ang device mo, mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng PIN mo bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito na protektahan data ng mga nawawala o ninakaw na device. Humingi ng PIN upang simulan ang iyong device?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Bukod sa paggamit ng iyong fingerprint upang i-unlock ang device mo, mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng pattern mo bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito na protektahan data ng mga nawawala o ninakaw na device. Humingi ng pattern upang simulan ang iyong device?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Bukod sa paggamit ng iyong fingerprint upang i-unlock ang device mo, mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng password mo bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito na protektahan data ng mga nawawala o ninakaw na device. Humingi ng password upang simulan ang iyong device&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Bukod pa sa paggamit ng iyong fingerprint sa pag-unlock ng device mo, maaari mong higit pang protektahan ang device na ito sa pamamagitan ng paghingi ng iyong password bago ito magsimula. Hangga\'t hindi nakakapagsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito sa pagprotekta ng data sa mga nawawala o nanakaw na device. Humingi ng password sa pagsisimula ng iyong device?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Oo"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Huwag"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Hingin ang PIN?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Mga alerto sa paggamit"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Ipakita ang kumpletong paggamit ng device"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Ipakita ang paggamit ng app"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Malakas gumamit ng baterya"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one">Hindi gumagana nang maayos ang <xliff:g id="NUMBER">%2$d</xliff:g> app</item>
+      <item quantity="other">Hindi gumagana nang maayos ang <xliff:g id="NUMBER">%2$d</xliff:g> na app</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Mga app na umuubos ng baterya</item>
+      <item quantity="other">Mga app na umuubos ng baterya</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Hindi naka-optimize"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Hindi naka-optimize"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Pag-optimize sa paggamit ng baterya"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Ipakita sa ibabaw ng ibang app"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"Pinapayagan ang <xliff:g id="COUNT_0">%1$d</xliff:g> sa <xliff:g id="COUNT_1">%2$d</xliff:g> (na) app na lumabas sa ibabaw ng ibang app"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Mga app na may pahintulot"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Oo"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Hindi"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Pinapayagan"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Hindi pinapayagan"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"mag-install ng mga app mula sa mga hindi kilalang pinagmulan"</string>
     <string name="write_settings" msgid="4797457275727195681">"Baguhin ang setting ng system"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"mag-write o magbago ng mga setting ng system"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"May tint na amber ang screen. Maaari ka nitong matulungan na makatulog."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Mga Suhestyon"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> pa"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> suhestyon</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> na suhestyon</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="one">+<xliff:g id="COUNT">%1$d</xliff:g> suhestyon</item>
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> na suhestyon</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Alisin"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Malamig na temperatura ng kulay"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Gumamit ng mas malalamig na kulay ng display"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Babala kapag umabot sa <xliff:g id="ID_1">%1$s</xliff:g> ang Data"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Babala kapag umabot sa <xliff:g id="ID_1">%1$s</xliff:g> ang Data / Limitasyong <xliff:g id="ID_2">%2$s</xliff:g> na Data"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Yugto ng pagsingil"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Magsisimula ang buwanang yugto sa <xliff:g id="ID_1">%1$s</xliff:g> ng bawat buwan"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Buwan-buwan simula sa <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Buwan-buwan sa araw <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Mga paghihigpit sa network"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> paghihigpit</item>
@@ -3316,7 +3408,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> na app ang pinapayagang gumamit ng hindi pinaghihigpitang data kapag naka-on ang Data Saver</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Data saver"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Access sa di-pinaghihigpitang data"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Hindi pinaghihigpitang data"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Naka-off ang data ng background"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Naka-on"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Naka-off"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kontrolin ang notification sa lockscreen"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Ipakita o itago ang content ng notification"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Lahat"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Suporta"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> (na) dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Suporta at mga tip"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Pinakamaliit na lapad"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Walang mga naka-install na app ang humiling ng access sa Premium SMS"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Maaaring kailanganin mong magbayad para sa Premium SMS at isasama ito sa mga singilin ng iyong carrier. Kung ie-enable mo ang pahintulot para sa isang app, magagawa mong magpadala ng premium SMS gamit ang app na iyon."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Awtomatiko"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manu-mano"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Magbakante ng espasyo ngayon"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Mga Galaw"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Mga shortcut ng galaw"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Mga mabilisang galaw upang makontrol ang iyong telepono"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Mga mabilisang galaw upang kontrolin ang iyong tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Mga mabilisang galaw upang kontrolin ang iyong device"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Pumunta sa camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Upang mabuksan kaagad ang camera, pindutin ang power button nang dalawang beses. Gumagana ito sa anumang screen."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Mabilisang buksan ang camera"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Pindutin nang 2 beses ang power button para buksan ang camera"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Lumipat ng camera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Mas mabilis na kumuha ng mga selfie"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"I-double twist ang telepono para sa selfie mode"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"I-double twist ang tablet para sa selfie mode"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"I-double twist ang device para sa selfie mode"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Mag-double tap upang suriin ang telepono"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Mag-double tap upang suriin ang tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Mag-double tap upang suriin ang device"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Upang makita kaagad ang iyong mga notification, mag-double tap sa screen mo."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Upang tingnan ang oras, mga icon ng notification, at iba pang impormasyon, i-double tap ang iyong screen."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Tingnan ang mga notification kapag naka-off ang screen"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Kunin upang suriin ang telepono"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Kunin upang suriin ang tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Kunin upang suriin ang device"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Upang makita kaagad ang iyong mga notification, kunin ang telepono mo."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Upang makita kaagad ang iyong mga notification, kunin ang tablet mo."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Upang makita kaagad ang iyong mga notification, kunin ang device mo."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Upang tingnan ang oras, mga icon ng notification, at iba pang impormasyon, kunin ang iyong telepono."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Upang tingnan ang oras, mga icon ng notification, at iba pang impormasyon, kunin ang iyong tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Upang tingnan ang oras, mga icon ng notification, at iba pang impormasyon, kunin ang iyong device."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Tingnan ang mga notification kapag naka-off ang screen"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"I-swipe ang fingerprint para sa mga notification"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Upang makita ang iyong mga notification, mag-swipe pababa sa sensor para sa fingerprint sa likod ng telepono mo."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Upang makita ang iyong mga notification, mag-swipe pababa sa sensor para sa fingerprint sa likod ng tablet mo."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Upang makita ang iyong mga notification, mag-swipe pababa sa sensor para sa fingerprint sa likod ng device mo."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Mabilisang tingnan ang mga notification"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Mag-swipe pababa sa sensor para sa fingerprint"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Itaas upang buksan ang camera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Upang awtomatikong buksan ang camera, iangat ang iyong telepono at iposisyon ito para sa pagkuha ng larawan (landscape o portrait). Gagana kapag naka-sleep o naka-lock ang iyong telepono."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Kumuha ng larawan kapag naka-sleep o naka-lock ang telepono"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Galaw para sa tulong"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Pagkasensitibo"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Gusto mo bang alisin ang instant na app na ito?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Mga Laro"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Mga audio file"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Espasyong ginagamit"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(na-uninstall para kay user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(na-disable para kay user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Serbisyo ng autofill"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Instant na app"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"I-off ang storage manager?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Mga app sa Pelikula at TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Espasyong ginagamit"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Impormasyon sa Provisioning ng Carrier"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"I-trigger ang Provisioning ng Carrier"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Ano\'ng bago at kapana-panabik?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Tingnan ang nangungunang 5 feature"</string>
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 482d43a..b84b724 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"İyi"</item>
     <item msgid="8986346415847956850">"Mükemmel"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Her zaman"</item>
-    <item msgid="844721238536786870">"Yalnızca prize takılıyken"</item>
-    <item msgid="1986753720941888596">"Hiçbir zaman"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Her zaman"</item>
-    <item msgid="7433294150916905997">"Yalnızca prize takılıyken"</item>
-    <item msgid="1390404486722375028">"Hiçbir zaman"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Son 30 gün"</item>
     <item msgid="6600989128423965319">"Kullanım döngüsünü ayarla..."</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d3a6469..954a1d9 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Artık siz bir geliştiricisiniz!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Gerekli değil, siz zaten bir geliştiricisiniz."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Lütfen önce geliştirici seçeneklerini etkinleştirin."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Kablosuz ve ağlar"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Bağlantılar"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Cihaz"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE Temel Hazırlığı Yapıldı"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Video Görüşmesi Temel Hazırlığını Yap"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Kablosuz Ağ Üzerinden Görüşme Temel Hazırlığını Yap"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Varlık Temel Hazırlığı Yapıldı"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Mobil Radyo Gücü"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM Adres Defterini Görüntüle"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Sabit Arama Numaralarını Görüntüle"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Cihazları tara"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Bu cihazı yeniden adlandır"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Yeniden adlandır"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Bağlantı kesilsin mi?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Şu cihazla bağlantınız kesilecek:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Cihazla bağlantı kesilsin mi?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Telefonunuzun <xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazıyla olan bağlantısı kesilecek."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Tabletinizin <xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazıyla olan bağlantısı kesilecek."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Cihazınızın <xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazıyla olan bağlantısı kesilecek."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Bağlantıyı kes"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Bluetooth ayarlarını değiştirmek için izniniz yok."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Yeni cihaz eşle"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, Bluetooth ayarları açıkken yakındaki cihazlar tarafından görülebilir."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Telefonun Bluetooth adresi: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Tabletin Bluetooth adresi: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Cihazın Bluetooth adresi: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> bağlantısı kesilsin mi?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Yayınlama"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil devre dışı bırakılsın mı?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth eşleşme isteği"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Eşleşme isteği"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşlemek için dokunun."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Alınan dosyaları göster"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Alınan dosyalar"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth cihazı seçin"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g>, Bluetooth\'u açmak istiyor"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g>, Bluetooth\'u kapatmak istiyor"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s, iletilerinize erişmek istiyor. %2$s için erişim izni veriyor musunuz?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM\'e erişim isteği"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, SIM kartınıza erişmek istiyor. SIM karta erişim vermek, bağlantı süresince cihazınızın veri bağlantısını devre dışı bırakır. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> adlı cihaza bağlantı verin"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Diğer cihazlar tarafından \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" olarak görülebilir"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Cihazlarınız"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Yeni cihaz eşle"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Tarih ve saat"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Saat dilimini seçin"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Hesaplar"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Konum"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Hesaplar"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Güvenlik ve Konum"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Güvenlik ve konum"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Şifreleme ve kimlik bilgileri"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon şifrelendi"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Cihaz şifrelendi"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Parmak iziyle kilit açma"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Parmak izinizi kullanma"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"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 etmeniz gerekir. Eklenen tek bir parmak iziyle bile bu işlemlerin tümü yapılabilir.\n\nNot: Parmak iziniz, güçlü bir desenden veya PIN\'den daha az güvenli olabilir."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Satın alma işlemlerini yetkilendirmek veya uygulamalarda oturum açmak için parmak izi sensörüne dokunmanız yeterli. Kimlerin parmak izini eklediğinize dikkat edin. Eklenen tek parmak izi bile bunların tümünü yapabilir.\n\nNot: Bu cihazın kilidini açmak için parmak izinizi kullanamazsınız. Daha fazla bilgi edinmek için kuruluşunuzun yöneticisiyle iletişim kurun."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Telefonunuzun kilidini açmak, satın alma işlemlerini onaylamak veya uygulamalarda oturum açmak için parmak izi sensörüne dokunmanız yeterli. Parmak izlerini ekleyeceğiniz kişiler konusunda dikkatli olun. Eklenen tek bir parmak iziyle bile bu işlemlerin tümü yapılabilir.\n\nNot: Parmak iziniz, güçlü bir desenden veya PIN\'den daha az güvenli olabilir."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"İptal"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Devam"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Atla"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Parmak izi ekle"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Cihaz koruma özellikleri etkinleştirilmeyecek. Kaybolduğunda, çalındığında ya da silindiğinde bu tabletin başkaları tarafından kullanılmasını engelleyemezsiniz."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Cihaz koruma özellikleri etkinleştirilmeyecek. Kaybolduğunda, çalındığında ya da silindiğinde bu cihazın başkaları tarafından kullanılmasını engelleyemezsiniz."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Cihaz koruma özellikleri etkinleştirilmeyecek. Kaybolduğunda, çalındığında ya da silindiğinde bu telefonun başkaları tarafından kullanılmasını engelleyemezsiniz."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Cihaz koruma özellikleri etkinleştirilmeyecek. Kaybolduğunda veya çalındığında bu tabletin başkaları tarafından kullanılmasını engelleyemezsiniz."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Cihaz koruma özellikleri etkinleştirilmeyecek. Kaybolduğunda veya çalındığında bu cihazın başkaları tarafından kullanılmasını engelleyemezsiniz."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Cihaz koruma özellikleri etkinleştirilmeyecek. Kaybolduğunda veya çalındığında bu telefonun başkaları tarafından kullanılmasını engelleyemezsiniz."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"İleri"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Cihaz koruma özellikleri etkinleştirilmeyecek. Dolayısıyla tablet kaybolduğunda, çalındığında veya sıfırlandığında başkalarının bu tableti kullanmasını önleyemeyeceksiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Cihaz koruma özellikleri etkinleştirilmeyecek. Dolayısıyla cihaz kaybolduğunda, çalındığında veya sıfırlandığında başkalarının bu cihazı kullanmasını önleyemeyeceksiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Cihaz koruma özellikleri etkinleştirilmeyecek. Dolayısıyla telefon kaybolduğunda, çalındığında veya sıfırlandığında başkalarının bu telefonu kullanmasını önleyemeyeceksiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Cihaz koruma özellikleri etkinleştirilmeyecek. Dolayısıyla tablet kaybolduğunda veya çalındığında başkalarının bu tableti kullanmasını önleyemeyeceksiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Cihaz koruma özellikleri etkinleştirilmeyecek. Dolayısıyla cihaz kaybolduğunda veya çalındığında başkalarının bu cihazı kullanmasını önleyemeyeceksiniz."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Cihaz koruma özellikleri etkinleştirilmeyecek. Dolayısıyla telefon kaybolduğunda veya çalındığında başkalarının bu telefonu kullanmasını önleyemeyeceksiniz."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Yine de atla"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Geri git"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Sensörü bulun"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Telefonunuzun arkasındaki parmak izi sensörünü bulun."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Sensöre dokunun"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Telefonunuzun arkasındadır. İşaret parmağınızı kullanın."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Cihaz ve parmak izi sensörünün yerini gösteren çizim"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Ad"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Tamam"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Sil"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Başlayalım"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Sensöre dokunun"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Parmağınızı sensörün üzerine koyun ve bir titreşim hissettiğinizde kaldırın"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Devam edin"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Parmak izinizin tüm farklı noktalarını eklemek için parmağınızı çok az hareket ettirin."</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Parmak izi eklendi!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Bu simgeyi her gördüğünüzde, kimlik belirlemek veya bir satın alma işlemine onay vermek için parmak izinizi kullanabilirsiniz."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Cihazınızı uyandırmak ve kilidini açmak için parmak izi sensörüne dokunmanız yeterli."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Bu simgeyi gördüğünüzde ayrıca satın alma işlemlerini yetkilendirebilir veya uygulamalarda oturum açabilirsiniz"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Kaldırın, tekrar dokunun"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Parmak izinizin tüm farklı noktalarını eklemek için parmağınızı sürekli kaldırıp dokunun"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Parmak izi eklendi"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"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="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Parmak izi ayarlama atlansın mı?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Telefonunuzun kilidini açmak için tek yöntem olarak parmak izinizi kullanmayı seçtiniz. Şimdi atlarsanız bunu daha sonra ayarlamanız gerekecek. Ayarlama işlemi yalnızca bir veya birkaç dakika sürer."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ekran kilidini ayarla"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Bitti"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Yanlış oldu, bu sensör değil"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Cihazınızda parmak izi sensörünü kullanın."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"İşaret parmağınızla telefonunun arkasındaki sensöre dokunun."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Kayıt işlemi tamamlanmadı"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Parmak izi kayıt işlemi için süre sınırı aşıldı. Tekrar deneyin."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Parmak izi kaydı çalışmadı. Tekrar deneyin veya farklı bir parmak kullanın."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu cihazı kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu telefonu kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Yedek ekran kilitleme yönteminizi seçin"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Ekran kilidi seçenekleri"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Ekran kilidi seçenekleri"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekran kilidi"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Uykudan hemen sonra"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Uykudan <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> sonra"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Kilit açma desenini değiştir"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Kilit açma PIN\'ini değiştir"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Kilit açma şifresini değiştir"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Tekrar deneyin. Toplam <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> denemeden <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> hakkınız kaldı."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Son deneme"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"İş profili desenini bu denemede yanlış girerseniz, iş profiliniz ve ilişkilendirilen veriler bu cihazdan kaldırılır."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"İş profili PIN\'i bu denemede yanlış girerseniz, iş profiliniz ve ilişkilendirilen veriler bu cihazdan kaldırılır."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"İş profili şifresini bu denemede yanlış girerseniz, iş profiliniz ve ilişkilendirilen veriler bu cihazdan kaldırılır."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Çok fazla hatalı denemede bulundunuz. İş profiliniz ve ilişkilendirilen veriler bu cihazdan kaldırılacak."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Kapat"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Tekrar deneyin. Toplam <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> denemeden <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> hakkınız kaldı."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Verileriniz silinecek"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Bir sonraki denemenizde yanlış desen girerseniz bu cihazın verileri silinecek"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Bir sonraki denemenizde yanlış PIN girerseniz bu cihazın verileri silinecek"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Bir sonraki denemenizde yanlış şifre girerseniz bu cihazın verileri silinecek"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Bir sonraki denemenizde yanlış desen girerseniz bu kullanıcı silinecek"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Bir sonraki denemenizde yanlış PIN girerseniz bu kullanıcı silinecek"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Bir sonraki denemenizde yanlış şifre girerseniz bu kullanıcı silinecek"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Bir sonraki denemenizde yanlış desen girerseniz iş profiliniz ve verileri silinecek"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Bir sonraki denemenizde yanlış PIN girerseniz iş profiliniz ve verileri silinecek"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Bir sonraki denemenizde yanlış şifre girerseniz iş profiliniz ve verileri silinecek"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Çok fazla sayıda hatalı deneme yapıldı. Bu cihazın verileri silinecek."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Çok fazla sayıda hatalı deneme yapıldı. Bu kullanıcı silinecek."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Çok fazla sayıda hatalı denemede yapıldı. İş profiliniz ve verileri silinecek."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Kapat"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"En az <xliff:g id="COUNT">%d</xliff:g> karakter olmalıdır"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN en az <xliff:g id="COUNT">%d</xliff:g> basamaklı olmalıdır"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Devam Et"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Gelişmiş Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth açık olduğunda, cihazınız yakındaki Bluetooth cihazlarla iletişim kurabilir."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Sistem uygulamaları ve hizmetleri, konum doğruluğunu iyileştirmek için Bluetooth cihazları yine de algılayabilir. Bu ayarı, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tarama ayarlarından<xliff:g id="LINK_END_1">LINK_END</xliff:g> değiştirebilirsiniz."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Bağlanılamadı. Tekrar deneyin."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Cihaz ayrıntıları"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Cihazın Bluetooth adresi: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Cihaz unutulsun mu?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Telefonunuzun <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile olan eşlemesi kaldırılacak"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Tabletinizin <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile olan eşlemesi kaldırılacak"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Cihazınızın <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile olan eşlemesi kaldırılacak"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Cihazı unut"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Bağlan…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> medya ses profilinden ayrılacak."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> eller serbest ses profilinden ayrılacak."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Sağlama"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Doğrulama"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Sertifika belirtilmedi. Bağlantınız gizli olmayacak."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Ağ adı çok uzun."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Alan adı belirtilmelidir."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS kullanılabilir"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS kullanılabilir)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 ağ</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Gelişmiş Kablosuz"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Kablosuz ayarları yapılandır"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC adresi"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP adresi"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Alt ağ maskesi"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Bu grup unutulsun mu?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Taşınabilir Kablosuz hotspot"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Kablosuz hotspot"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Kablosuz ağ sağlamak için mobil bağlantı kullan"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Bu tabletin internet bağlantısı hotspot üzerinden paylaşılmıyor"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Bu telefonun internet bağlantısı hotspot üzerinden paylaşılmıyor"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Diğer cihazlarla içerik veya interneti paylaşmıyor"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Bu tabletin internet bağlantısı hotspot üzerinden paylaşılıyor"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Bu telefonun internet bağlantısı hotspot üzerinden paylaşılıyor"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Uygulama içerik paylaşıyor. İnternet bağlantısını paylaşmak için hotspot\'u kapatıp tekrar açın"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Kablosuz ağ adı"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> etkinleştiriliyor..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Diğer cihazlar şuna bağlanabilir: <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Kablosuz ağ şifresi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Erişim Noktası Bandı"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Diğer cihazlarınıza yönelik kablosuz ağ oluşturmak için hotspot\'u kullanın. Hotspot, mobil veri bağlantınızı kullanarak internet bağlantısı sağlar. Bunun için ek mobil veri ücretleri uygulanabilir."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Uygulamalar yakınlardaki cihazlarla içerik paylaşmak için bir hotspot oluşturabilir."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Hotspot açılıyor…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot kapatılıyor…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> etkin durumda"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Kablosuz çağrı açık olduğunda, telefonunuz tercihinize ve hangi sinyalin daha güçlü olduğuna bağlı olarak çağrıları kablosuz ağlar veya operatörünüzün ağı üzerinden yönlendirebilir. Bu özelliği açmadan önce, ücretleri ve diğer ayrıntıları öğrenmek için operatörünüze danışın."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Acil Durum Adresini Güncelle"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Kablosuz bağlantı kullanarak 911\'i ararsanız, acil durum hizmetleri tarafından konumunuz olarak kullanılan adres"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Sonuç yok"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ekran"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Ekranı otomatik döndür"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Canlı renkler"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Tableti döndürürken yönü otomatik değiştir"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Telefonu döndürürken yönü otomatik değiştir"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Tableti döndürürken yönü otomatik değiştir"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Parlaklık düzeyini mevcut ışık için optimize edin. Bu özellik açık olduğunda parlaklığı geçici olarak ayarlamaya devam edebilirsiniz."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Gece Işığı"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Gece Işığı, ekranınızın renk tonunu amber yapar. Bu renk tonlaması, ekranınızı loş ışıkta daha iyi görmenizi sağlar ve daha kolay uyumanıza yardımcı olabilir."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Program"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Durum"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Otomatik olarak aç"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Hiçbir zaman"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Özel program"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Güneşin batışından doğuşuna"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Program"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Yok"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Belirlenen saatte açılır"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Güneşin batışından doğuşuna kadar açık kalır"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Başlangıç zamanı"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Bitiş zamanı"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Durum"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Yoğunluk"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Kapalı. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Hiçbir zaman otomatik olarak açılmayacak."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Şu saatte otomatik olarak açılacak: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Güneş battığında otomatik olarak açılacak."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Açık. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Hiçbir zaman otomatik olarak kapatılmayacak."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Şu saatte otomatik olarak kapatılacak: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Güneş doğduğunda otomatik olarak kapatılacak."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Kapalı / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Hiçbir zaman otomatik olarak açılmayacak"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Şu saatte otomatik olarak açılacak: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Güneş battığında otomatik olarak açılacak"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Açık / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Hiçbir zaman otomatik olarak kapatılmayacak"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Şu saatte otomatik olarak kapatılacak: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Güneş doğduğunda otomatik olarak kapatılacak"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Uyku"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekran kapanır"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> işlem yapılmadığında"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Ayarlar"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Otomatik parlaklık"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Kaldırarak uyandır"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Ortam ekranı"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ortam ekranı"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Her zaman açık"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Yeni bildirimler"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Ne zaman gösterilecek?"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Yeni bildirimler"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bildirim geldiğinde ekranı uyandır"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Her zaman açık"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Saati, bildirim simgelerini ve diğer bilgileri göster"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Yazı tipi boyutu"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Metni daha büyük veya daha küçük yapın"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kart kilit ayarları"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN boş olamaz."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC alanındaki değer 3 rakamdan oluşmalıdır."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC alanındaki değer 2 veya 3 rakamdan oluşmalıdır."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operatör %s türünde APN eklenmesine izin vermiyor."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Varsayılan APN ayarları geri yükleniyor."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Varsayılana sıfırla"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Varsayılan APN ayarlarına sıfırlama tamamlandı."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD kartı sil"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Dahili USB bellekteki müzik veya fotoğraf gibi tüm verileri sil"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD kartındaki müzik ve fotoğraf gibi tüm verileri sil"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM\'leri sil"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Telefondaki tüm eSIM\'leri siler. Bu işlem, mobil hizmet planınızı iptal etmez."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Tabletteki tüm eSIM\'leri siler. Bu işlem, mobil hizmet planınızı iptal etmez."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tableti sıfırla"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefonu sıfırla"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Tüm kişisel bilgileriniz ve indirdiğiniz uygulamalar silinsin mi? Bu işlemi geri alamazsınız!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Veri Tasarrufu açıkken taşınabilir hotspot\'lara bağlanılamaz veya kullanılamaz"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB tethering"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB bağlandı, bağlantıyı kontrol edin"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Bağlandı"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USB bellek kullanılırken tethering yapılamaz"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB bağlı değil"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Açmak için bağlanın"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB tethering hatası"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Telefonun internet bağlantısını USB üzerinden paylaşın"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Tabletin internet bağlantısını USB üzerinden paylaşın"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth tethering"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Bu tabletin internet bağlantısı Bluetooth üzerinden paylaşılıyor"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Bu telefonun internet bağlantısı Bluetooth üzerinden paylaşılıyor"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Bu tabletin internet bağlantısı Bluetooth üzerinden 1 cihazla paylaşılıyor"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Bu telefonun internet bağlantısı Bluetooth üzerinden 1 cihazla paylaşılıyor"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Bu tabletin internet bağlantısı Bluetooth üzerinden <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> cihazla paylaşılıyor"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Bu telefonun internet bağlantısı Bluetooth üzerinden <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> cihazla paylaşılıyor"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Tabletin internet bağlantısını Bluetooth üzerinden paylaşın"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Telefonun internet bağlantısını Bluetooth üzerinden paylaşın"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g> cihazının internet bağlantısı Bluetooth üzerinden paylaşılmıyor"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Bu tabletin internet bağlantısı Bluetooth üzerinden paylaşılmıyor"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Bu telefonun internet bağlantısı Bluetooth üzerinden paylaşılmıyor"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Tethering yapılmadı"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"En çok <xliff:g id="MAXCONNECTION">%1$d</xliff:g> cihaz için tethering yapılabilir."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> internet paylaşımı kesilecek."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Mobil veri bağlantınızdan başka cihazlara internet bağlantısı sağlamak için hotspot ve tethering kullanın."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Mobil veri bağlantınızdan başka cihazlara internet bağlantısı sağlamak için hotspot ve tethering\'İ kullanın. Ayrıca uygulamalar da yakınlardaki cihazlarla içerik paylaşmak için hotspot oluşturabilir."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Yardım"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobil ağ"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobil plan"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Konum modu"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Konum için GPS, kablosuz, Bluetooth veya mobil ağlar kullanılır"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Konum için kablosuz, Bluetooth veya mobil ağlar kullanılır"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Konumu belirlemek için GPS kullanılır"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Konumu belirlemek için GPS ve cihaz sensörleri kullanılır"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Tarama"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Kablosuz taraması"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Sistem uygulamalarının ve hizmetlerinin her zaman kablosuz ağları algılamasına izin vererek konum bilgisini iyileştirin."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Veri bağlantınız yok. Bu bilgileri şimdi görüntülemek için İnternet\'e bağlı herhangi bir bilgisayardan %s adresine gidin."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Yükleniyor…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Şifrenizi seçin"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Parmak izi için şifre ayarlayın"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Deseninizi seçin"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Parmak izi için desen ayarlayın"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN\'inizi seçin"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Parmak izi için PIN ayarlayın"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Şifrenizi onaylayın"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Deseninizi onaylayın"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN\'inizi onaylayın"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Uygulama ayarları"</string>
     <string name="install_applications" msgid="4872012136210802181">"Bilinmeyen kaynaklar"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Tüm uyg. kaynaklarına izin ver"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Son açılan uygulamalar"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"<xliff:g id="COUNT">%1$d</xliff:g> uygulamanın tümünü görün"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> önce"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tabletiniz ve kişisel verileriniz, bilinmeyen uygulamalardan gelen saldırılara karşı daha savunmasızdır. Bu kaynaktan uygulama yükleyerek, bu uygulamaları kullanmanız sonucunda tabletinizin başına gelebilecek her tür hasardan ve veri kaybından kendinizin sorumlu olduğunu kabul etmiş olursunuz."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefonunuz ve kişisel verileriniz, bilinmeyen uygulamalardan gelen saldırılara karşı daha savunmasızdır. Bu kaynaktan uygulama yükleyerek, bu uygulamaları kullanmanız sonucunda telefonunuzun başına gelebilecek her tür hasardan ve veri kaybından kendinizin sorumlu olduğunu kabul etmiş olursunuz."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Gelişmiş ayarlar"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Sis hiz durdrlsn mu?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Bu hizmeti durdurursanız, tabletinizin bazı özellikleri, tablet kapatılıp yeniden açılmadan düzgün çalışmayabilir."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Bu hizmeti durdurursanız, telefonunuzun bazı özellikleri, telefon kapatılıp yeniden açılmadan düzgün çalışmayabilir."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Diller, giriş ve hareketler"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Diller ve giriş"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Diller ve giriş"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Giriş yardımı"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> yazdırma hizmeti açık</item>
       <item quantity="one">1 yazdırma hizmeti açık</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> yazdırma işi</item>
+      <item quantity="one">1 yazdırma işi</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Yazdırma hizmetleri"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Hiçbir hizmet yüklenmedi"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Yazıcı bulunamadı"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Kullanım ayrıntıları"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Pil kullanımını ayarla"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Dahil olan paketler"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Pili tüketen uygulamalar"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Cihazı uyanık tutuyor"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Cihazı arka planda uyku modundan çıkarıyor"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Sık sık konum bilgisi istiyor"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> uygulama hatalı çalışıyor"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Uygulama durdurulsun mu?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"<xliff:g id="APP">%1$s</xliff:g> telefonunuzu sürekli açık tuttuğundan telefonunuz pili normal şekilde yönetemiyor.\n\nBu sorunu çözmek için uygulamayı durmaya zorlayabilirsiniz.\n\nBu durum sürekli meydana geliyorsa pil performansını iyileştirmek için uygulamanın yüklemesini kaldırmanız gerekebilir."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"<xliff:g id="APP">%1$s</xliff:g> tabletinizi sürekli açık tuttuğundan tabletiniz pili normal şekilde yönetemiyor.\n\nBu sorunu çözmek için uygulamayı durmaya zorlayabilirsiniz.\n\nBu durum sürekli meydana geliyorsa pil performansını iyileştirmek için uygulamanın yüklemesini kaldırmanız gerekebilir."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"<xliff:g id="APP">%1$s</xliff:g> cihazınızı sürekli açık tuttuğundan cihazınız pili normal şekilde yönetemiyor.\n\nBu sorunu çözmek için uygulamayı durmaya zorlayabilirsiniz.\n\nBu durum sürekli meydana geliyorsa pil performansını iyileştirmek için uygulamanın yüklemesini kaldırmanız gerekebilir."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Uygulamayı durdur"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Arka plan kullanımı kapatılsın mı?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"<xliff:g id="APP">%1$s</xliff:g> telefonunuzu sürekli uyku modundan çıkardığından telefonunuz pili normal şekilde yönetemiyor.\n\nBu sorunun çözülmesi için telefonunuz bu uygulamanın arka planda çalışmasını engelleyebilir."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"<xliff:g id="APP">%1$s</xliff:g> tabletinizi sürekli uyku modundan çıkardığından tabletiniz pili normal şekilde yönetemiyor.\n\nBu sorunun çözülmesi için tabletiniz bu uygulamanın arka planda çalışmasını engelleyebilir."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"<xliff:g id="APP">%1$s</xliff:g> cihazınızı sürekli uyku modundan çıkardığından cihazınız pili normal şekilde yönetemiyor.\n\nBu sorunun çözülmesi için cihazınız bu uygulamanın arka planda çalışmasını engelleyebilir."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Kapat"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Konum kapatılsın mı?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"<xliff:g id="APP">%1$s</xliff:g> uygulaması kullanılmadığı zamanlarda da sürekli konum bilginizi istediğinden telefonunuz pili normal şekilde yönetemiyor.\n\nBu uygulama için konum bilgisi özelliğini kapatarak bu sorunu çözebilirsiniz."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"<xliff:g id="APP">%1$s</xliff:g> uygulaması kullanılmadığı zamanlarda da sürekli konum bilginizi istediğinden tabletiniz pili normal şekilde yönetemiyor.\n\nBu uygulama için konum bilgisi özelliğini kapatarak bu sorunu çözebilirsiniz."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"<xliff:g id="APP">%1$s</xliff:g> uygulaması kullanılmadığı zamanlarda da sürekli konum bilginizi istediğinden cihazınız pili normal şekilde yönetemiyor.\n\nBu uygulama için konum bilgisi özelliğini kapatarak bu sorunu çözebilirsiniz."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Kapat"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ekran"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"El feneri"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Uygulamalar"</string>
     <string name="power_service" msgid="1599661212370831780">"Hizmetler"</string>
     <string name="power_system" msgid="8290455327965307383">"Sistem"</string>
-    <string name="power_user" msgid="1889728099253018005">"Kullanıcı"</string>
+    <string name="power_user" msgid="3706143225319881667">"Diğer kullanıcılar"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Toplam CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ön planı"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Uyanık tut"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Fazla hesaplanan güç kullanımı"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> süreyle kullanıldı"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"<xliff:g id="TIME">^1</xliff:g> süreyle aktif"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Ekran kullanım süresi: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> kadarı <xliff:g id="APP">%2$s</xliff:g> tarafından kullanılıyor"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Toplam pilin <xliff:g id="PERCENT">%1$s</xliff:g> kadarı"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN\'i değiştir"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Bildirimleri göster"</string>
     <string name="help_label" msgid="6886837949306318591">"Yardım ve geri bildirim"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Yardım makaleleri, telefon ve sohbet desteği"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Yardım makaleleri, telefon ve sohbet, başlarken"</string>
     <string name="user_account_title" msgid="1127193807312271167">"İçerik için kullanılan hesap"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Fotoğraflı Kimlik"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Aşırı tehditler"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Gizli %d öğeyi göster</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Ağ ve İnternet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Kablosuz, mobil, veri kullanımı, hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobil"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"veri kullanımı"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Bağlı cihazlar"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Yayınlama, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Yayınlama"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Uygulamalar ve bildirimler"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"İzinler, varsayılan uygulamalar"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Kullanıcılar ve hesaplar"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"hareket"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ödeme, dokunma, ödemeler"</string>
     <string name="keywords_backup" msgid="470070289135403022">"yedek, yedekleme"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"hareket, kenar, yan, aktif kenar, sıkma, tutma, asist, asistan, squeez, squeezie, squeezey, squeezee, squizi, squzi, skuzi, skuizi, skuyzi, ok google, google assistan"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"hareket, uyandır, bildirimler, ekran, görüntü, ekran kapalı, ekran açık, sıkma, kenar, uykuda, uyku, tutma"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"hareket, sessizlik, uyku, alarm, gelen çağrı, sessiz, ekran, kilit ekranı, sıkma, tutma, kenar, durdurma"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Kablosuz NFC Etiketini ayarla"</string>
     <string name="write_tag" msgid="8571858602896222537">"Yaz"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Yazmak için bir etikete dokunun..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"İş bildirimlerini hiç gösterme"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Cihazınız kilitliyken profil bildirimlerinin nasıl gösterilmesini istersiniz?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profil bildirimleri"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Bildirimler"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Bildirimler"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Uygulama bildirimleri"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Bildirim kategorisi"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Önem"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Uygulama karar versin"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Acil"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Sese izin ver"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Ses çıkarma, titreştirme veya bu bildirimleri geçerli ekrana getirme."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Önem düzeyi düşük"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Önem düzeyi orta"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Önem düzeyi yüksek"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Önem düzeyi acil"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Bildirim yardımcısı"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Bildirim erişimi"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"İş profili bildirimlerine erişim engellendi"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Ekran içinde ekran"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Ekran içinde ekran özelliğine izin ver"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Bu uygulamanın, uygulama açıkken veya uygulamadan çıktıktan sonra (örneğin, video izlemeye devam etmek için) ekran içinde ekran penceresi oluşturmasına izin verin. Bu pencere, kullandığınız diğer uygulamaların üzerinde gösterilir."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Evet"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Hayır"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Rahatsız Etmeyin erişimi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Yüklü hiçbir uygulama Rahatsız Etmeyin erişimi isteğinde bulunmadı"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Uygulamalar yükleniyor..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Bu iş profili şunun tarafından yönetiliyor:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> tarafından yönetiliyor"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Deneysel)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Cihaz döndürme"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Ekranın içeriğini döndür"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Dikey görünümde kal"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Yatay görünümde kal"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Geçerli yönde kal"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Güvenli başlatma"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Devam"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Başlatılmadan önce PIN\'inizi girmeyi zorunlu kılarak bu cihazı daha da koruyabilirsiniz. Cihaz başlatılıncaya kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirim alamaz.\n\nBu, kayıp veya çalıntı cihazlarda verilerin korunmasına yardımcı olur. Cihazınızı başlatmak için PIN girilmesi zorunlu kılınsın mı?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Başlatılmadan önce şifrenizi girmeyi zorunlu kılarak bu cihazı daha da koruyabilirsiniz. Cihaz başlatılıncaya kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirim alamaz.\n\nBu, kayıp veya çalıntı cihazlarda verilerin korunmasına yardımcı olur. Cihazınızı başlatmak için şifre girilmesi zorunlu kılınsın mı?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Cihazınızın kilidini açmak için parmak izinizi kullanmaya ek olarak, başlatılmadan önce PIN\'inizi girmeyi zorunlu kılarak bu cihazı daha da koruyabilirsiniz. Cihaz başlatılıncaya kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirim alamaz.\n\nBu, kayıp veya çalıntı cihazlarda verilerin korunmasına yardımcı olur. Cihazınızı başlatmak için PIN girilmesi zorunlu kılınsın mı?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Cihazınızın kilidini açmak için parmak izinizi kullanmaya ek olarak, başlatılmadan önce deseninizi girmeyi zorunlu kılarak bu cihazı daha da koruyabilirsiniz. Cihaz başlatılıncaya kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirim alamaz.\n\nBu, kayıp veya çalıntı cihazlarda verilerin korunmasına yardımcı olur. Cihazınızı başlatmak için desen girilmesi zorunlu kılınsın mı?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Cihazınızın kilidini açmak için parmak izinizi kullanmaya ek olarak, başlatılmadan önce şifrenizi girmeyi zorunlu kılarak bu cihazı daha da koruyabilirsiniz. Cihaz başlatılıncaya kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirim alamaz.\n\nBu, kayıp veya çalıntı cihazlarda verilerin korunmasına yardımcı olur. Cihazınızı başlatmak için şifre girilmesini zorunlu tutun&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Cihazınızın kilidini açmak için parmak izinizi kullanmanın yanı sıra, başlatılması için şifrenizin girilmesini zorunlu hale getirerek bu cihaz için ek koruma sağlayabilirsiniz. Cihaz, başlatılana kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirimleri almaz.\n\nBu özellik, kaybolan veya çalınan cihazlardaki verileri korumaya yardımcı olur. Cihazınızı başlatmak için şifre girilmesi zorunlu kılınsın mı?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Evet"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Hayır"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN istensin mi?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Kullanım uyarıları"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Tam cihaz kullanımını göster"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Uygulama kullanımını göster"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Yüksek kullanım"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> uygulama anormal davranıyor</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> anormal davranıyor</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Pili tüketen uygulamalar</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> pili tüketiyor</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Optimize edilmeyenler"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Optimize edilmedi"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Pil kullanımı optimize ediliyor"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Diğer uyg. üzerinde göster"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g> uyg. diğer uyg. üzerinde gösterilmesine izin veriliyor"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"İzni olan uygulamalar"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Evet"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Hayır"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"İzin veriliyor"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"İzin verilmiyor"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"uygulamalar yükleme bilinmeyen kaynaklar"</string>
     <string name="write_settings" msgid="4797457275727195681">"Sistem ayarlarını değiştir"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"yazma değiştirme sistem ayarları"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekran rengi amber tonuna geçirilir. Bu renk, uyumanıza yardımcı olabilir."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Öneriler"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> daha"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> öneri</item>
+      <item quantity="one">1 öneri</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> öneri</item>
+      <item quantity="one">+1 öneri</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Kaldır"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Soğuk renk sıcaklığı"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Daha soğuk ekran renkleri kullan"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> Veri uyarısı"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> Veri uyarısı / <xliff:g id="ID_2">%2$s</xliff:g> Veri sınırı"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Fatura dönemi"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Aylık döngü, her ayın <xliff:g id="ID_1">%1$s</xliff:g> günü başlar"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Aylık dönem başlangıcı: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Her ayın <xliff:g id="ID_1">%1$s</xliff:g>. gününde"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Ağ kısıtlamaları"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> kısıtlama</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">Veri Tasarrufu açıkken 1 uygulamanın sınırsız veri kullanmasına izin veriliyor</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Veri tasarrufu"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Sınırsız veri erişimi"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Kısıtlanmamış veri"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Arka plan verisi kapalı"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Açık"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Kapalı"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kilit ekranı bildirimlerini kontrol edin"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bildirim içeriğini gösterin veya gizleyin"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Tümü"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Destek"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Destek ve ipuçları"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"En küçük genişlik"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Yüklü hiçbir uygulama, Premium SMS erişimi isteğinde bulunmadı"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premium SMS kullanımı, para ödemenizi gerektirebilir ve bu ücret operatör faturanıza eklenir. Bir uygulamaya bu izni verdiğinizde söz konusu uygulamayı kullanarak ücretli SMS gönderebilirsiniz."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Otomatik"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuel"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Şimdi yer boşalt"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Hareketler"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Hareket kısayolları"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Telefonunuzu kontrol etmek için hızlı hareketler"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Tabletinizi kontrol etmek için pratik hareketler"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Cihazınızı kontrol etmek için pratik hareketler"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kamerayı hızlı açma"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Kamerayı çabuk açmak için güç düğmesine iki kez dokunun. Tüm ekranlarda çalışır."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Kamerayı hızlı açın"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Kamerayı açmak için güç düğmesine iki kez basın"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kamerayı çevir"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Selfie\'leri daha hızlı çekin"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Selfie modu için telefonu iki kez döndürün"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Selfie modu için tableti iki kez döndürün"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Selfie modu için cihazı iki kez döndürün"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Telefonu kontrol etmek için iki kez dokunun"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tableti kontrol etmek için iki kez dokunun"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Cihazı kontrol etmek için iki kez dokunun"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Bildirimlerinizi hızlıca kontrol etmek için ekrana iki kez dokunun."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Saati, bildirim simgelerini ve diğer bilgileri kontrol etmek için ekranınıza iki kez dokunun."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Ekran kapalıyken bildirimleri kontrol edin"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Telefonu kontrol etmek için kaldırın"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tableti kontrol etmek için kaldırın"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Cihazı kontrol etmek için kaldırın"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Bildirimlerinizi hızlıca kontrol etmek için telefonunuzu elinize alın."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Bildirimlerinizi hızlıca kontrol etmek için tabletinizi elinize alın."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Bildirimlerinizi hızlıca kontrol etmek için cihazınızı elinize alın."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Saati, bildirim simgelerini ve diğer bilgileri kontrol etmek için telefonunuzu seçin."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Saati, bildirim simgelerini ve diğer bilgileri kontrol etmek için tabletinizi seçin."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Saati, bildirim simgelerini ve diğer bilgileri kontrol etmek için cihazınızı seçin."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Ekran kapalıyken bildirimleri kontrol edin"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Bildirimler için parmak izini hızlıca kaydırın"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Bildirimlerinizi kontrol etmek için telefonunuzun arkasındaki parmak izi sensöründe parmağınızı hızlıca aşağı kaydırın."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Bildirimlerinizi kontrol etmek için tabletinizin arkasındaki parmak izi sensöründe parmağınızı hızlıca aşağı kaydırın."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Bildirimlerinizi kontrol etmek için cihazınızın arkasındaki parmak izi sensöründe parmağınızı hızlıca aşağı kaydırın."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Bildirimleri hızlıca görün"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Parmak izi sensöründe hızlıca aşağı kaydırın"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Kamerayı açmak için telefonu kaldırın"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Kamerayı otomatik olarak açmak için telefonunuzu fotoğraf çekme pozisyonunda (yatay veya dikey) olacak şekilde kaldırın."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Telefonunuz uyku modundayken veya kilitliyken fotoğraf çekin"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Asistan hareketi"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Hassasiyet"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Bu hazır uygulamayı kaldırmak istiyor musunuz?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Oyunlar"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Ses dosyaları"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Kullanılan alan"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> için yükleme kaldırıldı)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> için devre dışı bırakıldı)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Otomatik doldurma hizmeti"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Hazır uygulama"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Depolama yöneticisi kapatılsın mı?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Film ve TV uygulamaları"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Kullanılan alan"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Operatör Temel Hazırlık Bilgileri"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Tetikleyici Operatör Temel Hazırlığı"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Yeni ve heyecan verici neler var?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"En önemli 5 özelliği inceleyin"</string>
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 4d706ff..20f0141 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Добрий"</item>
     <item msgid="8986346415847956850">"Відмінний"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Завжди"</item>
-    <item msgid="844721238536786870">"Лише в підключеному стані"</item>
-    <item msgid="1986753720941888596">"Ніколи"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Завжди"</item>
-    <item msgid="7433294150916905997">"Лише в підключеному стані"</item>
-    <item msgid="1390404486722375028">"Ніколи"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Останні 30 днів"</item>
     <item msgid="6600989128423965319">"Цикл використання даних…"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 2f62836..ac70968 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -32,6 +32,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Тепер ви – розробник!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Немає потреби, ви вже розробник."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Спершу ввімкніть параметри розробника."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Бездротові та дротові мережі"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"З’єднання"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Пристрій"</string>
@@ -43,6 +44,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Ініціалізація VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Відеодзвінки дозволено"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Виклики через Wi-Fi дозволено"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Увімкнено службу EAB/Presence"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Потужність мобільного радіо"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Переглянути адресну книгу SIM-карти"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Перегл. фікс. номери набору"</string>
@@ -108,10 +110,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Сканув. пристроїв"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Перейменувати цей пристрій"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Перейменувати"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Від’єднатися?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Це призведе до роз’єднання з пристроєм:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Від’єднати пристрій?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Ваш телефон буде від’єднано від пристрою <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Ваш планшет буде від’єднано від пристрою <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Ваш пристрій буде від’єднано від пристрою <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Від’єднати"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Ви не маєте дозволу змінювати налаштування Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Підключити новий пристрій"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Пристрої поблизу можуть знайти <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, якщо відкрито налаштування Bluetooth."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Адреса Bluetooth телефона: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Адреса Bluetooth планшета: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Адреса Bluetooth пристрою: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Відключити пристрій <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Трансляція"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Вимкнути профіль?"</string>
@@ -123,7 +132,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Запит Bluetooth на створення пари"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Запит на створення пари"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Торкніться, щоб підключитися до пристрою <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Показати отримані файли"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Отримані файли"</string>
     <string name="device_picker" msgid="4978696506172252813">"Виберіть пристрій Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"Додаток <xliff:g id="APP_NAME">%1$s</xliff:g> хоче ввімкнути Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"Додаток <xliff:g id="APP_NAME">%1$s</xliff:g> хоче вимкнути Bluetooth"</string>
@@ -159,6 +168,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s хоче отримати доступ до ваших повідомлень. Надати %2$s доступ?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Запит на доступ до SIM-карти"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"Пристрою <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> потрібен доступ до вашої SIM-карти. Коли він використовуватиме SIM-карту, ви не зможете передавати дані. Надати доступ пристрою <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Видно як \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" для інших пристроїв"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ваші пристрої"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Підключити новий пристрій"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Дата й час"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Вибрати часовий пояс"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -333,7 +345,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Облікові записи"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Місцезнаходження"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Облікові записи"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Безпека та місцезнаходження"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Безпека та місцезнаходження"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрування й облікові дані"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Телефон зашифровано"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Пристрій зашифровано"</string>
@@ -360,40 +372,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Розблокування відбитком"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Відбиток пальця"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Щоб розблокувати телефон, дозволити покупку або ввійти в додаток, просто торкніться сканера відбитків пальців. Будьте обачні, оскільки приймається будь-який відбиток, доданий на телефон.\n\nПримітка. Відбиток пальця може бути менш надійним, ніж ключ або PIN-код."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Щоб підтвердити покупку або ввійти в додаток, просто торкніться сканера відбитків пальців. Це можна зробити за допомогою будь-якого відбитка, доданого на телефон. Тож будьте обачні.\n\nПримітка. Відбитком пальця не можна розблоковувати пристрій. Щоб отримати докладнішу інформацію, зв’яжіться з адміністратором своєї організації."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Щоб розблокувати телефон, дозволити покупку або ввійти в додаток, просто торкніться сканера відбитків пальців. Будьте обачні, оскільки приймається будь-який відбиток, доданий на телефон.\n\nПримітка. Відбиток пальця може бути менш надійним, ніж ключ або PIN-код."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Розблоковуйте телефон або схвалюйте покупки відбитком пальця.\n\nПримітка. Цей пристрій не можна розблоковувати відбитком пальця. Щоб дізнатися більше, зв’яжіться з адміністратором своєї організації."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Розблоковуйте телефон або схвалюйте покупки відбитком пальця.\n\nПримітка. Відбиток пальця може бути менш надійним, ніж ключ чи PIN-код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Скасувати"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Далі"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Пропустити"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Додати відбиток пальця"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Функції захисту пристрою не буде активовано. Інші люди зможуть користуватися цим планшетом, якщо його буде загублено, викрадено чи очищено."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Функції захисту пристрою не буде активовано. Якщо пристрій буде загублено чи викрадено, ним зможуть скористатися сторонні."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Функції захисту пристрою не буде активовано. Якщо телефон буде загублено чи викрадено, ним зможуть скористатися сторонні."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Функції захисту пристрою не буде активовано. Якщо планшет буде загублено чи викрадено, ним зможуть скористатися сторонні."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Функції захисту пристрою не буде активовано. Якщо пристрій буде загублено чи викрадено, ним зможуть скористатися сторонні."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Функції захисту пристрою не буде активовано. Якщо телефон буде загублено чи викрадено, ним зможуть скористатися сторонні."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Далі"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Функції захисту пристрою не буде ввімкнено. Ви не зможете завадити іншим користуватися цим планшетом, якщо його буде втрачено, викрадено чи скинуто до заводських налаштувань."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Функції захисту пристрою не буде ввімкнено. Ви не зможете завадити іншим користуватися цим пристроєм, якщо його буде втрачено, викрадено чи скинуто до заводських налаштувань."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Функції захисту пристрою не буде ввімкнено. Ви не зможете завадити іншим користуватися цим телефоном, якщо його буде втрачено, викрадено чи скинуто до заводських налаштувань."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Функції захисту пристрою не буде ввімкнено. Ви не зможете завадити іншим користуватися цим планшетом, якщо його буде втрачено чи викрадено."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Функції захисту пристрою не буде ввімкнено. Ви не зможете завадити іншим користуватися цим пристроєм, якщо його буде втрачено чи викрадено."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Функції захисту пристрою не буде ввімкнено. Ви не зможете завадити іншим користуватися цим телефоном, якщо його буде втрачено чи викрадено."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Пропустити"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Назад"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Знайдіть датчик"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Знайдіть датчик цифрових відбитків на задній панелі телефона."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Торкніться сканера"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Сканер розташовано на задній панелі телефона. Прикладіть вказівний палець."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Розташування датчика цифрових відбитків на пристрої"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Назва"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ОК"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Видалити"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Почнімо"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Торкніться сканера"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Покладіть палець на датчик і заберіть його, коли відчуєте вібрацію"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Продовжуйте"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Плавно переміщуйте палець, щоб відсканувати відбиток повністю"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Відбиток додано."</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Цей значок означає, що ви можете підтвердити свою особу або покупку за допомогою цифрового відбитка."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Щоб активувати та розблокувати пристрій, просто торкніться датчика відбитків пальців."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Коли ви бачите цей значок, ви також можете дозволяти покупки або входити в додатки."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Підніміть і знову торкніться"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Піднімайте палець, щоб додати різні частини відбитка"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Відбиток пальця додано"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Коли ви бачите цей значок, підтвердьте свою особу або покупку за допомогою відбитка пальця."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Пропустити налаштування відбитка?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Ви вибрали відбиток пальця як один зі способів розблокування телефона. Якщо пропустити цей крок зараз, потрібно буде налаштувати відбиток пізніше. Це займає близько хвилини."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Налаштувати блокування екрана"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Готово"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Це не датчик"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Скористайтеся датчиком відбитків на пристрої."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Торкніться сканера на задній панелі телефона. Прикладіть вказівний палець."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Відбиток не зареєстровано"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Час для реєстрації відбитка минув. Повторіть спробу."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Відбиток не зареєстровано. Повторіть спробу або прикладіть інший палець."</string>
@@ -455,6 +465,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Активуйте функції захисту пристрою, щоб інші люди не могли ним користуватися без вашого дозволу. Виберіть спосіб блокування екрана."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Активуйте функції захисту телефона, щоб інші люди не могли ним користуватися без вашого дозволу. Виберіть спосіб блокування екрана."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Виберіть резервний спосіб блокування екрана"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Способи блокування екрана"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Способи блокування екрана"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блокування екрана"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>: одразу після виходу з режиму сну"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>: <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> після виходу з режиму сну"</string>
@@ -525,13 +537,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Змінити ключ розблокув."</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Змінити PIN розблок."</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Змінити пароль розблок."</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Спробуйте ще. Спроба <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> із <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Остання спроба"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Якщо цього разу ви введете неправильний ключ, ваш робочий профіль і зв’язані з ним дані буде видалено з цього пристрою."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Якщо цього разу ви введете неправильний PIN-код, ваш робочий профіль і зв’язані з ним дані буде видалено з цього пристрою."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Якщо цього разу ви введете неправильний пароль, ваш робочий профіль і зв’язані з ним дані буде видалено з цього пристрою."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Забагато невдалих спроб. Ваш робочий профіль і зв’язані з ним дані буде видалено з цього пристрою."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Відхилити"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Спробуйте ще. Спроба <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> із <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Ваші дані буде видалено"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Якщо наступного разу ви введете неправильний ключ, дані на цьому пристрої буде видалено"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Якщо наступного разу ви введете неправильний PIN-код, дані на цьому пристрої буде видалено"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Якщо наступного разу ви введете неправильний пароль, дані на цьому пристрої буде видалено"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Якщо наступного разу ви введете неправильний ключ, цього користувача буде видалено"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Якщо наступного разу ви введете неправильний PIN-код, цього користувача буде видалено"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Якщо наступного разу ви введете неправильний пароль, цього користувача буде видалено"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Якщо наступного разу ви введете неправильний ключ, ваш робочий профіль і його дані буде видалено"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Якщо наступного разу ви введете неправильний PIN-код, ваш робочий профіль і його дані буде видалено"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Якщо наступного разу ви введете неправильний пароль, ваш робочий профіль і його дані буде видалено"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Забагато невдалих спроб. Дані на цьому пристрої буде видалено."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Забагато невдалих спроб. Цього користувача буде видалено."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Забагато невдалих спроб. Цей робочий профіль і його дані буде видалено."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Закрити"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Має містити принаймні стільки символів: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN-код має містити принаймні стільки цифр: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Продовжити"</string>
@@ -648,6 +668,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Розшир. налаштування Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Коли Bluetooth увімкнено, пристрій може обмінюватися даними з пристроями Bluetooth поблизу."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Щоб точніше визначати місцеположення, додатки та сервіси системи все одно шукатимуть пристрої Bluetooth. Це можна змінити в <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>налаштуваннях сканування<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Не вдалося під’єднатися. Повторіть спробу."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Про пристрій"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Адреса Bluetooth пристрою: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Забути пристрій?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Ваш телефон більше не буде підключено до пристрою <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Ваш планшет більше не буде підключено до пристрою <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Ваш пристрій більше не буде підключено до пристрою <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Забути пристрій"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Підключ. до…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> буде відключено від аудіоджерела."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Пристрій <xliff:g id="DEVICE_NAME">%1$s</xliff:g> буде відключено від аудіо гарнітури."</string>
@@ -800,6 +828,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Не надавати"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Не перевіряти"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Сертифікат не вказано. З’єднання не буде конфіденційним."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Назва мережі задовга."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Укажіть домен."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Є доступ до WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" Є доступ до WPS"</string>
@@ -833,7 +862,6 @@
       <item quantity="other">%d мережі</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Розширені налаштування Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Налаштувати Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-адреса"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"ІР-адреса"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска підмережі"</string>
@@ -870,9 +898,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Видалити цю групу?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Портативна точка доступу Wi‑Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Точка доступу Wi‑Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Вмикати мобільне з’єднання для Wi‑Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Немає доступу до Інтернету через точку доступу на цьому планшеті"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Немає доступу до Інтернету через точку доступу на цьому телефоні"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Інші пристрої не матимуть доступу до Інтернету чи вмісту"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Надається доступ до інтернет-з’єднання на цьому планшеті через точку доступу"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Надається доступ до інтернет-з’єднання на цьому телефоні через точку доступу"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Додаток ділиться вмістом. Щоб надати доступ до інтернет-з’єднання, вимкніть і знову ввімкніть точку доступу"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Назва Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Увімкнення точки доступу \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\"…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Інші пристрої можуть підключитися до точки доступу \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\""</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Пароль Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Діапазон частот точки доступу"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Створювати мережу Wi‑Fi для інших пристроїв за допомогою точки доступу. Точка доступу надає Інтернет, використовуючи мобільну мережу. Може стягуватися додаткова плата за мобільний Інтернет."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Додатки можуть створювати точку доступу, щоб ділитися вмістом із пристроями поруч."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Увімкнення точки доступу…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Вимкнення точки доступу…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> активовано"</string>
@@ -919,6 +955,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Якщо ввімкнути Wi-Fi, ваш телефон зможе спрямовувати дзвінки через мережі Wi-Fi або мережу вашого оператора, залежно від вибраних налаштувань і потужності сигналу мережі. Перш ніж увімкнути цю функцію, уточніть в оператора, скільки коштує ця послуга, та інші деталі."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Оновити екстрену адресу"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Адреса, яку знатимуть екстрені служби, якщо ви зателефонуєте 112 через Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Екран"</string>
@@ -976,6 +1013,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Результатів немає"</string>
     <string name="display_settings" msgid="7965901687241669598">"Екран"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Автоповорот екрана"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Яскраві кольори"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Автомат. переключ. орієнтацію під час обертання пристрою"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Автомат. переключ. орієнтацію при обертанні телефону"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Автомат. переключ. орієнтацію під час обертання пристрою"</string>
@@ -1003,23 +1041,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Оптимізація яскравості з урахуванням освітлення. Якщо цю функцію ввімкнено, ви все одно можете тимчасово змінювати яскравість."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Нічний режим"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Коли ввімкнено Нічний режим, екран набуває бурштинового відтінку. Так зручніше дивитися на екран при тьмяному освітленні та легше заснути."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Розклад"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Статус"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Вмикати автоматично"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Ніколи"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Користувацький графік"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Від заходу до сходу сонця"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Розклад"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ніколи"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Вмикається в установлений час"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Вмикається від заходу до світанку"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Час початку"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Час завершення"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Статус"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Інтенсивність"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Вимкнено. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Ніколи не вмикатиметься автоматично."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Вмикатиметься автоматично о <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Вмикатиметься автоматично після заходу сонця."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Увімкнено. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Ніколи не вимикатиметься автоматично."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Вимикатиметься автоматично о <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Вимикатиметься автоматично на світанку."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Вимкнено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Ніколи не вмикатиметься автоматично"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Вмикатиметься автоматично о <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Вмикатиметься автоматично після заходу сонця"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Увімкнено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Ніколи не вимикатиметься автоматично"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Вимикатиметься автоматично о <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Вимикатиметься автоматично на світанку"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Режим сну"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Вимикати екран"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Коли минає <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездіяльності"</string>
@@ -1043,8 +1080,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Налаштування"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яскравість"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Підняти, щоб активувати"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Активація екрана"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Активація екрана"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Завжди ввімкнено"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Нові сповіщення"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Час показу"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Нові сповіщення"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Активувати екран, коли надходять сповіщення"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Завжди ввімкнено"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Показувати час, значки сповіщень тощо"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Розмір шрифту"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Збільшуйте або зменшуйте текст"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Налаштування блокування SIM-карти"</string>
@@ -1298,6 +1341,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"Поле APN не може бути порожнім."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Поле MCC має містити 3 цифри."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Поле MNC має містити 2 або 3 цифри."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Оператор не дозволяє додавати APN типу %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Відновлення налаштувань APN за умовчанням."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Скинути налаштування"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Налаштування за умовчанням відновлено."</string>
@@ -1329,6 +1373,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Очистити карту SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Стерти всі дані на внутрішньому носії USB, як-от музику чи фото"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Стерти всі дані на карті SD, такі як музика чи фото."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Стерти eSIM-карти"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Стерти всі eSIM-карти на телефоні. Ваш тарифний план не буде скасовано."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Стерти всі eSIM-карти на планшеті. Ваш тарифний план не буде скасовано."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Скинути пристр."</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Скинути налаштування"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Стерти всю особисту інформацію та завантажені додатки? Цю дію не можна скасувати."</string>
@@ -1351,26 +1398,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Коли ввімкнено Заощадження трафіку, неможливо ввімкнути режим модема або використовувати портативні точки доступу"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Прив\'язка USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB підключено, увімкніть передачу даних"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Прив\'язано"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Режим модема неможливий, якщо носій USB використовується"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB не підключено"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Підключіть, щоб увімкнути"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Помилка прив\'язки USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Надавати доступ до інтернет-з’єднання на телефоні через USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Надавати доступ до інтернет-з’єднання на планшеті через USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Прив\'язка Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Доступ до Інтернету через Bluetooth на планшеті"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Доступ до Інтернету через Bluetooth на телефоні"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Доступ до Інтернету через Bluetooth на цьому планшеті для 1 пристрою"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Доступ до Інтернету через Bluetooth на цьому телефоні для 1 пристрою"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Доступ до Інтернету через Bluetooth на планшеті для стількох пристроїв: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Доступ до Інтернету через Bluetooth на телефоні для стількох пристроїв: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Надавати доступ до інтернет-з’єднання на планшеті через Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Надавати доступ до інтернет-з’єднання на телефоні через Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Доступ до Інтернету через Bluetooth на пристрої <xliff:g id="DEVICE_NAME">%1$d</xliff:g>"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Немає доступу до Інтернету через Bluetooth на планшеті"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Немає доступу до Інтернету через Bluetooth на телефоні"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Не в режимі модема"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Режим модема можливий для макс. стількох пристр.: <xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Прив\'язку <xliff:g id="DEVICE_NAME">%1$s</xliff:g> буде скасовано."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Надавати іншим пристроям доступ до Інтернету через мобільну мережу за допомогою точки доступу та модема."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Надавати іншим пристроям доступ до Інтернету через мобільну мережу за допомогою точки доступу та модема. Додатки також можуть створювати точку доступу, щоб ділитися вмістом із пристроями поруч."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Довідка"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Мобільна мережа"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Тарифний план"</string>
@@ -1403,7 +1439,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим локації"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Визначати місцезнаходження за допомогою GPS, Wi-Fi, Bluetooth і мобільних мереж"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Визначати місцезнаходження за допомогою Wi-Fi, Bluetooth і мобільних мереж"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Використовувати GPS для визначення місцезнаходження"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Визначати місцезнаходження за допомогою GPS і датчиків пристрою"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Пошук"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Шукати мережі Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Щоб покращити точність визначення місцеположення, дозвольте додаткам і сервісам системи будь-коли шукати мережі Wi‑Fi."</string>
@@ -1448,8 +1484,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Відсутнє з’єднання з мережею. Щоб переглянути цю інформацію зараз, перейдіть на %s з будь-якого комп’ютера, під’єднаного до Інтернету."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Завантаження…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Виберіть пароль"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Щоб користуватися відбитком пальця, налаштуйте пароль"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Створіть ключ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Щоб користуватися відбитком пальця, налаштуйте ключ"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Виберіть свій PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Щоб користуватися відбитком пальця, налаштуйте PIN-код"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Підтвердьте свій пароль"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Підтвердьте ключ розблокування"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Підтвердьте свій PIN"</string>
@@ -1518,6 +1557,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Налаштування програми"</string>
     <string name="install_applications" msgid="4872012136210802181">"Невідомі джерела"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Дозволити всі джерела додатків"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Нещодавно відкриті додатки"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Переглянути всі додатки: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> тому"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Ваш планшет і особисті дані більш уразливі до атак із боку додатків із невідомих джерел Установлюючи додатки з цього джерела, ви погоджуєтеся, що несете відповідальність за будь-яку шкоду, заподіяну вашому планшету, чи втрату даних унаслідок використання таких додатків."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Ваш телефон і особисті дані більш уразливі до атак із боку додатків із невідомих джерел Установлюючи додатки з цього джерела, ви погоджуєтеся, що несете відповідальність за будь-яку шкоду, заподіяну вашому телефону, чи втрату даних унаслідок використання таких додатків."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Розширені налаштування"</string>
@@ -1688,6 +1730,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Зупин. системну службу?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Якщо припинити роботу цієї служби, деякі функції планшетного ПК можуть працювати неправильно, поки живлення не буде вимкнено та знову ввімкнено."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Якщо припинити роботу цієї служби, деякі функції телефону можуть працювати неправильно, поки живлення не буде вимкнено та знову ввімкнено."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Мови, способи введення та жести"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Мова та введення"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Мова та введення"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Допомога під час введення"</string>
@@ -1914,6 +1960,12 @@
       <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="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <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="print_settings_title" msgid="3685449667822217816">"Налаштування друку"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Не встановлено жодну службу"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Принтери не знайдено"</string>
@@ -1980,6 +2032,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Вжиток"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Режим енергоспоживання"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Уключені пакети"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Додатки, які розряджають акумулятор"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Пристрій не переходить у режим сну"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Виводить пристрій із режиму сну у фоновому режимі"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Часто запитує геодані"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Кількість додатків, які працюють неналежним чином: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Припинити роботу додатка?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Телефон не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP">%1$s</xliff:g> постійно підтримує телефон в активному режимі.\n\nСпробуйте вирішити цю проблему, примусово припинивши роботу додатка.\n\nЯкщо проблема не зникне, можливо, потрібно буде видалити додаток, щоб покращити роботу акумулятора."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Планшет не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP">%1$s</xliff:g> постійно підтримує планшет в активному режимі.\n\nСпробуйте вирішити цю проблему, примусово припинивши роботу додатка.\n\nЯкщо проблема не зникне, можливо, потрібно буде видалити додаток, щоб покращити роботу акумулятора."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Пристрій не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP">%1$s</xliff:g> постійно підтримує пристрій в активному режимі.\n\nСпробуйте вирішити цю проблему, примусово припинивши роботу додатка.\n\nЯкщо проблема не зникне, можливо, потрібно буде видалити додаток, щоб покращити роботу акумулятора."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Припинити роботу додатка"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Вимкнути використання у фоновому режимі?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Телефон не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP">%1$s</xliff:g> постійно виводить телефон із режиму сну.\n\nЩоб вирішити цю проблему, потрібно заборонити цьому додатку працювати у фоновому режимі."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Планшет не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP">%1$s</xliff:g> постійно виводить планшет із режиму сну.\n\nЩоб вирішити цю проблему, потрібно заборонити цьому додатку працювати у фоновому режимі."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Пристрій не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP">%1$s</xliff:g> постійно виводить пристрій із режиму сну.\n\nЩоб вирішити цю проблему, потрібно заборонити цьому додатку працювати у фоновому режимі."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Вимкнути"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Вимкнути геодані?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Телефон не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP">%1$s</xliff:g> продовжує запитувати ваші геодані, коли ви не користуєтеся ним.\n\nЩоб вирішити цю проблему, вимкніть доступ до геоданих для цього додатка."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Планшет не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP">%1$s</xliff:g> продовжує запитувати ваші геодані, коли ви не користуєтеся ним.\n\nЩоб вирішити цю проблему, вимкніть доступ до геоданих для цього додатка."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Пристрій не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP">%1$s</xliff:g> продовжує запитувати ваші геодані, коли ви не користуєтеся ним.\n\nЩоб вирішити цю проблему, вимкніть доступ до геоданих для цього додатка."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Вимкнути"</string>
     <string name="power_screen" msgid="3023346080675904613">"Екран"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Ліхтарик"</string>
     <string name="power_camera" msgid="4976286950934622605">"Камера"</string>
@@ -1994,7 +2066,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Додатки"</string>
     <string name="power_service" msgid="1599661212370831780">"Служби"</string>
     <string name="power_system" msgid="8290455327965307383">"Система"</string>
-    <string name="power_user" msgid="1889728099253018005">"Користувач"</string>
+    <string name="power_user" msgid="3706143225319881667">"Інші користувачі"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Заг. ЦП"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Актив. процеси ЦП"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Залишати активним"</string>
@@ -2046,6 +2118,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Переоцінене енергоспоживання"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мА/год"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Час використання: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Активний <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Використання екрана: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> заряду використовує додаток <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> усього заряду"</string>
@@ -2613,7 +2686,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Змінити PIN-код"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Показати сповіщення"</string>
     <string name="help_label" msgid="6886837949306318591">"Довідка й відгуки"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Довідкові статті, підтримка телефоном і в чаті"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Довідкові статті, підтримка телефоном і в чаті, початок роботи"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Обліковий запис для вмісту"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Ідентифікатор фотографії"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Серйозні загрози"</string>
@@ -2705,9 +2778,12 @@
       <item quantity="other">Показати %d схованого елемента</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Мережа й Інтернет"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, мобільний, використання трафіку, точка доступу"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобільна мережа"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"використання трафіку"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"точка доступу"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Під’єднані пристрої"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast і NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth і Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Додатки та сповіщення"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Дозволи та додатки за умовчанням"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Користувачі й облікові записи"</string>
@@ -2760,6 +2836,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"жест"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"оплатити, торкнутися, платежі"</string>
     <string name="keywords_backup" msgid="470070289135403022">"резервна копія, резервне копіювання"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"жест, край, сторона, активний край, стиснути, міцно тримати, допомагати, помічник, squeezy, ok google, google помічник"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"жест, активний режим, сповіщення, екран, дисплей, екран вимкнено, екран увімкнено, стиснути, край, режим сну, сон, міцно тримати"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"жест, вимкнути звук, відкласти, будильник, вхідний дзвінок, беззвучний режим, дисплей, заблокований екран, стиснути, міцно тримати, край, припинити"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Налаштувати NFC-тег для Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Записати"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Торкніться тегу, у який потрібно записати дані…"</string>
@@ -2844,7 +2923,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Узагалі не показувати робочі сповіщення"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Як показувати сповіщення профілю, коли пристрій заблоковано?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Сповіщення профілю"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Сповіщення"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Сповіщення"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Сповіщення з додатків"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Категорія сповіщень"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Пріоритет"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Дозволити додатку вирішувати"</string>
@@ -2859,6 +2939,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Термінове сповіщення"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Дозволити звуковий сигнал"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Не подавати звуковий сигнал і вібросигнал та не показувати ці сповіщення на поточному екрані."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Низький пріоритет"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Середній пріоритет"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Високий пріоритет"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Терміново"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Диспетчер сповіщень"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Доступ до сповіщень"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Доступ до сповіщень робочого профілю заблоковано"</string>
@@ -2888,8 +2972,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Картинка в картинці"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Дозволити функцію картинки в картинці"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Додаток зможе створювати вікно з картинкою в картинці, доки додаток відкрито або після виходу з нього (наприклад, щоб продовжити перегляд відео). Це вікно з’являтиметься поверх інших додатків."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Так"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Ні"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Доступ у режимі \"Не турбувати\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Установлені додатки не запитували доступу до функції \"Не турбувати\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Завантаження додатків…"</string>
@@ -3028,11 +3110,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Цим робочим профілем керує додаток"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Керує додаток <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментальна функція)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Обертання пристрою"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Обертати вміст екрана"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Залишити книжкову орієнтацію"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Залишити альбомну орієнтацію"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Залишити поточну орієнтацію"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Захищений запуск"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Продовжити"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Ви можете додатково захистити цей пристрій, увімкнувши запит PIN-коду перед запуском. Доки пристрій не запуститься, він не прийматиме дзвінки, повідомлення та сповіщення, і на ньому не працюватимуть будильники. \n\nЦе допомагає захистити дані на загублених чи викрадених пристроях. Запитувати PIN-код перед запуском?"</string>
@@ -3040,7 +3117,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Ви можете додатково захистити цей пристрій, увімкнувши запит пароля перед запуском. Доки пристрій не запуститься, він не прийматиме дзвінки, повідомлення та сповіщення, і на ньому не працюватимуть будильники. \n\nЦе допомагає захистити дані на загублених чи викрадених пристроях. Запитувати пароль перед запуском?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Окрім розблокування відбитком пальця, ви можете додатково захистити пристрій, увімкнувши запит PIN-коду перед запуском. Доки пристрій не запуститься, він не прийматиме дзвінки, повідомлення та сповіщення, і на ньому не працюватимуть будильники.\n\nЦе допомагає захистити дані на загублених чи викрадених пристроях. Запитувати PIN-код перед запуском?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Окрім розблокування відбитком пальця, ви можете додатково захистити пристрій, увімкнувши запит ключа перед запуском. Доки пристрій не запуститься, він не прийматиме дзвінки, повідомлення та сповіщення, і на ньому не працюватимуть будильники.\n\nЦе допомагає захистити дані на загублених чи викрадених пристроях. Запитувати ключ перед запуском?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Окрім розблокування відбитком пальця, ви можете додатково захистити пристрій, увімкнувши запит пароля перед запуском. Доки пристрій не запуститься, він не прийматиме дзвінки, повідомлення та сповіщення, і на ньому не працюватимуть будильники.\n\nЦе допомагає захистити дані на загублених чи викрадених пристроях. Запитувати пароль перед запуском?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Якщо ви розблоковуєте пристрій відбитком пальця, можна додатково захистити його паролем перед запуском. Доки пристрій не запуститься, він не прийматиме виклики, повідомлення чи сповіщення, зокрема сигнали.\n\nЦе допомагає захистити дані на загублених чи вкрадених пристроях. Запитувати пароль перед запуском пристрою?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Так"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ні"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Вводити PIN-код?"</string>
@@ -3166,6 +3243,19 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Сповіщення про використання"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Показати повне використання пристрою"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Показати використання додатка"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Споживає багато електроенергії"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> додаток працює неналежним чином</item>
+      <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> додатки працюють неналежним чином</item>
+      <item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> додатків працюють неналежним чином</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> додатка працюють неналежним чином</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Додатки, які розряджають акумулятор</item>
+      <item quantity="few">Додатки, які розряджають акумулятор</item>
+      <item quantity="many">Додатки, які розряджають акумулятор</item>
+      <item quantity="other">Додатки, які розряджають акумулятор</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Додатки без оптимізації"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Не оптимізовано"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Використання акумулятора оптимізується"</string>
@@ -3260,8 +3350,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Показувати поверх додатків"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"Додатки, які можуть відображатися поверх інших додатків: <xliff:g id="COUNT_0">%1$d</xliff:g> з <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Додатки з дозволом"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Так"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Ні"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Дозволено"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Заборонено"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"установлювати додатки невідомі джерела"</string>
     <string name="write_settings" msgid="4797457275727195681">"Змінювати налаштування системи"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"змінювати налаштування системи"</string>
@@ -3353,6 +3443,19 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Можливо, бурштиновий відтінок екрана допоможе вам заснути."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Пропозиції"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"і ще <xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <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="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <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="suggestion_remove" msgid="904627293892092439">"Видалити"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Холодна температура кольорів"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Використовувати холодніші кольори дисплея"</string>
@@ -3371,8 +3474,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Застереження про трафік: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Застереження про трафік: <xliff:g id="ID_1">%1$s</xliff:g> / Ліміт трафіку: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Платіжний цикл"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Платіжний цикл починається <xliff:g id="ID_1">%1$s</xliff:g> числа кожного місяця"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Починається <xliff:g id="ID_1">%1$s</xliff:g> числа кожного місяця"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Щомісяця <xliff:g id="ID_1">%1$s</xliff:g> числа"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Обмеження мережі"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> обмеження</item>
@@ -3396,7 +3498,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> додатків можуть без обмежень передавати дані, коли ввімкнено Заощадження трафіку</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Заощадження трафіку"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Повний доступ до трафіку"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Необмежені дані"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Фоновий режим вимкнено"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Увімкнено"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Вимкнено"</string>
@@ -3462,8 +3564,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Керуйте сповіщеннями на заблок. екрані"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Показуйте або приховуйте вміст сповіщень"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Усі"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Підтримка"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"Точок: <xliff:g id="ID_1">%d</xliff:g>"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Підтримка та поради"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Найменша ширина"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Установлені додатки не запитували доступу до платних SMS"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Кошти за платні SMS стягує оператор. Ви зможете надсилати платні SMS через додаток, якому надасте такий дозвіл."</string>
@@ -3534,28 +3635,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Автоматично"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Вручну"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Звільнити місце"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Жести"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Жести швидкого доступу"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Швидкі жести для керування телефоном"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Швидкі жести для керування планшетом"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Швидкі жести для керування пристроєм"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Перейти до камери"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Щоб швидко відкрити камеру, двічі натисніть кнопку живлення. Працює на будь-якому екрані."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Швидке відкривання камери"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Відкривати камеру подвійним натисканням кнопки живлення"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Змінити камеру"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Робіть автопортрети швидше"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Двічі покрутити телефоном, щоб перейти в режим автопортрета"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Двічі покрутити планшетом, щоб перейти в режим автопортрета"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Двічі покрутити пристроєм, щоб перейти в режим автопортрета"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Двічі торкніться, щоб перевірити телефон"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Двічі торкніться, щоб перевірити планшет"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Двічі торкніться, щоб перевірити пристрій"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Щоб швидко переглянути сповіщення, двічі торкніться екрана."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Щоб переглянути час, значки сповіщень тощо, двічі торкніться екрана."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Переглядати сповіщення, коли екран вимкнено"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Підняти телефон, щоб перевірити сповіщення"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Підніміть планшет, щоб перевірити його"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Підніміть пристрій, щоб перевірити його"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Щоб швидко переглянути сповіщення, візьміть телефон у руки."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Щоб швидко переглянути сповіщення, візьміть планшет у руки."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Щоб швидко переглянути сповіщення, візьміть пристрій у руки."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Щоб переглянути час, значки сповіщень тощо, підніміть телефон."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Щоб переглянути час, значки сповіщень тощо, підніміть планшет."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Щоб переглянути час, значки сповіщень тощо, підніміть пристрій."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Переглядати сповіщення, коли екран вимкнено"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Використати відбиток, щоб переглянути сповіщення"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Щоб переглянути сповіщення, проведіть пальцем униз по сканеру відбитків на задній панелі телефона."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Щоб переглянути сповіщення, проведіть пальцем униз по сканеру відбитків на задній панелі планшета."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Щоб переглянути сповіщення, проведіть пальцем униз по сканеру відбитків на задній панелі пристрою."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Швидкий перегляд сповіщень"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Провести вниз на сканері відбитків пальців"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Щоб відкрити камеру, підніміть телефон"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Щоб автоматично відкрити камеру, підніміть телефон у положення для зйомки (альбомна або книжкова орієнтація). Працює, навіть коли телефон у режимі сну або заблокований."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Фотографувати, коли телефон у режимі сну або заблокований"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Допоміжний жест"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Чутливість"</string>
@@ -3673,6 +3787,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Видалити цей додаток із миттєвим запуском?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Ігри"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Аудіофайли"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Використано місця"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(видалено для користувача <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(вимкнено для користувача <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Служба автозаповнення"</string>
@@ -3686,5 +3801,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Додаток із миттєвим запуском"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Вимкнути диспетчер пам’яті?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Додатки для перегляду фільмів"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Використано місця"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Інформація про ініціалізацію оператора"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Активатор ініціалізації оператора"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Що нового та цікавого?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Перегляньте 5 найкращих функцій"</string>
 </resources>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index 5d159c7..27a2b63 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"اچھا"</item>
     <item msgid="8986346415847956850">"عمدہ"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"ہمیشہ"</item>
-    <item msgid="844721238536786870">"صرف پلگ ان ہونے پر"</item>
-    <item msgid="1986753720941888596">"کبھی نہیں"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"ہمیشہ"</item>
-    <item msgid="7433294150916905997">"صرف پلگ ان ہونے پر"</item>
-    <item msgid="1390404486722375028">"کبھی نہیں"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"آخری 30 دن"</item>
     <item msgid="6600989128423965319">"استعمال کا دور سیٹ کریں…"</item>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index a247c62..95fd99f 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"اب آپ ایک ڈیولپر ہیں!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"کوئی ضرورت نہیں ہے، آپ پہلے سے ہی ایک ڈیولپر ہیں۔"</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"براہ کرم پہلے ڈیولپر کے اختیارات فعال کریں"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"وائرلیس اور نیٹ ورکس"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"کنکشنز"</string>
     <string name="header_category_device" msgid="4544026001618307754">"آلہ"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"‏VoLTE سے لیس"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ویڈیو کالنگ فراہم کردہ"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"‏WiFi کالنگ فراہم کردہ"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"‏EAB/موجودگی فراہم کر دی گئی"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"موبائل ریڈیو پاور"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"‏SIM ایڈریس بک دیکھیں"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"فکسڈ ڈائلنگ نمبرز دیکھیں"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"آلات کیلئے اسکین کریں"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"اس آلہ کا نام تبدیل کریں"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"نام بدلیں"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"غیر مربوط کریں؟"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"‏یہ اس کے ساتھ آپ کے کنکشن کو ختم کر دے گا:&amp;‎lt;br&gt;&lt;‎b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;‎"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"آلہ کو غیر منسلک کریں؟"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"آپ کا فون <xliff:g id="DEVICE_NAME">%1$s</xliff:g> سے غیر منسلک ہوجائے گا۔"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"آپ کا ٹیبلیٹ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> سے غیر منسلک ہو جائے گا۔"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"آپ کا آلہ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> سے غیر منسلک ہو جائے گا۔"</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"غیر منسلک کریں"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"آپ کو بلوٹوتھ ترتیبات میں تبدیلی کرنے کی اجازت نہیں ہے۔"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"نئے آلہ کا جوڑا بنائیں"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"بلوٹوتھ ترتیبات کھلی ہونے پر <xliff:g id="DEVICE_NAME">%1$s</xliff:g> قریبی آلات کیلئے مرئی ہے۔"</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"فون کا بلوٹوتھ پتہ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"ٹیبلیٹ کا بلوٹوتھ پتہ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"آلے کا بلوٹوتھ پتہ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> کو منقطع کریں؟"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"نشریات"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"پروفائل غیر فعال کریں؟"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"بلوٹوتھ جوڑا بنانے کی درخواست"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"جوڑا بنانے کی درخواست"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> کے ساتھ جوڑا بنانے کیلئے تھپتھپائیں۔"</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"موصولہ فائلیں دکھائیں"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"موصولہ فائلیں"</string>
     <string name="device_picker" msgid="4978696506172252813">"بلوٹوتھ آلہ منتخب کریں"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> بلوٹوتھ آن کرنا چاہتی ہے"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> بلوٹوتھ آف کرنا چاہتا ہے"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"‏%1$s آپ کے پیغامات تک رسائی حاصل کرنا چاہتا ہے۔ ‎%2$s کو رسائی دیں؟"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"‏SIM تک رسائی کی درخواست"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"‏<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> آپ کے SIM کارڈ تک رسائی حاصل کرنا چاہتا ہے۔ SIM کارڈ تک رسائی دینے سے کنکشن کے دورانیہ تک کیلئے آپ کے آلہ پر ڈیٹا کنیکٹیوٹی غیر فعال ہو جائے گی۔ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> تک رسائی دیں"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"دیگر آلات کے لیے بطور \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' مرئی ہے"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"آپ کے آلات"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"نئے آلہ کا جوڑا بنائیں"</string>
     <string name="date_and_time" msgid="9062980487860757694">"تاریخ اور وقت"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ٹائم زون منتخب کریں"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"اکاؤنٹس"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"مقام"</string>
     <string name="account_settings_title" msgid="626177544686329806">"اکاؤنٹس"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"سیکیورٹی اور مقام"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"مرموز کاری اور اسناد"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"فون مرموز کیا گيا"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"آلہ کی مرموز کاری ہو گئی"</string>
@@ -354,40 +367,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"فنگر پرنٹ کے ساتھ غیر مقفل کریں"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"اپنا فنگر پرنٹ استعمال کریں"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"‏اپنا فون غیر مقفل کرنے، خریداریوں کی اجازت دینے یا ایپس میں سائن ان کرنے کیلئے بس فنگر پرنٹ سنسر کو ٹچ کریں۔ کسی کے فنگر پرنٹس شامل کرتے وقت احتیاط برتیں۔ بس ایک شامل کردہ فنگر پرنٹ سے یہ سارے کام کئے جا سکتے ہیں۔\n\nنوٹ: ایک طاقتور پیٹرن یا PIN کی نسبت آپ کا فنگر پرنٹ شاید کم محفوظ ہو۔"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"خریداریوں کی اجازت دینے یا ایپس میں سائن ان کرنے کیلئے بس فنگر پرنٹ سینسر کو ٹچ کریں۔ کسی کے فنگر پرنٹس شامل کرتے ہوئے احتیاط برتیں۔ صرف ایک شامل کردہ پرنٹ سے بھی یہ سب کام کیے جا سکتے ہیں۔\n\nنوٹ: آپ اس آلہ کو غیر مقفل کرنے کیلئے اپنا فنگر پرنٹ استعمال نہیں کر سکتے۔ مزید معلومات کیلئے، اپنی تنظیم کے منتظم سے رابطہ کریں۔"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"‏اپنا فون غیر مقفل کرنے، خریداریوں کی اجازت دینے یا ایپس میں سائن ان کرنے کیلئے بس فنگر پرنٹ سنسر کو ٹچ کریں۔ کسی کے فنگر پرنٹس شامل کرتے وقت احتیاط برتیں۔ بس ایک شامل کردہ فنگر پرنٹ سے یہ سارے کام کئے جا سکتے ہیں۔\n\nنوٹ: ایک طاقتور پیٹرن یا PIN کی نسبت آپ کا فنگر پرنٹ شاید کم محفوظ ہو۔"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"اپنا فون غیرمقفل کرنے یا خریداریاں منظور کرنے کے لیے اپنے فنگرپرنٹ کا استعمال کریں۔\n\nنوٹ: آپ اس آلہ کو غیرمقفل کرنے کے لیے اپنا فنگرپرنٹ استعمال نہیں کر سکتے۔ مزید معلومات کے لیے، اپنی تنظیم کے منتظم سے رابطہ کریں۔"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"‏اپنا فون غیرمقفل کرنے یا خریداریاں منظور کرنے کے لیے اپنے فنگرپرنٹ کا استعمال کریں۔\n\nنوٹ: ایک طاقتور پیٹرن یا PIN کی بنسبت آپ کا فنگر پرنٹ شاید کم محفوظ ہو۔"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"منسوخ کریں"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"جاری رکھیں"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"نظر انداز کریں"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"فنگر پرنٹ شامل کریں"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"آلہ کے تحفظ کی خصوصیات فعال نہیں ہونگی۔ غائب، چوری یا صاف کر دیے جانے کی صورت میں آپ دوسروں کو یہ ٹیبلیٹ استعمال کرنے سے نہیں روک سکیں گے۔"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"آلہ کے تحفظ کی خصوصیات فعال نہیں ہونگی۔ غائب، چوری یا صاف کر دیے جانے کی صورت میں آپ دوسروں کو یہ آلہ استعمال کرنے سے نہیں روک سکیں گے۔"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"آلہ کے تحفظ کی خصوصیات فعال نہیں ہونگی۔ غائب، چوری یا صاف کر دیے جانے کی صورت میں آپ دوسروں کو یہ فون استعمال کرنے سے نہیں روک سکیں گے۔"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"آلہ کے تحفظ کی خصوصیات فعال نہیں ہونگی۔ غائب یا چوری ہو جانے کی صورت میں آپ دوسروں کو یہ ٹیبلیٹ استعمال کرنے سے نہیں روک سکیں گے۔"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"آلہ کے تحفظ کی خصوصیات فعال نہیں ہونگی۔ غائب یا چوری ہو جانے کی صورت میں آپ دوسروں کو یہ آلہ استعمال کرنے سے نہیں روک سکیں گے۔"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"آلہ کے تحفظ کی خصوصیات فعال نہیں ہونگی۔ غائب یا چوری ہو جانے کی صورت میں آپ دوسروں کو یہ فون استعمال کرنے سے نہیں روک سکیں گے۔"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"آگے جائیں"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"آلہ کے تحفظ کی خصوصیات آن نہیں ہوں گی۔ اس کے ضائع، چوری یا دوبارہ ترتیب دئے جانے پر آپ دوسروں کو اس ٹیبلیٹ کے استعمال سے نہیں روک پائیں گے۔"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"آلہ کے تحفظ کی خصوصیات آن نہیں ہوں گی۔ اس کے ضائع، چوری یا دوبارہ ترتیب دئے جانے پر آپ دوسروں کو اس آلہ کے استعمال سے نہیں روک پائیں گے۔"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"آلہ کے تحفظ کی خصوصیات آن نہیں ہوں گی۔ اس کے ضائع، چوری یا دوبارہ ترتیب دئے جانے پر آپ دوسروں کو اس فون کے استعمال سے نہیں روک پائیں گے۔"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"آلہ کے تحفظ کی خصوصیات آن نہیں ہوں گی۔ اس کے ضائع یا چوری ہوجانے پر آپ دوسروں کو اس ٹیبلیٹ کے استعمال سے نہیں روک پائیں گے۔"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"آلہ کے تحفظ کی خصوصیات آن نہیں ہوں گی۔ اس کے ضائع یا چوری ہو جانے پر آپ دوسروں کو اس آلہ کے استعمال سے نہیں روک پائیں گے۔"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"آلہ کے تحفظ کی خصوصیات آن نہیں ہوں گی۔ اس کے ضائع یا چوری ہوجانے پر آپ دوسروں کو اس فون کے استعمال سے نہیں روک پائیں گے۔"</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"بہرحال نظر انداز کریں"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"پیچھے جائیں"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"سینسر تلاش کریں"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"اپنے فون کی پشت پر فنگر پرنٹ سینسر کا پتا لگائیں۔"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"سنسر کو ٹچ کریں"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"یہ آپ کے فون کے پشت پر ہے۔ اپنے انڈیکس فنگر کا استعمال کریں۔"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"آلہ اور فنگر پرنٹ سینسر کے مقام کا خاکہ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"نام"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ٹھیک ہے"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"حذف کریں"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"آئیے شروع کریں"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"سنسر کو ٹچ کریں"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"اپنی انگلی سنسر پر رکھیں اور ارتعاش محسوس ہونے کے بعد اٹھا لیں"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"جاری رکھیں"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"اپنے فنگرپرنٹ کے تمام حصوں کو شامل کرنے کیلئے اپنی انگلی کو تھوڑی سی حرکت دیں"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"فنگر پرنٹ شامل ہو گیا!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"آپ کو جب بھی یہ آئیکن دکھائی دیتا ہے تو آپ شناخت کرنے یا خریداری کی توثیق کرنے کیلئے اپنا فنگر پرنٹ استعمال کر سکتے ہیں۔"</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"اپنے آلے کو جگانے اور غیر مقفل کرنے کیلئے بس فنگرپرنٹ سنسر کو ٹچ کریں۔"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"جب آپ اس آئیکن کو دیکھیں، آپ خریداریوں کی اجازت بھی دے سکتے ہیں یا ایپس میں سائن ان ہو سکتے ہیں۔"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"اٹھائیں، پھر دوبارہ ٹچ کریں"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"اپنے فنگرپرنٹ کے مختلف حصوں کو شامل کرنے کے لیے اپنی انگلی کو اٹھاتے رہیں"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"فنگر پرنٹ شامل ہو گیا"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"جب آپ کو یہ آئیکن دکھائی دے تو آپ شناخت کرنے یا خریداریوں کی منظوری کے لیے اپنے فنگرپرنٹ کا استعمال کریں۔"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"فنگر پرنٹ سیٹ اپ نظر انداز کریں؟"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"آپ نے اپنا فون غیر مقفل کرنے کیلئے ایک طریقہ اپنے فنگرپرنٹ کا استعمال منتخب کیا ہے۔ اگر آپ اب نظر انداز کرتے ہیں تو آپ کو اسے بعد میں سیٹ اپ کرنا ہوگا۔ سیٹ اپ میں کم و بیش ایک منٹ کا وقت لگتا ہے۔"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"اسکرین لاک کو ترتیب دیں"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"ہوگیا"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"افوہ، یہ سینسر نہیں ہے"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"اپنے آلہ پر فنگر پرنٹ سینسر کا استعمال کریں"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"اپنے فون کے پشت پر سینسر کو ٹچ کریں۔ اپنے انڈیکس فنگر کا استعمال کریں۔"</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"اندراج مکمل نہیں ہوا تھا"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"فنگر پرنٹ اندراج کی حدِ وقت پوری ہو گئی۔ دوبارہ کوشش کریں۔"</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"فنگر پرنٹ اندراج نہیں ہوا۔ دوبارہ کوشش کریں یا مختلف انگلی استعمال کریں۔"</string>
@@ -449,6 +460,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"آلہ کے تحفظ کی خصوصیات فعال کر کے اپنی اجازت کے بغیر دوسروں کو یہ آلہ استعمال کرنے سے روکیں۔ وہ اسکرین قفل منتخب کریں جو آپ استعمال کرنا چاہتے ہیں۔"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"آلہ کے تحفظ کی خصوصیات فعال کر کے اپنی اجازت کے بغیر دوسروں کو یہ فون استعمال کرنے سے روکیں۔ وہ اسکرین قفل منتخب کریں جو آپ استعمال کرنا چاہتے ہیں۔"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"اسکرین مقفل کرنے کا اپنا بیک اپ طریقہ کار منتخب کریں"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"اسکرین لاک کے اختیارات"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"اسکرین لاک کے اختیارات"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"اسکرین لاک"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / سلیپ وضع کے فوراً بعد"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> سلیپ وضع کے بعد"</string>
@@ -519,13 +532,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"غیر مقفل کرنے کا پیٹرن تبدیل کریں"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"‏غیر مقفل کرنے کا PIN تبدیل کریں"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"غیر مقفل کرنے کا پاس ورڈ تبدیل کریں"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"دوبارہ کوشش کریں۔ کوشش <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> از <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>۔"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"آخری کوشش"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"اگر آپ نے اس کوشش میں غلط دفتری پیٹرن داخل کیا تو آپ کا دفتری پروفائل اور وابستہ ڈیٹا اس آلہ سے ہٹا دیا جائے گا۔"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"‏اگر آپ نے اس کوشش میں غلط دفتری PIN داخل کیا تو آپ کا دفتری پروفائل اور وابستہ ڈیٹا اس آلہ سے ہٹا دیا جائے گا۔"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"اگر آپ نے اس کوشش میں غلط دفتری پاسورڈ داخل کیا تو آپ کا دفتری پروفائل اور وابستہ ڈیٹا اس آلہ سے ہٹا دیا جائے گا۔"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"بہت زیادہ غلط کوششیں۔ آپ کا دفتری پروفائل اور وابستہ ڈیٹا اس آلہ سے ہٹا دیا جائے گا۔"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"برخاست کریں"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"دوبارہ کوشش کریں۔ کوشش <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> از <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>۔"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"آپ کا ڈیٹا حذف کر دیا جائے گا"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"اگر آپ نے اگلی کوشش میں غلط پیٹرن درج کیا، تو آلات کا یہ ڈیٹا حذف کر دیا جائے گا"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"‏اگر آپ نے اگلی کوشش میں غلط PIN درج کیا، تو آلات کا یہ ڈیٹا حذف کر دیا جائے گا"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"اگر آپ نے اگلی کوشش میں غلط پاس ورڈ درج کیا، تو آلات کا یہ ڈیٹا حذف کر دیا جائے گا"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"اگر آپ نے اگلی کوشش میں غلط پیٹرن درج کیا، تو اس صارف کو حذف کر دیا جائے گا"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"‏اگر آپ نے اگلی کوشش میں غلط PIN درج کیا، تو اس صارف کو حذف کر دیا جائے گا"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"اگر آپ نے اگلی کوشش میں غلط پاس ورڈ درج کیا، تو اس صارف کو حذف کر دیا جائے گا"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"اگر آپ نے اگلی کوشش میں غلط پیٹرن درج کیا، تو آپ کا دفتری پروفائل اور اس کا ڈیٹا حذف کر دیا جائے گا"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"‏اگر آپ نے اگلی کوشش میں غلط PIN درج کیا، تو آپ کا دفتری پروفائل اور اس کا ڈیٹا حذف کر دیا جائے گا"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"اگر آپ نے اگلی کوشش میں غلط پاس ورڈ درج کیا، تو آپ کا دفتری پروفائل اور اس کا ڈیٹا حذف کر دیا جائے گا"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"بہت زیادہ غلط کوششیں۔ آلات کا یہ ڈیٹا حذف کر دیا جائے گا۔"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"بہت زیادہ غلط کوششیں۔ اس صارف کو حذف کر دیا جائے گا۔"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"بہت زیادہ غلط کوششیں۔ یہ دفتری پروفائل اور اس کا ڈیٹا حذف کر دیا جائے گا۔"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"برخاست کریں"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"کم از کم <xliff:g id="COUNT">%d</xliff:g> حروف پر مشتمل ہونا چاہیے"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"‏PIN کم از کم <xliff:g id="COUNT">%d</xliff:g> ہندسوں کا ہونا چاہیے"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"جاری رکھیں"</string>
@@ -626,6 +647,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"جدید ترین بلوٹوتھ"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"بلوٹوتھ آن ہونے پر، آپ کا آلہ دیگر قریبی بلوٹوتھ آلات کے ساتھ مواصلت کر سکتا ہے۔"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"مقام کی درستگی کو بہتر بنانے کیلئے، سسٹم ایپس اور سروسز ابھی بھی بلوٹوتھ آلات کا پتہ لگا سکتی ہیں۔ آپ اس کو <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>اسکیننگ ترتیبات<xliff:g id="LINK_END_1">LINK_END</xliff:g> میں تبدیل کر سکتے ہیں۔"</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"منسلک نہیں ہو سکا۔ دوبارہ کوشش کریں۔"</string>
+    <string name="device_details_title" msgid="6576953269221085300">"آلہ کی تفصیلات"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"آلے کا بلوٹوتھ پتہ: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"آلہ بھولنا ہے؟"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"آپ کے فون کو <xliff:g id="DEVICE_NAME">%1$s</xliff:g> کے ساتھ مزید نہیں جوڑا جائے گا"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"آپ کے ٹیبلیٹ کو <xliff:g id="DEVICE_NAME">%1$s</xliff:g> کے ساتھ مزید نہیں جوڑا جائے گا"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"آپ کے آلہ کو <xliff:g id="DEVICE_NAME">%1$s</xliff:g> کے ساتھ مزید نہیں جوڑا جائے گا"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"آلہ بھول جائیں"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"اس سے مربوط ہوں…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> میڈیا آڈیو سے منقطع ہو جائے گا۔"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ہینڈز فری آڈیو سے منقطع ہو جائے گا۔"</string>
@@ -778,6 +807,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"فراہم نہ کریں"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"توثیق نہ کریں"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"کوئی سرٹیفیکیٹ متعین نہیں کیا گیا۔ آپ کا کنکشن نجی نہیں ہو گا۔"</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"نیٹ ورک کا نام کافی بڑا ہے۔"</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"کوئی ڈومین مختص کرنا لازمی ہے۔"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"‏WPS دستیاب ہے"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS دستیاب ہے)"</string>
@@ -809,7 +839,6 @@
       <item quantity="one">1 نیٹ ورک</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"‏جدید Wi‑Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"‏Wi‑Fi کنفیگر کریں"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"‏MAC پتہ"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"‏IP پتہ"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"سب نیٹ ماسک"</string>
@@ -846,9 +875,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"اس گروپ کو بھول جائیں؟"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"‏پورٹیبل Wi‑Fi ہاٹ اسپاٹ"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"‏Wi‑Fi ہاٹ اسپاٹ"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"‏Wi‑Fi نیٹ ورک فراہمی کیلئے موبائل کنکشن استعمال کریں"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"اس ٹیبلٹ کے انٹرنیٹ کنکشن کا ہاٹ اسپاٹ کے ذریعے اشتراک نہیں کر رہا ہے"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"اس فون کے انٹرنیٹ کنکشن کا ہاٹ اسپاٹ کے ذریعے اشتراک نہیں کر رہا ہے"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"دیگر آلات کے ساتھ انٹرنیٹ یا مواد کا اشتراک نہیں ہو رہا ہے"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"ہاٹ اسپاٹ کے ذریعے اس ٹیبلیٹ کے انٹرنیٹ کنکشن کا اشتراک ہو رہا ہے"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"ہاٹ اسپاٹ کے ذریعے اس فون کے انٹرنیٹ کنکشن کا اشتراک ہو رہا ہے"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"ایپ مواد کا اشتراک کر رہی ہے۔ انٹرنیٹ کنکشن کا اشتراک کرنے کے لیے، ہاٹ اسپاٹ آف کر کے آن کریں"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"‏Wi‑Fi کا نام"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> آن ہو رہا ہے..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"دیگر آلات <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> سے منسلک ہو سکتی ہیں"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"‏Wi-Fi پاس ورڈ"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"‏AP بینڈ"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"‏اپنے دیگر آلات کیلئے Wi‑Fi نیٹ ورک بنانے کی خاطر ہاٹ اسپاٹ کا استعمال کریں۔ ہاٹ اسپاٹ آپ کے موبائل ڈیٹا کنکشن کا استعمال کر کے انٹرنیٹ فراہم کرتا ہے۔ اضافی موبائل ڈیٹا کے چارجز عائد ہو سکتے ہیں۔"</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"قریبی آلات کے ساتھ مواد کا اشتراک کرنے کے لیے ایپس ایک ہاٹ اسپاٹ بنا سکتی ہیں۔"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"ہاٹ اسپاٹ آن ہو رہا ہے…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"ہاٹ اسپاٹ آف ہو رہا ہے…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> فعال ہے"</string>
@@ -895,6 +932,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"‏Wi-Fi کالنگ آن ہونے پر، آپ کا فون آپ کی ترجیح اور زیادہ مضبوط سگنل کی بنیاد پر کالز کا روٹ Wi-Fi یا آپ کے کیریئر نیٹ ورک کے ذریعہ کر سکتا ہے۔ اس خصوصیت کو آن کرنے سے پہلے، فیس اور دیگر تفصیلات کیلئے اپنے کیریئر سے رابطہ کریں۔"</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"ہنگامی پتہ اپ ڈیٹ کریں"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"‏اگر آپ WiFi استعمال کرکے 911 پر کال کریں تو ایمرجنسی سروسز کی جانب سے پتہ آپ کے مقام کے طور پر استعمال ہوتا ہے"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ڈسپلے"</string>
@@ -952,6 +990,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"کوئی نتائج نہیں"</string>
     <string name="display_settings" msgid="7965901687241669598">"ڈسپلے"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"اسکرین کو خود کار طور پر گھمائیں"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"بھڑکیلا رنگ"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ٹیبلٹ گھماتے وقت سمت بندی کو خود کار طور پر سوئچ کریں"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"فون گھماتے وقت سمت بندی کو خود کار طور پر سوئچ کریں"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"ٹیبلٹ گھماتے وقت سمت بندی کو خود کار طور پر سوئچ کریں"</string>
@@ -979,23 +1018,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"دستیاب روشنی کیلئے چمک کی سطح کو بہتر بنائیں۔ خصوصیت آن ہونے پر بھی آپ چمک کو عارضی طور پر ایڈجسٹ کر سکتے ہیں۔"</string>
     <string name="night_display_title" msgid="2626451512200357686">"نائٹ لائٹ"</string>
     <string name="night_display_text" msgid="1837277457033025056">"نائٹ لائٹ آپ کی اسکرین کو ہلکا کر کے امبر کر دیتی ہے۔ اس سے مدھم روشنی میں اسکرین دیکھنا یا پڑھنا آسان ہو جاتا ہے اور ممکنہ طور پر آپ کو زیادہ آسانی سے سونے میں مدد بھی کرتی ہے۔"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"شیڈول"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"اسٹیٹس"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"خودکار طور پر آن کریں"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"کبھی نہیں"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"حسب ضرورت شیڈول"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"طلوع غروب سے طلوع آفتاب تک"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"شیڈول"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"کوئی نہیں"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"حسب ضرورت وقت پر آن ہوتا ہے"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"شام سے صبح تک کیلئے آن ہوتا ہے"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"وقت آغاز"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"وقت اختتام"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"اسٹیٹس"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"شدت"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"آف۔ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"کبھی بھی خودکار طور پر آن نہیں ہو گا۔"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g> پر خودکار طور پر آن ہو جائے گا۔"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"غروب آفتاب پر خودکار طور پر آن ہو جائے گا۔"</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"آن۔ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"کبھی بھی خودکار طور پر آف نہیں ہو گا۔"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g> پر خودکار طور پر آف ہو جائے گا۔"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"طلوع آفتاب پر خودکار طور پر آف ہو جائے گا۔"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"آف / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"کبھی بھی خودکار طور پر آن نہیں ہوگا"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g> پر خودکار طور پر آن ہو جائے گا"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"غروب آفتاب پر خودکار طور پر آن ہو جائے گا"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"آن / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"کبھی بھی خودکار طور پر آف نہیں ہوگا"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g> پر خودکار طور پر آف ہو جائے گا"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"طلوع آفتاب پر خودکار طور پر آف ہو جائے گا"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"سلیپ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"اسکرین آف ہوجاتی ہے"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"غیر فعالیت کے <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> بعد"</string>
@@ -1019,8 +1057,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"ترتیبات"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"خود کار چمک"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"جگانے کیلئے اٹھائیں"</string>
-    <string name="doze_title" msgid="2259176504273878294">"ایمبی اینٹ ڈسپلے"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"ايمبيئنٹ ڈسپلے"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"ہمیشہ آن"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"نئی اطلاعات"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"دکھانے کا وقت"</string>
+    <string name="doze_title" msgid="2375510714460456687">"نئی اطلاعات"</string>
     <string name="doze_summary" msgid="3846219936142814032">"اطلاعات موصول ہونے پر اسکرین کو جگائیں"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"ہمیشہ آن"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"وقت، اطلاعاتی آئیکنز اور دیگر معلومات دکھائیں"</string>
     <string name="title_font_size" msgid="4405544325522105222">"فونٹ سائز"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"متن کو چھوٹا یا بڑا کریں"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"‏SIM کارڈ لاک کی ترتیبات"</string>
@@ -1272,6 +1316,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"‏APN خالی نہيں رہ سکتا۔"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"‏MCC فیلڈ میں لازمی طور پر 3 ہندسے ہونے چاہئیں۔"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"‏MNC فیلڈ میں لازمی طور پر 2 یا 3 ہندسے ہونے چاہئیں۔"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"‏کیریئر APNs کی قسم ‎%s‎ کو شامل کرنے کی اجازت نہیں دیتا ہے۔"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"‏ڈیفالٹ APN ترتیبات بحال ہو رہی ہیں۔"</string>
     <string name="menu_restore" msgid="8260067415075573273">"ڈیفالٹ پر دوبارہ ترتیب دیں"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"‏ڈیفالٹ APN ترتیبات کو دوبارہ ترتیب دینے کا عمل مکمل ہو گیا۔"</string>
@@ -1301,6 +1346,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"‏SD کارڈ حذف کریں"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"‏داخلی USB اسٹوریج پر موجود سبھی ڈیٹا، جیسے موسیقی یا تصاویر کو حذف کریں"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"‏SD کارڈ پر موجود سبھی ڈیٹا حذف کریں، جیسے موسیقی یا تصاویر"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"‏eSIMs مٹائیں"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"‏فون پر سبھی eSIMs صاف کریں۔ اس سے آپ کے موبائل سروس کا پلان منسوخ نہیں ہوگا۔"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"‏ٹیبلیٹ پر سبھی eSIMs صاف کریں۔ اس سے آپ کے موبائل سروس کا پلان منسوخ نہیں ہوگا۔"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ٹیبلٹ کو دوبارہ ترتیب دیں"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"فون کو دوبارہ ترتیب دیں"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"آپ کی سبھی ذاتی معلومات اور ڈاؤن لوڈ کردہ ایپس ہٹا دیں؟ آپ اس کارروائی کو کالعدم نہیں کر سکتے ہیں!"</string>
@@ -1323,26 +1371,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ڈیٹا سیور آن ہوتے ہوئے ربط نہیں بنایا جا سکتا یا پورٹیبل ہاٹ اسپاٹس استعمال نہیں ہو سکتے"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"‏USB ٹیتھرنگ"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"‏USB مربوط ہو گیا، ربط بنانے کیلئے چیک کریں"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"مربوط"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"‏USB اسٹوریج زیر استعمال ہونے پر ربط نہیں بنا سکتا"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"‏USB مربوط نہیں ہے"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"آن کرنے کیلئے مربوط کریں"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"‏USB ٹیتھرنگ کی خرابی"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"‏USB کے ذریعے فون کے انٹرنیٹ کنیکشن کا اشتراک کریں"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"‏USB کے ذریعے ٹیبلیٹ کے انٹرنیٹ کنیکشن کا اشتراک کریں"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"بلوٹوتھ ٹیتھرنگ"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"اس ٹیبلیٹ کے انٹرنیٹ کنکشن کا بلوٹوتھ کے ذریعے اشتراک کر رہا ہے"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"اس فون کے انٹرنیٹ کنکشن کا بلوٹوتھ کے ذریعے اشتراک کر رہا ہے"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"اس ٹیبلیٹ کے انٹرنیٹ کنکشن کا بلوٹوتھ کے ذریعے 1 آلے سے اشتراک کیا جا رہا ہے"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"اس فون کے انٹرنیٹ کنکشن کا بلوٹوتھ کے ذریعے 1 آلے سے اشتراک کیا جا رہا ہے"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"اس ٹیبلیٹ کے انٹرنیٹ کنکشن کا بلوٹوتھ کے ذریعے <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> آلات سے اشتراک کیا جا رہا ہے"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"اس فون کے انٹرنیٹ کنکشن کا بلوٹوتھ کے ذریعے <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> آلات سے اشتراک کیا جا رہا ہے"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"بلوٹوتھ کے ذریعے ٹیبلیٹ کے انٹرنیٹ کنکشن کا اشتراک کریں"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"بلوٹوتھ کے ذریعے فون کے انٹرنیٹ کنکشن کا اشتراک کریں"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"اس <xliff:g id="DEVICE_NAME">%1$d</xliff:g> کے انٹرنیٹ کنکشن کا بلوٹوتھ کے ذریعے اشتراک کیا جا رہا ہے"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"اس ٹیبلیٹ کے انٹرنیٹ کنکشن کا بلوٹوتھ کے ذریعے اشتراک نہیں کیا جا رہا ہے"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"اس فون کے انٹرنیٹ کنکشن کا بلوٹوتھ کے ذریعے اشتراک نہیں کیا جا رہا ہے"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"ربط نہیں بنایا گیا"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> سے زیادہ آلات کو مربوط نہیں کر سکتے۔"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> کا ربط ختم کر دیا جائے گا۔"</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"اپنے موبائل ڈیٹا کنکشن کے ذریعے دیگر آلات کو انٹرنیٹ فراہم کرنے کیلئے ہاٹ اسپاٹ اور ٹیتھرنگ کا استعمال کریں۔"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"اپنے موبائل ڈیٹا کنکشن کے ذریعے دیگر آلات کو انٹرنیٹ فراہم کرنے کیلئے ہاٹ اسپاٹ اور ٹیتھرنگ کا استعمال کریں۔ قریبی آلات کے ساتھ مواد کا اشتراک کرنے کے لیے ایپس ایک ہاٹ اسپاٹ بھی بنا سکتی ہیں۔"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"مدد"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"موبائل نیٹ ورک"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"موبائل پلان"</string>
@@ -1375,7 +1412,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"مقام وضع"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"‏مقام کا تعین کرنے کیلئے GPS‏، Wi‑Fi، بلوٹوتھ یا موبائل نیٹ ورکس استعمال کریں"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"‏مقام کا تعین کرنے کیلئے Wi‑Fi، بلوٹوتھ یا موبائل نیٹ ورکس استعمال کریں"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏مقام کا تعین کرنے کیلئے GPS استعمال کریں"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"‏مقام کا تعین کرنے کیلئے GPS اور آلہ کے سینسرز کا استعمال کریں"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"اسکیننگ"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"‏Wi‑Fi اسکیننگ"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"‏سسٹم ایپس اور سروسز کو کسی بھی وقت Wi‑Fi نیٹ ورکس کا پتا لگانے کی اجازت دے کر مقام کو بہتر بنائیں۔"</string>
@@ -1420,8 +1457,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"‏آپ کے پاس ڈيٹا کنکشن نہيں ہے۔ اس معلومات کو ابھی دیکھنے کیلئے، انٹرنیٹ سے مربوط کسی بھی کمپیوٹر سے ‎%s پر جائیں۔"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"لوڈ ہو رہا ہے…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"اپنا پاس ورڈ منتخب کریں"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"فنگر پرنٹ کے استعمال کے لیے پاسورڈ سیٹ کریں"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"اپنا پیٹرن منتخب کریں"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"فنگر پرنٹ کے استعمال کے لیے پیٹرن سیٹ کریں"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"‏اپنا PIN منتخب کریں"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"‏فنگر پرنٹ کے استعمال کے لیے PIN سیٹ کریں"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"اپنے پاس ورڈ کی توثیق کریں"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"اپنے پیٹرن کی توثیق کریں"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"‏اپنے PIN کی توثیق کریں"</string>
@@ -1490,6 +1530,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"ایپ کی ترتیبات"</string>
     <string name="install_applications" msgid="4872012136210802181">"نامعلوم ذرائع"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"ایپ کے سبھی مآخذ کی اجازت دیں"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"حال ہی میں کھولی گئی ایپس"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"سبھی <xliff:g id="COUNT">%1$d</xliff:g> ایپس دیکھیں"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> قبل"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"آپ کے ٹیبلیٹ اور ذاتی ڈیٹا کو نامعلوم ایپس کی جانب سے حملے کا زیادہ خطرہ ہے۔ اس ذریعے سے ایپس ڈاؤن لوڈ کر کے، آپ اس بات سے اتفاق کرتے ہیں کہ آپ ان ایپس سے اپنے ٹیبلیٹ کو ہونے والے کسی بھی نقصان یا ڈیٹا کے نقصان کیلئے تنہا خود ذمہ دار ہوں گے۔"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"آپ کے فون اور ذاتی ڈیٹا کو نامعلوم ایپس کی جانب سے حملے کا زیادہ خطرہ ہے۔ اس ذریعے سے ایپس ڈاؤن لوڈ کر کے، آپ اس بات سے اتفاق کرتے ہیں کہ آپ ان ایپس سے اپنے فون کو ہونے والے کسی بھی نقصان یا ڈیٹا کے نقصان کیلئے تنہا خود ذمہ دار ہوں گے۔"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"جدید ترین ترتیبات"</string>
@@ -1658,6 +1701,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"سسٹم سروس کو روکیں؟"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"اگر آپ اس سروس کو روک دیتے ہیں تو آپ کے ٹیبلٹ کی کچھ خصوصیات ٹھیک سے کام کرنا بند کر سکتی ہیں الّا یہ کہ آپ اس کی پاور بند کر دیں اور پھر دوبارہ آن کریں۔"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"اگر آپ اس سروس کو روک دیتے ہیں تو آپ کے فون کی کچھ خصوصیات ٹھیک سے کام کرنا بند کر سکتی ہیں الّا یہ کہ آپ اس کی پاور بند کر دیں اور پھر دوبارہ آن کریں۔"</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"زبانیں، ان پٹ اور اشارات"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"زبانیں اور ان پٹ"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"زبانیں اور ان پٹ"</string>
     <string name="input_assistance" msgid="7577795275222555487">"ان پٹ سے متعلق معاونت"</string>
@@ -1872,6 +1919,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> پرنٹ سروسز آن ہیں</item>
       <item quantity="one">1 پرنٹ سروس آن ہے</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> پرنٹ جابز</item>
+      <item quantity="one">1 پرنٹ جاب</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"پرنٹ سروسز"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"کوئی سروسز انسٹال نہیں ہے"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"کوئی پرنٹرز نہیں ملے"</string>
@@ -1938,6 +1989,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"استعمال کی تفصیلات"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"پاور کا استعمال ایڈجسٹ کریں"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"شامل کردہ پیکیجز"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ایپس بیٹری کو تیزی سے ختم کر رہی ہیں"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"آلہ کو بیدار موڈ میں رکھا جا رہا ہے"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"پس منظر مییں آلہ چل رہا ہے"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"کثرت سے مقام کی درخواست کی جا رہی ہے"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ایپس صحیح سے کام نہیں کر رہی ہیں"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"ایپ بند کریں؟"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"آپ کا فون عام طور پر بیٹری کا نظم نہیں کر سکتا کیوں کہ <xliff:g id="APP">%1$s</xliff:g> آپ کے آلہ کو بیدار موڈ میں رکھ رہی ہے۔\n\nاس مسئلے کو حل کرنے کی کوشش کرنے کے لیے، آپ ایپ کو زبردستی روک سکتے ہیں۔\n\nاگر ایسا ہوتا رہتا ہے، تو بیٹری کی کارکردگی بہتر بنانے کے لیے آپ کو ایپ ان انسٹال کرنے کی ضرورت پڑ سکتی ہے۔"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"آپ کا ٹیبلیٹ عام طور پر بیٹری کا نظم نہیں کرسکتا کیوں کہ <xliff:g id="APP">%1$s</xliff:g> آپ کے آلہ کو بیدار موڈ میں رکھ رہی ہے۔\n\nاس مسئلے کو حل کرنے کی کوشش کرنے کے لیے، آپ ایپ کو زبردستی روک سکتے ہیں۔\n\nاگر ایسا ہوتا رہتا ہے، تو بیٹری کی کارکردگی بہتر بنانے کے لیے آپ کو ایپ ان انسٹال کرنے کی ضرورت پڑ سکتی ہے۔"</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"آپ کا آلہ عام طور پر بیٹری کا نظم نہیں کر سکتا کیوں کہ <xliff:g id="APP">%1$s</xliff:g> آپ کے آلہ کو بیدار موڈ میں رکھ رہی ہے۔\n\nاس مسئلے کو حل کرنے کی کوشش کرنے کے لیے، آپ ایپ کو زبردستی روک سکتے ہیں۔\n\nاگر ایسا ہوتا رہتا ہے، تو بیٹری کی کارکردگی بہتر بنانے کے لیے آپ کو ایپ ان انسٹال کرنے کی ضرورت پڑ سکتی ہے۔"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"ایپ بند کریں"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"پس منطر کا استعمال آف کریں؟"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"آپ کا فون عام طور پر بیٹری کا نظم نہیں کر سکتا کیوں کہ <xliff:g id="APP">%1$s</xliff:g> آپ کے فون کو چالو رکھتی ہے۔\n\nاس مسئلے کو حل کرنے کے لیے، آپ کا فون اس ایپ کو پس منظر میں چلنے سے روک سکتا ہے۔"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"آپ کا ٹیبلیٹ عام طور پر بیٹری کا نظم نہیں کر سکتا کیوں کہ <xliff:g id="APP">%1$s</xliff:g> آپ کے ٹیبلیٹ کو چالو رکھتی ہے۔\n\nاس مسئلے کو حل کرنے کے لیے، آپ کا ٹیبلیٹ اس ایپ کو پس منظر میں چلنے سے روک سکتا ہے۔"</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"آپ کا آلہ عام طور پر بیٹری کا نظم نہیں کر سکتا کیوں کہ <xliff:g id="APP">%1$s</xliff:g> آپ کے آلہ کو چالو رکھتی ہے۔\n\nاس مسئلے کو حل کرنے کے لیے، آپ کا آلہ اس ایپ کو پس منظر میں چلنے سے روک سکتا ہے۔"</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"آف کریں"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"مقام آف کریں؟"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"آپ کا فون عام طور پر بیٹری کا نظم نہیں کر سکتا کیوں کہ جب آپ ایپ استعمال نہیں کر رہے ہوتے ہیں تو <xliff:g id="APP">%1$s</xliff:g> آپ کے مقام کی درخواست کرتی رہتی ہے۔\n\nاس مسئلے کو حل کرنے کے لیے، آپ اس ایپ کے لیے مقام کو آف کر سکتے ہیں۔"</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"آپ کا ٹیبلیٹ عام طور پر بیٹری کا نظم نہیں کر سکتا کیوں کہ جب آپ ایپ استعمال نہیں کر رہے ہوتے ہیں تو <xliff:g id="APP">%1$s</xliff:g> آپ کے مقام کی درخواست کرتی رہتی ہے۔\n\nاس مسئلے کو حل کرنے کے لیے، آپ اس ایپ کے لیے مقام کو آف کر سکتے ہیں۔"</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"آپ کا آلہ عام طور پر بیٹری کا نظم نہیں کرسکتا کیوں کہ جب آپ ایپ استعمال نہیں کر رہے ہوتے ہیں تو <xliff:g id="APP">%1$s</xliff:g> آپ کے مقام کی درخواست کرتی رہتی ہے۔\n\nاس مسئلے کو حل کرنے کے لیے، آپ اس ایپ کے لیے مقام کو آف کر سکتے ہیں۔"</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"آف کریں"</string>
     <string name="power_screen" msgid="3023346080675904613">"اسکرین"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"فلیش لائٹ"</string>
     <string name="power_camera" msgid="4976286950934622605">"کیمرا"</string>
@@ -1952,7 +2023,7 @@
     <string name="power_apps" msgid="2043554781293951327">"ایپس"</string>
     <string name="power_service" msgid="1599661212370831780">"سروسز"</string>
     <string name="power_system" msgid="8290455327965307383">"سسٹم"</string>
-    <string name="power_user" msgid="1889728099253018005">"صارف"</string>
+    <string name="power_user" msgid="3706143225319881667">"دیگر صارفین"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"‏CPU کل"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏CPU پیش منظر"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"بیدار رکھیں"</string>
@@ -2004,6 +2075,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"پاور کا ضرورت سے زیادہ استعمال"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> کیلئے استعمال کیا گیا"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"<xliff:g id="TIME">^1</xliff:g> کے لیے فعال"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"اسکرین کا استعمال <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> کے ذریعے <xliff:g id="PERCENT">%1$s</xliff:g> استعمال کیا گیا"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"مجموعی بیٹری میں سے <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2563,7 +2635,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"‏PIN تبدیل کریں"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"اطلاعات دکھائیں"</string>
     <string name="help_label" msgid="6886837949306318591">"مدد اور تاثرات"</string>
-    <string name="support_summary" msgid="8276116616493882830">"امدادی مضامین، فون اور چیٹ سپورٹ"</string>
+    <string name="support_summary" msgid="2705726826263742491">"امدادی مضامین، فون اور چیٹ، شروع کرنا"</string>
     <string name="user_account_title" msgid="1127193807312271167">"مواد کیلئے اکاؤنٹ"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"‏تصویری ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"انتہائی خطرات"</string>
@@ -2651,9 +2723,12 @@
     <!-- String.format failed for translation -->
     <!-- no translation found for settings_suggestion_header_summary_hidden_items (5597356221942118048) -->
     <string name="network_dashboard_title" msgid="4771589228992391573">"نیٹ ورک اور انٹرنیٹ"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"‏Wi-Fi، موبائل، ڈیٹا کا استعمال، ہاٹ اسپاٹ"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"موبائل"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ڈیٹا کا استعمال"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ہاٹ اسپاٹ"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"منسلک آلات"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"‏بلوٹوتھ، کاسٹ، NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"بلوٹوتھ، کاسٹ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ایپس اور اطلاعات"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"اجازتیں، ڈیفالٹ ایپس"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"صارفین اور اکاؤنٹس"</string>
@@ -2706,6 +2781,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"اشارہ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ادائیگی کریں، تھپتھپائیں، ادائیگیاں"</string>
     <string name="keywords_backup" msgid="470070289135403022">"بیک اپ، بیک اپ لیں"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"‏اشارہ، edge، سائیڈ، فعال edge، دباؤ، گرفت، مدد، معاون، squeezy، squeezy، squeezy، squeezy، ok google، google معاون"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"‏اشارہ، جاگنا، اطلاعات، اسکرین، ڈسپلے، آف اسکرین، آن اسکرین، دباؤ، edge، سویا ہوا، سلیپ وضع، گرفت"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"‏اشارہ، خاموشی، اسنوز، الارم، آنے والی کال، خاموش، ڈسپلے، لاک اسکرین، دباؤ، گرفت، edge، روکیں"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏Wi-Fi NFC ٹیگ ترتیب دیں"</string>
     <string name="write_tag" msgid="8571858602896222537">"تحریر کریں"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"لکھنے کیلئے ایک ٹیگ کو تھپتھپائیں…"</string>
@@ -2788,7 +2866,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"دفتری اطلاعات بالکل بھی نہ دکھائیں"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"اپنا آلہ مقفل ہونے پر آپ پروفائل کی اطلاعات کیسے دیکھنا چاہیں گے؟"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"پروفائل کی اطلاعات"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"اطلاعات"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"اطلاعات"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"ایپ کی اطلاعات"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"اطلاع کا زمرہ"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"اہمیت"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"ایپ کو فیصلہ کرنے دیں"</string>
@@ -2803,6 +2882,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"ارجنٹ"</string>
     <string name="allow_sound" msgid="1820188704793497324">"آواز کی اجازت دیں"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"آواز نہ نکالیں، وائبریٹ نہ کریں اور ان اطلاعات کو موجودہ اسکرین پر نہ دکھائیں۔"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"کم اہمیت"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"متوسط اہمیت"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"زیادہ اہمیت"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"فوری اہمیت"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"اطلاع کا معاون"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"اطلاع تک رسائی"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"دفتری پروفائل کی اطلاعات تک رسائی مسدود ہے"</string>
@@ -2830,8 +2913,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"تصویر میں تصویر"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"تصویر میں تصویر کی اجازت دیں"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"ایپ کے کھلے رہنے پر یا آپ کے اسے چھوڑنے کے بعد اس ایپ کو تصویر میں تصویر ونڈو بنانے کی اجازت دیں (مثال کے طور پر، ویڈیو دیکھنا جاری رکھیں)۔ یہ ونڈو آپ کے ذریعے استعمال کی جانے والی دیگر ایپس کے اوپری حصے پر ڈسپلے ہوتی ہے۔"</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"ہاں"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"نہیں"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ڈسٹرب نہ کریں تک رسائی"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"کسی انسٹال کردہ ایپس نے ڈسٹرب نہ کریں تک رسائی کی درخواست نہیں کی ہے"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ایپس لوڈ ہو رہی ہیں…"</string>
@@ -2962,11 +3043,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"یہ دفتری پروفائل اس کے زیر انتظام ہے:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> کے زیر انتظام ہے"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(تجرباتی)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"آلہ کی گردش"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"اسکرین کے موادوں کو گھمائیں"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"پورٹریٹ منظر میں رہیں"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"لینڈ اسکیپ منظر میں رہیں"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"موجودہ سمت بندی میں رہیں"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"محفوظ آغاز"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"جاری رکھیں"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"‏آپ یہ آلہ شروع ہونے سے پہلے اپنے PIN کا تقاضہ کر کے، اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا ہے۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع کرنے سے پہلے PIN طلب کریں؟"</string>
@@ -2974,7 +3050,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"آپ یہ آلہ شروع ہونے سے پہلے اپنے پاسورڈ کا تقاضہ کر کے، اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا ہے۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع کرنے سے پہلے پاسورڈ طلب کریں؟"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"‏اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی انگلی کا نشان استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے PIN کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع ہونے سے پہلے PIN طلب کریں؟"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی انگلی کا نشان استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے پیٹرن کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع کرنے سے پہلے پیٹرن طلب کریں؟"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی انگلی کا نشان استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے پاس ورڈ کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع کرنے سے پہلے پاسورڈ طلب کریں؟"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی انگلی کا نشان استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے پاس ورڈ کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع ہونے سے پہلے پاس ورڈ طلب کریں؟"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"ہاں"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"نہیں"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"‏PIN درکار ہے؟"</string>
@@ -3092,6 +3168,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"استعمال سے متعلق الرٹس"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"آلہ کا مکمل استعمال دکھائیں"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"ایپ کا استعمال دکھائیں"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"بہت زیادہ استعمال"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ایپس معمول کے خلاف برتاؤ کر رہی ہیں</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> معمول کے خلاف برتاؤ کر رہی ہے</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">ایپس بیٹری کو تیزی سے ختم کر رہی ہیں</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> بیٹری کو تیزی سے ختم کر رہا ہے</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"بہترین بنائی گئی نہیں ہیں"</string>
     <string name="high_power_on" msgid="6216293998227583810">"بہترین بنائی گئی نہیں ہیں"</string>
     <string name="high_power_off" msgid="3393904131961263278">"بیٹری استعمال کو بہترین بنا رہی ہے"</string>
@@ -3184,8 +3269,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"دیگر ایپس پر ڈسپلے کریں"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> میں سے <xliff:g id="COUNT_0">%1$d</xliff:g> ایپس کو دیگر ایپس پر دکھانے کی اجازت ہے"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"اجازت والی ایپس"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"ہاں"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"نہیں"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"اجازت ہے"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"اجازت نہیں ہے"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"نامعلوم ذرائع کی ایپس انسٹال کریں"</string>
     <string name="write_settings" msgid="4797457275727195681">"سسٹم ترتیبات میں ترمیم کریں"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"\'سسٹم ترتیبات میں ترمیم کریں\' لکھیں"</string>
@@ -3275,6 +3360,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"اسکرین کا رنگ ہلکا امبر ہے۔ اس سے ممکن ہے آپ کو سونے میں مدد ملے۔"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"تجاویز"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"<xliff:g id="ID_1">%1$d</xliff:g>+"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> مزید"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> تجاویز</item>
+      <item quantity="one">1 تجویز</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> تجاویز</item>
+      <item quantity="one">+1 تجویز</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"ہٹائیں"</string>
     <string name="color_temperature" msgid="2070126836910615605">"سرد رنگ کا درجہ حرارت"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"ڈسپلے کیلئے سرد رنگ استعمال کریں"</string>
@@ -3293,8 +3387,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> ڈیٹا انتباہ"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> ڈیٹا انتباہ / <xliff:g id="ID_2">%2$s</xliff:g> ڈیٹا کی حد"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"بلنگ سائیکل"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"ماہانہ سائیکل کا آغاز ہر مہینے <xliff:g id="ID_1">%1$s</xliff:g> کو ہوتا ہے"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"ماہانہ اغاز <xliff:g id="ID_1">%1$s</xliff:g> کو ہوگا"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"ماہانہ <xliff:g id="ID_1">%1$s</xliff:g> دن کو"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"نیٹ ورک کی پابندیاں"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> پابندیاں</item>
@@ -3314,7 +3407,7 @@
       <item quantity="one">ڈیٹا سیور آن ہو تو 1 ایپ کو غیر محدود ڈیٹا استعمال کرنے کی اجازت ہے</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"ڈیٹا سیور"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"غیر محدود ڈیٹا تک رسائی"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"غیر محدود ڈیٹا"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"پس منظر کا ڈیٹا آف ہے"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"آن"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"آف"</string>
@@ -3378,8 +3471,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"قفل اسکرین کی اطلاعات کنٹرول کریں"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"اطلاعی مواد دکھائیں یا چھپائیں"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"تمام"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"سپورٹ"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"سپورٹ اور تجاویز"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"سب سے چھوٹی چوڑائی"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"‏کسی انسٹال کردہ ایپ نے پریمیم SMS تک رسائی کی درخواست نہیں کی"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"‏ہو سکتا ہے آپ کو پریمیم SMS کے پیسے ادا کرنا پڑیں اور یہ آپ کے کیرئیر بلز میں شامل ہو جائیں گے۔ اگر آپ ایک ایپ کیلئے اجازت فعال کرتے ہیں تو آپ اس ایپ کو استعمال کرکے آپ پریمیم SMS بھیج پائیں گے۔"</string>
@@ -3444,28 +3536,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"خودکار"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"مینوئل"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"اب جگہ خالی کریں"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"اشارے"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"اشارہ شارٹ کٹس"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"آپ کے فون کو کنٹرول کرنے کیلئے تیز اشارے"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"آپ کے ٹیبلیٹ کو کنٹرول کرنے کیلئے تیز اشارے"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"آپ کے آلہ کو کنٹرول کرنے کیلئے تیز اشارے"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"کیمرا پر جائیں"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"کیمرہ کو تیزی سے کھولنے کیلئے، پاور بٹن کو دوبار دبائیں۔ کسی بھی اسکرین سے ہو جاتا ہے۔"</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"جلدی سے کیمرا کھولیں"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"کیمرا کھولنے کے لیے پاور بٹن کو دوبار دبائیں"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"کیمرا پلٹیں"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"سیلفیز زیادہ تیزی سے لیں"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"سیلفی موڈ کے لیے فون کو دو بار مروڑیں"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"سیلفی موڈ کے لیے ٹیبلیٹ کو دو بار مروڑیں"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"سیلفی موڈ کے لیے آلہ کو دو بار مروڑیں"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"فون کو چیک کرنے کیلئے دو بار تھپتھپائیں"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ٹیبلیٹ کو چیک کرنے کیلئے دو بار تھپتھپائیں"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"آلہ کو چیک کرنے کیلئے دو بار تھپتھپائیں"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"اپنی اطلاعات فوری طور پر چیک کرنے کیلئے، اپنی اسکرین کو دو بار تھپتھپائیں۔"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"وقت، اطلاعاتی آئیکنز، اور دیگر معلومات چیک کرنے کے لیے، اپنی اسکرین کو دو بار تھپتھپائیں۔"</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"اسکرین آف ہونے پر اطلاعات چیک کریں"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"چیک کرنے کیلئے فون کو اٹھائیں"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"چیک کرنے کیلئے ٹیبلیٹ کو اٹھائیں"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"چیک کرنے کیلئے آلہ کو اٹھائیں"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"اپنی اطلاعات فوری طور پر چیک کرنے کیلئے، اپنا فون اٹھائیں۔"</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"اپنی اطلاعات فوری طور پر چیک کرنے کیلئے، اپنا ٹیبلیٹ اٹھائیں۔"</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"اپنی اطلاعات فوری طور پر چیک کرنے کیلئے، اپنا آلہ اٹھائیں۔"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"وقت، اطلاعاتی آئیکنز، اور دیگر معلومات چیک کرنے کے لیے، اپنا فون اٹھائیں۔"</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"وقت، اطلاعاتی آئیکنز، اور دیگر معلومات چیک کرنے کے لیے، اپنا ٹیبلیٹ اٹھائیں۔"</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"وقت، اطلاعاتی آئیکنز، اور دیگر معلومات چیک کرنے کے لیے، اپنا آلہ اٹھائیں۔"</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"اسکرین آف ہونے پر اطلاعات چیک کریں"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"اطلاعات کیلئے فنگر پرنٹ سوائپ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"اپنی اطلاعات چیک کرنے کیلئے اپنے فون کی پشت پر فنگر پرنٹ سینسر پر نیچے سوائپ کریں۔"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"اپنی اطلاعات چیک کرنے کیلئے اپنے ٹیبلیٹ کی پشت پر فنگر پرنٹ سینسر پر نیچے سوائپ کریں۔"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"اپنی اطلاعات چیک کرنے کیلئے اپنے آلہ کی پشت پر فنگر پرنٹ سینسر پر نیچے سوائپ کریں۔"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"جلدی سے اطلاعات دیکھیں"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"فنگر پرنٹ سینسر پر نیچے سوائپ کریں"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"کیمرا کھولنے کے لیے اٹھائيں"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"کیمرا کو خودکار طور پر کھولنے کیلئے، اپنے فون کو تصویر لینے والی پوزیشن (لینڈ اسکیپ یا پورٹریٹ) تک اٹھائيں۔ یہ اس وقت کام کرتا ہے جب آپ کا فون سلیپ وضع میں ہوتا ہے یا مقفل ہوتا ہے۔"</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"فون کے سلیپ موڈ میں یا مقفل ہونے پر تصاویر لیں"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"معاونت کا اشارہ"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"حسّاسیت"</string>
@@ -3569,6 +3674,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"کیا آپ اس فوری ایپ کو ہٹانا چاہتے ہیں؟"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"گیمز"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"آڈیو فائلز"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"استعمال شدہ جگہ"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(صارف کیلیے اَن انسٹال ہوگیا <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(صارف کے لیے غیر فعال ہوگیا <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"آٹو فل سروس"</string>
@@ -3582,5 +3688,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"فوری ایپ"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"اسٹوریج مینیجر آف کریں؟"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"‏مووی اور TV ایپس"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"استعمال شدہ جگہ"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"کیرئیر فراہمی معلومات"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ٹرگر کیرئیر فراہمی"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"نیا اور دلچسپ کیا ہے؟"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"سرفہرست 5 خصوصیات دیکھیں"</string>
 </resources>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index e43e78b..31c1102 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Yaxshi"</item>
     <item msgid="8986346415847956850">"A’lo"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"O‘chirilmasin"</item>
-    <item msgid="844721238536786870">"Faqat quvvat olayotganda"</item>
-    <item msgid="1986753720941888596">"Hech qachon"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"O‘chirilmasin"</item>
-    <item msgid="7433294150916905997">"Faqat quvvat olayotganda"</item>
-    <item msgid="1390404486722375028">"Hech qachon"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"So‘nggi 30 kun"</item>
     <item msgid="6600989128423965319">"Internetdan foyd-sh davri…"</item>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 327884c..9bc1ebe 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Siz endi dasturchisiz!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Shart emas, siz allaqachon dasturchi rejimiga o‘tgansiz."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Avval dasturchi sozlamalarini yoqing."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Simsiz tarmoqlar"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Ulanishlar"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Qurilma"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE sinxronizatsiyasi yoqilgan"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Video qo‘ng‘iroqlar ta’minoti yoniq"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Wifi qo‘ng‘iroqlar ta’minoti yoniq"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presence sinxronizatsiyasi yoniq"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Radiosignal quvvati"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM kartadagi manzillar kitobini ko‘rish"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ruxsat etilgan raqamlarni ko‘rish"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Qurilmalarni izlash"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Qurilmani qayta nomlash"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Qayta nomlash"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Uzilsinmi?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Quyidagi qurilma bilan aloqa uziladi:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Qurilma uzib qo‘yilsinmi?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Telefoningiz <xliff:g id="DEVICE_NAME">%1$s</xliff:g> qurilmasidan uziladi."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Planshetingiz <xliff:g id="DEVICE_NAME">%1$s</xliff:g> qurilmasidan uziladi."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Qurilmangiz <xliff:g id="DEVICE_NAME">%1$s</xliff:g> qurilmasidan uziladi."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Aloqani uzish"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Sizda Bluetooth sozlamalarini o‘zgartirish uchun ruxsat yo‘q."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Yangi qurilmani ulash"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Bluetooth sozlamalari ochiq turgan vaqtda <xliff:g id="DEVICE_NAME">%1$s</xliff:g> yaqin-atrofdagi qurilmalarga ko‘rinadi."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Telefonning Bluetooth manzili: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Planshetning Bluetooth manzili: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Qurilmaning Bluetooth manzili: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> bilan aloqa uzilsinmi?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Signal uzatish"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil o‘chirib qo‘yilsinmi?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth orqali ulanish so‘rovi"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Biriktirish so‘rovi"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> qurilmasiga ulanish uchun bosing."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Qabul qilingan fayllar"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Qabul qilingan fayllar"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth qurilmani tanlang"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasi Bluetooth xizmatini yoqmoqchi"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasi Bluetooth xizmatini o‘chirib qo‘ymoqchi"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s xabarlaringizni ochmoqchi. %2$s‘ga ruxsat berilsinmi?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM karta ma’lumotlariga kirish so‘rovi"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"“<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>” qurilmasi SIM karta ma’lumotlarini ko‘rmoqchi. SIM karta ma’lumotlarini ko‘rishga ruxsat bersangiz, qurilmangizdagi ulanishlar vaqtincha o‘chib qoladi. “<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>” qurilmasiga ruxsat berish."</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Boshqa qurilmalarga “<xliff:g id="DEVICE_NAME">^1</xliff:g>” sifatida ko‘rinadi"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Qurilmalaringiz"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Yangi qurilmani ulash"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Sana va vaqt"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Vaqt zonasini tanlang"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Hisoblar"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Joylashuv"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Hisoblar"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Xavfsizlik va joylashuv"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Shifrlash va hisob ma’lumotlari"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon shifrlangan"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Qurilma shifrlangan"</string>
@@ -354,40 +367,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Barmoq izi skaneri"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Barmoq izidan foydalanish"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Telefon qulfini ochish, xaridlarni amalga oshirish yoki ilovalarga kirish uchun shunchaki barmoq izi skaneriga tegining. Telefoningizga qo‘shilgan har qanday barmoq izi yordamida bularni bajarish mumkin, shuning uchun undan ehtiyot bo‘lib foydalaning.\n\nEslatma: Barmoq izining himoya darajasi grafik kalit yoki PIN kodga qaraganda kuchsizroq."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Xaridlarni amalga oshirish yoki ilovalarga kirish uchun shunchaki barmoq izi skaneriga tegining. Telefoningizga qo‘shilgan har qanday barmoq izi yordamida bularni bajarish mumkin, shuning uchun ehtiyot undan bo‘lib foydalaning.\n\nEslatma: barmoq izi orqali qurilmani qulfdan chiqara olmaysiz. Batafsil ma’lumot olish uchun tashkilot administratori bilan bog‘laning."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Telefonni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalarga kirish uchun shunchaki barmoq izi skaneriga tegining. Telefoningizga qo‘shilgan har qanday barmoq izi yordamida bularni bajarish mumkin, shuning uchun ehtiyot undan bo‘lib foydalaning.\n\nEslatma: Barmoq izining himoya darajasi chizmali kalit yoki PIN kodnikidek emas."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"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="6817326798834882531">"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="3199351118385606526">"Bekor qilish"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Davom etish"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Tashlab ketish"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Barmoq izi qo‘shish"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Qurilmani himoyalash funksiyalari faollashmaydi. Agar planshetingiz yo‘qolsa, o‘g‘irlansa yoki ma’lumotlari tozalab tashlansa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Qurilmani himoyalash funksiyalari faollashtirilmaydi. Agar qurilmangiz yo‘qolsa, o‘g‘irlansa yoki ma’lumotlari tozalab tashlansa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Qurilmani himoyalash funksiyalari faollashtirilmaydi. Agar telefoningiz yo‘qolsa, o‘g‘irlansa yoki ma’lumotlari tozalab tashlansa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Qurilmani himoyalash funksiyasi faollashmaydi. Agar planshetingiz yo‘qolib qolsa yoki o‘g‘irlansa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Qurilmani himoyalash funksiyasi faollashmaydi. Agar qurilmangiz yo‘qolib qolsa yoki o‘g‘irlansa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Qurilmani himoyalash funksiyasi faollashmaydi. Agar telefoningiz yo‘qolib qolsa yoki o‘g‘irlansa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Keyingisi"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Qurilmani himoyalash funksiyalari yoqilmaydi. Agar planshetingiz yo‘qolsa, o‘g‘irlansa yoki asliga qaytarilsa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Qurilmani himoyalash funksiyasi yoqilmaydi. Agar qurilmangiz yo‘qolib qolsa, o‘g‘irlansa yoki asliga qaytarilsa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Qurilmani himoyalash funksiyasi yoqilmaydi. Agar telefoningiz yo‘qolib qolsa, o‘g‘irlansa yoki asliga qaytarilsa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Qurilmani himoyalash funksiyasi yoqilmaydi. Agar planshetingiz yo‘qolib qolsa yoki o‘g‘irlansa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Qurilmani himoyalash funksiyasi yoqilmaydi. Agar qurilmangiz yo‘qolib qolsa yoki o‘g‘irlansa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Qurilmani himoyalash funksiyasi yoqilmaydi. Agar telefoningiz yo‘qolib qolsa yoki o‘g‘irlansa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"OK"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Orqaga"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Skanerni toping"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Telefoningiz orqasidagi barmoq izi skanerini toping."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Sensorga tegining"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Sensor telefonning orqasida joylashgan. Ko‘rsatkich barmog‘ingizdan foydalaning."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ushbu rasmda barmoq izi skaneri qayerda joylashgani ko‘rsatilgan"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nomi"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"O‘chirish"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Boshladik"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Sensorga tegining"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Barmog‘ingizni skaner ustiga qo‘yib, tebranishni his qilguncha bosib turing"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Davom eting"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Barmoq izi to‘liq olinishi uchun barmog‘ingizni sekin harakatlantiring."</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Barmoq izi qo‘shildi!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quyidagi belgi identifikatsiyadan o‘tish yoki xaridlarni tasdiqlash uchun barmoq izidan foydalanish mumkinligini bildiradi."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Qurilmani uyg‘otish va uni qulfdan chiqarish uchun shunchaki barmoq izi skaneriga tegining."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Agar shu ikonka ko‘rinsa, xaridlarni tasdiqlashingiz yoki ilovalarga kirishingiz ham mumkin."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Barmoqni ko‘tarib, keyin uni yana tekkizing"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Barmoq izingizning boshqa qismlarini qo‘shish uchun barmog‘ingizni ko‘tarib turing"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Barmoq izi qo‘shildi"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Agar shu belgi ko‘rinsa, identifikatsiya yoki xaridlarni tasdiqlash uchun barmoq izingizdan foydalaning."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Barmoq izini sozlash o‘tkazib yuborilsinmi?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Siz telefoningizni qulfdan chiqarishning bir usuli sifatida barmoq izini tanlagansiz. Agar buni hozir o‘tkazib yuborsangiz, uni keyinroq sozlashga to‘g‘ri keladi. Sozlash atigi bir daqiqa atrofida vaqt oladi."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Ekranni qulfini sozlash"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Tayyor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Obbo, bu sensor emas."</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Qurilmadagi barmoq izi skanerini toping."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Telefonning orqasida joylashgan sensorga tegining. Ko‘rsatkich barmog‘ingizdan foydalaning."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Barmoq izini kiritish tugallanmadi"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Barmoq izini kiritish vaqti tugab qoldi. Qayta urinib ko‘ring."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Barmoq izini kiritish amalga oshmadi. Qayta urinib ko‘ring yoki boshqa barmoqdan foydalaning."</string>
@@ -449,6 +460,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Qurilmani himoyalash funksiyalarini faollashtirish orqali boshqalarning ushbu qurilmadan sizning ruxsatingizsiz foydalanishining oldini oling. Ekran qulfini tanlang."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Qurilmani himoyalash funksiyalarini faollashtirish orqali boshqalarning ushbu telefondan sizning ruxsatingizsiz foydalanishining oldini oling. Ekran qulfini tanlang."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Ekran qulfi uchun muqobil usulni tanlang"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Ekran qulfi parametrlari"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Ekran qulfi parametrlari"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekran qulfi"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / uyqu rejimidan keyinoq"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / uyqu rejimidan <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g>dan keyin"</string>
@@ -519,13 +532,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Grafik kalitni o‘zgartirish"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Qulfdan ochish PIN kodini o‘zgartirish"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Qulfni ochish parolini o‘zgartirish"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Qaytadan urinib ko‘ring. Urinish: <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> / <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"So‘nggi urinish"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Agar bu urinishda ishchi profil grafik kalitini noto‘g‘ri kiritsangiz, ishchi profilingiz va unga bog‘liq ma’lumotlar mazkur qurilmadan o‘chirib tashlanadi."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Agar bu urinishda ishchi profil PIN kodini noto‘g‘ri kiritsangiz, ishchi profilingiz va unga bog‘liq ma’lumotlar mazkur qurilmadan o‘chirib tashlanadi."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Agar bu urinishda ishchi profil parolini noto‘g‘ri kiritsangiz, ishchi profilingiz va unga bog‘liq ma’lumotlar mazkur qurilmadan o‘chirib tashlanadi."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Juda ko‘p marta muvaffaqiyatsiz urinishlar amalga oshirildi. Ishchi profilingiz va unga bog‘liq ma’lumotlar bu qurilmadan o‘chirib tashlanadi."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Yopish"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Qaytadan urining. Urinish: <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> / <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Bitta urinish qoldi"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Agar grafik kalitni xato kiritsangiz, bu qurilmadagi ma’lumotlar o‘chirib tashlanadi"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Agar PIN kodni xato kiritsangiz, bu qurilmadagi ma’lumotlar o‘chirib tashlanadi"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Agar parolni xato kiritsangiz, qurilmadagi ma’lumotlar o‘chirib tashlanadi"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Agar grafik kalitni xato kiritsangiz, bu foydalanuvchi o‘chirib tashlanadi"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Agar PIN kodni xato kiritsangiz, bu foydalanuvchi o‘chirib tashlanadi"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Agar parolni xato kiritsangiz, bu foydalanuvchi o‘chirib tashlanadi"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Agar grafik kalitni xato kiritsangiz, ishchi profil va undagi ma’lumotlar o‘chirib tashlanadi"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Agar PIN kodni xato kiritsangiz, ishchi profil va undagi ma’lumotlar o‘chirib tashlanadi"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Agar parolni xato kiritsangiz, ishchi profil va undagi ma’lumotlar o‘chirib tashlanadi"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Juda ko‘p marta muvaffaqiyatsiz urinishlar amalga oshirildi. Bu qurilmadagi ma’lumotlar o‘chirib tashlanadi."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Juda ko‘p marta muvaffaqiyatsiz urinishlar amalga oshirildi. Bu foydalanuvchi o‘chirib tashlanadi."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Juda ko‘p marta muvaffaqiyatsiz urinishlar amalga oshirildi. Bu ishchi profil va undagi ma’lumotlar o‘chirib tashlanadi."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Yopish"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Kamida <xliff:g id="COUNT">%d</xliff:g> ta belgi bo‘lishi kerak"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN kod kamida <xliff:g id="COUNT">%d</xliff:g> raqamdan iborat bo‘lishi shart"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Davom etish"</string>
@@ -626,6 +647,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth kengaytmalari"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Yaqin-atrofdagi Bluetooth-qurilmalarga ulanish uchun Bluetooth funksiyasini yoqing."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Bluetooth tarmoqlari o‘chirilgan bo‘lsa-da, joylashuv aniqligini oshirish maqsadida tizimga oid ilova va xizmatlar yaqin-atrofdagi Bluetooth qurilmalarni qidirishda davom etadi. Buni <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tekshirish sozlamalari<xliff:g id="LINK_END_1">LINK_END</xliff:g> orqali o‘chirib qo‘yish mumkin."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Ulanilmadi. Qaytadan urining."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Qurilma tafsilotlari"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Qurilmaning Bluetooth manzili: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Qurilma unutilsinmi?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Telefoningiz endi <xliff:g id="DEVICE_NAME">%1$s</xliff:g> qurilmasiga ulanmaydi"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Planshetingiz endi <xliff:g id="DEVICE_NAME">%1$s</xliff:g> qurilmasiga ulanmaydi"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Qurilmangiz endi <xliff:g id="DEVICE_NAME">%1$s</xliff:g> qurilmasiga ulanmaydi"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Qurilmani unutish"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Ulanish..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> media audio’dan uziladi."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> garnituradan uziladi."</string>
@@ -778,6 +807,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Taklif etilmasin"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Tasdiqlanmasin"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Birorta ham sertifikat ko‘rsatilmagan. Aloqangiz ochiq bo‘ladi."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Tarmoq nomi juda uzun."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Domenni ko‘rsating."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS mavjud"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS mavjud)"</string>
@@ -809,7 +839,6 @@
       <item quantity="one">1 ta tarmoq</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Qo‘shimcha funksiyalar"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wi‑Fi tarmog‘ini sozlash"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-manzil"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP manzil"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Quyi tarmoq niqobi"</string>
@@ -846,9 +875,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Bu guruh unitilsinmi?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Wi‑Fi ulanish nuqtasi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi ulanish nuqtasi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Wi‑Fi tarqatish uchun mobil internetdan foydalanilsin"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Bu planshet internet aloqasi hotspot orqali tarqatilmayapti"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Bu telefon internet aloqasi hotspot orqali tarqatilmayapti"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Internet yoki kontent boshqa qurilmalarga ulashilmayapti"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Bu planshet internet aloqasi hotspot orqali tarqatilmoqda"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Bu telefon internet aloqasi hotspot orqali tarqatilmoqda"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Ilova kontent ulashmoqda. Internet tarqatish uchun hotspotni o‘chirib, keyin qayta yoqing"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi nomi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> yoqilmoqda…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Boshqa qurilmalar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> tarmog‘iga ulanishi mumkin"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi paroli"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Wi-Fi chastotalari diapazoni"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Boshqa qurilmalaringiz uchun Wi-Fi tarmoq yaratish uchun hotspotdan foydalaning. Hotspot mobil internetingizni tarqatadi. Qo‘shimcha mobil internet uchun to‘lovlar olinishi mumkin."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Ilovalar yaqin-atrofdagi qurilmalarga kontent ulashish uchun hotspot yarata oladi."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Ulanish nuqtasi yoqilmoqda…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Ulanish nuqtasi o‘chirilmoqda…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> faol"</string>
@@ -895,6 +932,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi qo‘ng‘iroqlari xizmati yoniqligida telefoningiz signal quvvatiga asoslanib Wi-Fi tarmoqlari yoki mobil internet orqali qo‘ng‘iroqlarni amalga oshiradi. Ushbu xizmatni yoqib qo‘yishdan oldin o‘z mobil operatoringizdan narxlar va tafsilotlarni surishtirib oling."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Favqulodda holatlar uchun manzilni o‘zgartirish"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"WiFi orqali 112 raqamiga qo‘ng‘iroq qilganingizda, favqulodda xizmatlar foydalanadigan manzilingiz"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
@@ -952,6 +990,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Hech narsa topilmadi"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ekran"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Ekranni avtomatik burish"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Yorqin ranglar"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Planshet aylantirilganda ekran joylashuvini avtomatik almashtirish"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Ekran joylashuvini telefon burilganda avtomatik almashtirish"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Planshet aylantirilganda ekran joylashuvini avtomatik almashtirish"</string>
@@ -979,23 +1018,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Yorqinlikni yorug‘lik darajasiga qarab moslashtiring. Agar bu funksiya yoniq bo‘lsa, yorug‘likni vaqtinchalik sozlashingiz mumkin."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Tungi rejim"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Tungi rejim ekraningiz tusini qizg‘ish rangga o‘zgartiradi. Bu ekranga xira yorug‘da qarashni osonlashtiradi va osonroq uyquga ketishga yordamlashadi."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Jadval"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Holati"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Avtomatik yoqish"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Hech qachon"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Maxsus jadval"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Kun botishidan to chiqqunicha"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Jadval"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Hech biri"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Muayyan vaqtda yoqiladi"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Kun botishidan to chiqqunicha yoqiladi"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Boshlanish vaqti"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Tugash vaqti"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Holati"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Yorqinlik"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"O‘chiq. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Hech qachon avtomatik yoqilmaydi."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"<xliff:g id="ID_1">%1$s</xliff:g> da avtomatik yoqiladi."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Quyosh botishi bilan avtomatik yoqiladi."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Yoniq. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Hech qachon avtomatik o‘chirib qo‘yilmaydi."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g> da avtomatik o‘chirib qo‘yiladi."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Quyosh chiqishi bilan avtomatik o‘chirib qo‘yiladi."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"O‘chiq / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Hech qachon avtomatik yoqilmaydi"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g> da avtomatik yoqiladi"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Quyosh botishi bilan avtomatik yoqiladi"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Yoniq / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Hech qachon avtomatik o‘chirib qo‘yilmaydi"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"<xliff:g id="ID_1">%1$s</xliff:g> da avtomatik o‘chirib qo‘yiladi"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Quyosh chiqishi bilan avtomatik o‘chirib qo‘yiladi"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Uyqu rejimi"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekranning o‘chishi"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> harakatsizlikdan keyin"</string>
@@ -1019,8 +1057,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Sozlamalar"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Avtomatik yorqinlik"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Tik holatda faollashtirish"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Sezgir ekran"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Sezgir ekran"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Har doim yoniq"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Yangi bildirishnomalar"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Qachon ko‘rsatilsin"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Yangi bildirishnomalar"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bildirishnoma kelganda ekran yonadi"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Har doim yoniq"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Vaqt, bildirishnoma belgilari va boshqa ma’lumotlarni ko‘rsatish"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Shrift o‘lchami"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Matnni kattalashtirish yoki kichiklashtirish"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM karta qulfi sozlamalari"</string>
@@ -1272,6 +1316,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN to‘ldirilishi shart"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC 3 ta raqamdan iborat bo‘lishi shart."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC 2 yoki 3 ta raqamdan iborat bo‘lishi shart."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Aloqa operatori bunday turdagi APN (%s) qo‘shishni taqiqlagan."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"APN standart sozlamalari tiklanmoqda."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Sozlamalarni tiklash"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Standart sozlamalar tiklandi."</string>
@@ -1301,6 +1346,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD-kartani tozalash"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ichki USB xotiradan musiqa va rasmlar kabi barcha ma‘lumotlarni tozalash"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD-kartadagi barcha ma’lumotlar, jumladan, musiqa va rasmlarni o‘chirib tashlash"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM kartalarni tozalash"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Telefondan barcha eSIM kartalarni tozalash. Bunda mobil xizmat tarif rejalari bekor qilinmaydi."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Planshetdan barcha eSIM kartalarni tozalash. Bunda mobil xizmat tarif rejalari bekor qilinmaydi."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Planshetni dastlabki sozlamarga qaytarish"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefon sozlamalarini tiklash"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Barcha shaxsiy ma’lumotlaringiz va yuklab olingan ilovalar o‘chirib tashlansinmi? Ularni keyin qayta tiklab bo‘lmaydi."</string>
@@ -1323,26 +1371,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Trafik tejash rejimida hotspotga ulanib bo‘lmaydi"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB modem"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB qurilma ulangan, mobil internetni yoqing"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Bog‘langan"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USB xotiradan foydalanilayotganda bog‘lanilmaydi"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB ulanmagan"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Yoqish uchun ulaning"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB bog‘lashda xatolik"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Telefon internetini USB orqali tarqarish"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Planshet internetini USB orqali tarqatish"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth modem"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Bu planshet interneti Bluetooth orqali tarqatilmoqda"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Bu telefon interneti Bluetooth orqali tarqatilmoqda"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Bu planshet interneti Bluetooth orqali 1 ta qurilmaga tarqatilmoqda"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Bu telefon interneti Bluetooth orqali 1 ta qurilmaga tarqatilmoqda"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Bu planshet interneti Bluetooth orqali <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ta qurilmaga tarqatilmoqda"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Bu telefon interneti Bluetooth orqali <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ta qurilmaga tarqatilmoqda"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Planshet internetini Bluetooth orqali tarqatish"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Telefon internetini Bluetooth orqali tarqarish"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g> interneti Bluetooth orqali tarqatilmoqda"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Bu planshet interneti Bluetooth orqali tarqatilmayapti"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Bu telefon interneti Bluetooth orqali tarqatilmayapti"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Bog‘lanmagan"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g>dan ortiq qurilmalarga bog‘lanib bo‘lmaydi."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ulashilmaydi."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Boshqa qurilmalarga mobil internetni tarqatish uchun hotspot va modem rejimidan foydalaning."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Boshqa qurilmalarga mobil internetni tarqatish uchun hotspot va modem rejimidan foydalaning. Ilovalar ham yaqin-atrofdagi qurilmalarga kontent ulashish uchun hotspot yarata oladi."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Yordam"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobil tarmoq"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Uyali tarmoq paketlari"</string>
@@ -1375,7 +1412,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Joylashuvni aniqlash"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Joylashuvni aniqlash uchun GPS, Wi-Fi, Bluetooth  yoki mobil tarmoqlardan foydalanish"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Joylashuvni aniqlash uchun Wi-Fi, Bluetooth yoki mobil tarmoqlardan foydalanish"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Joylashuvni GPS yordamida aniqlash"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Joylashuvni GPS va qurilma sensorlari yordamida aniqlash"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Qidiruv"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi orqali aniqlash"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Joylashuv axboroti aniq bo‘lishi uchun tizimga oid ilova va xizmatlarga xohlagan vaqtda yaqin-atrofdagi Wi-Fi tarmoqlarini qidirishiga ruxsat bering."</string>
@@ -1420,8 +1457,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Sizda internet ulanish yo‘q. Bu ma‘lumotni ko‘rish uchun, internetga ulangan kompyuterda %s manziliga kiring."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Yuklanmoqda…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Parol tanlang"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Barmoq izidan foydalanish uchun parol o‘rnating"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Grafik kalit yarating"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Barmoq izidan foydalanish uchun grafik kalit o‘rnating"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN kod kiriting"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Barmoq izidan foydalanish uchun PIN kod o‘rnating"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Parolni tasdiqlang"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Grafik kalitni tasdiqlang"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN kodni kiriting"</string>
@@ -1490,6 +1530,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Ilova sozlamalari"</string>
     <string name="install_applications" msgid="4872012136210802181">"Noma’lum manbalar"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Barcha manbalarga ruxsat"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Yaqinda ochilgan ilovalar"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Barcha ilovalarni (<xliff:g id="COUNT">%1$d</xliff:g>) ko‘rish"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> oldin"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Planshetingiz va shaxsiy ma‘lumotlaringiz notanish ilovalar xujumiga zaif bo‘ladi. Bunday ilovalarni ushbu manbadan o‘rnatish bilan ularning planshetizga yetkazadigan shikast va ma‘lumotlaringizni o‘chirib yuborishiga javobgarlikni o‘z zimmangizga olasiz."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefoningiz va shaxsiy ma‘lumotlaringiz notanish ilovalar xujumiga zaif bo‘ladi. Bunday ilovalarni ushbu manbadan o‘rnatish bilan ularning telefoningizga yetkazadigan shikast va ma‘lumotlaringizni o‘chirib yuborishiga javobgarlikni o‘z zimmangizga olasiz."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Kengaytirilgan sozlamalar"</string>
@@ -1658,6 +1701,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Tizim xizmati to‘xtatilsinmi?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Ushbu xizmatni to\'xtatsangiz, planshetizdagi bari narsalar faoliyati ishdan chiqishi mumkin, faoliyat to\'g\'ri bo\'lishi uchun uni o\'chirib keyin qayta ishga tushiring."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ushbu xizmatni to‘xtatsangiz, telefoningizdagi ba\'zi imkoniyatlar ishlamay qolishi mumkin, bunday holda telefonni o‘chirib yoqishingiz kerak bo‘ladi."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Tillar, matn kiritish va imo-ishoralar"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Tillar va matn kiritish"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Tillar va matn kiritish"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Matn kiritishda yordam"</string>
@@ -1872,6 +1919,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ta chop etish xizmati yoniq</item>
       <item quantity="one">1 ta chop etish xizmati yoniq</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ta chop etish vazifasi</item>
+      <item quantity="one">1 ta chop etish vazifasi</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Chop etish xizmatlari"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Xizmatlar o‘rnatilmagan"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Printer topilmadi"</string>
@@ -1944,6 +1995,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Batareya sarfi"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Quvvatdan foydalanishni moslash"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Quyidagi paketlarni o‘z ichiga oladi"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Ilovalar batareyani kuchli sarflamoqda"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Qurilmani yoniq qoldirmoqda"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Qurilmani fonda uyg‘otmoqda"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Joylashuv axborotini tez-tez so‘ramoqda"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ta ilova xato ishlayapti"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Ilova to‘xtatilsinmi?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Telefoningiz batareyani normal boshqara olmayapti, chunki <xliff:g id="APP">%1$s</xliff:g> ilovasi telefoningizni yoniq qoldirmoqda.\n\nBu muammoni tuzatish uchun ilovani majburan to‘xtatishingiz mumkin.\n\nAgar bu yana takrorlansa, batareya quvvati unumdorligini oshirish uchun ilovani o‘chirib tashlashingiz lozim bo‘ladi."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Planshetingiz batareyani normal boshqara olmayapti, chunki <xliff:g id="APP">%1$s</xliff:g> ilovasi planshetingizni yoniq qoldirmoqda.\n\nBu muammoni tuzatish uchun ilovani majburan to‘xtatishingiz mumkin.\n\nAgar bu yana takrorlansa, batareya quvvati unumdorligini oshirish uchun ilovani o‘chirib tashlashingiz lozim bo‘ladi."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Qurilmangiz batareyani normal boshqara olmayapti, chunki <xliff:g id="APP">%1$s</xliff:g> ilovasi qurilmangizni yoniq qoldirmoqda.\n\nBu muammoni tuzatish uchun ilovani majburan to‘xtatishingiz mumkin.\n\nAgar bu yana takrorlansa, batareya quvvati unumdorligini oshirish uchun ilovani o‘chirib tashlashingiz lozim bo‘ladi."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Ilovani to‘xtatish"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Fonda ishlashi o‘chirib qo‘yilsinmi?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Telefoningiz batareyani normal boshqara olmayapti, chunki <xliff:g id="APP">%1$s</xliff:g> ilovasi telefoningizni uyg‘otmoqda.\n\nBu muammoni hal qilish uchun telefoningiz ushbu ilovaning fonda ishlashining oldini olishi mumkin."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Planshetingiz batareyani normal boshqara olmayapti, chunki <xliff:g id="APP">%1$s</xliff:g> ilovasi planshetingizni uyg‘otmoqda.\n\nBu muammoni hal qilish uchun planshetingiz ushbu ilovaning fonda ishlashining oldini olishi mumkin."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Qurilmangiz batareyani normal boshqara olmayapti, chunki <xliff:g id="APP">%1$s</xliff:g> ilovasi qurilmangizni uyg‘otmoqda.\n\nBu muammoni hal qilish uchun qurilmangiz ushbu ilovaning fonda ishlashining oldini olishi mumkin."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Faolsizlantirish"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Joylashuv o‘chirib qo‘yilsinmi?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Telefoningiz batareyani normal boshqara olmayapti, chunki <xliff:g id="APP">%1$s</xliff:g> ilovasidan foydalanmayotganingizda ham u joylashuv axborotidan foydalanishda davom etmoqda.\n\nBu muammoni tuzatish uchun joylashuv xizmatini bu ilova uchun o‘chirib qo‘yishingiz mumkin."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Planshetingiz batareyani normal boshqara olmayapti, chunki <xliff:g id="APP">%1$s</xliff:g> ilovasidan foydalanmayotganingizda ham u joylashuv axborotidan foydalanishda davom etmoqda.\n\nBu muammoni tuzatish uchun joylashuv xizmatini bu ilova uchun o‘chirib qo‘yishingiz mumkin."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Qurilmangiz batareyani normal boshqara olmayapti, chunki <xliff:g id="APP">%1$s</xliff:g> ilovasidan foydalanmayotganingizda ham u joylashuv axborotidan foydalanishda davom etmoqda.\n\nBu muammoni tuzatish uchun joylashuv xizmatini bu ilova uchun o‘chirib qo‘yishingiz mumkin."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Faolsizlantirish"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ekran"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Fonar"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1958,7 +2029,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Ilovalar"</string>
     <string name="power_service" msgid="1599661212370831780">"Xizmatlar"</string>
     <string name="power_system" msgid="8290455327965307383">"Tizim"</string>
-    <string name="power_user" msgid="1889728099253018005">"Foydalanuvchi"</string>
+    <string name="power_user" msgid="3706143225319881667">"Boshqa foydalanuvchilar"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU umumiy"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ekrandagi sarfi"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Uyg‘oq turish"</string>
@@ -2010,6 +2081,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Orttirib hisoblangan quvvat sarfi"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mA/s"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Ishlatilgan vaqti: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"<xliff:g id="TIME">^1</xliff:g> faol"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Ekrandan foydalanish: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> – <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> batareya quvvati"</string>
@@ -2575,7 +2647,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN kodni o‘zgartirish"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Xabarnomalarni ko‘rsatish"</string>
     <string name="help_label" msgid="6886837949306318591">"Yordam va fikr-mulohaza"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Yordam maqolalari, telefon va chat orqali ko‘mak"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Yordam maqolalari, telefon va chat, ishni boshlash"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Kontent uchun hisob"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Suratli hujjat"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Keskin tahdidlar"</string>
@@ -2665,9 +2737,12 @@
       <item quantity="one">%d ta yashirin elementni ko‘rsatish</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Tarmoq va Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobil, trafik sarfi, hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobil"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"trafik sarfi"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Ulangan qurilmalar"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, translatsiya, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Ilovalar va bildirishnomalar"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Ruxsatnomalar, birlamchi ilovalar"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Foydalanuvchilar va hisoblar"</string>
@@ -2720,6 +2795,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"imo-ishora orqali matn kiritish"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"to‘lash, bosish, to‘lovlar"</string>
     <string name="keywords_backup" msgid="470070289135403022">"zaxira, zaxira nusxa olish"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"imo-ishora, qirra, tomon, faol qirra, qisish, ushlash, yordam, assistent, qisish, ok google, google assistent"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"imo-ishora, uyg‘otish, bildirishnomalar, ekran, displey, ekran o‘chiq, ekran yoniq, qisish, qirra, uyqu, uxlash, ushlash"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"imo-ishora, ovozsiz, kechiktirish, signal, kiruvchi chaqiruv, jimjit, ekran, ekran qulfi, qisish, ushlash, qirra, to‘xtatish"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi’ni sozlash u-n NFC yorliq"</string>
     <string name="write_tag" msgid="8571858602896222537">"Yozish"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Yozish uchun yorliq ustiga bosing…"</string>
@@ -2802,7 +2880,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Ishchi profil bildirishnomalari ko‘rsatilmasin"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Qurilmangiz qulflanganda, profil bildirishnomalari qanday ko‘rsatilsin?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profil bildirishnomalari"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Bildirishnomalar"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Bildirishnomalar"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Ilova bildirishnomalari"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Bildirishnomalar turkumi"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Muhimligi"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Ilovaning ixtiyorida qoldiring"</string>
@@ -2817,6 +2896,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Juda muhim"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Ovozga ruxsat berish"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Qurilma ovozli signal va tebranish bermaydi, bildirishnomalar boshqa ilovalar ustidan ochilmaydi"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Kamroq muhim"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"O‘rtacha muhim"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Juda muhim"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Favqulodda muhim"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Bildirishnoma yordamchisi"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Bildirishnomalarga kirish"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Ishchi profil bildirishnomalariga kirish taqiqlangan"</string>
@@ -2844,8 +2927,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Tasvir ustida tasvir"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Tasvir ustida tasvir rejimiga ruxsat berish"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Bu ilova ochiqligida yoki uni qoldirib ketganingizda (masalan, video tomosha qilishni davom ettirish uchun) bu ilova tasvir ustida tasvir rejimida ishlashiga ruxsat bering. Bu oyna boshqa ishlatilayotgan ilovalar ustida ochiladi."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Ha"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Yo‘q"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"“Bezovta qilinmasin” fuksiyasi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Hech qaysi ilova “Bezovta qilinmasin” funksiyasiga ruxsat so‘ramagan"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ilovalar yuklanmoqda…"</string>
@@ -2976,11 +3057,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Bu ishchi profil quyidagi tomonidan boshqariladi:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> tomonidan boshqariladi"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Tajribaviy)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Qurilmaning burilishi"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Ekrandagi tasvir ham burilsin"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Tik holatda qolsin"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Yotiq holatda qolsin"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Joriy holatda qolsin"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Xavfsiz ishga tushirish"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Davom etish"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Qurilmani ishga tushirishda PIN kod talab qilish orqali uni yanada kuchliroq himoyalashingiz mumkin. Qurilma ishga tushmaguncha, u qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallarini qabul qila olmaydi. \n\nBu yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi. Qurilmani ishga tushirish uchun PIN kod talab qilinsinmi?"</string>
@@ -2988,7 +3064,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Qurilmani ishga tushirishda parol talab qilish orqali uni yanada kuchliroq himoyalashingiz mumkin. Qurilma ishga tushmaguncha, u qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallarini qabul qila olmaydi. \n\nBu yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi. Qurilmani ishga tushirish uchun parol talab qilinsinmi?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Qurilmani qulfdan chiqarish uchun siz nafaqat barmoq izidan foydalanish, balki unga qo‘shimcha tarzda PIN kod kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha, qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallari ishlamaydi.\n\nBu xususiyat yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi. Qurilmani ishga tushirish uchun PIN kod talab qilinsinmi?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Qurilmani qulfdan chiqarish uchun siz nafaqat barmoq izidan foydalanish, balki unga qo‘shimcha tarzda chizmali kalit kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha, qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallari ishlamaydi.\n\nBu xususiyat yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi. Qurilmani ishga tushirish uchun grafik kalit talab qilinsinmi?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Qurilmani qulfdan chiqarish uchun siz nafaqat barmoq izidan foydalanish, balki unga qo‘shimcha tarzda parol kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha, qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallari ishlamaydi.\n\nBu xususiyat yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi. Qurilmani ishga tushirish uchun parol talab qilinsinmi?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Qurilmani qulfini ochish uchun siz nafaqat barmoq izidan foydalanish, balki unga qo‘shimcha tarzda parol kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha, chaqiruvlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallari ishlamaydi.\n\nBu xususiyat yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi. Qurilmani ishga tushirish uchun parol talab qilinsinmi?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ha"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Yo‘q"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN-kod talab qilinsinmi?"</string>
@@ -3106,6 +3182,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Ogohlantirishlar"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Butun qurilmaning quvvat sarfi"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Ilovalardan foydalanish"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Batareya sarfi yuqori"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ta ilova xato ishlayapti</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> ilovasi xato ishlayapti</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Ilovalar batareyani kuchli sarflamoqda</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> batareyani kuchli sarflamoqda</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Quvvat tejamaydi"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Quvvat tejamaydi"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Batareya cheklovi o‘rnatilgan"</string>
@@ -3198,8 +3283,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Boshqa oynalar ustidan ochish"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> ta ilova boshqa oynalar ustidan ochilishi mumkin (jami: <xliff:g id="COUNT_1">%2$d</xliff:g>)"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Ruxsatga ega ilovalar"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Ha"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Yo‘q"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Ruxsat berilgan"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Ruxsat berilmagan"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"notanish manbalar ilovalar o‘rnatish"</string>
     <string name="write_settings" msgid="4797457275727195681">"Tizim sozlamalarini o‘zgar-sh"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"tizim sozlamalarini o‘zgartirish"</string>
@@ -3289,6 +3374,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Ekran qizg‘ish tusga kirdi. Bu osonroq uyquga ketishga yordamlashadi."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Tavsiyalar"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> ta"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ta taklif</item>
+      <item quantity="one">1 ta taklif</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> ta taklif</item>
+      <item quantity="one">+1 ta taklif</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Olib tashlash"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Salqin rang harorati"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Salqin displey ranglaridan foydalanish"</string>
@@ -3307,8 +3401,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Ma’lumotlarni uzatishdagi ogohlantirishlar: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Ma’lumotlarni uzatishdagi ogohlantirishlar: <xliff:g id="ID_1">%1$s</xliff:g> / Ma’lumotlarni uzatish cheklovi: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"To‘lov davriyligi"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Har oyning <xliff:g id="ID_1">%1$s</xliff:g>-sanasidan to‘lov davri boshlanadi"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Har oyning <xliff:g id="ID_1">%1$s</xliff:g>-sanasidan"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Har oyda (<xliff:g id="ID_1">%1$s</xliff:g>-kuni)"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Tarmoq cheklovlari"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ta cheklov</item>
@@ -3328,7 +3421,7 @@
       <item quantity="one">Trafik tejash rejimi yoniqligida 1 ta ilova internet-trafikdan cheklovsiz foydalanishi mumkin</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Trafik tejash"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Cheklanmagan internet-trafik"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Ma’lumotlarga cheksiz ruxsat"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Fondagi internet o‘chiq"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Yoniq"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"O‘chiq"</string>
@@ -3392,8 +3485,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Ekran qulfi bildirishnomalarini boshqaring"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bildirishnomani ko‘rsatish yoki berkitish"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Hammasi"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Ko‘mak"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Yordam va maslahatlar"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Eng kichik eni"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"O‘rnatilgan ilovalardan hech biri SMSdan foydalanish uchun ruxsat so‘ramagan."</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS uchun sizdan haq olinishi va operatorga qo‘shimcha to‘lov amalga oshirilishi mumkin. Agar ilova uchun ruxsatnoma taqdim etsangiz, o‘sha ilovadan SMS yuborishingiz mumkin bo‘ladi."</string>
@@ -3458,28 +3550,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Avtomatik"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Qo‘llanma"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Joy bo‘shatish"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Imo-ishoralar"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Tezkor ishoralar"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Telefonni boshqarish uchun tezkor imo-ishoralar"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Planshetni boshqarish uchun tezkor imo-ishoralar"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Qurilmani boshqarish uchun tezkor imo-ishoralar"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kameraga o‘tish"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Kamerani tezda ochish uchun quvvat tugmasini ikki marta bosing. Har qanday ekranda ishlaydi."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Kamerani tezkor ochish"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Kamerani ochish uchun quvvat tugmasini ikki marta bosish"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kamerani almashtirish"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Tezkor selfi olish"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Selfi rejimiga o‘tish uchun telefonni ikki marta silkiting"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Selfi rejimiga o‘tish uchun planshetni ikki marta silkiting"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Selfi rejimiga o‘tish uchun qurilmani ikki marta silkiting"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Telefonni tekshirish uchun ekranni ikki marta bosing"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Planshetni tekshirish uchun ekranni ikki marta bosing"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Qurilmani tekshirish uchun ekranni ikki marta bosing"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Bildirishnomalarni tezkor tekshirish uchun ekranni ikki marta bosing."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Vaqt, bildirishnoma belgilari va boshqa ma’lumotlarni tekshirish uchun ekranni ikki marta bosing."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Ekran o‘chiqligida bildirishnomalarni tekshirish"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Tekshirish uchun telefonni yuqoriga ko‘taring"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tekshirish uchun planshetni yuqoriga ko‘taring"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Tekshirish uchun qurilmani yuqoriga ko‘taring"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Bildirishnomalarni tezkor tekshirish uchun telefonni qo‘lingizga oling."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Bildirishnomalarni tezkor tekshirish uchun planshetni qo‘lingizga oling."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Bildirishnomalarni tezkor tekshirish uchun qurilmani qo‘lingizga oling."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Vaqt, bildirishnoma belgilari va boshqa ma’lumotlarni tekshirish uchun telefonni qo‘lingizga oling."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Vaqt, bildirishnoma belgilari va boshqa ma’lumotlarni tekshirish uchun planshetni qo‘lingizga oling."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Vaqt, bildirishnoma belgilari va boshqa ma’lumotlarni tekshirish uchun qurilmani qo‘lingizga oling."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Ekran o‘chiqligida bildirishnomalarni tekshirish"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Barmoq izi skaneridan foydalanish"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Bildirishnomalarni tekshirish uchun telefon orqasidagi barmoq izi skaneri ustida pastga suring"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Bildirishnomalarni tekshirish uchun planshet orqasidagi barmoq izi skaneri ustida pastga suring"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Bildirishnomalarni tekshirish uchun qurilma orqasidagi barmoq izi skaneri ustida pastga suring"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Bildirishnomalarni tezda ko‘rish"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Barmoq izi skanerida pastga surish"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Kamerani ochish uchun ko‘taring"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Kamerani avtomatik ochish uchun telefonni suratga olish holatiga (yotiq yoki tik holat) keltiring. Telefon uyqu rejimida yoki qulflangan bo‘lsa ishlaydi."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Telefon uyqu rejimida yoki qulflangan holatida ham suratga oling"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Qo‘shimcha ishora"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Muhimlik"</string>
@@ -3583,6 +3688,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Ushbu darhol ochiladigan ilova olib tashlansinmi?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"O‘yinlar"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Audio fayllar"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Band qilgan joyi"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> uchun o‘chirilgan)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> uchun o‘chirib qo‘yilgan)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Avtomatik to‘ldirish xizmati"</string>
@@ -3596,5 +3702,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Darhol ochiladigan ilova"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Xotira boshqaruvi o‘chirib qo‘yilsinmi?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Film va TV ilovalari"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Band qilgan joyi"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Operator haqida"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Operator ta’minotini yoqish/o‘chirish"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Yangi va qiziqarli xususiyatlari"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Eng sara 5 ta xususiyati bilan tanishing"</string>
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 3856fc0..641f6ed 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Tốt"</item>
     <item msgid="8986346415847956850">"Tuyệt vời"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Luôn luôn"</item>
-    <item msgid="844721238536786870">"Chỉ khi cắm vào nguồn điện"</item>
-    <item msgid="1986753720941888596">"Không bao giờ"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Luôn luôn"</item>
-    <item msgid="7433294150916905997">"Chỉ khi cắm vào nguồn điện"</item>
-    <item msgid="1390404486722375028">"Không bao giờ"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 ngày qua"</item>
     <item msgid="6600989128423965319">"Đặt chu kỳ sử dụng..."</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 3306552..a277da4 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Bạn đã là nhà phát triển!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Không cần, bạn đã là nhà phát triển."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Vui lòng bật tùy chọn của nhà phát triển trước."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Mạng không dây và mạng"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Kết nối"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Thiết bị"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Đã cấp phép VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Đã cấp phép gọi điện video"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Đã cấp phép gọi điện qua Wi-Fi"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Đã cấp phép hiện diện/EAB"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Cường độ của sóng di động"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Xem sổ địa chỉ trên SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Xem Số quay định sẵn"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Dò tìm thiết bị"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Đổi tên thiết bị này"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Đổi tên"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ngắt kết nối?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tác vụ này sẽ kết thúc kết nối của bạn với:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Ngắt kết nối thiết bị?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Điện thoại của bạn sẽ ngắt kết nối khỏi <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Máy tính bảng của bạn sẽ ngắt kết nối khỏi <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Thiết bị của bạn sẽ ngắt kết nối khỏi <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Ngắt kết nối"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Bạn không có quyền thay đổi cài đặt Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Ghép nối thiết bị mới"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> hiển thị với thiết bị lân cận khi cài đặt Bluetooth mở."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Địa chỉ Bluetooth của điện thoại: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Địa chỉ Bluetooth của máy tính bảng: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Địa chỉ Bluetooth của thiết bị: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Ngắt kết nối <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Phát sóng"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vô hiệu hồ sơ?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Yêu cầu ghép nối Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Yêu cầu ghép nối"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Nhấn để ghép nối với <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Hiển thị các tệp đã nhận"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Tệp đã nhận"</string>
     <string name="device_picker" msgid="4978696506172252813">"Chọn thiết bị Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> muốn bật Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> muốn tắt Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s muốn truy cập tin nhắn của bạn. Bạn có muốn cấp quyền truy cập cho %2$s không?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Yêu cầu truy cập SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> muốn truy cập vào thẻ SIM của bạn. Cấp quyền truy cập vào thẻ SIM sẽ vô hiệu hóa khả năng kết nối dữ liệu trên thiết bị của bạn trong suốt thời gian kết nối. Cấp quyền truy cập vào <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Hiển thị là <xliff:g id="DEVICE_NAME">^1</xliff:g> với các thiết bị khác"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Thiết bị của bạn"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Ghép nối thiết bị mới"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Ngày và giờ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Chọn múi giờ"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Tài khoản"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Vị trí"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Tài khoản"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Bảo mật và vị trí"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Bảo mật &amp; vị trí"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Mã hóa và thông tin đăng nhập"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Điện thoại được mã hóa"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Thiết bị được mã hóa"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Mở khóa bằng vân tay"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Sử dụng vân tay của bạn"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"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 với vân tay mà bạn thêm. Thậm chí một vân tay được thêm cũng có thể làm tất cả những việc này.\n\nLưu ý: Vân tay của bạn có thể kém an toàn hơn so với hình mở khóa hoặc mã PIN mạnh."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Chỉ cần chạm vào cảm biến vân tay để ủy quyền mua hàng hoặc đăng nhập vào ứng dụng. Hãy cẩn trọng với vân tay mà bạn thêm. Thậm chí một vân tay được thêm có thể làm tất cả những việc này.\n\nLưu ý: Bạn không thể sử dụng vân tay của mình để 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."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"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 với vân tay mà bạn thêm. Ngay cả một vân tay được thêm cũng có thể làm tất cả những việc này.\n\nLưu ý: Vân tay của bạn có thể kém an toàn hơn so với hình mở khóa hoặc mã PIN mạnh."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Sử dụng vân tay của bạn để 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="6817326798834882531">"Sử dụng vân tay của bạn để 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ủa bạn có thể ít an toàn hơn hình mở khóa hoặc mã PIN khó đoán."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Hủy"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Tiếp tục"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Bỏ qua"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Thêm vân tay"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Tính năng bảo vệ thiết bị sẽ không được kích hoạt. Bạn sẽ không thể ngăn người khác sử dụng máy tính bảng này nếu máy bị mất, bị đánh cặp hoặc bị xóa sạch."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Tính năng bảo vệ thiết bị sẽ không được kích hoạt. Bạn sẽ không thể ngăn người khác sử dụng thiết bị này nếu thiết bị bị mất, đánh cắp hoặc xóa sạch."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Tính năng bảo vệ thiết bị sẽ không được kích hoạt. Bạn sẽ không thể ngăn người khác sử dụng điện thoại này nếu điện thoại bị mất, đánh cắp hoặc xóa sạch."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Tính năng bảo vệ thiết bị sẽ không được kích hoạt. Bạn sẽ không thể ngăn người khác sử dụng máy tính bảng này trong trường hợp máy tính bảng bị mất hoặc bị đánh cắp."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Tính năng bảo vệ thiết bị sẽ không được kích hoạt. Bạn sẽ không thể ngăn những người khác sử dụng thiết bị này trong trường hợp thiết bị bị mất hoặc bị đánh cắp."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Tính năng bảo vệ thiết bị sẽ không được kích hoạt. Bạn sẽ không thể ngăn những người khác sử dụng điện thoại này trong trường hợp điện thoại bị mất hoặc bị đánh cắp."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Tiếp theo"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Các tính năng bảo vệ thiết bị sẽ không được bật. Bạn sẽ không thể ngăn người khác sử dụng máy tính bảng này nếu máy tính bảng bị mất, bị đánh cắp hoặc bị đặt lại."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Các tính năng bảo vệ thiết bị sẽ không được bật. Bạn sẽ không thể ngăn người khác sử dụng thiết bị này nếu thiết bị bị mất, bị đánh cắp hoặc bị đặt lại."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Các tính năng bảo vệ thiết bị sẽ không được bật. Bạn sẽ không thể ngăn người khác sử dụng điện thoại này nếu điện thoại bị mất, bị đánh cắp hoặc bị đặt lại."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Các tính năng bảo vệ thiết bị sẽ không được bật. Bạn sẽ không thể ngăn người khác sử dụng máy tính bảng này nếu máy tính bảng bị mất hoặc bị đánh cắp."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Các tính năng bảo vệ thiết bị sẽ không được bật. Bạn sẽ không thể ngăn người khác sử dụng thiết bị này nếu thiết bị bị mất hoặc bị đánh cắp."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Các tính năng bảo vệ thiết bị sẽ không được bật. Bạn sẽ không thể ngăn người khác sử dụng điện thoại này nếu điện thoại bị mất hoặc bị đánh cắp."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Vẫn bỏ qua"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Quay lại"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Tìm cảm biến"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Tìm cảm biến vân tay trên mặt sau điện thoại của bạn."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Chạm vào cảm biến"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Ở mặt sau của điện thoại. Sử dụng ngón tay trỏ của bạn."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"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="7086763077909041106">"Tên"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Xóa"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Hãy bắt đầu"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Chạm vào cảm biến"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Đặt ngón tay của bạn lên cảm biến và nhấc lên sau khi bạn cảm thấy rung"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Tiếp tục"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Di chuyển ngón tay của bạn một chút để thêm tất cả các phần khác nhau của dấu vân tay"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Đã thêm vân tay!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Bất cứ khi nào nhìn thấy biểu tượng này, bạn có thể sử dụng vân tay của mình để nhận dạng hoặc ủy quyền mua hàng."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Chỉ cần chạm vào cảm biến dấu vân tay để đánh thức và mở khóa thiết bị của bạn."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Khi thấy biểu tượng này, bạn cũng có thể ủy quyền đơn mua hàng hoặc đăng nhập vào ứng dụng."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Nhấc ngón tay, rồi chạm lại"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Tiếp tục nhấc ngón tay để thêm các phần khác nhau của vân tay"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Đã thêm vân tay"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Khi bạn nhìn thấy biểu tượng này, hãy sử dụng vân tay của bạn để nhận dạng hoặc phê duyệt các giao dịch mua."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Bỏ qua thiết lập vân tay?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Bạn đã chọn sử dụng vân tay là cách mở khóa điện thoại của mình. Nếu bỏ qua ngay bây giờ, bạn sẽ cần thiết lập cài đặt này sau. Thiết lập sẽ chỉ mất ít phút."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Thiết lập khóa màn hình"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Xong"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Rất tiếc, đó không phải là cảm biến"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Sử dụng cảm biến vân tay trên thiết bị của bạn."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Chạm vào cảm biến ở mặt sau điện thoại. Dùng ngón tay trỏ."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Đăng ký chưa hoàn tất"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Đã đến giới hạn thời gian đăng ký dấu vân tay. Hãy thử lại."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Đăng ký dấu vân tay không hoạt động. Hãy thử lại hoặc sử dụng ngón tay khác."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Ngăn người khác sử dụng thiết bị này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Ngăn người khác sử dụng điện thoại này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Chọn phương pháp khóa màn hình sao lưu của bạn"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Tùy chọn khóa màn hình"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Tùy chọn khóa màn hình"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Khóa màn hình"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / ngay sau khi chuyển sang chế độ ngủ"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> sau khi chuyển sang chế độ ngủ"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Thay đổi hình mở khóa"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Thay đổi mã PIN mở khóa"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Thay đổi mật khẩu mở khóa"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Thử lại. Lần thử <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>/<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Lần thử cuối cùng"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Nếu bạn nhập sai hình mở khóa công việc vào lần thử này, hồ sơ công việc và dữ liệu được liên kết của bạn sẽ bị xóa khỏi thiết bị này."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Nếu bạn nhập sai mã PIN công việc vào lần thử này, hồ sơ công việc và dữ liệu được liên kết của bạn sẽ bị xóa khỏi thiết bị này."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Nếu bạn nhập sai mật khẩu công việc vào lần thử này, hồ sơ công việc và dữ liệu được liên kết của bạn sẽ bị xóa khỏi thiết bị này."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Quá nhiều lần thử sai. Hồ sơ công việc và dữ liệu được liên kết của bạn sẽ bị xóa khỏi thiết bị này."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Loại bỏ"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Thử lại. Lần thử <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>/<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Dữ liệu của bạn sẽ bị xóa"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Nếu bạn nhập hình mở khóa không chính xác vào lần thử tiếp theo, dữ liệu thiết bị này sẽ bị xóa"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Nếu bạn nhập mã PIN không chính xác vào lần thử tiếp theo, dữ liệu thiết bị này sẽ bị xóa"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Nếu bạn nhập mật khẩu không chính xác vào lần thử tiếp theo, dữ liệu thiết bị này sẽ bị xóa"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Nếu bạn nhập hình mở khóa không chính xác vào lần thử tiếp theo, người dùng này sẽ bị xóa"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Nếu bạn nhập mã PIN không chính xác vào lần thử tiếp theo, người dùng này sẽ bị xóa"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Nếu bạn nhập mật khẩu không chính xác vào lần thử tiếp theo, người dùng này sẽ bị xóa"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Nếu bạn nhập hình mở khóa không chính xác vào lần thử tiếp theo, hồ sơ công việc của bạn và dữ liệu của hồ sơ công việc sẽ bị xóa"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Nếu bạn nhập mã PIN không chính xác vào lần thử tiếp theo, hồ sơ công việc của bạn và dữ liệu của hồ sơ công việc sẽ bị xóa"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Nếu bạn nhập mật khẩu không chính xác vào lần thử tiếp theo, hồ sơ công việc của bạn và dữ liệu của hồ sơ công việc sẽ bị xóa"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Quá nhiều lần thử không chính xác. Dữ liệu thiết bị này sẽ bị xóa."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Quá nhiều lần thử không chính xác. Người dùng này sẽ bị xóa."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Quá nhiều lần thử không chính xác. Hồ sơ công việc này và dữ liệu của hồ sơ công việc sẽ bị xóa."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Loại bỏ"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Phải chứa ít nhất <xliff:g id="COUNT">%d</xliff:g> ký tự"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Mã PIN phải chứa ít nhất <xliff:g id="COUNT">%d</xliff:g> chữ số"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Tiếp tục"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth nâng cao"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Khi Bluetooth bật, thiết bị của bạn có thể kết nối với thiết bị Bluetooth khác ở gần."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Để nâng cao độ chính xác về vị trí, các ứng dụng và dịch vụ hệ thống có thể vẫn phát hiện thấy các thiết bị Bluetooth. Bạn có thể thay đổi tùy chọn này trong <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>cài đặt quét<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Không thể kết nối. Hãy thử lại."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Chi tiết thiết bị"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Địa chỉ Bluetooth của thiết bị: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Quên thiết bị?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Điện thoại của bạn sẽ không được ghép nối với <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nữa"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Máy tính bảng của bạn sẽ không được ghép nối với <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nữa"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Thiết bị của bạn sẽ không được ghép nối với <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nữa"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Quên thiết bị"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Kết nối với…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi âm thanh phương tiện."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi âm thanh thiết bị rảnh tay."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Không cung cấp"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Không xác thực"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Không có chứng chỉ nào được chỉ định. Kết nối của bạn sẽ không phải là riêng tư."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Tên mạng quá dài."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Phải chỉ định một miền."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Có WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Có WPS)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 mạng</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi‑Fi nâng cao"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Định cấu hình Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Địa chỉ MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Địa chỉ IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Mặt nạ mạng con"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Bỏ qua nhóm này?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Điểm phát sóng Wi‑Fi di động"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Điểm phát sóng Wi‑Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Sử dụng kết nối di động để cung cấp mạng Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Không chia sẻ kết nối Internet của máy tính bảng này qua điểm phát sóng"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Không chia sẻ kết nối Internet của điện thoại này qua điểm phát sóng"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Không chia sẻ Internet hoặc nội dung với các thiết bị khác"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Chia sẻ kết nối Internet của máy tính bảng này qua điểm phát sóng"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Chia sẻ kết nối Internet của điện thoại này qua điểm phát sóng"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Ứng dụng đang chia sẻ nội dung. Để chia sẻ kết nối Internet, hãy tắt điểm phát sóng, rồi bật lại"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Tên Wi-Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Đang bật <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Các thiết bị khác có thể kết nối với <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Mật khẩu Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Băng tần AP"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Sử dụng điểm phát sóng để tạo mạng Wi-Fi cho các thiết bị khác của bạn. Điểm phát sóng cung cấp kết nối Internet bằng kết nối dữ liệu di động của bạn. Bạn có thể mất thêm phí dữ liệu di động."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Ứng dụng có thể tạo một điểm phát sóng để chia sẻ nội dung với các thiết bị lân cận."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Đang bật điểm phát sóng…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Đang tắt điểm phát sóng…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> đang hiện hoạt"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Khi gọi qua Wi-Fi bật, điện thoại của bạn có thể định tuyến cuộc gọi qua mạng Wi-Fi hoặc mạng của nhà cung cấp dịch vụ, tùy thuộc vào tùy chọn của bạn và tín hiệu nào mạnh hơn. Trước khi bật tính năng này, hãy hỏi nhà cung cấp dịch vụ của bạn về phí và các chi tiết khác."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Cập nhật địa chỉ khẩn cấp"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Địa chỉ được các dịch vụ khẩn cấp sử dụng làm vị trí của bạn nếu bạn gọi cho 911 bằng WiFi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Hiển thị"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Không có kết quả nào"</string>
     <string name="display_settings" msgid="7965901687241669598">"Hiển thị"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Tự động xoay màn hình"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Màu sắc rực rỡ"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Tự động chuyển hướng khi xoay máy tính bảng"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Tự động chuyển hướng khi xoay điện thoại"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Tự động chuyển hướng khi xoay máy tính bảng"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Tối ưu độ sáng cho ánh sáng có sẵn. Khi tính năng này bật, bạn vẫn có thể chỉnh độ sáng tạm thời."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Đèn đọc sách"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Tính năng Đèn đọc sách phủ màu hổ phách cho màn hình. Điều này giúp bạn dễ nhìn màn hình hoặc đọc trong ánh sáng mờ hơn và có thể giúp bạn dễ ngủ hơn."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Lịch biểu"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Trạng thái"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Tự động bật"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Không bao giờ"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Lịch biểu tùy chỉnh"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Tối đến sáng"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Lịch biểu"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Không có"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Bật vào thời gian tùy chỉnh"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Bật từ tối đến sáng"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Thời gian bắt đầu"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Thời gian kết thúc"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Trạng thái"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Cường độ"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Tắt. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Sẽ không bao giờ tự động bật."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Sẽ tự động bật lúc <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Sẽ tự động bật lúc hoàng hôn."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Bật. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Sẽ không bao giờ tự động tắt."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Sẽ tự động tắt lúc <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Sẽ tự động tắt lúc bình minh."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Tắt / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Sẽ không bao giờ tự động bật"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Sẽ tự động bật lúc <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Sẽ tự động bật lúc hoàng hôn"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Bật / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Sẽ không bao giờ tự động tắt"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Sẽ tự động tắt lúc <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Sẽ tự động tắt lúc bình minh"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Ngủ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Màn hình tắt"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Sau khi không hoạt động <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Cài đặt"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Độ sáng tự động"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Nhấc lên để đánh thức"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Màn hình xung quanh"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Màn hình sáng"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Luôn bật"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Thông báo mới"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Thời điểm hiển thị"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Thông báo mới"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bật màn hình khi bạn nhận được thông báo"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Luôn bật"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Hiển thị thời gian, biểu tượng thông báo và các thông tin khác"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Kích thước phông chữ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Phóng to hoặc thu nhỏ văn bản"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Cài đặt khóa thẻ SIM"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN không được để trống."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Trường MCC phải có 3 chữ số."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Trường MNC phải có 2 hoặc 3 chữ số."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Nhà cung cấp dịch vụ không cho phép thêm APN thuộc loại %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Đang khôi phục cài đặt APN mặc định."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Đặt lại về mặc định"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Đặt lại cài đặt APN mặc định đã hoàn tất."</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Xóa thẻ SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Xóa tất cả dữ liệu trên bộ nhớ trong USB, chẳng hạn như nhạc hoặc ảnh"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Xóa tất cả dữ liệu trên thẻ SD, chẳng hạn như nhạc hoặc ảnh"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Xóa eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Xóa tất cả eSIM trên điện thoại. Thao tác này sẽ không hủy gói dịch vụ di động của bạn."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Xóa tất cả eSIM trên máy tính bảng. Thao tác này sẽ không hủy gói dịch vụ di động của bạn."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Đặt lại máy tính bảng"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Đặt lại điện thoại"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Xóa tất cả thông tin cá nhân và ứng dụng đã tải xuống của bạn? Bạn không thể hoàn tác thao tác này!"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Không thể chia sẻ kết nối hoặc sử dụng điểm phát sóng di động khi Trình tiết kiệm dữ liệu đang bật"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Chia sẻ kết nối Internet qua USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB đã kết nối, kiểm tra để dùng làm điểm truy cập Internet"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Được dùng làm điểm truy cập Internet"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Không thể dùng làm điểm truy cập Internet khi bộ lưu trữ USB được sử dụng"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB chưa được kết nối"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Hãy kết nối để bật"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Lỗi truy cập Internet qua USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Chia sẻ kết nối Internet của điện thoại qua USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Chia sẻ kết nối Internet của máy tính bảng qua USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Chia sẻ kết nối Internet qua Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Chia sẻ kết nối Internet của máy tính bảng này qua Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Chia sẻ kết nối Internet của điện thoại này qua Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Chia sẻ kết nối Internet của máy tính bảng này với 1 thiết bị qua Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Chia sẻ kết nối Internet của điện thoại này với 1 thiết bị qua Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Chia sẻ kết nối Internet của máy tính bảng này với <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> thiết bị qua Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Chia sẻ kết nối Internet của điện thoại này với <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> thiết bị qua Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Chia sẻ kết nối Internet của máy tính bảng qua Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Chia sẻ kết nối Internet của điện thoại qua Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Chia sẻ kết nối Internet của <xliff:g id="DEVICE_NAME">%1$d</xliff:g> này qua Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Không chia sẻ kết nối Internet của máy tính bảng này qua Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Không chia sẻ kết nối Internet của điện thoại này qua Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Không được dùng làm điểm truy cập Internet"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Không thể dùng làm điểm truy cập Internet cho hơn <xliff:g id="MAXCONNECTION">%1$d</xliff:g> thiết bị."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ được tháo."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Sử dụng điểm phát sóng và chia sẻ kết nối để cung cấp kết nối Internet cho các thiết bị khác thông qua kết nối dữ liệu di động của bạn."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Sử dụng điểm phát sóng và chia sẻ kết nối để cung cấp kết nối Internet cho các thiết bị khác thông qua kết nối dữ liệu di động của bạn. Ứng dụng cũng có thể tạo một điểm phát sóng để chia sẻ nội dung với các thiết bị lân cận."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Trợ giúp"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mạng di động"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Gói dịch vụ di động"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Chế độ vị trí"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Sử dụng GPS, Wi‑Fi, Bluetooth hoặc mạng di động để xác định vị trí"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Sử dụng Wi‑Fi, Bluetooth hoặc mạng di động để xác định vị trí"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Sử dụng GPS để xác định vị trí"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Sử dụng GPS và các cảm biến của thiết bị để xác định vị trí"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Đang quét"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Quét Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Cải thiện thông tin vị trí bằng cách cho phép các ứng dụng và dịch vụ hệ thống phát hiện mạng Wi‑Fi bất cứ lúc nào."</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Bạn chưa có kết nối dữ liệu. Để xem thông tin này ngay bây giờ, hãy truy cập %s từ bất kỳ máy tính nào đã kết nối với Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Đang tải…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Chọn mật khẩu của bạn"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Để dùng vân tay, đặt mật khẩu"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Chọn hình của bạn"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Để dùng vân tay, đặt hình m.khóa"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Chọn mã PIN của bạn"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Để dùng vân tay, đặt mã PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Xác nhận mật khẩu của bạn"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Xác nhận hình của bạn"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Xác nhận mã PIN của bạn"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Cài đặt ứng dụng"</string>
     <string name="install_applications" msgid="4872012136210802181">"Không rõ nguồn gốc"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Cho phép tất cả các nguồn ƯD"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Ứng dụng đã mở gần đây"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Xem tất cả <xliff:g id="COUNT">%1$d</xliff:g> ứng dụng"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"cách đây <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Máy tính bảng và dữ liệu cá nhân của bạn dễ bị các ứng dụng không xác định tấn công hơn. Bằng cách cài đặt ứng dụng từ nguồn này, bạn đồng ý tự chịu trách nhiệm cho mọi hỏng hóc đối với máy tính bảng của mình hoặc mất mát dữ liệu có thể phát sinh do sử dụng những ứng dụng này."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Điện thoại và dữ liệu cá nhân của bạn dễ bị các ứng dụng không xác định tấn công hơn. Bằng cách cài đặt ứng dụng từ nguồn này, bạn đồng ý tự chịu trách nhiệm cho mọi hỏng hóc đối với điện thoại của mình hoặc mất mát dữ liệu có thể phát sinh do sử dụng những ứng dụng này."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Cài đặt nâng cao"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Dừng dịch vụ hệ thống?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Nếu bạn dừng dịch vụ này, một số tính năng của máy tính bảng của bạn có thể ngừng hoạt động đúng cho tới khi bạn tắt rồi bật lại máy tính bảng."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Nếu bạn dừng dịch vụ này, một số tính năng của điện thoại của bạn có thể ngừng hoạt động đúng cho tới khi bạn tắt rồi bật lại điện thoại."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Ngôn ngữ, phương thức nhập và cử chỉ"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Ngôn ngữ và nhập liệu"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Ngôn ngữ và nhập liệu"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Hỗ trợ nhập liệu"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> dịch vụ in bật</item>
       <item quantity="one">1 dịch vụ in bật</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> lệnh in</item>
+      <item quantity="one">1 lệnh in</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Dịch vụ in"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Chưa có dịch vụ nào được cài đặt"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Không tìm thấy máy in"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Chi tiết sử dụng"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Điều chỉnh việc sử dụng nguồn"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Gói bao gồm"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Ứng dụng tiêu hao pin"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Giữ thiết bị ở chế độ bật"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Đánh thức thiết bị trong nền"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Thường xuyên yêu cầu vị trí"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ứng dụng hoạt động sai"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Dừng ứng dụng?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Điện thoại của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> đang giữ điện thoại ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể buộc dừng ứng dụng.\n\nNếu sự cố này vẫn tiếp diễn, bạn có thể cần phải gỡ cài đặt ứng dụng để cải thiện hiệu suất pin."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Máy tính bảng của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> đang giữ máy tính bảng ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể buộc dừng ứng dụng.\n\nNếu sự cố này vẫn tiếp diễn, bạn có thể cần phải gỡ cài đặt ứng dụng để cải thiện hiệu suất pin."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Thiết bị của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> đang giữ thiết bị ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể buộc dừng ứng dụng.\n\nNếu sự cố này vẫn tiếp diễn, bạn có thể cần phải gỡ cài đặt ứng dụng để cải thiện hiệu suất pin."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Dừng ứng dụng"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Tắt sử dụng trong nền?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Điện thoại của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> giữ điện thoại ở chế độ bật.\n\nĐể giải quyết vấn đề này, điện thoại của bạn có thể ngăn ứng dụng này chạy trong nền."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Máy tính bảng của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> giữ máy tính bảng ở chế độ bật.\n\nĐể giải quyết vấn đề này, máy tính bảng của bạn có thể ngăn ứng dụng này chạy trong nền."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Thiết bị của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> giữ thiết bị ở chế độ bật.\n\nĐể giải quyết vấn đề này, thiết bị của bạn có thể ngăn ứng dụng này chạy trong nền."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Tắt"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Tắt vị trí?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Điện thoại của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> không ngừng yêu cầu vị trí của bạn khi bạn không sử dụng ứng dụng.\n\nĐể khắc phục sự cố này, bạn có thể tắt vị trí cho ứng dụng này."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Máy tính bảng của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> không ngừng yêu cầu vị trí của bạn khi bạn không sử dụng ứng dụng.\n\nĐể khắc phục sự cố này, bạn có thể tắt vị trí cho ứng dụng này."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Thiết bị của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> không ngừng yêu cầu vị trí của bạn khi bạn không sử dụng ứng dụng.\n\nĐể khắc phục sự cố này, bạn có thể tắt vị trí cho ứng dụng này."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Tắt"</string>
     <string name="power_screen" msgid="3023346080675904613">"Màn hình"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Đèn pin"</string>
     <string name="power_camera" msgid="4976286950934622605">"Máy ảnh"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Ứng dụng"</string>
     <string name="power_service" msgid="1599661212370831780">"Dịch vụ"</string>
     <string name="power_system" msgid="8290455327965307383">"Hệ thống"</string>
-    <string name="power_user" msgid="1889728099253018005">"Người dùng"</string>
+    <string name="power_user" msgid="3706143225319881667">"Người dùng khác"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU tổng"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Nền trước CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Không khóa màn hình"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Sử dụng nguồn vượt mức"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Được sử dụng cho <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Hoạt động trong <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Thời gian sử dụng màn hình <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> được sử dụng bởi <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> trong tổng số thời lượng pin"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Thay đổi PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Hiển thị thông báo"</string>
     <string name="help_label" msgid="6886837949306318591">"Trợ giúp và phản hồi"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Bài viết trợ giúp, hỗ trợ qua điện thoại và trò chuyện"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Bài viết trợ giúp, điện thoại và trò chuyện, bắt đầu"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Tài khoản dành cho nội dung"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID ảnh"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Mối đe dọa cực kỳ nghiêm trọng"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">Hiển thị %d mục ẩn</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Mạng và Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, thiết bị di động, mức sử dụng dữ liệu, điểm phát sóng"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"thiết bị di động"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"sử dụng dữ liệu"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"điểm phát sóng"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Thiết bị đã kết nối"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Truyền, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Truyền"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Ứng dụng và thông báo"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Quyền, ứng dụng mặc định"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Người dùng và tài khoản"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"cử chỉ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"thanh toán, nhấn, khoản thanh toán"</string>
     <string name="keywords_backup" msgid="470070289135403022">"sao lưu"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"cử chỉ, cạnh, bên cạnh, active edge, vuốt, cầm nắm, hỗ trợ, trợ lý, ok google, trợ lý google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"cử chỉ, đánh thức, thông báo, màn hình, hiển thị, tắt màn hình, bật màn hình, vuốt, cạnh, buồn ngủ, ngủ, cầm nắm"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"cử chỉ, im lặng, báo lại, báo thức, cuộc gọi đến, im lặng, hiển thị, màn hình khóa, vuốt, cầm nắm, cạnh, dừng"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Thiết lập thẻ NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Ghi"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Nhấn vào một thẻ để ghi..."</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Không hiển thị thông báo công việc nào"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Khi thiết bị của bạn bị khóa, bạn muốn thông báo hồ sơ hiển thị như thế nào?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Thông báo hồ sơ"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Thông báo"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Thông báo"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Thông báo ứng dụng"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Loại thông báo"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Mức độ quan trọng"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Để ứng dụng quyết định"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Khẩn cấp"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Cho phép âm thanh"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Không phát ra âm thanh, rung hoặc hiển thị các thông báo này khi xem trên màn hình hiện tại."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Tầm quan trọng thấp"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Tầm quan trọng trung bình"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Tầm quan trọng cao"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Tầm quan trọng khẩn cấp"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Trợ lý thông báo"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Truy cập thông báo"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Quyền truy cập vào thông báo hồ sơ công việc bị chặn"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Ảnh trong ảnh"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Cho phép ảnh trong ảnh"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Cho phép ứng dụng tạo cửa sổ ảnh trong ảnh trong khi ứng dụng đang mở hoặc sau khi bạn rời khỏi ứng dụng đó (ví dụ: để tiếp tục xem video). Cửa sổ này sẽ hiển thị trên các ứng dụng khác mà bạn đang sử dụng."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Có"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Không"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Không làm phiền"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Không có ứng dụng được cài đặt nào yêu cầu quyền truy cập Không làm phiền"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Đang tải ứng dụng..."</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Hồ sơ công việc này được quản lý bằng:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Quản lý bởi <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Thử nghiệm)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Xoay thiết bị"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Xoay các nội dung của màn hình"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Giữ nguyên chế độ xem dọc"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Giữ nguyên chế độ xem ngang"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Giữ nguyên hướng hiện tại"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Khởi động an toàn"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Tiếp tục"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mã PIN trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức. \n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mã PIN để khởi động thiết bị của bạn?"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mật khẩu trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức. \n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mật khẩu để khởi động thiết bị của bạn?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Ngoài việc sử dụng vân tay để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mã PIN trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mã PIN để khởi động thiết bị của bạn?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Ngoài việc sử dụng vân tay để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu hình mở khóa trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu hình mở khóa để khởi động thiết bị của bạn?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Ngoài việc sử dụng vân tay để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mật khẩu trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mật khẩu để khởi động thiết bị của bạn&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Ngoài việc sử dụng vân tay để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mật khẩu trước khi thiết bị khởi động. Thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo bao gồm cả báo thức cho đến khi khởi động.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mật khẩu để khởi động thiết bị của bạn?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Có"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Không"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Yêu cầu mã PIN?"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Thông báo về mức sử dụng"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Hiển thị dữ liệu sử dụng thiết bị đầy đủ"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Hiển thị dữ liệu sử dụng ứng dụng"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Mức sử dụng cao"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ứng dụng đang hoạt động bất thường</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> đang hoạt động bất thường</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">Ứng dụng tiêu hao pin</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> tiêu hao pin</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Không được tối ưu hóa"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Không được tối ưu hóa"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Tối ưu hóa mức sử dụng pin"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Hiển thị trên các ứng dụng khác"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g> ứng dụng được phép hiển thị trên các ứng dụng khác"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Các ứng dụng có quyền"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Có"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Không"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Được phép"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Không được phép"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"cài đặt ứng dụng từ nguồn không xác định"</string>
     <string name="write_settings" msgid="4797457275727195681">"Sửa đổi cài đặt hệ thống"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"ghi/sửa đổi cài đặt hệ thống"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Màn hình được phủ màu hổ phách. Điều này có thể giúp bạn dễ ngủ."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Đề xuất"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> đề xuất"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> đề xuất</item>
+      <item quantity="one">1 đề xuất</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> đề xuất</item>
+      <item quantity="one">+1 đề xuất</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Xóa"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Nhiệt độ màu lạnh"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Sử dụng màu hiển thị lạnh hơn"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> cảnh báo dữ liệu"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> cảnh báo dữ liệu / <xliff:g id="ID_2">%2$s</xliff:g> giới hạn dữ liệu"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Chu kỳ thanh toán"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Chu kỳ hàng tháng bắt đầu vào <xliff:g id="ID_1">%1$s</xliff:g> mỗi tháng"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Hàng tháng, bắt đầu vào ngày <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Hàng tháng vào ngày <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Hạn chế của mạng"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> hạn chế</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">1 ứng dụng được phép sử dụng dữ liệu không hạn chế khi Trình tiết kiệm dữ liệu đang bật</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Trình tiết kiệm dữ liệu"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Tr.cập dữ liệu ko hạn chế"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Dữ liệu không hạn chế"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Dữ liệu nền bị tắt"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Bật"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Tắt"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Kiểm soát thông báo trên màn hình khóa"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Hiển thị hoặc ẩn nội dung thông báo"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Tất cả"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Hỗ trợ"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Hỗ trợ và mẹo"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Độ rộng nhỏ nhất"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Không có ứng dụng đã cài đặt nào yêu cầu quyền truy cập SMS cao cấp"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"SMS cao cấp có thể làm bạn mất tiền và sẽ tính thêm vào hóa đơn của nhà cung cấp dịch vụ của bạn. Nếu bạn bật quyền cho một ứng dụng, bạn sẽ có thể gửi SMS cao cấp bằng ứng dụng đó."</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Tự động"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Hướng dẫn sử dụng"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Giải phóng dung lượng ngay"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Cử chỉ"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Phím tắt cử chỉ"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Cử chỉ nhanh để kiểm soát điện thoại"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Cử chỉ nhanh để điều khiển máy tính bảng của bạn"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Cử chỉ nhanh để điều khiển thiết bị của bạn"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Chuyển đến máy ảnh"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Để mở nhanh máy ảnh, hãy nhấn vào nút nguồn 2 lần. Hoạt động từ mọi màn hình."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Mở nhanh máy ảnh"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Nhấn nút nguồn hai lần để mở máy ảnh"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Chuyển máy ảnh"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Tự chụp ảnh mình nhanh hơn"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Xoay điện thoại 2 lần để sử dụng chế độ tự chụp ảnh mình"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Xoay máy tính bảng 2 lần để sử dụng chế độ tự chụp ảnh mình"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Xoay thiết bị 2 lần để sử dụng chế độ tự chụp ảnh mình"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Nhấn đúp để kiểm tra điện thoại"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Nhấn đúp để kiểm tra máy tính bảng"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Nhấn đúp để kiểm tra thiết bị"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Để kiểm tra nhanh thông báo, nhấn đúp vào màn hình."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Để kiểm tra thời gian, biểu tượng thông báo và thông tin khác, hãy nhấn đúp vào màn hình."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Kiểm tra thông báo khi màn hình tắt"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Nhấc để kiểm tra điện thoại"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Nhấc để kiểm tra máy tính bảng"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Nhấc để kiểm tra thiết bị"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Để kiểm tra nhanh thông báo, hãy nhấc điện thoại lên."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Để kiểm tra nhanh thông báo, hãy nhấc máy tính bảng lên."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Để kiểm tra nhanh thông báo, hãy nhấc thiết bị lên."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Để kiểm tra thời gian, biểu tượng thông báo và thông tin khác, hãy nhấc điện thoại lên."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Để kiểm tra thời gian, biểu tượng thông báo và thông tin khác, hãy nhấc máy tính bảng lên."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Để kiểm tra thời gian, biểu tượng thông báo và thông tin khác, hãy nhấc thiết bị lên."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Kiểm tra thông báo khi màn hình tắt"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Vuốt dấu vân tay để xem thông báo"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Để kiểm tra thông báo, hãy vuốt xuống trên cảm biến vân tay ở mặt sau điện thoại."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Để kiểm tra thông báo, hãy vuốt xuống trên cảm biến vân tay ở mặt sau máy tính bảng."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Để kiểm tra thông báo, hãy vuốt xuống trên cảm biến vân tay ở mặt sau thiết bị."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Xem nhanh thông báo"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Vuốt xuống trên cảm biến vân tay"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Nâng lên để mở máy ảnh"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Để tự động mở máy ảnh, hãy nhấc điện thoại vào vị trí chụp ảnh (ngang hoặc dọc). Hoạt động khi điện thoại của bạn ở chế độ ngủ hoặc bị khóa."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Chụp ảnh khi điện thoại ở chế độ ngủ hoặc bị khóa"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Cử chỉ hỗ trợ"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Độ nhạy cảm"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Bạn có muốn xóa ứng dụng tức thì này không?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Trò chơi"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Tệp âm thanh"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Dung lượng đã sử dụng"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(gỡ cài đặt cho người dùng <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(đã tắt cho người dùng <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Dịch vụ tự động điền"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Ứng dụng tức thì"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Tắt trình quản lý bộ nhớ?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Ứng dụng TV và Phim"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Dung lượng đã sử dụng"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Thông tin cấp phép của nhà cung cấp dịch vụ"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Kích hoạt cấp phép của nhà cung cấp dịch vụ"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Có gì mới và thú vị?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Dùng thử 5 tính năng hàng đầu"</string>
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 1005c8a..cf3af7a 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"良好"</item>
     <item msgid="8986346415847956850">"极佳"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"始终"</item>
-    <item msgid="844721238536786870">"仅限充电时"</item>
-    <item msgid="1986753720941888596">"永不"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"始终"</item>
-    <item msgid="7433294150916905997">"仅限充电时"</item>
-    <item msgid="1390404486722375028">"永不"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"过去30天"</item>
     <item msgid="6600989128423965319">"设置流量周期…"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2021d94..7567187 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"您现在处于开发者模式！"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"您已处于开发者模式，无需进行此操作。"</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"请先启用开发者选项。"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"无线和网络"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"无线和网络"</string>
     <string name="header_category_device" msgid="4544026001618307754">"设备"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"已配置 VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"已配置视频通话"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"已配置 WLAN 通话"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"已配置 EAB/Presence"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"移动无线装置电源"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"查看 SIM 卡通讯录"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"查看固定拨号号码"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"扫描设备"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"重命名此设备"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"重命名"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"要断开连接吗？"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"此操作将会断开您与以下设备的连接：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"要断开与该设备的连接吗？"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"您的手机将断开与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>的连接。"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"您的平板电脑将断开与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>的连接。"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"您的设备将断开与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>的连接。"</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"断开连接"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"您无权更改蓝牙设置。"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"与新设备配对"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"在 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 上开启蓝牙设置后，附近的设备将可以检测到该设备。"</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"手机的蓝牙地址：<xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"平板电脑的蓝牙地址：<xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"设备的蓝牙地址：<xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"要断开与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>的连接吗？"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"广播"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"要停用配置文件吗？"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"蓝牙配对请求"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"配对请求"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"点按即可与“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”配对。"</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"显示收到的文件"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"收到的文件"</string>
     <string name="device_picker" msgid="4978696506172252813">"选择蓝牙设备"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g>请求开启蓝牙"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g>请求关闭蓝牙"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"“%1$s”想要查看您的消息。要向“%2$s”授予权限吗？"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM 访问权限请求"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>想要访问您的 SIM 卡。如果授权该设备访问 SIM 卡，您设备的数据连接功能在蓝牙连接期间将停用。将访问权限授予<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"向其他设备显示为“<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"您的设备"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"与新设备配对"</string>
     <string name="date_and_time" msgid="9062980487860757694">"日期和时间"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"选择时区"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"帐号"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"位置信息"</string>
     <string name="account_settings_title" msgid="626177544686329806">"帐号"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"安全性与位置信息"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"安全性和位置"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"加密与凭据"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"手机已加密"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"设备已加密"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"使用指纹解锁"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"使用指纹"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"只需触摸指纹传感器即可解锁您的手机、对购买交易进行授权或登录应用。请务必谨慎添加指纹，因为添加的任何指纹都能够用来执行上述操作。\n\n请注意：指纹识别的安全性可能不及安全系数高的图案或 PIN 码。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"只需触摸指纹传感器即可对购买交易进行授权或登录应用。请务必谨慎添加指纹，因为添加的任何指纹都能够用来执行上述操作。\n\n注意：您无法使用指纹来解锁此设备。要了解详情，请与贵单位的管理员联系。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"只需触摸指纹传感器即可解锁您的手机、对购买交易进行授权或登录应用。请务必谨慎添加指纹，因为添加的任何指纹都能够用来执行上述操作。\n\n请注意：指纹识别的安全性可能不及安全系数高的图案或 PIN 码。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"使用指纹解锁手机或批准购买交易。\n\n请注意：您无法使用指纹来解锁此设备。要了解详情，请与贵单位的管理员联系。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"使用指纹解锁手机或批准购买交易。\n\n请注意：指纹的安全性可能不及安全系数高的图案或 PIN 码。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"取消"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"继续"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"跳过"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"添加指纹"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"系统将不会启用设备保护功能。如果您的平板电脑丢失、被盗，或者其中的数据遭到清空，您将无法防止他人使用此平板电脑。"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"系统将不会启用设备保护功能。如果您的设备丢失、被盗，或者其中的数据遭到清空，您将无法防止他人使用此设备。"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"系统将不会启用设备保护功能。如果您的手机丢失、被盗，或者其中的数据遭到清空，您将无法防止他人使用此手机。"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"系统将不会启用设备保护功能。如果您的平板电脑丢失或被盗，您将无法防止他人使用此平板电脑。"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"系统将不会启用设备保护功能。如果您的设备丢失或被盗，您将无法防止他人使用此设备。"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"系统将不会启用设备保护功能。如果您的手机丢失或被盗，您将无法防止他人使用此手机。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"下一屏幕"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"系统将不会启用设备保护功能。如果您的平板电脑丢失、被盗或被重置，您将无法防止他人使用此平板电脑。"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"系统将不会启用设备保护功能。如果您的设备丢失、被盗或被重置，您将无法防止他人使用此设备。"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"系统将不会启用设备保护功能。如果您的手机丢失、被盗或被重置，您将无法防止他人使用此手机。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"系统将不会启用设备保护功能。如果您的平板电脑丢失或被盗，您将无法防止他人使用此平板电脑。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"系统将不会启用设备保护功能。如果您的设备丢失或被盗，您将无法防止他人使用此设备。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"系统将不会启用设备保护功能。如果您的手机丢失或被盗，您将无法防止他人使用此手机。"</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"仍然跳过"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"返回"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"寻找传感器"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"您可以在手机背面找到指纹传感器。"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"触摸传感器"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"指纹传感器位于您手机的背面。请用食指触摸传感器。"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"关于设备和指纹传感器位置的图示说明"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"名称"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"确定"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"删除"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"我们开始吧"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"触摸传感器"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"将您的手指放在指纹传感器上，感觉到振动后移开手指"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"继续触摸"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"略微移动手指，以便传感器更完整地记录下您的指纹"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"指纹已添加！"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"只要您看见此图标，就可以使用指纹进行身份验证或对购买交易进行授权。"</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"只需触摸指纹传感器即可唤醒并解锁设备。"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"当您看到此图标时，您还可以对购买交易进行授权或登录应用。"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"移开手指，然后再次触摸传感器"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"不时地移开手指，以便传感器更完整地记录下您的指纹"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"指纹已添加"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"当您看见此图标时，请使用您的指纹进行身份验证或批准购买交易。"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"要跳过指纹设置？"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"您已选择使用指纹作为解锁手机的方式之一。如果您现在跳过这项设置，则以后还需要再进行设置。设置过程只需大约一分钟的时间。"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"设置屏幕锁定"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"完成"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"糟糕，这不是传感器"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"使用您设备上的指纹传感器。"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"请用您的食指触摸位于手机背面的传感器。"</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"未完成注册"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"指纹注册操作超时，请重试。"</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"无法注册指纹。请重试或使用其他手指。"</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"启用设备保护功能可防止他人在未经您允许的情况下使用此设备。请选择您要使用的屏幕锁定方式。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"启用设备保护功能可防止他人在未经您允许的情况下使用此手机。请选择您要使用的屏幕锁定方式。"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"选择您的备用屏幕锁定方式"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"屏幕锁定选项"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"屏幕锁定选项"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"屏幕锁定"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / 休眠后立即启动"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / 休眠 <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g>后启动"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"更改解锁图案"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"更改解锁PIN码"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"更改解锁密码"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"请重试。您目前已尝试 <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> 次，最多可尝试 <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> 次。"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"最后一次尝试"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"如果您这次绘制的工作解锁图案仍然有误，您的工作资料和相关数据都将从此设备中移除。"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"如果您这次输入的工作 PIN 码仍然有误，您的工作资料和相关数据都将从此设备中移除。"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"如果您这次输入的工作密码仍然有误，您的工作资料和相关数据都将从此设备中移除。"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"错误次数过多。您的工作资料和相关数据将会从此设备中移除。"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"关闭"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"请重试。您目前已尝试 <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> 次，最多可尝试 <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> 次。"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"您的数据将遭到删除"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"如果您下次绘制的解锁图案仍然有误，系统将删除此设备上的数据"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"如果您下次输入的 PIN 码仍然有误，系统将删除此设备上的数据"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"如果您下次输入的密码仍然有误，系统将删除此设备上的数据"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"如果您下次绘制的解锁图案仍然有误，系统将删除此用户"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"如果您下次输入的 PIN 码仍然有误，系统将删除此用户"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"如果您下次输入的密码仍然有误，系统将删除此用户"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"如果您下次绘制的解锁图案仍然有误，系统将删除您的工作资料和相关数据"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"如果您下次输入的 PIN 码仍然有误，系统将删除您的工作资料和相关数据"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"如果您下次输入的密码仍然有误，系统将删除您的工作资料和相关数据"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"错误次数过多。系统将删除此设备上的数据。"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"错误次数过多。系统将删除此用户。"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"错误次数过多。系统将删除此工作资料和相关数据。"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"关闭"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"必须至少包含 <xliff:g id="COUNT">%d</xliff:g> 个字符"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN 码必须至少为 <xliff:g id="COUNT">%d</xliff:g> 位数"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"继续"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"高级蓝牙设置"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"开启蓝牙后，您的设备可以与附近的其他蓝牙设备通信。"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"为了提高位置信息的精确度，系统应用和服务仍然会检测蓝牙设备。您可以在<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>扫描设置<xliff:g id="LINK_END_1">LINK_END</xliff:g>中更改此设置。"</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"无法连接，请重试。"</string>
+    <string name="device_details_title" msgid="6576953269221085300">"设备详细信息"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"设备的蓝牙地址：<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"要与该设备取消配对吗？"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"您的手机将与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>取消配对"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"您的平板电脑将与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>取消配对"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"您的设备将与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>取消配对"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"与设备取消配对"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"连接到..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>将与媒体音频断开连接。"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>将与免提音频断开连接。"</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"不提供"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"不验证"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"未指定任何证书。您的网络连接将不是私密连接。"</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"网络名称太长。"</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"必须指定网域。"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"可使用 WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" （可使用 WPS）"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 个网络</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"高级WLAN"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"配置 WLAN"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC地址"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP 地址"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"子网掩码"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"取消保存此群组？"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"便携式WLAN热点"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"WLAN热点"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"使用移动网络连接提供 WLAN 网络"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"不通过热点共享该平板电脑的互联网连接"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"不通过热点共享该手机的互联网连接"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"目前没有与其他设备共享互联网连接或内容"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"正在通过热点共享此平板电脑的互联网连接"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"正在通过热点共享此手机的互联网连接"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"应用正在共享内容。要共享互联网连接，请先关闭热点，然后重新打开"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"WLAN 名称"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"正在打开<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"其他设备可以连接到<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"WLAN 密码"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP 频段"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"使用热点创建 WLAN 网络供其他设备使用。热点会使用您的移动数据连接提供互联网连接。这可能会产生额外的移动数据流量费用。"</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"应用可以通过创建热点，与附近的设备共享内容。"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"正在打开热点..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"正在关闭热点..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> 已连接"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"开启“WLAN 通话”功能后，您的手机可根据您的偏好设置，通过 WLAN 网络或您的运营商网络通话（具体取决于哪个网络信号较强）。开启此功能之前，请先向您的运营商咨询收费情况及其他详情。"</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"更新紧急地址"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"当您使用 WLAN 拨打 911 时，紧急服务会将此地址视为您所在位置的地址"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"显示"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"没有结果"</string>
     <string name="display_settings" msgid="7965901687241669598">"显示"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"自动旋转屏幕"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"鲜明的色彩"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"旋转平板电脑时自动改变浏览模式"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"旋转手机时自动改变显示方向"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"旋转平板电脑时自动切换浏览模式"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"根据环境光线情况优化亮度。开启此功能后，您仍然可以暂时调整亮度。"</string>
     <string name="night_display_title" msgid="2626451512200357686">"夜间模式"</string>
     <string name="night_display_text" msgid="1837277457033025056">"夜间模式会将您的屏幕色调调节为琥珀色，让您在光线昏暗的环境下可以更舒适地查看屏幕或阅读文字，并可能有助于您入睡。"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"排定时间"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"状态"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"自动开启"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"永不"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"自定义时间安排"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"日落到日出"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"排定时间"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"无"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"在自定义的时间开启"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"在日落到日出期间开启"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"开始时间"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"结束时间"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"状态"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"浓度"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"关闭。<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"一律不自动开启。"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"将在<xliff:g id="ID_1">%1$s</xliff:g>自动开启。"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"将在日落时自动开启。"</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"开启。<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"一律不自动关闭。"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"将在<xliff:g id="ID_1">%1$s</xliff:g>自动关闭。"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"将在日出时自动关闭。"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"关闭 / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"一律不自动开启"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"将在<xliff:g id="ID_1">%1$s</xliff:g>自动开启"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"将在日落时自动开启"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"开启 / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"一律不自动关闭"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"将在<xliff:g id="ID_1">%1$s</xliff:g>自动关闭"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"将在日出时自动关闭"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"休眠"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"屏幕关闭"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"无操作<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"设置"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"自动调整亮度"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"拿起设备时唤醒"</string>
-    <string name="doze_title" msgid="2259176504273878294">"主动显示"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"主动显示"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"始终开启"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"新通知"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"何时显示"</string>
+    <string name="doze_title" msgid="2375510714460456687">"新通知"</string>
     <string name="doze_summary" msgid="3846219936142814032">"收到通知时唤醒屏幕"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"始终开启"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"显示时间、通知图标和其他信息"</string>
     <string name="title_font_size" msgid="4405544325522105222">"字体大小"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"放大或缩小文字"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM卡锁定设置"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN 不能为空。"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC 字段必须为 3 位数。"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC 字段必须为 2 位数或 3 位数。"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"运营商不允许添加“%s”类型的 APN。"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"正在恢复默认 APN 设置。"</string>
     <string name="menu_restore" msgid="8260067415075573273">"重置为默认设置"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"已重置默认APN设置。"</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"格式化SD卡"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"清除该内部USB存储设备中的全部数据，例如音乐或照片"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"清除SD卡中的全部数据，例如音乐或照片"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"清空 eSIM 卡"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"清空手机上的所有 eSIM 卡。此操作并不会取消您的移动服务套餐。"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"清空平板电脑上的所有 eSIM 卡。此操作并不会取消您的移动服务套餐。"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"恢复平板电脑出厂设置"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"恢复手机出厂设置"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"要清空您的所有个人信息和下载的应用吗？此操作无法撤消！"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"当流量节省程序开启时，无法使用网络共享功能或便携式热点"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB网络共享"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"已连接USB，选中即可共享网络"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"已共享网络"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"使用USB存储设备时无法共享网络"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB未连接"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"连接USB后即可开启"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB网络共享出错"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"通过 USB 共享手机的互联网连接"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"通过 USB 共享平板电脑的互联网连接"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"蓝牙网络共享"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"通过蓝牙共享该平板电脑的互联网连接"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"通过蓝牙共享该手机的互联网连接"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"通过蓝牙与 1 台设备共享该平板电脑的互联网连接"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"通过蓝牙与 1 台设备共享该手机的互联网连接"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"通过蓝牙与 <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> 台设备共享该平板电脑的互联网连接"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"通过蓝牙与 <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> 台设备共享该手机的互联网连接"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"通过蓝牙共享平板电脑的互联网连接"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"通过蓝牙共享手机的互联网连接"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"通过蓝牙共享该<xliff:g id="DEVICE_NAME">%1$d</xliff:g>的互联网连接"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"不通过蓝牙共享该平板电脑的互联网连接"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"不通过蓝牙共享该手机的互联网连接"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"未共享网络"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"无法与 <xliff:g id="MAXCONNECTION">%1$d</xliff:g> 台以上的设备共享网络。"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"即将断开与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>的网络共享。"</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"使用热点和网络共享功能，通过您的移动数据连接向其他设备提供互联网连接。"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"使用热点和网络共享功能，通过您的移动数据连接向其他设备提供互联网连接。应用还可以通过创建热点，与附近的设备共享内容。"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"帮助"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"移动网络"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"手机套餐"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"位置信息模式"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"使用 GPS、WLAN、蓝牙或移动网络确定位置"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"使用 WLAN、蓝牙或移动网络确定位置"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"使用 GPS 确定位置"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"使用 GPS 和设备传感器确定位置"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"扫描"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"WLAN 扫描"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"允许系统应用和服务随时检测 WLAN 网络，以便提高位置信息的精确度。"</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"您没有数据连接。要立即查看此信息，请使用联网的计算机访问%s。"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"正在加载..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"选择您的密码"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"要使用指纹，请设置密码"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"选择您的图案"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"要使用指纹，请设置解锁图案"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"选择PIN码"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"要使用指纹，请设置 PIN 码"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"确认您的密码"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"确认您的图案"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"确认 PIN 码"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"应用设置"</string>
     <string name="install_applications" msgid="4872012136210802181">"未知来源"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"允许所有应用来源"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"最近打开的应用"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"查看全部 <xliff:g id="COUNT">%1$d</xliff:g> 个应用"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g>前"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"您的平板电脑和个人数据更容易受到未知应用的攻击。安装来自该来源的应用即表示，您同意对因使用这些应用可能导致的平板电脑损坏或数据丢失承担责任。"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"您的手机和个人数据更容易受到未知应用的攻击。安装来自该来源的应用即表示，您同意对因使用这些应用可能导致的手机损坏或数据丢失承担责任。"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"高级设置"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"要停止系统服务吗？"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"如果停止此服务，您平板电脑上的某些功能也将随之停止工作，并在您将平板电脑关机然后再重新打开后才能使用。"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"如果停止此服务，您手机上的某些功能也将随之停止工作，并在您将手机关机然后再重新打开后才能使用。"</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"语言、输入法和手势"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"语言和输入法"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"语言和输入法"</string>
     <string name="input_assistance" msgid="7577795275222555487">"输入帮助"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other">已开启 <xliff:g id="COUNT">%1$d</xliff:g> 项打印服务</item>
       <item quantity="one">已开启 1 项打印服务</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> 项打印任务</item>
+      <item quantity="one">1 项打印任务</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"打印服务"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"未安装任何服务"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"找不到打印机"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"详细使用情况"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"省电提示"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"包含的软件包"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"多个应用正在消耗大量电池电量"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"使设备保持唤醒状态"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"在后台唤醒设备"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"请求获取位置信息的频率过高"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> 个应用出现异常"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"要停止该应用吗？"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"由于“<xliff:g id="APP">%1$s</xliff:g>”一直让手机保持唤醒状态，因此您的手机无法正常管理电池。\n\n要尝试解决此问题，您可以强行停止该应用。\n\n如果问题仍然存在，您可能需要卸载此应用，以改善电池效能。"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"由于“<xliff:g id="APP">%1$s</xliff:g>”一直让设备保持唤醒状态，因此您的平板电脑无法正常管理电池。\n\n要尝试解决此问题，您可以强行停止该应用。\n\n如果问题仍然存在，您可能需要卸载此应用，以改善电池效能。"</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"由于“<xliff:g id="APP">%1$s</xliff:g>”一直让设备保持唤醒状态，因此您的设备无法正常管理电池。\n\n要尝试解决此问题，您可以强行停止该应用。\n\n如果问题仍然存在，您可能需要卸载此应用，以改善电池效能。"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"停止应用"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"要关闭后台使用功能吗？"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"由于“<xliff:g id="APP">%1$s</xliff:g>”一直让手机保持唤醒状态，因此您的手机无法正常管理电池。\n\n要解决此问题，请将您的手机设置为禁止此应用在后台运行。"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"由于“<xliff:g id="APP">%1$s</xliff:g>”一直让平板电脑保持唤醒状态，因此您的平板电脑无法正常管理电池。\n\n要解决此问题，请将您的平板电脑设置为禁止此应用在后台运行。"</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"由于“<xliff:g id="APP">%1$s</xliff:g>”一直让设备保持唤醒状态，因此您的设备无法正常管理电池。\n\n要解决此问题，请将您的设备设置为禁止此应用在后台运行。"</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"关闭"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"要关闭位置信息服务吗？"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"由于“<xliff:g id="APP">%1$s</xliff:g>”在您并未使用它时仍一直请求获取您的位置信息，因此您的手机无法正常管理电池。\n\n要解决这个问题，请关闭此应用的位置信息服务。"</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"由于“<xliff:g id="APP">%1$s</xliff:g>”在您并未使用它时仍一直请求获取您的位置信息，因此您的平板电脑无法正常管理电池。\n\n要解决这个问题，请关闭此应用的位置信息服务。"</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"由于“<xliff:g id="APP">%1$s</xliff:g>”在您并未使用它时仍一直请求获取您的位置信息，因此您的设备无法正常管理电池。\n\n要解决这个问题，请关闭此应用的位置信息服务。"</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"关闭"</string>
     <string name="power_screen" msgid="3023346080675904613">"屏幕"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"手电筒"</string>
     <string name="power_camera" msgid="4976286950934622605">"相机"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"应用"</string>
     <string name="power_service" msgid="1599661212370831780">"服务"</string>
     <string name="power_system" msgid="8290455327965307383">"系统"</string>
-    <string name="power_user" msgid="1889728099253018005">"用户"</string>
+    <string name="power_user" msgid="3706143225319881667">"其他用户"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU总使用时间"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU（前台）"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"保持唤醒状态"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"多算了的用电量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>毫安时"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"使用时间：<xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"使用时间：<xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"屏幕使用时间：<xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>用电量占 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"整体用电量的 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2563,7 +2634,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"更改PIN码"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"显示通知"</string>
     <string name="help_label" msgid="6886837949306318591">"帮助和反馈"</string>
-    <string name="support_summary" msgid="8276116616493882830">"帮助文章、电话与聊天支持"</string>
+    <string name="support_summary" msgid="2705726826263742491">"帮助文章、电话与聊天支持、使用入门"</string>
     <string name="user_account_title" msgid="1127193807312271167">"内容帐号"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"照片 ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"极端威胁"</string>
@@ -2653,9 +2724,12 @@
       <item quantity="one">显示 %d 项隐藏内容</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"网络和互联网"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"WLAN、移动、流量消耗、热点"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"移动网络"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"流量使用"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"热点"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"已关联的设备"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"蓝牙、投射、NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"蓝牙、投射"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"应用和通知"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"权限、默认应用"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"用户和帐号"</string>
@@ -2708,6 +2782,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"手势"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"支付、点按、付款"</string>
     <string name="keywords_backup" msgid="470070289135403022">"备份内容, 备份"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"手势, 边缘, 侧边, 活动边, 握紧, 持握, 辅助, 智能助理, 压握, 握紧, 挤压, 紧握, Ok Google, Google 智能助理"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"手势, 唤醒, 通知, 屏幕, 显示屏, 屏幕关闭, 屏幕开启, 握紧, 边缘, 休眠, 睡眠, 持握"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"手势, 静音, 暂停, 闹钟, 来电, 勿扰, 显示屏, 锁定屏幕, 握紧, 持握, 边缘, 停止"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"设置WLAN NFC标签"</string>
     <string name="write_tag" msgid="8571858602896222537">"写入"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"点按标签即可写入…"</string>
@@ -2790,7 +2867,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"一律不显示工作通知"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"在设备锁定时，您希望个人资料通知如何显示？"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"个人资料通知"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"通知"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"通知"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"应用通知"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"通知类别"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"重要程度"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"让应用决定"</string>
@@ -2805,6 +2883,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"紧急"</string>
     <string name="allow_sound" msgid="1820188704793497324">"允许发出提示音"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"不发出提示音，不振动，也不在当前屏幕上短暂显示这些通知。"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"重要性：低"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"重要性：中等"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"重要性：高"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"重要性：紧急"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"通知助手"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"通知使用权"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"已禁止访问工作资料通知"</string>
@@ -2832,8 +2914,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"画中画"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"允许进入画中画模式"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"允许此应用在您打开或离开应用（如继续观看视频）时创建画中画窗口。该窗口会显示在您当前使用的其他应用的上层。"</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"是"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"否"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"“勿扰”权限"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"没有任何已安装应用申请“勿扰”权限"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在加载应用…"</string>
@@ -2964,11 +3044,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"此工作资料由以下应用管理："</string>
     <string name="managing_admin" msgid="8843802210377459055">"由<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>管理"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"（实验性）"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"设备旋转"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"旋转屏幕内容方向"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"保持纵向"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"保持横向"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"保持当前方向"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"安全启动"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"继续"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"为了进一步保护此设备的安全，您可以将设备设为需要输入 PIN 码才能启动。在设备启动之前，无法接听电话、接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要输入 PIN 码才能启动吗？"</string>
@@ -2976,7 +3051,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"为了进一步保护此设备的安全，您可以将设备设为需要输入密码才能启动。在设备启动之前，无法接听电话、接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要输入密码才能启动吗？"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"为了进一步保护此设备的安全，除了使用指纹解锁设备之外，您还可以将设备设为需要输入 PIN 码才能启动。在设备启动之前，无法接听电话、接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要输入 PIN 码才能启动吗？"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"为了进一步保护此设备的安全，除了使用指纹解锁设备之外，您还可以将设备设为需要绘制解锁图案才能启动。在设备启动之前，无法接听电话、接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要绘制解锁图案才能启动吗？"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"为了进一步保护此设备的安全，除了使用指纹解锁设备之外，您还可以将设备设为需要输入密码才能启动。在设备启动之前，无法接听电话、接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要输入密码才能启动吗？"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"为了进一步保护此设备的安全，除了使用指纹解锁设备之外，您还可以将设备设为需要输入密码才能启动。在设备启动之前，无法接听电话、接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要输入密码才能启动吗？"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"是"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"否"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"要求输入 PIN 码吗？"</string>
@@ -3094,6 +3169,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"电池用量提醒"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"显示完整的设备用电量"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"显示应用使用情况"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"耗电量高"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> 个应用的行为异常</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g>的行为异常</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">多个应用正在消耗大量电池电量</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g>正在消耗大量电池电量</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"未优化"</string>
     <string name="high_power_on" msgid="6216293998227583810">"未优化"</string>
     <string name="high_power_off" msgid="3393904131961263278">"优化电池使用"</string>
@@ -3186,8 +3270,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"显示在其他应用的上层"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> 个（共 <xliff:g id="COUNT_1">%2$d</xliff:g> 个）应用可以显示在其他应用的上层"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"具有该权限的应用"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"允许"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"不允许"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"允许"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"不允许"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"安装应用 未知来源"</string>
     <string name="write_settings" msgid="4797457275727195681">"修改系统设置"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"写入 修改 系统 设置"</string>
@@ -3277,6 +3361,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"屏幕已变成琥珀色，这可能有助于您安然入睡。"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"建议"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"另外 <xliff:g id="ID_1">%1$d</xliff:g> 条"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> 条建议</item>
+      <item quantity="one">1 条建议</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">另外 <xliff:g id="COUNT">%1$d</xliff:g> 条建议</item>
+      <item quantity="one">另外 1 条建议</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"移除"</string>
     <string name="color_temperature" msgid="2070126836910615605">"冷色温"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用较冷的显示颜色"</string>
@@ -3295,8 +3388,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"流量警告：<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"流量警告：<xliff:g id="ID_1">%1$s</xliff:g>/流量上限：<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"结算周期"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"每月结算周期从当月 <xliff:g id="ID_1">%1$s</xliff:g>日开始"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"每月 <xliff:g id="ID_1">%1$s</xliff:g>日开始"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"每月 <xliff:g id="ID_1">%1$s</xliff:g> 日"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"网络流量限制"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> 项限制</item>
@@ -3316,7 +3408,7 @@
       <item quantity="one">已允许 1 个应用在流量节省程序开启时无限量使用数据流量。</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"流量节省程序"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"不受流量限制"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"不受流量限制"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"后台数据已关闭"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"开启"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"关闭"</string>
@@ -3380,8 +3472,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"控制锁定屏幕通知"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"显示或隐藏通知内容"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"全部"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"支持"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"支持和提示"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"最小宽度"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"没有任何已安装的应用申请付费短信权限"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"“付费短信”可能会产生费用，而且相关费用将计入您的运营商帐单。如果您为某个应用启用该权限，那么您将能够使用该应用发送付费短信。"</string>
@@ -3446,28 +3537,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"自动"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"手动"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"立即释放空间"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"手势"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"手势快捷方式"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"通过简单手势控制手机"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"通过简单手势控制平板电脑"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"通过简单手势控制设备"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"快速打开相机"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"要快速打开相机，请按两次电源按钮（适用于任何屏幕）。"</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"快速打开相机"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"按电源按钮两次即可打开相机"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"切换相机模式"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"自拍更便捷"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"扭转手机两次即可开启自拍模式"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"扭转平板电脑两次即可开启自拍模式"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"扭转设备两次即可开启自拍模式"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"点按两次即可查看手机"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"点按两次即可查看平板电脑"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"点按两次即可查看设备"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"要快速查看通知，请在屏幕上点按两次。"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"点按两次屏幕即可查看时间、通知图标和其他信息。"</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"屏幕关闭时查看通知"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"触碰即主动显示"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"拿起平板电脑即可查看"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"拿起设备即可查看"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"要快速查看通知，请拿起您的手机。"</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"要快速查看通知，请拿起您的平板电脑。"</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"要快速查看通知，请拿起您的设备。"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"拿起您的手机即可查看时间、通知图标和其他信息。"</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"拿起您的平板电脑即可查看时间、通知图标和其他信息。"</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"要查看时间、通知图标和其他信息，请拿起您的设备。"</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"屏幕关闭时查看通知"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"滑动指纹即可查看通知"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"要查看通知，请在手机背面的指纹传感器上向下滑动手指。"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"要查看通知，请在平板电脑背面的指纹传感器上向下滑动手指。"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"要查看通知，请在设备背面的指纹传感器上向下滑动手指。"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"快速查看通知"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"在指纹传感器上向下滑动手指"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"拿起手机时让相机打开"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"要让相机自动打开，只需将手机拿起来并做出拍照（横向或纵向）动作即可。此功能适用于手机处于休眠或锁定状态时。"</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"在手机处于休眠或锁定状态下时拍照"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"辅助手势"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"敏感度"</string>
@@ -3571,6 +3675,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"要移除这个免安装应用吗？"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"游戏"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"音频文件"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"已用空间"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"（已为用户<xliff:g id="USER">%s</xliff:g>卸载）"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"（已为用户<xliff:g id="USER">%s</xliff:g>停用）"</string>
     <string name="autofill_app" msgid="7338387238377914374">"自动填充服务"</string>
@@ -3584,5 +3689,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"免安装应用"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"要关闭存储空间管理器吗？"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"影视应用"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"已用空间"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"运营商配置信息"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"触发运营商配置"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"新增了哪些精彩功能？"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"查看前 5 大热门功能"</string>
 </resources>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index 4cb0452..ba1fe3a 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"強"</item>
     <item msgid="8986346415847956850">"非常強"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"永遠"</item>
-    <item msgid="844721238536786870">"只在充電時"</item>
-    <item msgid="1986753720941888596">"永不"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"永遠"</item>
-    <item msgid="7433294150916905997">"只在充電時"</item>
-    <item msgid="1390404486722375028">"永不"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"最近 30 天"</item>
     <item msgid="6600989128423965319">"設定用量週期…"</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 4ce9d45..131c681 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"您現已成為開發人員！"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"不需要了，您已經是開發人員。"</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"請先啟用開發人員選項。"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"無線與網絡"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"連線"</string>
     <string name="header_category_device" msgid="4544026001618307754">"裝置"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"已佈建 VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"已佈建視像通話"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"已佈建 Wi-Fi 通話"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"已佈建 EAB/Presence"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"流動無線電的電源"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"查看 SIM 卡通訊錄"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"查看固定撥號"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"掃瞄裝置"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"重新命名這部裝置"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"重新命名"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"中斷連線？"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"這樣會結束您與下列裝置的連線：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"要解除連結裝置嗎？"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"您的手機將會與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 解除連結。"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"您的平板電腦將會與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 解除連結。"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"您的裝置將會與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 解除連結。"</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"解除連結"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"您沒有變更藍牙設定的權限。"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"配對新裝置"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"開啟藍牙設定時，附近的裝置可偵測到 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>。"</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"手機的藍牙位址：<xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"平板電腦的藍牙位址：<xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"裝置的藍牙位址：<xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"解除與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」的連結？"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"廣播"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"停用個人資料？"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"藍牙配對請求"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"配對連線要求"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"輕按即可與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」配對。"</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"顯示已接收的檔案"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"已接收的檔案"</string>
     <string name="device_picker" msgid="4978696506172252813">"選擇藍牙裝置"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」要求開啟藍牙功能"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」要求關閉藍牙功能"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s 想存取您的訊息，要授予 %2$s 存取權嗎？"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM 卡存取權要求"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> 要存取您的 SIM 卡。如果允許存取 SIM 卡，您裝置上的數據連線將於連線期間停用。允許 <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> 存取"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"對其他裝置顯示為「<xliff:g id="DEVICE_NAME">^1</xliff:g>」"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"您的裝置"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"配對新裝置"</string>
     <string name="date_and_time" msgid="9062980487860757694">"日期與時間"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"選擇時區"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"帳戶"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"位置"</string>
     <string name="account_settings_title" msgid="626177544686329806">"帳戶"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"安全性與位置"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"安全性和位置"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"加密和憑證"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"手機已加密"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"裝置已加密"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"指紋解鎖"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"使用您的指紋"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"輕觸指紋感應器即可解鎖手機、授權購物或登入應用程式。任何指紋加入手機後均可執行這些操作，因此請審慎決定要加入的指紋。\n\n請注意：相對於複雜的上鎖圖案或 PIN，指紋識別的安全性較低。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"輕觸指紋感應器即可核准購物，或登入應用程式。所有已加入裝置的指紋均可執行這些操作，因此請審慎決定讓哪些人加入指紋。\n\n請注意，您不可使用指紋解鎖此裝置。如需瞭解詳情，請聯絡您機構的管理員。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"輕觸指紋感應器即可解鎖手機、授權購物或登入應用程式。任何指紋加入手機後均可執行這些操作，因此請審慎決定要加入的指紋。\n\n請注意：相對於複雜的上鎖圖案或 PIN，指紋識別的安全性較低。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"使用指紋解鎖手機或核准購物交易。\n\n請注意：您無法使用指紋解鎖此裝置。如需瞭解詳情，請聯絡您機構的管理員。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"使用指紋解鎖手機或核准購物交易。\n\n請注意：相對於複雜的上鎖圖案或 PIN，指紋識別的安全性較低。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"取消"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"繼續"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"略過"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"新增指紋"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"裝置保護功能將不會啟用。如果這部平板電腦遺失、被盜或被清空，您將無法阻止他人使用平板電腦。"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"裝置保護功能將不會啟用。如果這部裝置遺失、被盜或被清空，您將無法阻止他人使用裝置。"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"裝置保護功能將不會啟用。如果這部手機遺失、被盜或被清空，您將無法阻止他人使用手機。"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"裝置保護功能將不會啟用。如果這部平板電腦遺失或被盜，您將無法阻止他人使用平板電腦。"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"裝置保護功能將不會啟用。如果這部裝置遺失或被盜，您將無法阻止他人使用裝置。"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"裝置保護功能將不會啟用。如果這部手機遺失或被盜，您將無法阻止他人使用手機。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"下一個畫面"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"系統將不會開啟裝置保護功能。如果您的平板電腦遺失、被盜或被重設，您將無法防止他人使用此平板電腦。"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"系統將不會開啟裝置保護功能。如果您的裝置遺失、被盜或被重設，您將無法防止他人使用此裝置。"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"系統將不會開啟裝置保護功能。如果您的手機遺失、被盜或被重設，您將無法防止他人使用此手機。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"系統將不會開啟裝置保護功能。如果您的平板電腦遺失或被盜，您將無法防止他人使用此平板電腦。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"系統將不會開啟裝置保護功能。如果您的裝置遺失或被盜，您將無法防止他人使用此裝置。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"系統將不會開啟裝置保護功能。如果您的手機遺失或被盜，您將無法防止他人使用此手機。"</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"仍要略過"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"返回"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"尋找感應器"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"在您的手機背面可以找到指紋感應器。"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"輕觸感應器"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"指紋感應器位於手機背面。請使用食指輕觸感應器。"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"裝置和指紋感應器位置圖示"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"名稱"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"確定"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"刪除"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"開始加入指紋"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"輕觸感應器"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"將手指放在感應器上，直至感到震動時放開"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"請繼續"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"輕輕移動您的手指，以加入指紋的所有部分"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"已加入指紋！"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"每當看見這個圖示，即表示您可以使用指紋識別身分或授權購買。"</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"只需輕觸指紋感應器即可喚醒裝置或為裝置解鎖。"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"看到此圖示後，您便可授權購物或登入應用程式。"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"提起手指，然後再次輕觸感應器"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"持續輕觸指紋感應器即可加入指紋的所有部分"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"已加入指紋"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"看到此圖示時，請使用您的指紋識別身份或核准購物交易。"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"略過指紋設定？"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"您已選擇使用指紋作為唯一的手機解鎖方式。如果您現在略過，將需要稍後設定。設定過程只需約一分鐘。"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"設定螢幕鎖定"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"完成"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"糟糕，這不是感應器"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"使用您裝置上的指紋感應器。"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"請使用食指輕觸位於手機背面的感應器。"</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"尚未完成註冊"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"已達到指紋註冊次數上限，請重試。"</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"無法註冊指紋，請重試或使用另一隻手指。"</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"只要啟用裝置保護功能，即可阻止他人在未經您准許下使用此裝置。請選擇您想使用的螢幕鎖定功能。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"只要啟用裝置保護功能，即可阻止他人在未經您准許下使用此手機。請選擇您想使用的螢幕鎖定功能。"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"選擇您的後備螢幕鎖定方式"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"螢幕鎖定選項"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"螢幕鎖定選項"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"螢幕鎖定"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/休眠後立即啟動"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/休眠 <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g>後啟動"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"更改解鎖圖形"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"變更解鎖 PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"變更解鎖密碼"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"請再試一次。您已嘗試 <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> 次，最多可試 <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> 次。"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"最後一次機會"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"如果您這次畫出錯誤的工作解鎖圖案，工作設定檔和相關資料將從這部裝置中移除。"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"如果您這次輸入錯誤的工作 PIN 碼，工作設定檔和相關資料將從這部裝置中移除。"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"如果您這次輸入錯誤的工作密碼，工作設定檔和相關資料將從這部裝置中移除。"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"輸入錯誤的次數太多。您的工作設定檔和相關資料將從這部裝置中移除。"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"關閉"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"請再試一次。您已嘗試 <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> 次，最多可試 <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> 次。"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"您的資料將會刪除"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"如果您下次畫出錯誤的上鎖圖案，系統將會刪除此裝置上的資料"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"如果您下次輸入錯誤的 PIN，系統將會刪除此裝置上的資料"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"如果您下次輸入錯誤的密碼，系統將會刪除此裝置上的資料"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"如果您下次畫出錯誤的上鎖圖案，系統將會刪除此使用者"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"如果您下次輸入錯誤的 PIN，系統將會刪除此使用者"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"如果您下次輸入錯誤的密碼，系統將會刪除此使用者"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"如果您下次畫出錯誤的上鎖圖案，系統將會刪除工作設定檔和相關資料"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"如果您下次輸入錯誤的 PIN，系統將會刪除工作設定檔和相關資料"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"如果您下次輸入錯誤的密碼，系統將會刪除工作設定檔和相關資料"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"輸入錯誤的次數太多，系統將會刪除此裝置上的資料。"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"輸入錯誤的次數太多，系統將會刪除此使用者。"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"輸入錯誤的次數太多，系統將會刪除此工作設定檔和相關資料。"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"關閉"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"必須至少有 <xliff:g id="COUNT">%d</xliff:g> 個字元"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN 必須至少有 <xliff:g id="COUNT">%d</xliff:g> 個數字"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"繼續"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"藍牙進階設定"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"當啟用藍牙功能後，您的裝置可以與其他附近的藍牙裝置通訊。"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"為提高定位準確度，系統應用程式和服務仍可偵測藍牙裝置。您可以在<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>掃瞄設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>中更改此設定。"</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"無法連線，請再試一次。"</string>
+    <string name="device_details_title" msgid="6576953269221085300">"裝置詳情"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"裝置的藍牙位址：<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"要取消配對裝置嗎？"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"您的手機將與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 取消配對"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"您的平板電腦將與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 取消配對"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"您的裝置將與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 取消配對"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"取消配對裝置"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"連線至..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"即將中斷「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」與媒體音頻的連線。"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"即將中斷「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」與免提聽筒音頻的連線。"</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"不提供"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"不驗證"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"您未指定任何憑證，因此將無法設定私人連線。"</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"網絡名稱太長。"</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"必須指定網域。"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"有 WPS 可供使用"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (有 WPS 可供使用)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 個網絡</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"進階 Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"設定 Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC 位址"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP 位址"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"子網絡遮罩"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"刪除這個群組？"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"可攜式 Wi-Fi 熱點"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi 熱點"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"使用流動網絡連線提供 Wi‑Fi 網絡"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"不透過熱點分享此平板電腦的互聯網連線"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"不透過熱點分享此手機的互聯網連線"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"目前沒有與其他裝置分享互聯網或內容"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"正在透過熱點分享此平板電腦的互聯網連線"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"正在透過熱點分享此手機的互聯網連線"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"應用程式正在分享內容。如要分享互聯網連線，請關閉熱點並重新開啟"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi 名稱"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"正在開啟 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"其他裝置可以連線至 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi 密碼"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"存取點頻段"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"使用熱點為其他裝置建立 Wi-Fi 網絡。熱點會使用流動數據連線提供互聯網服務。可能需要支付額外流動數據費用。"</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"應用程式可以建立熱點，與附近的裝置分享內容。"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"正在開啟熱點…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"正在關閉熱點…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> 使用中"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"當開啟 Wi-Fi 通話時，您的手機可根據偏好設定及訊號強弱，選擇使用 Wi-Fi 網絡或流動網絡供應商的網絡安排來電轉駁。開啟此功能前，請向您的流動網絡供應商查詢收費及其他詳情。"</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"更新緊急地址"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"當您使用 Wi-Fi 致電 911 時，緊急服務使用的地址將會作為您的地點"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"找不到結果"</string>
     <string name="display_settings" msgid="7965901687241669598">"顯示"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"自動旋轉螢幕"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"鮮豔顏色"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"旋轉平板電腦時自動切換瀏覽模式"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"旋轉手機時自動改變顯示方向"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"旋轉平板電腦時自動切換瀏覽模式"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"按環境光線優化亮度。啟用此功能後，您仍可以暫時性地調整亮度。"</string>
     <string name="night_display_title" msgid="2626451512200357686">"夜燈模式"</string>
     <string name="night_display_text" msgid="1837277457033025056">"「夜燈模式」會將您的螢幕轉成橙黃色，讓您在光線昏暗的環境下輕易觀看螢幕內容或閱讀，並可能有助您更容易入睡。"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"設定時間"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"狀態"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"自動開啟"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"永不"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"自訂時段"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"由日落至日出"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"設定時間"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"無"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"在自訂時間開啟"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"由日落至日出期間開啟"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"開始時間"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"結束時間"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"狀態"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"濃度"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"關閉。<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"永遠不會自動開啟。"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"將會在<xliff:g id="ID_1">%1$s</xliff:g>自動開啟。"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"將會在日落時自動開啟。"</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"開啟。<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"永遠不會自動關閉。"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"將會在<xliff:g id="ID_1">%1$s</xliff:g>自動關閉。"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"將會在日出時自動關閉。"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"關閉/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"永遠不會自動開啟"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"將會在<xliff:g id="ID_1">%1$s</xliff:g>自動開啟"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"將會在日落時自動開啟"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"開啟/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"永遠不會自動關閉"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"將會在<xliff:g id="ID_1">%1$s</xliff:g>自動關閉"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"將會在日出時自動關閉"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"休眠"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"螢幕關閉時"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"設定"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"舉起即可喚醒"</string>
-    <string name="doze_title" msgid="2259176504273878294">"環境顯示"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"環境顯示"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"永遠開啟"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"新通知"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"何時顯示"</string>
+    <string name="doze_title" msgid="2375510714460456687">"新通知"</string>
     <string name="doze_summary" msgid="3846219936142814032">"收到通知時喚醒螢幕"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"永遠開啟"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"顯示時間、通知圖示和其他資料"</string>
     <string name="title_font_size" msgid="4405544325522105222">"字型大小"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"放大或縮小文字"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 卡鎖定設定"</string>
@@ -1273,6 +1316,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN 不可留空。"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC 欄位必須為 3 位數。"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC 欄位必須要有 2 或 3 位數。"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"流動網絡供應商不允許新增 %s 類型的 APN。"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"正在還原預設 APN 設定。"</string>
     <string name="menu_restore" msgid="8260067415075573273">"重設回預設值"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"重設預設 APN 設定已完成。"</string>
@@ -1302,6 +1346,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"清除 SD 記憶卡資料"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"清除內部 USB 儲存裝置中的所有資料，例如音樂或相片"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"清除 SD 記憶卡中的所有資料，例如音樂或相片"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"清除 eSIM 卡"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"清除手機上的所有 eSIM。此操作不會取消您的流動服務計劃。"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"清除平板電腦上的所有 eSIM。此操作不會取消您的流動服務計劃。"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"重設平板電腦"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"重設手機"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"您要清除所有個人資訊和已下載的應用程式嗎？您無法復原這項操作！"</string>
@@ -1324,26 +1371,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"「數據節省模式」開啟時，網絡共享功能或便攜熱點便無法使用。"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB 網絡共享"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"已連接 USB，勾選即可共享網絡"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"已共用網絡"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"使用 USB 儲存裝置時無法共享網絡"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB 尚未連線"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"連接並開啟"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB 網絡共享發生錯誤"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"透過 USB 分享手機的互聯網連線"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"透過 USB 分享平板電腦的互聯網連線"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"藍牙網絡共享"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"透過藍牙分享此平板電腦的互聯網連線"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"透過藍牙分享此手機的互聯網連線"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"透過藍牙與 1 部裝置分享此平板電腦的互聯網連線"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"透過藍牙與 1 部裝置分享此手機的互聯網連線"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"透過藍牙與 <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> 部裝置分享此平板電腦的互聯網連線"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"透過藍牙與 <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> 部裝置分享此手機的互聯網連線"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"透過藍牙分享平板電腦的互聯網連線"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"透過藍牙分享手機的互聯網連線"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"透過藍牙分享此<xliff:g id="DEVICE_NAME">%1$d</xliff:g>的互聯網連線"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"不透過藍牙分享此平板電腦的互聯網連線"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"不透過藍牙分享此手機的互聯網連線"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"未共用網絡"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"不可與超過 <xliff:g id="MAXCONNECTION">%1$d</xliff:g> 部裝置分享網絡。"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的網絡共享即將中斷。"</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"使用熱點和網絡共享功能，透過您的流動數據連線向其他裝置提供互聯網服務。"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"使用熱點和網絡共享功能，透過您的流動數據連線向其他裝置提供互聯網服務。應用程式亦可以建立熱點，與附近的裝置分享內容。"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"說明"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"流動網絡"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"流動數據計劃"</string>
@@ -1376,7 +1412,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"定位模式"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"使用 GPS、Wi‑Fi、藍牙或流動網絡定位"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"使用 Wi‑Fi、藍牙或流動網絡定位"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"使用 GPS 定位"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"使用 GPS 和裝置感應器定位"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"掃瞄"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi 掃瞄"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"允許系統應用程式和服務隨時偵測 Wi-Fi 網絡，以提高位置資訊的準確度。"</string>
@@ -1421,8 +1457,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"您沒有數據連線，如要立即查看這項資訊，請使用任何已連接互聯網的電腦前往 %s。"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"載入中…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"選擇密碼"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"如要使用指紋，請設定密碼"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"選擇圖形"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"如要使用指紋，請設定上鎖圖案"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"選擇 PIN"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"如要使用指紋，請設定 PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"確認密碼"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"確認圖形"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"確認 PIN"</string>
@@ -1491,6 +1530,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"應用程式設定"</string>
     <string name="install_applications" msgid="4872012136210802181">"不明來源"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"允許安裝所有來源的應用程式"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"最近開啟的應用程式"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"查看全部 <xliff:g id="COUNT">%1$d</xliff:g> 個應用程式"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g>前"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"來源不明的應用程式可能會侵害您的平板電腦和個人資料。安裝來自此來源的應用程式，即表示您同意承擔因使用這些應用程式而導致平板電腦損壞或資料遺失的責任。"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"來源不明的應用程式可能會侵害您的手機和個人資料。安裝來自此來源的應用程式，即表示您同意承擔因使用這些應用程式而導致手機損壞或資料遺失的責任。"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"進階設定"</string>
@@ -1659,6 +1701,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"停止系統服務？"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"如果您停用這項服務，您平板電腦上的某些功能可能會停止正常運作，待您重新開機後才會恢復正常。"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"如果您停用這項服務，您手機上的某些功能可能會停止正常運作，待您重新開機後才會恢復正常。"</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"語言、輸入和手勢"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"語言及輸入"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"語言及輸入"</string>
     <string name="input_assistance" msgid="7577795275222555487">"輸入協助"</string>
@@ -1873,6 +1919,10 @@
       <item quantity="other">已啟用 <xliff:g id="COUNT">%1$d</xliff:g> 項列印服務</item>
       <item quantity="one">已啟用 1 項列印服務</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> 項列印工作</item>
+      <item quantity="one"> 1 項列印工作</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"列印服務"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"未安裝任何服務"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"找不到打印機"</string>
@@ -1939,6 +1989,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"詳細使用狀況"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"調整電力使用"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"已包含套件"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"多個應用程式正在大量耗電"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"讓裝置處於喚醒狀態"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"在背景喚醒裝置"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"要求獲取位置資訊的頻率過高"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> 個應用程式運作異常"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"要停止應用程式嗎？"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"由於「<xliff:g id="APP">%1$s</xliff:g>」讓您的手機處於喚醒狀態，因此手機無法正常管理電池。\n\n如要解決此問題，您可以強制停止該應用程式。\n\n如果問題持續，您可能需要解除安裝應用程式，才能改善電池效能。"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"由於「<xliff:g id="APP">%1$s</xliff:g>」讓您的平板電腦處於喚醒狀態，因此平板電腦無法正常管理電池。\n\n如要解決此問題，您可以強制停止該應用程式。\n\n如果問題持續，您可能需要解除安裝應用程式，才能改善電池效能。"</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"由於「<xliff:g id="APP">%1$s</xliff:g>」讓您的裝置處於喚醒狀態，因此裝置無法正常管理電池。\n\n如要解決此問題，您可以強制停止該應用程式。\n\n如果問題持續，您可能需要解除安裝應用程式，才能改善電池效能。"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"停止應用程式"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"要關閉背景使用功能嗎？"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"由於「<xliff:g id="APP">%1$s</xliff:g>」一直讓您的手機處於喚醒狀態，因此手機無法正常管理電池。\n\n如要解決此問題，請將手機設定為禁止此應用程式在背景背景中執行。"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"由於「<xliff:g id="APP">%1$s</xliff:g>」一直讓您的平板電腦處於喚醒狀態，因此平板電腦無法正常管理電池。\n\n如要解決此問題，請將平板電腦設定為禁止此應用程式在背景背景中執行。"</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"由於「<xliff:g id="APP">%1$s</xliff:g>」一直讓您的裝置處於喚醒狀態，因此裝置無法正常管理電池。\n\n如要解決此問題，請將裝置設定為禁止此應用程式在背景背景中執行。"</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"關閉"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"要關閉位置資訊功能嗎？"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"由於「<xliff:g id="APP">%1$s</xliff:g>」在您未使用時持續要求獲取您的位置資訊，因此手機無法正常管理電池。\n\n如要解決此問題，請關閉此應用程式的位置資訊功能。"</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"由於「<xliff:g id="APP">%1$s</xliff:g>」在您未使用時持續要求獲取您的位置資訊，因此平板電腦無法正常管理電池。\n\n如要解決此問題，請關閉此應用程式的位置資訊功能。"</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"由於「<xliff:g id="APP">%1$s</xliff:g>」在您未使用時持續要求獲取您的位置資訊，因此裝置無法正常管理電池。\n\n如要解決此問題，請關閉此應用程式的位置資訊功能。"</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"關閉"</string>
     <string name="power_screen" msgid="3023346080675904613">"螢幕"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"閃光燈"</string>
     <string name="power_camera" msgid="4976286950934622605">"相機"</string>
@@ -1953,7 +2023,7 @@
     <string name="power_apps" msgid="2043554781293951327">"應用程式"</string>
     <string name="power_service" msgid="1599661212370831780">"服務"</string>
     <string name="power_system" msgid="8290455327965307383">"系統"</string>
-    <string name="power_user" msgid="1889728099253018005">"使用者"</string>
+    <string name="power_user" msgid="3706143225319881667">"其他使用者"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU 總使用時間"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 前端使用狀況"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"保持啟用"</string>
@@ -2005,6 +2075,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"計算過高的用電量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"使用時間：<xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"使用時間：<xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"螢幕使用時間：<xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>用量佔 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"整體電量的 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2566,7 +2637,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"更改 PIN 碼"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"顯示通知"</string>
     <string name="help_label" msgid="6886837949306318591">"說明和意見反映"</string>
-    <string name="support_summary" msgid="8276116616493882830">"說明文章、手機和即時通訊支援"</string>
+    <string name="support_summary" msgid="2705726826263742491">"說明文章、手機和即時通訊、開始使用"</string>
     <string name="user_account_title" msgid="1127193807312271167">"內容帳戶"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"相片 ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"極嚴重威脅"</string>
@@ -2656,9 +2727,12 @@
       <item quantity="one">顯示 %d 個隱藏項目</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"網絡和互聯網"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi、流動裝置、數據用量、熱點"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"流動網絡"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"數據用量"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"熱點"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"已連結的裝置"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"藍牙、投放、NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"藍牙、投放"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"應用程式和通知"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"權限、預設應用程式"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"使用者和帳戶"</string>
@@ -2711,6 +2785,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"手勢"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"支付, 輕按, 付款"</string>
     <string name="keywords_backup" msgid="470070289135403022">"備份內容, 備份"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"手勢、邊緣、側邊、有效的邊緣、擠壓、拿起、協助、助理、擠壓、緊握、握住、握緊、Ok Google、Google 助理"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"手勢、喚醒、通知、螢幕、顯示、螢幕關閉、螢幕開啟、擠壓、邊緣、休眠、睡眠、拿起"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"手勢、靜音、延後、鬧鐘、來電、安靜、顯示、鎖定螢幕、擠壓、拿起、邊緣、停止"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"設定 Wi-Fi NFC 標籤"</string>
     <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"輕按標籤即可寫入…"</string>
@@ -2793,7 +2870,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"永不顯示工作通知"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"裝置鎖定時，應如何顯示個人檔案通知？"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"個人檔案通知"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"通知"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"通知"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"應用程式通知"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"通知類別"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"重要性"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"讓應用程式決定"</string>
@@ -2808,6 +2886,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"緊急"</string>
     <string name="allow_sound" msgid="1820188704793497324">"允許發出音效"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"禁止這些通知發出音效、震動或不時於目前螢幕上出現。"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"低重要性"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"中重要性"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"高重要性"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"緊急重要性"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"通知小幫手"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"通知存取權"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"管理員已禁止存取工作設定檔通知"</string>
@@ -2835,8 +2917,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"畫中畫"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"允許畫中畫"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"允許此應用程式在開啟時或您離開後 (例如繼續觀看影片) 建立畫中畫視窗。該視窗會在您目前使用的其他應用程式上層顯示。"</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"是"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"否"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"「請勿騷擾」存取權"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"沒有已安裝的應用程式要求存取「請勿騷擾」。"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式…"</string>
@@ -2967,11 +3047,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"這個工作設定檔由以下應用程式管理："</string>
     <string name="managing_admin" msgid="8843802210377459055">"由<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>管理"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(實驗性)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"裝置旋轉"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"旋轉畫面內容"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"保持縱向畫面"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"保持橫向畫面"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"保持目前方向"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"安全啟動"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"繼續"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"為加強保護此裝置，您可以在裝置啟動前要求輸入 PIN 碼。裝置啟動前，您將無法接收來電、訊息或通知 (包括鬧鐘)。\n\n這有助保護遺失或被盜裝置上的資料。要在啟動裝置時要求輸入 PIN 碼嗎？"</string>
@@ -2979,7 +3054,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"為加強保護此裝置，您可以在裝置啟動前要求輸入密碼。裝置啟動前，您將無法接收來電、訊息或通知 (包括鬧鐘)。\n\n這有助保護遺失或被盜裝置上的資料。要在啟動裝置時要求輸入密碼嗎？"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"為加強保護此裝置，除了使用指紋解鎖裝置外，您亦可以在裝置啟動前要求輸入 PIN 碼。裝置啟動前，您將無法接收來電、訊息或通知 (包括鬧鐘)。\n\n這有助保護遺失或被盜裝置上的資料。要在啟動裝置時要求輸入 PIN 碼嗎？"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"為加強保護此裝置，除了使用指紋解鎖裝置外，您亦可以在裝置啟動前要求畫出上鎖圖案。裝置啟動前，您將無法接收來電、訊息或通知 (包括鬧鐘)。\n\n這有助保護遺失或被盜裝置上的資料。要在啟動裝置時要求畫出上鎖圖案嗎？"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"為加強保護此裝置，除了使用指紋解鎖裝置外，您亦可以在裝置啟動前要求輸入密碼。裝置啟動前，您將無法接收來電、訊息或通知 (包括鬧鐘)。\n\n這有助保護遺失或被盜裝置上的資料。要在啟動裝置時要求輸入密碼嗎？"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"除了使用指紋解鎖外，您亦可以設定裝置必需密碼才能啟動，再加一重保護。裝置必須成功啟動才能接收來電、訊息或通知 (包括鬧鐘)。\n\n即使裝置遺失或遭竊，資料仍會安全無虞。要設定裝置必需密碼才能啟動嗎？"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"是"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"否"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"要求輸入 PIN 嗎？"</string>
@@ -3097,6 +3172,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"用量警示"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"顯示完整的裝置用電量"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"顯示應用程式使用情況"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"耗電量高"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> 個應用程式無法正常運作</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> 無法正常運作</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">應用程式正在大量耗電</item>
+      <item quantity="one">「<xliff:g id="APP">%1$s</xliff:g>」正在大量耗電</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"尚未優化"</string>
     <string name="high_power_on" msgid="6216293998227583810">"尚未優化"</string>
     <string name="high_power_off" msgid="3393904131961263278">"正在優化電池使用"</string>
@@ -3189,8 +3273,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"可顯示在其他應用程式上面"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> 個應用程式 (共 <xliff:g id="COUNT_1">%2$d</xliff:g> 個) 可顯示在其他應用程式上面"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"擁有權限的應用程式"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"允許"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"不允許"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"允許"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"不允許"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"安裝來自不明來源的應用程式"</string>
     <string name="write_settings" msgid="4797457275727195681">"修改系統設定"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"寫入修改系統設定"</string>
@@ -3280,6 +3364,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"螢幕會轉成橙黃色。這可能有助您入睡。"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"建議"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"還有 <xliff:g id="ID_1">%1$d</xliff:g> 個建議"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"另外 <xliff:g id="ID_1">%1$d</xliff:g> 項"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> 項建議</item>
+      <item quantity="one">1 項建議</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">另外 <xliff:g id="COUNT">%1$d</xliff:g> 項建議</item>
+      <item quantity="one">另外 1 項建議</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"移除"</string>
     <string name="color_temperature" msgid="2070126836910615605">"冷色色溫"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用較冷的顯示器顏色"</string>
@@ -3298,8 +3391,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> 數據用量警告"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> 數據用量警告 / <xliff:g id="ID_2">%2$s</xliff:g> 數據上限"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"結算週期"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"結算週期於每月 <xliff:g id="ID_1">%1$s</xliff:g> 日開始"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"由 <xliff:g id="ID_1">%1$s</xliff:g> 日起按月收費"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"每月第 <xliff:g id="ID_1">%1$s</xliff:g> 日"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"網絡限制"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> 個限制</item>
@@ -3319,7 +3411,7 @@
       <item quantity="one">「數據節省模式」開啟時，允許 1 個應用程式使用無限制數據</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"數據節省模式"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"數據用量不限"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"數據用量不限"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"背景數據已關閉"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"開啟"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"關閉"</string>
@@ -3383,8 +3475,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"控制上鎖畫面通知"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"顯示或隱藏通知內容"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"全部"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"支援"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"支援和提示"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"最小寬度"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"沒有已安裝的應用程式要求發送付費短訊的權限"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"付費短訊的費用可能高昂，並會增加您流動網絡供應商帳單的款項。如果您為應用程式開放權限，將可以透過該應用程式發送付費短訊。"</string>
@@ -3449,28 +3540,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"自動"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"手動"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"立即釋放空間"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"手勢"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"手勢捷徑"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"快速手勢讓您控制手機"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"快速手勢讓您控制平板電腦"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"快速手勢讓您控制裝置"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"快速開啟相機"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"在任何畫面上按開關按鈕兩下，即可快速開啟相機。"</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"快速開啟相機"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"按開關按鈕兩下即可開啟相機"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"切換相機鏡頭"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"自拍更快速"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"轉動手機兩下即可開啟自拍模式"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"轉動平板電腦兩下即可開啟自拍模式"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"轉動裝置兩下即可開啟自拍模式"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"輕按兩下即可查看手機"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"輕按兩下即可查看平板電腦"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"輕按兩下即可查看裝置"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"如要快速查看通知，請輕按螢幕兩下。"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"輕按螢幕兩下即可查看時間、通知圖示和其他資訊。"</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"螢幕關閉時查看通知"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"拿起手機立即顯示"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"提起即可查看平板電腦"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"提起即可查看裝置"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"拿起手機，即可快速查看通知。"</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"如要快速查看通知，請拿起您的平板電腦。"</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"如要快速查看通知，請拿起您的裝置。"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"拿起您的手機即可查看時間、通知圖示和其他資訊。"</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"拿起您的平板電腦即可查看時間、通知圖示和其他資訊。"</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"拿起您的裝置即可查看時間、通知圖示和其他資訊。"</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"螢幕關閉時查看通知"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"快速滑動指紋以查看通知"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"向下快速滑動手機背面的指紋感應器，即可查看通知。"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"向下快速滑動平板電腦背面的指紋感應器，即可查看通知。"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"向下快速滑動裝置背面的指紋感應器，即可查看通知。"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"快速查看通知"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"在指紋感應器向下快速滑動"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"拿起手機時開啟相機"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"只要拿起手機做出拍照 (橫向或直向) 動作，即可讓系統自動開啟相機。即使手機進入休眠狀態或已上鎖，亦能使用此功能。"</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"在手機處於休眠狀態或鎖定時拍攝相片"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"輔助手勢"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"敏感度"</string>
@@ -3574,6 +3678,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"您要移除此即時應用程式嗎？"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"遊戲"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"音訊檔案"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"已使用的儲存空間"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(已為使用者 (<xliff:g id="USER">%s</xliff:g>) 解除安裝)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(已為使用者<xliff:g id="USER">%s</xliff:g>停用)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"自動填入服務"</string>
@@ -3587,5 +3692,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"即時應用程式"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"要停用儲存空間管理員嗎？"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"電影和電視應用程式"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"已使用的儲存空間"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"流動網絡供應商佈建資料"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"觸發流動網絡供應商佈建程序"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"新增了哪些精彩功能？"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"查看前 5 個熱門功能"</string>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 7d52a49..181ea93 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"良好"</item>
     <item msgid="8986346415847956850">"極佳"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"一律"</item>
-    <item msgid="844721238536786870">"僅限充電時"</item>
-    <item msgid="1986753720941888596">"永不"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"一律"</item>
-    <item msgid="7433294150916905997">"僅限充電時"</item>
-    <item msgid="1390404486722375028">"永不採用"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"最近 30 天"</item>
     <item msgid="6600989128423965319">"設定用量週期..."</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index d04d0bb..ee513e3 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"你現在已成為開發人員！"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"不需要了，你已經是開發人員。"</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"請先啟用開發人員選項。"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"無線與網路"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"連線方式"</string>
     <string name="header_category_device" msgid="4544026001618307754">"裝置"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"已佈建 VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"已建立視訊通話"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"已建立 Wi-Fi 通話"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/顯示狀態：已啟用"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"行動無線電電源"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"查看 SIM 通訊錄"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"查看固定撥號"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"掃描裝置"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"重新命名這個裝置"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"重新命名"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"中斷連線？"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"這樣會結束你與下列裝置的連線：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"要取消連結裝置嗎？"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"你的手機將與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」中斷連線。"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"你的平板電腦將與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」中斷連線。"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"你的裝置將與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」中斷連線。"</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"中斷連線"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"你沒有變更藍牙設定的權限。"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"配對新裝置"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"藍牙設定開啟時，附近的裝置可偵測到「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。"</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"手機的藍牙位址：<xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"平板電腦的藍牙位址：<xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"裝置的藍牙位址：<xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"要中斷與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」的連線嗎？"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"廣播"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"停用設定檔？"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"藍牙配對要求"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"配對要求"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"輕觸即可與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」配對。"</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"顯示已接收的檔案"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"已接收的檔案"</string>
     <string name="device_picker" msgid="4978696506172252813">"選擇藍牙裝置"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」要求開啟藍牙功能"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」要求關閉藍牙功能"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s 要求存取你的訊息。要將存取權授予 %2$s 嗎？"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM 存取權請求"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"「<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>」想要存取你的 SIM 卡。如果授權該裝置存取 SIM 卡，你裝置的數據連線功能在藍牙連線期間將暫時停用。將存取權授予「<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>」"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"向其他裝置顯示為「<xliff:g id="DEVICE_NAME">^1</xliff:g>」"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"你的裝置"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"配對新裝置"</string>
     <string name="date_and_time" msgid="9062980487860757694">"日期和時間"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"選擇時區"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"帳戶"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"定位"</string>
     <string name="account_settings_title" msgid="626177544686329806">"帳戶"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"安全性與位置"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"安全性與位置資訊"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"加密和憑證"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"電話已加密"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"裝置已加密"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"使用指紋解鎖"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"使用指紋"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"只要輕觸指紋感應器，即可將手機解鎖、授權購物交易或登入應用程式。你在手機上新增的任何指紋都能用來進行前述操作，因此請慎選要加入的指紋。\n\n注意：使用複雜的圖形或 PIN 碼會比感應指紋來得安全。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"輕觸指紋感應器即可授權購物交易或登入應用程式。你在裝置上新增的任何指紋都能用來進行前述操作，因此請慎選要加入的指紋。\n\n注意：你無法使用指紋為這個裝置解鎖。詳情請洽貴機構的管理員。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"只要輕觸指紋感應器，即可將手機解鎖、授權購物交易或登入應用程式。你在手機上新增的任何指紋都能用來進行前述操作，因此請慎選要加入的指紋。\n\n注意：使用複雜的圖形或 PIN 碼會比感應指紋來得安全。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"使用你的指紋將手機解鎖或核准購物交易。\n\n注意：你無法使用指紋將這個裝置解鎖，詳情請洽貴機構的管理員。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"使用你的指紋將手機解鎖或核准購物交易。\n\n注意：使用複雜的圖案或 PIN 碼會比感應指紋來得安全。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"取消"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"繼續"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"略過"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"新增指紋"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"系統不會啟用裝置保護功能。萬一這台平板電腦遺失或遭竊，或是當中資料遭到清空，你將無法防止他人使用這台平板電腦。"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"系統不會啟用裝置保護功能。萬一這個裝置遺失或遭竊，或是當中資料遭到清空，你將無法防止他人使用這個裝置。"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"系統不會啟用裝置保護功能。萬一這支手機遺失或遭竊，或是當中資料遭到清空，你將無法防止他人使用這支手機。"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"系統不會啟用裝置保護功能。萬一這台平板電腦遺失或遭竊，你將無法防止他人使用這台平板電腦。"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"系統不會啟用裝置保護功能。萬一這個裝置遺失或遭竊，你將無法防止他人使用這個裝置。"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"系統不會啟用裝置保護功能。萬一這支手機遺失或遭竊，你將無法防止他人使用這支手機。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"繼續"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"裝置保護功能將不會開啟。在這種情況下，你無法在這部平板電腦遺失、遭竊或重設時，防止其他人使用平板電腦。"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"裝置保護功能將不會開啟。在這種情況下，你無法在這個裝置遺失、遭竊或重設時，防止其他人使用裝置。"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"裝置保護功能將不會開啟。在這種情況下，你無法在這支手機遺失、遭竊或重設時，防止其他人使用手機。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"裝置保護功能將不會開啟。在這種情況下，你無法在這部平板電腦遺失或遭竊時，防止其他人使用平板電腦。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"裝置保護功能將不會開啟。在這種情況下，你無法在這個裝置遺失或遭竊時，防止其他人使用裝置。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"裝置保護功能將不會開啟。在這種情況下，你無法在這支手機遺失或遭竊時，防止其他人使用手機。"</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"略過"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"返回"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"找出感應器"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"指紋感應器位於手機背面。"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"輕觸感應器"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"指紋感應器位於手機背面。請用食指輕觸感應器。"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"裝置指紋感應器位置插圖"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"名稱"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"確定"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"刪除"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"開始註冊"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"輕觸感應器"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"將你的手指放在感應器上，感到震動即可移開"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"繼續輕觸"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"稍微移動你的手指以新增完整的指紋"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"指紋新增成功！"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"只要看到這個圖示，就表示你可以使用指紋來驗證身分或授權進行購物交易。"</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"輕觸指紋感應器即可將裝置喚醒及解鎖。"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"當畫面顯示這個圖示時，你也可以授權購物交易或登入應用程式。"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"移開手指，然後再次輕觸"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"持續輕觸指紋感應器以新增完整的指紋"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"指紋新增成功"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"當你看到這個圖示時，請使用你的指紋來驗證身分或核准購物交易。"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"要略過指紋設定程序嗎？"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"你已選擇使用指紋做為其中一種手機解鎖方式。如果現在略過這項程序，你必須在稍後完成設定。設定程序只需要一分鐘左右。"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"設定螢幕鎖定"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"完成"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"糟糕，這不是感應器"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"使用裝置上的指紋感應器。"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"使用食指輕觸手機背面的感應器。"</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"未完成註冊"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"已達指紋註冊時間上限，請再試一次。"</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"無法註冊指紋。請再試一次或使用不同的手指。"</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"只要啟用裝置保護功能，即可防止他人在未獲你授權的情況下使用這個裝置。請選擇你要使用的螢幕鎖定方式。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"只要啟用裝置保護功能，即可防止他人在未獲你授權的情況下使用這支手機。請選擇你要使用的螢幕鎖定方式。"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"選擇你的備用螢幕鎖定方法"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"螢幕鎖定選項"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"螢幕鎖定選項"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"螢幕鎖定"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / 休眠後立即啟動"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / 休眠 <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g>後"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"變更解鎖圖案"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"變更解鎖 PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"變更解鎖密碼"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"請再試一次。你目前已嘗試 <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> 次，最多可試 <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> 次。"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"最後一次機會"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"如果你這次畫出的 Work 解鎖圖案錯誤，你的 Work 設定檔和相關資料將會從這個裝置中移除。"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"如果你這次輸入的 Work PIN 碼錯誤，你的 Work 設定檔和相關資料將會從這個裝置中移除。"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"如果你這次輸入的 Work 密碼錯誤，你的 Work 設定檔和相關資料將會從這個裝置中移除。"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"輸入錯誤次數過多。你的 Work 設定檔和相關資料將會從這個裝置中移除。"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"關閉"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"請再試一次。你目前已嘗試 <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> 次，最多可試 <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> 次。"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"你的資料將遭到刪除"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"如果下次輸入的解鎖圖案仍不正確，系統將刪除這個裝置中的資料"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"如果下次輸入的 PIN 碼仍不正確，系統將刪除這個裝置中的資料"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"如果下次輸入的密碼仍不正確，系統將刪除這個裝置中的資料"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"如果下次輸入的解鎖圖案仍不正確，系統將刪除這位使用者"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"如果下次輸入的 PIN 碼仍不正確，系統將刪除這位使用者"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"如果下次輸入的密碼仍不正確，系統將刪除這位使用者"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"如果下次輸入的解鎖圖案仍不正確，系統將刪除你的 Work 設定檔和相關資料"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"如果下次輸入的 PIN 碼仍不正確，系統將刪除你的 Work 設定檔和相關資料"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"如果下次輸入的密碼仍不正確，系統將刪除你的 Work 設定檔和相關資料"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"錯誤次數過多，系統將刪除這個裝置中的資料。"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"錯誤次數過多，系統將刪除這位使用者。"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"錯誤次數過多，系統將刪除這個 Work 設定檔和相關資料。"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"關閉"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"必須包含至少 <xliff:g id="COUNT">%d</xliff:g> 個字元"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN 碼至少要有 <xliff:g id="COUNT">%d</xliff:g> 位數字"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"繼續"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"藍牙進階設定"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"開啟藍牙功能後，你的裝置即可與其他鄰近的藍牙裝置相互傳輸資料。"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"為了提升定位精確度，系統應用程式和服務仍可偵測藍牙裝置。你可以前往<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>掃描設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>變更這項設定。"</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"無法連線，請再試一次。"</string>
+    <string name="device_details_title" msgid="6576953269221085300">"裝置詳細資料"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"裝置的藍牙位址：<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"要移除裝置嗎？"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"你的手機將與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」解除配對"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"你的平板電腦將與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」解除配對"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"你的裝置將與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」解除配對"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"移除裝置"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"連線到…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"即將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 與媒體音訊的連線。"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"即將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 與免持聽筒音訊的連線。"</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"不提供"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"不進行驗證"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"你未指定任何憑證，因此無法為你設定私人連線。"</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"網路名稱太長。"</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"必須指定網域。"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"可使用 WPS"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (可使用 WPS)"</string>
@@ -809,7 +838,6 @@
       <item quantity="one">1 個網路</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"進階 Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"設定 Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC 位址"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP 位址"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"子網路遮罩"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"刪除這個群組？"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"可攜式 Wi-Fi 無線基地台"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi 無線基地台"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"使用行動連線提供 Wi‑Fi 網路"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"未透過無線基地台分享這部平板電腦的網際網路連線"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"未透過無線基地台分享這支手機的網際網路連線"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"目前沒有與其他裝置分享網際網路或內容"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"正在透過無線基地台分享這部平板電腦的網際網路連線"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"正在透過無線基地台分享這支手機的網際網路連線"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"應用程式正在分享內容。如要分享網際網路連線，請關閉無線基地台並重新開啟"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Wi‑Fi 名稱"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"正在開啟 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"其他裝置可連線至 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Wi-Fi 密碼"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"存取點頻帶"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"使用無線基地台建立 Wi‑Fi 網路供其他裝置使用。無線基地台會使用你的行動數據連線提供網際網路。可能需支付額外的行動數據傳輸費用。"</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"應用程式可以建立無線基地台來和鄰近的裝置分享內容。"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"正在開啟無線基地台…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"正在關閉無線基地台…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> 使用中"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"開啟 Wi-Fi 通話功能之後，你的手機可依據你的偏好設定，透過 Wi-Fi 網路或你的行動通訊網路通話 (選擇訊號較強者)。開啟這項功能前，請先與你的電信業者詢問費用與其他細節。"</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"更新緊急地址"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"如果你使用 Wi-Fi 撥打 119，緊急服務會判定你位在這個地址"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"找不到相符的搜尋結果"</string>
     <string name="display_settings" msgid="7965901687241669598">"顯示"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"自動旋轉螢幕"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"鮮明色彩"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"旋轉平板電腦時自動切換瀏覽模式"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"旋轉手機時自動改變顯示方向"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"旋轉平板電腦時自動切換瀏覽模式"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"根據環境光源調整最佳亮度。開啟這項功能之後，你依然可以暫時調整亮度。"</string>
     <string name="night_display_title" msgid="2626451512200357686">"夜燈"</string>
     <string name="night_display_text" msgid="1837277457033025056">"夜燈功能會將你的螢幕色調改為琥珀色，讓你更輕鬆地在光線昏暗的環境中查看螢幕，也比較容易入睡。"</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"設定時間"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"狀態"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"自動開啟"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"永不"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"自訂時間"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"日落到日出"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"設定時間"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"無"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"在自訂時間開啟"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"在日落到日出之間開啟"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"開始時間"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"結束時間"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"狀態"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"濃度"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"關閉。<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"一律不自動開啟。"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"將於<xliff:g id="ID_1">%1$s</xliff:g> 自動開啟。"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"將於日落時自動開啟。"</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"開啟。<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"一律不自動關閉。"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"將於<xliff:g id="ID_1">%1$s</xliff:g> 自動關閉。"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"將於日出時自動關閉。"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"關閉/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"一律不自動開啟"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"將於<xliff:g id="ID_1">%1$s</xliff:g> 自動開啟"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"將於日落時自動開啟"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"開啟/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"一律不自動關閉"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"將於<xliff:g id="ID_1">%1$s</xliff:g> 自動關閉"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"將於日出時自動關閉"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"休眠"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"螢幕關閉時"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"設定"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"舉起即可喚醒"</string>
-    <string name="doze_title" msgid="2259176504273878294">"環境顯示"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"環境顯示"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"一律開啟"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"新通知"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"顯示時機"</string>
+    <string name="doze_title" msgid="2375510714460456687">"新通知"</string>
     <string name="doze_summary" msgid="3846219936142814032">"收到通知時喚醒螢幕"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"一律開啟"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"顯示時間、通知圖示和其他資訊"</string>
     <string name="title_font_size" msgid="4405544325522105222">"字型大小"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"縮小或放大文字"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 卡鎖定設定"</string>
@@ -1272,6 +1315,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN 不可留空。"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC 欄位必須為 3 位數。"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC 欄位必須要有 2 或 3 位數。"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"電信業者不允許新增「%s」類型的 APN。"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"正在還原預設 APN 設定。"</string>
     <string name="menu_restore" msgid="8260067415075573273">"還原為預設狀態"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"重設預設 APN 設定已完成。"</string>
@@ -1301,6 +1345,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"清除 SD 卡"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"清除內部 USB 儲存裝置中的所有資料，例如音樂或相片"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"清除 SD 卡中的所有資料，例如音樂或相片。"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"清除 eSIM 卡"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"清除手機上的所有 eSIM 卡。這項操作不會導致你現有的行動服務方案取消。"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"清除平板電腦上的所有 eSIM 卡。這項操作不會導致你的行動服務方案取消。"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"重設平板電腦"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"重設手機"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"你要清除所有個人資訊和已下載的應用程式嗎？這個動作無法復原！"</string>
@@ -1323,26 +1370,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"在數據節省模式開啟的狀態下，無法進行數據連線或使用可攜式無線基地台"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB 網路共用"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"已連接 USB，選取即可進行網路共用"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"網路已共用"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"使用 USB 儲存裝置時無法共用網路"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB 尚未連線"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"連接並開啟"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB 網路共用發生錯誤"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"透過 USB 分享手機的網際網路連線"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"透過 USB 分享平板電腦的網際網路連線"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"藍牙網路共用"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"透過藍牙分享這部平板電腦的網際網路連線"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"透過藍牙分享這支手機的網際網路連線"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"透過藍牙與 1 個裝置分享這部平板電腦的網際網路連線"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"透過藍牙與 1 個裝置分享這支手機的網際網路連線"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"透過藍牙與 <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> 個裝置分享這部平板電腦的網際網路連線"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"透過藍牙與 <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> 個裝置分享這支手機的網際網路連線"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"透過藍牙分享平板電腦的網際網路連線"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"透過藍牙分享手機的網際網路連線"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"透過藍牙分享這個<xliff:g id="DEVICE_NAME">%1$d</xliff:g>的網際網路連線"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"未透過藍牙分享這部平板電腦的網際網路連線"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"未透過藍牙分享這支手機的網際網路連線"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"網路未共用"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"最多只能有 <xliff:g id="MAXCONNECTION">%1$d</xliff:g> 個裝置共用網路。"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的網路共用。"</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"使用無線基地台和網路共用功能，透過你的行動數據連線提供網際網路給其他裝置。"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"使用無線基地台和網路共用功能，透過你的行動數據連線提供網際網路給其他裝置。應用程式也可以建立無線基地台來和鄰近的裝置分享內容。"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"說明"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"行動網路"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"行動數據傳輸資費方案"</string>
@@ -1375,7 +1411,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"定位模式"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"使用 GPS、Wi-Fi、藍牙或行動網路判斷所在位置"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"使用 Wi-Fi、藍牙或行動網路判斷所在位置"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"使用 GPS 判斷你的所在位置"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"使用 GPS 和裝置感應器判斷所在位置"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"掃描"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi 掃描"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"允許系統應用程式和服務隨時偵測 Wi‑Fi 網路，以提升定位精確度。"</string>
@@ -1420,8 +1456,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"你沒有數據連線，如要立即查看這項資訊，請使用任何已連上網際網路的電腦前往 %s。"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"載入中…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"選擇密碼"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"如要使用指紋，請設定密碼"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"選擇圖案"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"如要使用指紋，請設定解鎖圖案"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"選擇 PIN 碼"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"如要使用指紋，請設定 PIN 碼"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"確認密碼"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"確認圖案"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"確認你的 PIN 碼"</string>
@@ -1490,6 +1529,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"應用程式設定"</string>
     <string name="install_applications" msgid="4872012136210802181">"不明的來源"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"允許安裝所有來源的應用程式"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"最近開啟的應用程式"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"查看全部共 <xliff:g id="COUNT">%1$d</xliff:g> 個應用程式"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g>前"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"來歷不明的應用程式可能會損害你的平板電腦和個人資料。安裝這個來源提供的應用程式集表示你同意，如因使用這些應用程式導致你的平板電腦受損或資料遺失，須自行負責。"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"來歷不明的應用程式可能會損害你的手機和個人資料。安裝這個來源提供的應用程式即表示你同意，如因使用這些應用程式導致你的手機受損或資料遺失，須自行負責。"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"進階設定"</string>
@@ -1658,6 +1700,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"停止系統服務？"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"如果你停用這項服務，你的平板電腦上的某些功能可能無法正常運作，待你重新開機後才會恢復正常。"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"如果你停用這項服務，你的手機上的某些功能可能無法正常運作，待你重新開機後才會恢復正常。"</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"語言、輸入和手勢"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"語言與輸入設定"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"語言與輸入設定"</string>
     <string name="input_assistance" msgid="7577795275222555487">"輸入輔助"</string>
@@ -1872,6 +1918,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> 個列印服務已啟用</item>
       <item quantity="one">1 個列印服務已啟用</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> 項列印工作</item>
+      <item quantity="one">1 項列印工作</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"列印服務"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"未安裝任何服務"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"找不到印表機"</string>
@@ -1938,6 +1988,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"使用狀況詳細資訊"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"調整電力使用"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"已包含封裝檔案"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"多個應用程式正在消耗大量電池電力"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"避免裝置進入待機狀態"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"在背景喚醒裝置"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"要求取得位置資訊的頻率過高"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> 個應用程式未正常運作"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"要停止應用程式嗎？"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"由於「<xliff:g id="APP">%1$s</xliff:g>」避免你的手機進入待機狀態，因此你的手機無法正常管理電池。\n\n你可以強制停止這個應用程式來解決此問題。\n\n如果問題持續發生，你可能需要解除安裝應用程式，才能改善電池效能。"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"由於「<xliff:g id="APP">%1$s</xliff:g>」避免你的平板電腦進入待機狀態，因此你的平板電腦無法正常管理電池。\n\n你可以強制停止這個應用程式來解決此問題。\n\n如果問題持續發生，你可能需要解除安裝應用程式，才能改善電池效能。"</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"由於「<xliff:g id="APP">%1$s</xliff:g>」避免你的裝置進入待機狀態，因此你的裝置無法正常管理電池。\n\n你可以強制停止這個應用程式來解決此問題。\n\n如果問題持續發生，你可能需要解除安裝應用程式，才能改善電池效能。"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"停止應用程式"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"要關閉背景使用功能嗎？"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"由於「<xliff:g id="APP">%1$s</xliff:g>」避免你的手機進入待機狀態，因此你的手機無法正常管理電池。\n\n請設定手機禁止讓這個應用程式在背景執行，以解決這個問題。"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"由於「<xliff:g id="APP">%1$s</xliff:g>」避免你的平板電腦進入待機狀態，因此你的平板電腦無法正常管理電池。\n\n請設定平板電腦禁止讓這個應用程式在背景執行，以解決這個問題。"</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"由於「<xliff:g id="APP">%1$s</xliff:g>」避免你的裝置進入待機狀態，因此你的裝置無法正常管理電池。\n\n請設定裝置禁止讓這個應用程式在背景執行，以解決這個問題。"</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"關閉"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"要關閉定位功能嗎？"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"由於「<xliff:g id="APP">%1$s</xliff:g>」在你不使用時持續要求取得位置資訊，因此你的手機無法正常管理電池。\n\n請關閉這個應用程式的定位功能，以解決這個問題。"</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"由於「<xliff:g id="APP">%1$s</xliff:g>」在你不使用時持續要求取得位置資訊，因此你的平板電腦無法正常管理電池。\n\n請關閉這個應用程式的定位功能，以解決這個問題。"</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"由於「<xliff:g id="APP">%1$s</xliff:g>」在你不使用時持續要求取得位置資訊，因此你的裝置無法正常管理電池。\n\n請關閉這個應用程式的定位功能，以解決這個問題。"</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"關閉"</string>
     <string name="power_screen" msgid="3023346080675904613">"螢幕"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"手電筒"</string>
     <string name="power_camera" msgid="4976286950934622605">"相機"</string>
@@ -1952,7 +2022,7 @@
     <string name="power_apps" msgid="2043554781293951327">"應用程式"</string>
     <string name="power_service" msgid="1599661212370831780">"服務"</string>
     <string name="power_system" msgid="8290455327965307383">"系統"</string>
-    <string name="power_user" msgid="1889728099253018005">"使用者"</string>
+    <string name="power_user" msgid="3706143225319881667">"其他使用者"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU 總使用時間"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 前景使用時間"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"停用休眠"</string>
@@ -2004,6 +2074,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"估計過高的用電量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"使用時間：<xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"使用時間：<xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"螢幕使用時間：<xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>用量佔 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"整體電量的 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2567,7 +2638,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"變更 PIN 碼"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"顯示通知"</string>
     <string name="help_label" msgid="6886837949306318591">"說明與意見回饋"</string>
-    <string name="support_summary" msgid="8276116616493882830">"說明文章、電話與即時通訊支援"</string>
+    <string name="support_summary" msgid="2705726826263742491">"說明文章、電話與即時通訊、開始使用"</string>
     <string name="user_account_title" msgid="1127193807312271167">"內容帳戶"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"相片 ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"重大威脅"</string>
@@ -2657,9 +2728,12 @@
       <item quantity="one">顯示 %d 個隱藏項目</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"網路和網際網路"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi、行動網路、數據用量、無線基地台"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"行動網路"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"數據用量"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"無線基地台"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"已連結的裝置"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"藍牙、投放、NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"藍牙、投放"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"應用程式和通知"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"權限、預設應用程式"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"使用者和帳戶"</string>
@@ -2712,6 +2786,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"手勢"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"支付、輕觸、付款"</string>
     <string name="keywords_backup" msgid="470070289135403022">"備份內容, 備份"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"手勢, 邊緣, 側面, 有效的邊緣, 握壓, 拿握, 協助, 個人助理, 壓握, 抓握, 握住, 緊握, Ok Google, Google 個人助理"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"手勢, 喚醒, 通知, 螢幕, 顯示, 關閉螢幕, 開啟螢幕, 握壓, 邊緣, 睡眠, 休眠, 拿握"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"手勢, 關閉鈴聲, 貪睡, 鬧鐘, 來電, 靜音, 顯示, 螢幕鎖定, 握壓, 拿握, 邊緣, 停止"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"設定 Wi-Fi NFC 標記"</string>
     <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"輕觸標記即可寫入..."</string>
@@ -2794,7 +2871,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"一律不顯示 Work 通知"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"當裝置鎖定時，你要如何顯示個人資料通知？"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"個人資料通知"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"通知"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"通知"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"應用程式通知"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"通知類別"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"重要性"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"讓應用程式決定"</string>
@@ -2809,6 +2887,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"緊急"</string>
     <string name="allow_sound" msgid="1820188704793497324">"開啟音效"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"不要發出音效、震動，也不要在目前畫面上短暫顯示這類通知。"</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"低重要性"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"中重要性"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"高重要性"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"緊急重要性"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"通知小幫手"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"通知存取權"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"管理員已禁止存取 Work 設定檔通知"</string>
@@ -2836,8 +2918,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"子母畫面"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"允許子母畫面"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"允許這個應用程式在開啟時或你離開後 (例如繼續觀看影片) 建立子母畫面視窗。這類視窗會在你目前使用的其他應用程式上層顯示。"</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"是"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"否"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"零打擾存取權"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"最近沒有已安裝的應用程式要求「零打擾」存取權"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式..."</string>
@@ -2968,11 +3048,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"這個 Work 設定檔是由下列應用程式管理："</string>
     <string name="managing_admin" msgid="8843802210377459055">"由 <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> 管理"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(實驗性)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"裝置旋轉"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"旋轉畫面內容"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"保持直向畫面"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"保持橫向畫面"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"保持目前方向"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"安全啟動"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"繼續"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"如要進一步保護裝置，你可以將裝置設為需要輸入 PIN 碼才能啟動，等裝置啟動後方可接收來電、訊息或通知 (包括警告)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要輸入 PIN 碼才能啟動嗎？"</string>
@@ -2980,7 +3055,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"如要進一步保護裝置，你可以將裝置設為需要輸入密碼才能啟動，等裝置啟動後方可接收來電、訊息或通知 (包括警告)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要輸入密碼才能啟動嗎？"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"除了使用指紋來解鎖裝置之外，你也可以將裝置設為需要輸入 PIN 碼才能啟動，等裝置啟動後方可接收來電、訊息或通知 (包括警告)，進一步保護裝置。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要輸入 PIN 碼才能啟動嗎？"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"除了使用指紋來解鎖裝置之外，你也可以將裝置設為需要畫出解鎖圖案才能啟動，等裝置啟動後方可接收來電、訊息或通知 (包括警告)，進一步保護裝置。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要畫出解鎖圖案才能啟動嗎？"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"除了使用指紋解鎖裝置之外，你也可以將裝置設為需要輸入密碼才能啟動，等裝置啟動後方可接收來電、訊息或通知 (包括警告)，進一步保護裝置。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要輸入密碼才能啟動嗎？"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"除了啟用裝置的指紋解鎖功能，你還可以將裝置設為需要輸入密碼才能啟動，增添多一道防護。裝置必須成功啟動才能接聽電話及接收訊息或通知 (包括鬧鐘)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要輸入密碼才能啟動嗎？"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"是"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"否"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"需要輸入 PIN？"</string>
@@ -3098,6 +3173,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"電池用量警示"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"顯示完整的裝置用電量"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"應用程式使用情況"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"電池用量高"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> 個應用程式的行為異常</item>
+      <item quantity="one">「<xliff:g id="APP">%1$s</xliff:g>」的行為異常</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="other">多個應用程式正在消耗大量電池電力</item>
+      <item quantity="one">「<xliff:g id="APP">%1$s</xliff:g>」正在消耗大量電池電力</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"未套用最佳化設定"</string>
     <string name="high_power_on" msgid="6216293998227583810">"未套用最佳化設定"</string>
     <string name="high_power_off" msgid="3393904131961263278">"採用電池效能最佳化設定"</string>
@@ -3190,8 +3274,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"顯示在其他應用程式上層"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> 個應用程式可以顯示在其他應用程式上層 (共 <xliff:g id="COUNT_1">%2$d</xliff:g> 個應用程式)"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"具備權限的應用程式"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"可"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"否"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"允許"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"不允許"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"安裝應用程式不明來源"</string>
     <string name="write_settings" msgid="4797457275727195681">"修改系統設定"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"編寫修改系統設定"</string>
@@ -3281,6 +3365,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"已將螢幕色調改為琥珀色，讓你比較容易入睡。"</string>
     <string name="suggestions_title" msgid="7280792342273268377">"建議"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"另外 <xliff:g id="ID_1">%1$d</xliff:g> 個"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> 個建議</item>
+      <item quantity="one">1 個建議</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="other">另外 <xliff:g id="COUNT">%1$d</xliff:g> 個建議</item>
+      <item quantity="one">另外 1 個建議</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"移除"</string>
     <string name="color_temperature" msgid="2070126836910615605">"冷色溫"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"使用較冷的顯示器色溫"</string>
@@ -3299,8 +3392,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> 數據用量警告"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> 數據用量警告/<xliff:g id="ID_2">%2$s</xliff:g> 數據用量上限"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"帳單週期"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"每月週期從當月 <xliff:g id="ID_1">%1$s</xliff:g>日起算"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"每月 <xliff:g id="ID_1">%1$s</xliff:g>日起算"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"每月 <xliff:g id="ID_1">%1$s</xliff:g> 號"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"網路限制"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> 項限制</item>
@@ -3320,7 +3412,7 @@
       <item quantity="one">已允許 1 個應用程式在數據節省模式開啟時無限量使用數據</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"數據節省模式"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"數據用量不受限"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"數據用量不受限"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"背景資料功能已關閉"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"已開啟"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"已關閉"</string>
@@ -3384,8 +3476,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"管理螢幕鎖定通知"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"顯示或隱藏通知內容"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"全部"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"支援"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"支援和提示"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"最小寬度"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"沒有任何已安裝的應用程式要求「付費簡訊」存取權"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"「付費簡訊」需要額外計費，相關費用會併入你的電信費帳單。如果你為某個應用程式啟用權限，即可利用該應用程式傳送付費簡訊。"</string>
@@ -3450,28 +3541,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"自動"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"手動"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"立即釋出空間"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"手勢"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"手勢捷徑"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"透過簡單的手勢操作手機"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"透過簡單的手勢操作平板電腦"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"透過簡單的手勢操作裝置"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"快速開啟相機"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"只要在任何畫面中按兩下電源按鈕，即可快速開啟相機。"</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"快速開啟相機"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"按兩下電源鍵來開啟相機"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"快速切換鏡頭"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"自拍更快速"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"將手機扭動兩下來開啟自拍模式"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"將平板電腦扭動兩下來開啟自拍模式"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"將裝置扭動兩下來開啟自拍模式"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"輕觸兩下手機即可查看"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"輕觸兩下平板電腦即可查看"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"輕觸兩下裝置即可查看"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"只要輕觸螢幕兩下，即可快速查看通知。"</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"輕觸兩下螢幕即可查看時間、通知圖示和其他資訊。"</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"在螢幕關閉時查看通知"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"拿起手機即可查看"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"拿起平板電腦即可查看"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"拿起裝置即可查看"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"只要拿起手機，即可快速查看通知。"</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"只要拿起平板電腦，即可快速查看通知。"</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"只要拿起裝置，即可快速查看通知。"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"拿起手機即可查看時間、通知圖示和其他資訊。"</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"拿起平板電腦即可查看時間、通知圖示和其他資訊。"</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"拿起裝置即可查看時間、通知圖示和其他資訊。"</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"在螢幕關閉時查看通知"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"滑動感應指紋以查看通知"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"將手指放在手機背面的指紋感應器上並向下滑動，即可查看通知。"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"將手指放在平板電腦背面的指紋感應器上並向下滑動，即可查看通知。"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"將手指放在裝置背面的指紋感應器上並向下滑動，即可查看通知。"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"快速查看通知"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"將手指放在指紋感應器上並向下滑動"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"在拿起手機時開啟相機"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"如要自動開啟相機，只要將手機拿起做出拍照 (橫向或縱向) 動作即可。即使手機進入睡眠模式或鎖定狀態，都能使用此功能。"</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"在手機處於睡眠模式或鎖定狀態時拍攝相片"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"輔助手勢"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"敏感度"</string>
@@ -3575,6 +3679,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"要移除這個免安裝應用程式嗎？"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"遊戲"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"音訊檔案"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"已使用的空間"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(已為使用者<xliff:g id="USER">%s</xliff:g>解除安裝)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(已為使用者<xliff:g id="USER">%s</xliff:g>停用)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"自動填入服務"</string>
@@ -3588,5 +3693,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"免安裝應用程式"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"要停用儲存空間管理員嗎？"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"影視應用程式"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"已使用的空間"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"電信業者佈建資訊"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"觸發電信業者佈建程序"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"這個裝置有哪些值得一試的新功能？"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"查看前 5 項功能"</string>
 </resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 1e2e285..df1e995 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Kuhle"</item>
     <item msgid="8986346415847956850">"Kuhle kakhulu"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Njalo"</item>
-    <item msgid="844721238536786870">"Uma ixhunyiwe kuphela"</item>
-    <item msgid="1986753720941888596">"Akusoze"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Njalo"</item>
-    <item msgid="7433294150916905997">"Uma ixhunyiwe kuphela"</item>
-    <item msgid="1390404486722375028">"Akusoze"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Izinsuku zokugcina ezingu-30"</item>
     <item msgid="6600989128423965319">"Isetha umjikelezo wokusebenzisa..."</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 7cc2910..a8fd720 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -30,6 +30,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Manje ungunjiniyela!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Asikho isidingo, usuvele ungunjiniyela."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Sicela unike amandla izinketho zokuthuthukisa kuqala."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Okugenantambo namanethiwekhi"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Oxhumana nabo"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Idivayisi"</string>
@@ -41,6 +42,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Okunikeziwe kwe-VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Kugunyazwe ukushaya kwevidiyo"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Kugunyazwe ukushaya kwe-Wifi"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"I-EAB/Ukuba khona kunikezelwe"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Amandla erediyo yeselula"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Buka incwadi yekheli le-SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Buka Izinombolo Zokudayela Okungaguquki"</string>
@@ -106,10 +108,17 @@
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Skena amadivaysi"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"Qamba kabusha le divayisi"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Qamba kabusha"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ungaxhumeki kwi-inthanethi?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Lokhu kuzophelisa uxhumano nge:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disconnect_title" msgid="7830252930348734303">"Nqamula idivayisi?"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8208712728668714199">"Ifoni yakho izonqamuka kusuka ku-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="6611038575213485336">"Ithebhulethi yakho izonqamuka kusuka ku-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Idivayisi yakho izonqamuka kusuka ku-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Nqamula"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Awunayo imvume yokushintsha izilungiselelo ze-Bluetooth."</string>
+    <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Bhanqa idivayisi entsha"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"I-<xliff:g id="DEVICE_NAME">%1$s</xliff:g> iyabonakala kumadivayisi aseduzane ngenkathi izilungiselelo ze-Bluetooth zivulekile."</string>
+    <string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Ikheli le-Bluetooth lefoni: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Ikhli le-Bluetooth lethebhulethi: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Ikheli le-Bluetooth yedivayisi: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Nqamula i-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Ukusakaza"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vimbela iphrofayli?"</string>
@@ -121,7 +130,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Isicelo sokubhanqa i-Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Isicelo sokubhangqa"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"Thepha ukuze ubhanqe ne-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Bonisa amafayili atholiwe"</string>
+    <string name="bluetooth_show_received_files" msgid="3144149432555230410">"Amafayela atholiwe"</string>
     <string name="device_picker" msgid="4978696506172252813">"Khetha idivayisi ye-Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ifuna ukuvula i-Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ufuna ukuvula i-Bluetooth"</string>
@@ -157,6 +166,9 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"I-%1$s ifuna ukufinyelela kumilayezo yakho. Nikeza ukufinyelela ku-%2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Isicelo sokufinyelela ku-SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"I-<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ifuna ukufinyelela kukhadi lakho le-SIM. Ukunikeza ukufinyelela kukhadi le-SIM kuzokhubaza ukuxhumeka kwedatha kudivayisi yakho ngesikhathi sokuxhumeka. Nikeza ukufinyelela ku-<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_device_name_summary" msgid="4757990010751789977">"Kubonakala njenge-\'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' kwamanye amadivayisi"</string>
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Amadivayisi akho"</string>
+    <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Bhanqa idivayisi entsha"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Idethi nesikhathi"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Khetha isikhathi sendawo"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +341,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Ama-akhawunti"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Indawo"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Ama-akhawunti"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Ukuphepha nendawo"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Ukuvikela nendawo"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Ukubethela nokuqinisekisa"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Ifoni ibethelwe"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Idivayisi ibethelwe"</string>
@@ -354,40 +366,38 @@
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Vula ngezigxivizo zeminwe"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Sebenzisa izigxivizo zakho zeminwe"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Vele uthinte inzwa yezigxivizo zeminwe ukuze uvule ifoni yakho, ugunyaze ukuthenga, noma ungene ngemvume kuzinhlelo zokusebenza. Qaphela ukuthi ungeza izigxivizo zeminwe zakabani. Nezigxivizo ezizodwa ezingeziwe zingenza zonke lezi zinto.\n\nYazi: Izigxivizo zakho zeminwe zingavikeleka kancane kunephethini eqinile noma i-PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Vele uthinte inzwa yezigxivizo zeminwe ukuze ugunyaze ukuthenga, noma ngena ngemvume kuzinhlelo zokusebenza. Qaphela ukuthi ungeza izigxivizo zeminwe zikabani. Nezigxivizo ezizodwa ezingeziwe zingenza noma iziphi zalezi zinto.\n\nYazi: Awukwazi ukusebenzisa izigxivizo zakho zeminwe ukuze uvule le divayisi. Ukuze uthole olunye ulwazi, xhumana nomqondisi wenhlangano yakho."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Vele uthinte inzwa yezigxivizo zeminwe ukuze uvule ifoni yakho, ugunyaze ukuthenga, noma ungene ngemvume kuzinhlelo zokusebenza. Qaphela ukuthi ungeza izigxivizo zeminwe zakabani. Nezigxivizo ezizodwa ezingeziwe zingenza zonke lezi zinto.\n\nYazi: Izigxivizo zakho zeminwe zingavikeleka kancane kunephethini eqinile noma iphinikhodi."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Sebenzisa isigxivizo sakho somunwe 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="6817326798834882531">"Sebenzisa izigxivizo zakho zeminwe 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="3199351118385606526">"Khansela"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Qhubeka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Yeqa"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Engeza izigxivizo zeminwe"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Izici zokuvikela idivayisi ngeke zenziwe zisebenze. Ngeke uze ukwazi ukuvimbela abanye kusukela ekusebenziseni le thebulethi uma lilahleka, lintshontshwa noma lisulwa"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Izici zokuvikela kwedivayisi ngeke zenziwe zisebenze. Ngeke uze ukwazi ukuvimbela abanye kusukela ekusebenziseni le divayisi uma ngabe ilahleka, intshontshwa noma isulwa."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Izici zokuvikela idivayisi ngeke zenziwe zisebenze. Ngeke uze ukwazi ukuvimbela abanye kusukela ekusebenziseni le foni uma ilahleka, intshontshwa noma isulwa."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Izici zokuvikela idivayisi ngeke zenziwe zisebenze. Ngeke uze ukwazi ukuvimbela abanye kusukela ekusebenziseni le thebulethi uma ilahleka noma intshontshwa."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Izici zokuvikela idivayisi ngeke zenziwe zisebenze. Ngeke uze ukwazi ukuvimbela abanye kusukela ekusebenziseni le divayisi uma ilahleka noma intshontshwa."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Izici zokuvikela idivayisi ngeke zenziwe zisebenze. Ngeke uze ukwazi ukuvimbela abanye kusukela ekusebenziseni le foni uma ilahleka noma intshontshwa."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Okulandelayo"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Izici zokuvikela idivayisi ngeke zivulwe. Ngeke ukwazi ukugwema abanye ukuthi bangasebenzisi le thebhulethi uma ilahlekile, itshontshiwe noma ilele."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Izici zokuvikela idivayisi ngeke zivulwe. Ngeke ukwazi ukugwema abanye ukuthi bangasebenzisi le divayisi uma ilahlekile, itshontshiwe noma ilele."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="2423428240245737909">"Izici zokuvikela idivayisi ngeke zivulwe. Ngeke ukwazi ukugwema abanye ukuthi bangasebenzisi le foni uma ilahlekile, itshontshiwe noma ilele."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="5219287483885558525">"Izici zokuvikela idivayisi ngeke zivulwe. Ngeke ukwazi ukugwema abanye ukuthi bangasebenzisi le thebhulethi uma ilahlekile noma itshontshiwe."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Izici zokuvikela idivayisi ngeke zivulwe. Ngeke ukwazi ukugwema abanye ukuthi bangasebenzisi le divayisi uma ilahlekile noma itshontshiwe."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Izici zokuvikela idivayisi ngeke zivulwe. Ngeke ukwazi ukugwema abanye ukuthi bangasebenzisi le foni uma ilahlekile noma itshontshiwe."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Yeqa noma kunjalo"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Buyela emuva"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Thola inzwa"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Beka inzwa yezigxivizo zeminwe emuva kwefoni yakho."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Thinta inzwa"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Kusemuva kwefoni yakho. Sebenzisa umunwe wakho wokukhomba."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Ukuvezwa ngedivayisi ngendawo yenzwa yezigxivizo zeminwe"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Igama"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"KULUNGILE"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Susa"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Asiqalise"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="2068961812439460133">"Thinta inzwa"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Beka umunwe wakho kunzwa uphinde uphakamise ngemuva kokuthi uzwe ukudlidliza"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Qhubeka"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Hambisa umunwe wakho kancane ukuze ungeze zonke izingxenye ezihlukile zezigxivizo zeminwe yakho"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Izigxivizo zeminwe zingeziwe!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Noma kunini lapho ubona khona lesi sithonjana, ungasebenzisa izigxivizo zakho zeminwe noma ugunyaze ukuthenga."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Vele uthinte inzwa yezigxivizo zeminwe uphinde uvule idivayisi yakho."</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Uma ubona lesi sithonjana, ungaphinda ugunyaze ukuthenga noma ukungena ngemvume kuzinhlelo zokusebenza."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Phakamisa, bese uthinte futhi"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Qhubeka nokuphakamisa umunwe wakho ukuze ungeze izingxenye ezahlukahlukene zesigxiviso sakho somunwe"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Izigxivizo zeminwe zingeziwe"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="4796715961273420536">"Uma usebenzisa lesi sithonjana, sebenzisa isigxivizo somunwe ukuze ukhombe nomauvume ukuthenta."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Yeqa ukusethwa kwezigxivizo zeminwe?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Ukhethe ukusebenzisa izigxivizo zakho zeminwe njengendlela eyodwa yokuvula ifoni yakho. Uma weqa manje, kuzomele usethe lokhu ngemuva kwesikhathi. Ukusetha kuthatha iminithi noma isikhathi esingalapho."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Hlela ukuvala isikrini"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Kwenziwe"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Hhayi bo, akuyona inzwa leyo"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Sebenzisa inzwa yezigxivizo zeminwe kudivayisi yakho."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Thinta inzwa emuva kwefoni yakho. Sebenzisa umunwe wakho wokukhomba."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Ukubhaliswa akuzange kuqedwe"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Isikhathi sokubhaliswa kwezigxivizo zeminwe sifinyelelwe. Zama futhi."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Ukubhaliswa kwezigxivizo zeminwe akuzange kusebenze. Zama futhi noma sebenzisa umunwe ohlukile."</string>
@@ -449,6 +459,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Vimbela abanye kusukela ekusebenziseni le divayisi ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukukusebenzisa."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Vimbela abanye kusukela ekusebenziseni le foni ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukukusebenzisa."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Khetha indlela yokukhiya isikrini yakho yokwenza isipele"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Izinketho zokukhiya isikrini"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Izinketho zokukhiya isikrini"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Isikrini sivaliwe."</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Ngokushesha ngemuva kokulala"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> ngemuva kokulala"</string>
@@ -519,13 +531,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Shintsha iphathini yokuvula"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Shintsha i-PIN yokuvula"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Shintsha iphasiwedi yokuvula"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Zama futhi. Umzamo <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> kwengu-<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Umzamo wokugcina"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Uma ufaka iphethini yomsebenzi engalungile kulo mzamo, iphrofayela yakho yomsebenzi kanye nedatha ephathelanisiwe kuzosuswa kusuka kule divayisi."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Uma ufaka iphini yomsebenzi engalungile kulo mzamo, iphrofayela yakho yomsebenzi kanye nedatha ephathelene kuzosuswa kusuka kule divayisi."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Uma iphasiwedi yomsebenzi engalungile kulo mzamo, iphrofayela yakho yomsebenzi nedatha ephathelanisiwe izosuswa kusuka kule divayisi."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Imizamo eminingi engalungile. Iphrofayela yakho yomsebenzi kanye nedatha ephathelanisiwe kuzosuswa kusuka kule divayisi."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Cashisa"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Zama futhi. Umzamo ongu-<xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> kwengu-<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Idatha yakho izosuswa"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Uma ufaka iphethini engalungile kumzamo olandelayo, le datha yamadivayisi izosuswa"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Uma ufaka iphinikhodi engalungile kumzamo olandelayo, le datha yalawa madivayisi izosuswa"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Uma ufake iphasiwedi engalungile kumzamo olandelayo, le datha yalawa madivayisi izosuswa"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Uma ufaka iphethini engalungile kumzamo olandelayo, lo msebenzisi uzosuswa"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Uma ufaka iphinikhodi engalungile kumzamo olandelayo, lo msebenzisi uzosuswa"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Uma ufaka iphasiwedi engalungile kumzamo olandelayo, lo msebenzisi uzosuswa"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Uma ufaka iphethini engalungile kumzamo olandelayo, iphrofayela yakho yomsebenzi nedatha yayo izosuswa"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Uma ufaka iphinikhodi engalungile kumzamo olandelayo, iphrofayela yakho yomsebenzi nedatha yayo izosuswa"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Uma ufake iphasiwedi engalungile kumzamo olandelayo, iphrofayela yakho yomsebenzi nedatha yayo izosuswa"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Imizamo eminingi kakhulu engalungile. Le datha yedivayisi izosuswa."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Imizamo eminingi kakhulu engalungile. Lo msebenzisi uzosuswa."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Imizamo eminingi kakhulu engalungile. Le phrofayela yomsebenzi nedatha yayo izosuswa."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Cashisa"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Kumele okungenani kube izinhlamvu ezingu-<xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Iphinikhodi kumele ibe okungenani amadijithi angu-<xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Qhubeka"</string>
@@ -626,6 +646,14 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"i-Bluetooth ephambili"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Uma i-Bluetooth ivuliwe, idivayisi yakho ingakwazi ukuxhumana namanye amadivayisi aseduze we-Bluetooth."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Ukusiza ukuthuthukisa ukuqonda, izinhlelo zokusebenza zesistimu namasevisi angasakwazi ukuthola amadivayisi we-Bluetooth. Ungashintsha lokhu <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>kuzilungiselelo zokuskena<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_connect_failed" msgid="4500234659813241053">"Ayikwazanga ukuxhuma. Zama futhi."</string>
+    <string name="device_details_title" msgid="6576953269221085300">"Imininingwane yedivayisi"</string>
+    <string name="bluetooth_device_mac_address" msgid="2513724313558236181">"Ikheli le-Bluetooth yedivayisi: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_title" msgid="38467834196432400">"Khohlwa idivayisi?"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="9087609557757135712">"Ifoni yakho ngeke isabhanqwa ne-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="7785695793007576501">"Ithebhulethi yakho ngeke isabhanqwa ne-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="251257782642157557">"Idivayisi yakho ngeke isabhanqwa ne-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="3829370108973879006">"Khohlwa idivayisi"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Xhuma kwi..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ingeke ixhumeke kumsindo wemidiya."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngeke ixhumeke kumsindo wehendsfri."</string>
@@ -778,6 +806,7 @@
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"Unganikezeli"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"Ungaqinisekisi"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"Asikho isitifiketi esicacisiwe. Ukuxhumeka kwakho ngeke kube yimfihlo."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"Igama lenethiwekhi lide kakhulu."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"Kumele icacise isizinda."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"i-WPS iyatholakala"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (i-WPS iyatholakala)"</string>
@@ -809,7 +838,6 @@
       <item quantity="other">%d amanethiwekhi</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Ukuxhumana kungenazintambo okuphambili"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Lungiselela i-Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Ikheli le-MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Ikheli le-IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Imaski ye-subnet"</string>
@@ -846,9 +874,17 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Khohlwa leli qembu?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Wi-Fi hotspot ephathekayo"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"I-Wi‑Fi hotspot"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Sebenzisa ukuxhumeka kweselula ukuze unikezele ngenethiwekhi ye-Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Akwabiwa ukuxhumeka kwe-inthanethi kwale thebulethi nge-hotspot"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Akwabiwa ukuxhumeka kwe-inthanethi kwale foni nge-hotspot"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="5466126533609394170">"Akukho ukwabelana kwe-inthanethi noma okuqukethwe namanye amadivayisi"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5752490509369962007">"Ukwabiwa ukuxhumeka kwe-inthanethi kwale thebulethi nge-hotspot"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Ukwabiwa ukuxhumeka kwe-inthanethi kwale foni nge-hotspot"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Uhlelo lokusebenza labelana ngokuqukethwe. Ukuze wabelane ngoxhumo lwe-inthanethi, vala i-hotspot, bese uyivule"</string>
+    <string name="wifi_hotspot_name_title" msgid="1341735529132128887">"Igama le-Wi‑Fi"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"Ivula i-<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"Amanye amadivayisi angaxhuma ku-<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_hotspot_password_title" msgid="1955592302902091281">"Iphasiwedi ye-Wi-Fi"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"I-AP Band"</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="1203489406068036455">"Sebenzisa i-hotspot ukudala inethiwekhi ye-Wi‑Fi yamanye amadivayisi akho. I-Hotspot inikezela nge-inthanethi isebenzisa uxhumo lwedatha yakho yeselula. Amashaji edatha yeselula angeziwe angasebenza."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Izinhlelo zokusebenza zingadala i-hotspot ukwabelana ngokuqukethwe namadivayisi aseduze."</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Ivula i-hotspot…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Ivala i-hotspot…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"I-<xliff:g id="NETWORK_SSID">%1$s</xliff:g> iyasebenza"</string>
@@ -895,6 +931,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Uma ukushaya kwe-Wi-Fi kuvuliwe, ifoni yakho ingarutha amakholi ngamanethiwekhi we-Wi-Fi noma kunethiwekhi yenkampani yakho yenethiwekhi, ngokuya ngokuncamelayo nokuthi iyiphi isiginali enamandla. Ngaphambi kokuvula lesi sici, hlola nenkampani yakho yenethiwekhi ngokuphathelene nezinkokhelo neminye imininingwane."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Buyekeza ikheli lesimo esiphuthumayo"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Ikheli elisetshenziswa amasevisi ezimo eziphuthumayo endaweni yakho uma wenza ikholi ye-911 usebenzisa i-WiFi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ukubukeka"</string>
@@ -952,6 +989,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Akukho miphumela"</string>
     <string name="display_settings" msgid="7965901687241669598">"Ukubukeka"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Phendula iskrini ngokuzenzakalela"</string>
+    <string name="color_mode_title" msgid="3159275920408338215">"Imibala ekhanya kakhulu"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Shintsha ukujikeleleza ngokuzenzakalela lapho ujikelezisa ithebhulethi"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Shintsha ukujikeleleza ngokuzenzakalela lapho ujikelezisa ifoni"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Shintsha ukujikeleleza ngokuzenzakalela lapho ujikelezisa ithebhulethi"</string>
@@ -979,23 +1017,22 @@
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Thuthukisa ileveli yokukhanya emkhanyweni otholakalayo. Uma lesi sici sivuliwe, ungalungisa ukukhanya okwesikhashana."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Ukukhanya kwasebusuku"</string>
     <string name="night_display_text" msgid="1837277457033025056">"I-Night Light ifiphaza isikrini sakho ngoku-amber. Lokhu kungenza kubelula ukubheka esikrinini sakho noma ufunde ngokufiphele, futhi ingakusiza ukuthi ulale kalula."</string>
-    <string name="night_display_category_schedule" msgid="2044072617637348966">"Ipulani"</string>
-    <string name="night_display_category_status" msgid="1952928783124400330">"Isimo"</string>
-    <string name="night_display_auto_mode_title" msgid="8046314360381608455">"Vula ngokuzenzakalela"</string>
-    <string name="night_display_auto_mode_never" msgid="6723636142053240947">"Akusoze"</string>
-    <string name="night_display_auto_mode_custom" msgid="6012300346981608242">"Ishehuli yokuzenzakalela"</string>
-    <string name="night_display_auto_mode_twilight" msgid="2123345097508167094">"Ukushona kwelanga nokuphuma kwalo"</string>
+    <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Ipulani"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Lutho"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Ivula ngesikhathi sangokwezifiso"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Ivula kusuka ekuseni kuya entambama"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Isikhathi sokuqala"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Isikhathi sokuphela"</string>
+    <string name="night_display_status_title" msgid="1784041143360286267">"Isimo"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Ukuqina"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Kuvaliwe. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"Ngeke ize ivuleke ngokuzenzakalela."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Izovula ngokuzenzakalela ngo-<xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Izovuleka ngokuzenzakalela ekushoneni kwelanga."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Kuvuliwe. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Ngeke ize ivaleke ngokuzenzakalela."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Izovaleka ngokuzenzakalela ngo-<xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Izovaleka ngokuzenzakalela ekuphumeni kwelanga."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Valiwe / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Ngeke ize ivuleke ngokuzenzakalela"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Izovula ngokuzenzakalela ngo-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Izovuleka ngokuzenzakalela ekushoneni kwelanga"</string>
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Vuliwe / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Ngeke ize ivaleke ngokuzenzakalela"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Izovaleka ngokuzenzakalela ngo-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Izovaleka ngokuzenzakalela ekuphumeni kwelanga"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Lala"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Isikrini siyavaleka"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Emva <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> okungasebenzi"</string>
@@ -1019,8 +1056,14 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Izilungiselelo"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ukukhanya okuzenzakalelayo"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ilifti yokuvuka"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Isibonisi esi-Ambient"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Isibonisi esi-Ambient"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7974004969481877214">"Njalo ivuliwe"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Izaziso ezintsha"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Kuboniswa nini"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Izaziso ezintsha"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Vusa isikrini uma uthola izaziso"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Njalo ivuliwe"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Isikhathi sokubonisa, izithonjana zesazsizo, nolunye ulwazi"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Usayizi wefonti"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Yenza umbhalo ube mkhulu noma ube mncane"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Izilungiselelo zokuvala ikhadi le-SIM"</string>
@@ -1273,6 +1316,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"I-APN akumelwe ingabi nalutho."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Inkundla ye-MCC kumele ibe namadijithi angu-3."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Inkundla ye-MNC kumelwe ibe amadijithi angu-2 noma angu--3"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Inkampani yenethiwekhi ayivumeli ukungezwa kwama-APN ohlobo lwe-%s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Ibuyisela izilungiselelo ezizenzakalelayo ku-APN"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Setha kabusha kube okumisiwe"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ukuhlela okumisiwe izilungiselelo ze-APN kuqedile."</string>
@@ -1302,6 +1346,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Sula ikhadi le-SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Sula yonke idatha ekusitoreji se-USB , njengomculo noma izithombe."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Sula yonke idatha ekhadini le-SD, njengomculo noma izithombe"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Sula ama-eSIMs"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Sula onke ama-eSIMs efonini. Lokhu ngeke kukhansele icebo lakho lesevisi yeselula."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Sula onke ama-eSIMs kuthebhulethi. Lokhu ngeke kukhansele icebo lakho lesevisi yeselula."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Setha kabusha ithebhulethi"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Setha kabusha ifoni"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Sula lonke ulwazi lakho lomuntu siqu kanye nezinhlelo zokusebenza ezilandiwe? Awukwazi ukuhlehlisa lesi senzo!"</string>
@@ -1324,26 +1371,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Thola i-tether noma sebenzisa ama-hotspots aphathekayo ngenkathi iseva yedatha ivulekile"</string>
     <string name="usb_title" msgid="7483344855356312510">"I-USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Imodemu nge-USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"I-USB ixhunyiwe, hlola ukusebenzisa njengemodemu"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Kusebenziswe ifoni njengemodemu"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Ayikwazi ukusebenza uma indawo yokugcina i-USB isetshenziswa"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"i-USB ayixhunyiwe"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Xhuma ukuze uvule"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Iphutha lemodemu nge-USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="5991482890033484794">"Yabelana ngoxhumo lwe-inthanethi lwefoni nge-USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Yabelana ngoxhumo lwe-inthanethi lwethebhulethi nge-USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Imodemu nge-Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Yabelana ngokuxhumeka kwe-inthanethi kwale thebulethi nge-Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Yabelana ngokuxhumeka kwe-inthanethi kwale foni nge-Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Yabelana ngokuxhumeka kwe-inthanethi kwale thebulethi kudivayisi engu-1 nge-Bluetooth"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Yabelana ngokuxhumeka kwe-inthanethi kwale foni kudivayisi engu-1 nge-Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Yabelana ngokuxhumeka kwe-inthanethi kwale thebulethi kumadivayisi angu-<xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> nge-Bluetooth"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Yabelana ngokuxhumeka kwe-inthanethi kwale foni kumadivayisi angu-<xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> nge-Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="4558227863463153412">"Yabelana ngoxhumo lwe-inthanethi lwethebhulethi yakho nge-Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="1055197887836203595">"Yabelana ngoxhumo lwe-inthanethi lwefoni yakho nge-Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Yabelana ngokuxhumeka kwe-inthanethi yale-<xliff:g id="DEVICE_NAME">%1$d</xliff:g> nge-Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Ayabelani ngokuxhumeka kwe-inthanethi kwale thebulethi nge-Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Ayabelani ngokuxhumeka kwe-inthanethi kwale foni nge-Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Akulungiselwe ukusebenza"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Ayikwazi ukusebenzisa amadivaysi adlula angu-<xliff:g id="MAXCONNECTION">%1$d</xliff:g>."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngeke kusebenziswe ifoni njengemodemu"</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Sebenzisa i-hotspot nefoni njengemodemu ukuze unikeze i-inthanethi kumanye amadivayisi ngokuxhumeka kwakho kwedatha yeselula."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Sebenzisa i-hotspot nefoni njengemodemu ukuze unikeze i-inthanethi kumanye amadivayisi ngokuxhumeka kwakho kwedatha yeselula. Izinhlelo zokusebenza nazo zingadala i-hotspot ukwabelana nokuqukethwe namadivayisi aseduze."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Usizo"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Inethiwekhi yeselula"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Uhlelo lweselula"</string>
@@ -1376,7 +1412,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Imodi yendawo"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Sebenzisa i-GPS, i-Wi-Fi, i-Bluetooth, noma amanethiwekhi eselula ukuze unqume indawo"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Sebenzisa i-Wi-Fi, i-Bluetooth, noma amanethiwekhi eselula ukuze unqume indawo"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Sebenzisa i-GPS ukuze unqume indawo"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Sebenzisa i-GPS nezinzwa zedivayisi ukunquma indawo"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Iyaskena"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Ukuskena kwe-Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Thuthukisa indawo ngokuvumela izinhlelo zokusebenza zesistimu namasevisi ukuthola amanethiwekhi we-Wi-Fi noma kunini."</string>
@@ -1421,8 +1457,11 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"Awunalo uxhumano lwedatha. Ukubuka lokhu kwaziswa manje, iya ku-%s kunoma iyiphi ikhompuyutha exhunywe kwi-Inthanethi."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Iyalayisha…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Khetha iphasiwedi yakho"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="6624409510609085450">"Ukuze usebenzise izigxivizo zeminwe, setha iphasiwedi"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Khetha iphathini yakho"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="5901096361617543819">"Ukuze usebenzise izigxivizo zeminwe, setha iphethini"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Khetha i-PIN yakho"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="765344692615917183">"Ukuze usebenzise izigxivizo zeminwe, setha iphinikhodi"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Qinisekisa iphasiwedi yakho"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Qinisekisa iphathini yakho"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Qinisekisa i-PIN yakho"</string>
@@ -1491,6 +1530,9 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Izilungiselelo zohlelo lokusebenza"</string>
     <string name="install_applications" msgid="4872012136210802181">"Imithombo engaziwa"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Vumela yonke imithombo yohlelo lokusebenza"</string>
+    <string name="recent_app_category_title" msgid="6673071268966003928">"Izinhlelo zokusebenze ezisanda kuvuleka"</string>
+    <string name="see_all_apps_title" msgid="1317153498074308438">"Bona zonke izinhlelo zokusebenza ezingu-<xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="recent_app_summary" msgid="3366446669844932300">"<xliff:g id="TIME">^1</xliff:g> okwedlule"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Ithebulethi yakho nedatha yomuntu siqu kusengcupheni enkulu ukuthi kungahlaselwa izinhlelo zokusebenza ezingaziwa. Ngokufaka izinhlelo zokusebenza kusukela kulo mthombo, uyavuma ukuthi unesibopho sanoma ikuphi ukonakala kuthebulethi yakho noma ukulahlekelwa idatha okungabangelwa ukusetshenziswa kwazo."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Ifoni yakho nedatha yomuntu siqu kusengcupheni enkulu ukuthi kungahlaselwa izinhlelo zokusebenza ezingaziwa. Ngokufaka izinhlelo zokusebenza kusukela kulo mthombo, uyavuma ukuthi unesibopho sanoma ikuphi ukonakala kufoni yakho noma ukulahlekelwa idatha okungabangelwa ukusetshenziswa kwazo."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Izilungiselelo ezithuthukisiwe"</string>
@@ -1659,6 +1701,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Misa isevisi yesistimu?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Uqinisekile ukuthi ufuna ukumisa le sevisi yesistimu? Uma kunjalo, ezinyeizici zethebhulethi yakho zingase ziyeke ukusebenza kahle kuze kube yilapho uyivala noma uyivula futhi."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Uqinisekile ukuthi ufuna ukumisa le sevisi yesistimu? Uma kunjalo, ezinyeizici zethebhulethi yakho zingase ziyeke ukusebenza kahle kuze kube yilapho uyivala noma uyivula futhi."</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Izilimi, okokufaka nokuthinta"</string>
+    <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
+    <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
+    <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
     <string name="language_settings" msgid="8758655933029560944">"Izilimi nokokufaka"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Izilimi nokokufaka"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Usizo lokufakwa"</string>
@@ -1873,6 +1919,10 @@
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> amasevisi ephrinta avulekile</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> amasevisi ephrinta avulekile</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> imisebenzi yokuphrinta</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> imisebenzi yokuphrinta</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Amasevisi wokuphrinta"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Awekho amasevisi afakiwe"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Awekho amaphrinta atholiwe"</string>
@@ -1939,6 +1989,26 @@
     <string name="details_subtitle" msgid="32593908269911734">"Sebenzisa imininingwane"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Lungisa amandla okusebenza"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Amaphakheji ahlanganisiwe"</string>
+    <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Izinhlelo zokusebenza eziqeda ibhethri"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Igcina idivayisi ivukile"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ivusa idivayisi ngasemuva"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Icela indawo njalo"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> izinhlelo zokusebenza ezingaziphathi kahle"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Misa uhlelo lokusebenza?"</string>
+    <string name="dialog_stop_message" product="default" msgid="9149534230295983971">"Ifoni yakho ayikwazi ukuphatha ibhethri ngokuvamile ngoba i-<xliff:g id="APP">%1$s</xliff:g> igcina ifoni yakho ivukile.\n\nUkuze uzame ukulungisa le nkinga, ungaphoqa ukumisa uhlelo lokusebenza.\n\nUma lokhu kuqhubeka nokwenzeka, ungadinga ukukhipha uhlelo lokusebenza ukuze uthuthukise ukusebenza kwebhethri."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="5702924180465982412">"Ithebhulethi yakho ayikwazi ukuphatha ibhethri ngokuvamile ngoba i-<xliff:g id="APP">%1$s</xliff:g> igcina ithebhulethi yakho ivukile.\n\nUkuze uzame ukulungisa le nkinga, ungaphoqa ukumisa uhlelo lokusebenza.\n\nUma lokhu kuqhubeka nokwenzeka, ungadinga ukukhipha uhlelo lokusebenza ukuze uthuthukise ukusebenza kwebhethri."</string>
+    <string name="dialog_stop_message" product="device" msgid="9201053069493107713">"Idivayisi yakho ayikwazi ukuphatha ibhethri ngokuvamile ngoba i-<xliff:g id="APP">%1$s</xliff:g> igcina idivayisi yakho ivukile.\n\nUkuze uzame ukulungisa le nkinga, ungaphoqa ukumisa uhlelo lokusebenza.\n\nUma lokhu kuqhubeka nokwenzeka, ungadinga ukukhipha uhlelo lokusebenza ukuze uthuthukise ukusebenza kwebhethri."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Misa uhlelo lokusebenza"</string>
+    <string name="dialog_background_check_title" msgid="1525936543485084879">"Vala ukusebenza kwangasemuva?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="5539009263025812279">"Ifoni yakho ayikwazi ukuphatha ibhethri ngokuvamile ngoba i-<xliff:g id="APP">%1$s</xliff:g> iqhubeka nokuvusa ifoni yakho.\n\nUkuze wazise le nkinga, ifoni yakho ingagwema lolu hlelo lokusebenza ekusebenzeni ngasemuva."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="4001747292234087612">"Ithebhulethi yakho ayikwazi ukuphatha ibhethri ngokuvamile ngoba i-<xliff:g id="APP">%1$s</xliff:g> iqhubeka nokuvusa ithebhulethi yakho.\n\nUkuze wazise le nkinga, ithebhulethi yakho ingagwema lolu hlelo lokusebenza ekusebenzeni ngasemuva."</string>
+    <string name="dialog_background_check_message" product="device" msgid="585341224642457664">"Idivayisi yakho ayikwazi ukuphatha ibhethri ngokuvamile ngoba i-<xliff:g id="APP">%1$s</xliff:g> iqhubeka nokuvusa idivayisi yakho.\n\nUkuze wazise le nkinga, idivayisi yakho ingagwema lolu hlelo lokusebenza ekusebenzeni ngasemuva."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Vala"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Vala indawo?"</string>
+    <string name="dialog_location_message" product="default" msgid="7684240588903005427">"Ifoni yakho ayikwazi ukuphatha ibhethri ngokuvamile ngoba i-<xliff:g id="APP">%1$s</xliff:g> iqhubeka nokucela indawo uma ungasebenzisi uhlelo lokusebenza.\n\nUkuze ulungise le nkinga, ungavala indawo kulolu hlelo lokusebenza."</string>
+    <string name="dialog_location_message" product="tablet" msgid="7439311770795993356">"Ithebhulethi yakho ayikwazi ukuphatha ibhethri ngokuvamile ngoba i-<xliff:g id="APP">%1$s</xliff:g> iqhubeka nokucela indawo uma ungasebenzisi uhlelo lokusebenza.\n\nUkuze ulungise le nkinga, ungavala indawo kulolu hlelo lokusebenza."</string>
+    <string name="dialog_location_message" product="device" msgid="6285773079775018012">"Idivayisi yakho ayikwazi ukuphatha ibhethri ngokuvamile ngoba i-<xliff:g id="APP">%1$s</xliff:g> iqhubeka nokucela indawo uma ungasebenzisi uhlelo lokusebenza.\n\nUkuze ulungise le nkinga, ungavala indawo kulolu hlelo lokusebenza."</string>
+    <string name="dialog_location_ok" msgid="4572391197601313986">"Vala"</string>
     <string name="power_screen" msgid="3023346080675904613">"Isikrini"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"I-Flashlight"</string>
     <string name="power_camera" msgid="4976286950934622605">"Ikhamera"</string>
@@ -1953,7 +2023,7 @@
     <string name="power_apps" msgid="2043554781293951327">"Izinhlelo zokusebenza"</string>
     <string name="power_service" msgid="1599661212370831780">"Amasevisi"</string>
     <string name="power_system" msgid="8290455327965307383">"Isistimu"</string>
-    <string name="power_user" msgid="1889728099253018005">"Umsebenzisi"</string>
+    <string name="power_user" msgid="3706143225319881667">"Abanye abasebenzisi"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Inani le-CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Ingaphambili le-CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Gcina kuphapheme"</string>
@@ -2005,6 +2075,7 @@
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Ukusetshenziswa kwamandla okubalwe ngaphezulu"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="2690821851327075443">"Kusetshenziswe nge-<xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_active_for" msgid="2964359540508103032">"Isebenza isikhathi esingu-<xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_screen_usage" msgid="6537658662149713585">"Ukusetshenziswa kwesikrini <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> kusetshenziswe yi-<xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> kwalo lonke ibhethri"</string>
@@ -2564,7 +2635,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Shintsha i-PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Bonisa izaziso"</string>
     <string name="help_label" msgid="6886837949306318591">"Usizo nempendulo"</string>
-    <string name="support_summary" msgid="8276116616493882830">"Ama-athikili wosizo, usekelo lwefoni nelengxoxo"</string>
+    <string name="support_summary" msgid="2705726826263742491">"Ama-athikili osizo, ifoni, ingxoxo, ukuqalisa"</string>
     <string name="user_account_title" msgid="1127193807312271167">"I-akhawunti yokuqukethwe"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"I-ID yesithombe"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Izinsongo ezinkulu"</string>
@@ -2654,9 +2725,12 @@
       <item quantity="other">Bonisa izinto ezingu-%d ezifihliwe</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Inethiwekhi ye-inthanethi"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"I-Wi-Fi, iselula, ukusetshenziswa kwedatha, i-hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"iselula"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ukusetshenziswa kwedatha"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"i-hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Amadivayisi axhunyiwe"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"I-Bluetooth, ukusakaza, i-NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"I-Bluetooth, Sakaza"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Izinhlelo zokusebenza nezaziso"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Izimvume, izinhlelo zokusebenza ezienzakalelayo"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Abasebenzisi nama-akhawunti"</string>
@@ -2709,6 +2783,9 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"ukuthinta"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"khokha, thepha, i-payments"</string>
     <string name="keywords_backup" msgid="470070289135403022">"isipele, yenza isipele"</string>
+    <string name="keywords_squeeze_to_launch_gesture" msgid="4459283333825902485">"ukuthinta, umphetho, inxenye, umphetho osebenzayo, ukuminyanisa, ukubamba, ukusiza, umsizi, okuminyanisiwe, okuminyiwe, minya, ok google, umsizi we-google"</string>
+    <string name="keywords_wake_squeeze_gesture" msgid="6923058534235267845">"ukuthinta, ukuvuka, izaziso, isikrini, ukubonisa, ukuvala isikrini, ukuvula isikrini, ukuminya, umphetho, ukulala, lala, bamba"</string>
+    <string name="keywords_alarm_silence_gesture" msgid="8507935972184597252">"ukuthinta, ukuthula, ukusnuza, i-alamu, ikholi engenayo, ukuthula, ukukhiya isikrini, ukuminyanisa, ukubamga, umphetho, misa"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Setha umaka we-Wi-Fi NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"Bhala"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Thepha umaki ukuze ubhale..."</string>
@@ -2791,7 +2868,8 @@
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Ungabonisi izaziso zomsebenzi sanhlobo"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Uma idivayisi yakho ikhiyiwe, ufuna ukuthi izaziso zephrofayela zivele kanjani?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Izaziso zephrofayela"</string>
-    <string name="app_notifications_title" msgid="139788604658984593">"Izaziso"</string>
+    <string name="notifications_title" msgid="8086372779371204971">"Izaziso"</string>
+    <string name="app_notifications_title" msgid="5810577805218003760">"Izaziso zohlelo lokusebenza"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Isigaba sezaziso"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Ukubaluleka"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Vumela uhlelo lokusebenza lunqume"</string>
@@ -2806,6 +2884,10 @@
     <string name="notification_importance_high_title" msgid="3058778300264746473">"Okuphuthumayo"</string>
     <string name="allow_sound" msgid="1820188704793497324">"Vumela umsindo"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Ungenzi umsindo, ukudlidlizela, noma ubheke lezi zaziso kusikrini samanje."</string>
+    <string name="notification_channel_summary_min" msgid="5401718014765921892">"Ukubaluleka okuphansi"</string>
+    <string name="notification_channel_summary_low" msgid="322317684244981244">"Ukubaluleka okumaphakathi"</string>
+    <string name="notification_channel_summary_default" msgid="1111749130423589931">"Ukubaluleka okuphezulu"</string>
+    <string name="notification_channel_summary_high" msgid="2085017556511003283">"Ukubaluleka okusheshayo"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Umsizi wesaziso"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Ukufinyelela isaziso"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Ukufinyelela kuzaziso zephrofayela yomsebenzi zivinjelwe"</string>
@@ -2833,8 +2915,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Isithombe-phakathi-kwesithombe"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Vumela isithombe phakathi kwesithombe"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Vumela lolu hlelo lokusebenza ukuthi ludale iwindi lesithombe ngaphakathi kwesithombe ngenkathi uhlelo lokusebenza luvuliwe noma ngemuva kokuthi ulishiye (isibonelo, ukuze uqhubeke ubuke ividiyo). Leli windi liboniswa ngaphezulu kwezinye izinhlelo zokusebenza ozisebenzisayo."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Yebo"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Cha"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Ukufinyelela kokungaphazamisi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Azikho izinhlelo zokusebenza ezifakiwe ezicele ukufinyelela kokungaphazamisi"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ilayisha izinhlelo zokusebenza..."</string>
@@ -2965,11 +3045,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Le phrofayela yomsebenzi iphethwe ngu:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Iphethwe ngu-<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Ukuhlola)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Ukuzungezisa idivayisi"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Jikelezisa okuqukethwe kwesikrini"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Hlala ekubukweni kokuma ngobude"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Hlala ekubukweni kokwakheka kwezwe"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Hlala kumumo wamanje"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Vikela ukuqala"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Qhubeka"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Ungaqhubeka uvikele le divayisi ngokudinga iphinikhodi yakho ngaphambi kokuthi iqale. Kuze kube idivayisi iyaqala, ayikwazi ukuthola amakholi, imilayezo, noma izaziso ezifaka ama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe."</string>
@@ -2977,7 +3052,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Ungavikela ngokuthuthukile le divayisi ngokudinga iphasiwedi yakho ngaphambi kokuthi iqalise. Kuze kuqale le divayisi, ingathola amakholi, imilayezo noma izaziso, kufaka phakathi ama-alamu. \n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma atshontshiwe. Kudinga iphasiwedi ukuqala idivayisi yakho?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Ngokungeziwe ekusebenziseni izigxivizo zakho zeminwe ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokucela iphinikhodi yakho ngaphambi kokuthi iqale. Kuze kube idivayisi iyaqala, ayikwazi ukuthola amakholi, imilayezo, noma izaziso ezifaka ama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe."</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Ngokungeziwe ekusebenziseni izigxivizo zakho zeminwe ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokudinga iphethini yakho ngaphambi kokuthi iqale. Kuze kube idivayisi iyaqala, ayikwazi ukwamukela amakholi, imilayezo, noma izaziso, ezifaka ama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Ngokungeziwe ekusebenziseni izigxivizo zakho zeminwe ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokudinga iphasiwedi yakho ngaphambi kokuthi iqale. Kuze kube idivayisi yakho iyaqala, ayikwazi ukuthola amakholi, imilayezo, noma izaziso, ezifaka ama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe."</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Ngokungeziwe ekusebenziseni izigxivizo zakho zeminwe ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokucela iphinikhodi yakho ngaphambi kokuthi iqale. Kuze kube idivayisi iyaqala, ayikwazi ukwamukela amakholi, imilayezo, noma izaziso ezifaka ama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe. Udinga iphasiwedi ukuze uqale idivayisi yakho?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Yebo"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Cha"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Idinga iphinikhodi"</string>
@@ -3095,6 +3170,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Izexwayiso zokusetshenziswa"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Bonisa ukusetshenziswa kwedivayisi okugcwele"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Bonisa ukusetshenziswa kohlelo lokusebenza"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Ukusetshenziswa okuphezulu"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> izinhlelo zokusebenza ziziphatha ngokungajwayelekile</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> izinhlelo zokusebenza ziziphatha ngokungajwayelekile</item>
+    </plurals>
+    <plurals name="power_high_usage_title" formatted="false" msgid="3826660033363082922">
+      <item quantity="one">Izinhlelo zokusebenza eziqeda ibhethri</item>
+      <item quantity="other">Izinhlelo zokusebenza eziqeda ibhethri</item>
+    </plurals>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Akulungiselelwe"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Akulungiselelwe"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Ilungiselela ukusetshenziswa kwebhethri"</string>
@@ -3187,8 +3271,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Bonisa ngaphezulu kwezinye izinhlelo zokusebenza"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> kuzinhlelo zokusebenza ezingu-<xliff:g id="COUNT_1">%2$d</xliff:g> zivunyelwe ukuboniswa ngaphezulu kwezinye izinhlelo zokusebenza"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Izinhlelo zokusebenza ezinemvume"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Yebo"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Cha"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Kuvumelekile"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Akuvumelekile"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"faka izinhlelo zokusebenza zemithombo engaziwa"</string>
     <string name="write_settings" msgid="4797457275727195681">"Shintsha izilungiselelo zesistimu"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"bhala izilungiselelo zokushintsha isistimu"</string>
@@ -3278,6 +3362,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"Isikrini sefiphazwe nge-amber. Lokhu kungakusiza ukuthi ulale."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Iziphakamiso"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <string name="suggestions_more_title" msgid="8223690393059519879">"+<xliff:g id="ID_1">%1$d</xliff:g> okuningi"</string>
+    <plurals name="suggestions_collapsed_title" formatted="false" msgid="1857433444865249823">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> iziphakamiso</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> iziphakamiso</item>
+    </plurals>
+    <plurals name="suggestions_collapsed_summary" formatted="false" msgid="7680263825371165461">
+      <item quantity="one">+<xliff:g id="COUNT">%1$d</xliff:g> iziphakamiso</item>
+      <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> iziphakamiso</item>
+    </plurals>
     <string name="suggestion_remove" msgid="904627293892092439">"Susa"</string>
     <string name="color_temperature" msgid="2070126836910615605">"Ithempelesha yombala opholile"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Sebenzisa imibala yesibonisi esipholile"</string>
@@ -3296,8 +3389,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> Isexwayiso sedatha"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> Isexwayiso sedatha / <xliff:g id="ID_2">%2$s</xliff:g> Umkhawulo wedatha"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Umjikelezo wokukhokha"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Umjikelezo wenyanga uqala ngomhla ka-<xliff:g id="ID_1">%1$s</xliff:g> njalo ngenyanga"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Njalo ngenyanga kusukela ngomhla ka-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Ngenyanga osukwini <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Imikhawulo yenethiwekhi"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> imikhawulo</item>
@@ -3317,7 +3409,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> izinhlelo zokusebenza ezivunyelwe ukuze kusetshenziswe idatha engakhawulelwe uma Iseva Yedatha ivuliwe</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Iseva yedatha"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Ukufinyelela kudatha okungakhawulelwe"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Idatha engakhawulelwe"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Idatha yangemuva ivaliwe"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Vuliwe"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Valiwe"</string>
@@ -3381,8 +3473,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"Lawula izaziso zesikrini sokukhiya"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Bonisa noma fihla okuqukethwe kwesaziso"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Konke"</string>
-    <string name="page_tab_title_support" msgid="6330657582897417458">"Usekelo"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"I-<xliff:g id="ID_1">%d</xliff:g> dp"</string>
+    <string name="page_tab_title_support" msgid="8483187649355540109">"Usekelo namathiphu"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ububanzi obuncane"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Azikho izinhlelo zokusebenza ezicele ukufinyelela kwe-Premium SMS"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"I-Premium SMS ingakwenzela izindleko zemali futhi izongeza kumabhili enkampani yenethiwekhi. Uma unika amandla imvume yohlelo lokusebenza, uzokwazi ukuthumela i-premium SMS usebenzisa lolo hlelo lokusebenza."</string>
@@ -3447,28 +3538,41 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Okuzenzakalelayo"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Okwenziwa ngesandla"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Khulula isikhala manje"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Ukuthinta"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Izinqamuleli zokuthinta"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Ukuthinta okusheshayo ukulawula ifoni yakho"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Ukuthinta okusheshayo kokulawula ithebhulethi yakho"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Ukuthinta okusheshayo ukulawula idivayisi yakho"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Yeqela kukhamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Ukuze uvule ngokushesha ikhamera yakho, cindezela inkinobho yamandla kabili. Isebenza kusukela kunoma isiphi isikrini."</string>
+    <string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Vula ikhamera ngokushesha"</string>
+    <string name="double_tap_power_for_camera_suggestion_summary" msgid="7010153544554016996">"Cindezela inkinobho yamandla kabili ukuze uvule ikhamera"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Jikisa ikhamera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Zishude ngokushesha"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="default" msgid="447403641027147153">"Shintsha kabili ifoni ngemodi yokuzishuda"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet" msgid="1724660290703318739">"Shintsha kabili ithebhulethi ngemodi yokuzishuda"</string>
+    <string name="double_twist_for_camera_suggestion_summary" product="device" msgid="5980398380988039489">"Shintsha kabili idivayisi ngemodi yokuzishuda"</string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Thepha kabili ukuze uhlole ifoni"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Thepha kabili ukuze uhlole ithebulethi"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Thepha kabili ukuze uhlole idivayisi"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Ukuze uhlole ngokushesha izaziso zakho, thepha kabili isikrini sakho."</string>
+    <string name="ambient_display_summary" msgid="525662960806416373">"Ukuze uhlole isikhathi, izithonjana zesaziso, nolunye ulwazi, thepha kabili isikrini sakho."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Hlola izaziso uma isikrini sivalekile"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Phakamisa ukuze uhlole ifoni"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Phakamisa ukuze uhlole ithebulethi"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Phakamisa ukuze uhlole idivayisi"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Ukuze uhlole ngokushesha izaziso zakho, phakamisa ifoni yakho."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Ukuze uhlole ngokushesha izaziso zakho, phakamisa ithebulethi yakho."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Ukuze uhlole ngokushesha izaziso zakho, phakamisa idivayisi yakho."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Ukuze uhlole isikhathi, izithonjana zesaziso, nolunye ulwazi, khetha ifoni yakho."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ukuze uhlole isikhathi, izithonjana zesaziso, nolunye ulwazi, khetha ithebhulethi yakho."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ukuze uhlole isikhathi, izithonjana zesaziso, nolunye ulwazi, khetha idivayisi yakho."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Hlola izaziso uma isikrini sivalekile"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Swayipha izigxivizo zeminwe ukuze uthole izaziso"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Ukuze uhlole izaziso zakho, swayiphela phansi kunzwa yezigxivizo zeminwe ngemuva kwefoni yakho."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Ukuze uhlole izaziso zakho, swayiphela phansi kunzwa yezigxivizo zeminwe ngemuva kwethebulethi yakho."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Ukuze uhlole izaziso zakho, swayiphela phansi kunzwa yezigxivizo zeminwe ngemuva kwedivayisi yakho."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Bona izaziso ngokushesha"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Swayiphela phansi kwinzwa yezigxivizo zeminwe"</string>
+    <string name="camera_lift_trigger_title" msgid="2758206307949942951">"Phakama ukuze uvule ikhamera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Ukuze uvule ikhamera ngokuzenzakalela, phakamisa ifoni yakho iye kusimo sokuthatha isithombe (ukwakheka kwezwe noma ukuma ngobude). Isebenza uma ifoni yakho ilele noma ikhiyiwe."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Thatha izithombe uma ifoni ilele noma ikhiyiwe"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Ukuthinta komsizi"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Ukuzwela"</string>
@@ -3572,6 +3676,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Ingabe uyafuna ukususa lolu hlelo lokusebenza olusheshayo?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Amageyimu"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Amafayela omsindo"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Isikhala esisetshenzisiwe"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(kukhishelwe umsebenzisi ongu-<xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(kukhutshazelwe umsebenzisi ongu-<xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Isevisi yokugcwalisa ngokuzenzakalela"</string>
@@ -3585,5 +3690,8 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Uhlelo lokusebenza olusheshayo"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Vala isiphathi sesitoreji?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Izinhlelo zokusebenza ze-Movie ne-TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Isikhala esisetshenzisiwe"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Ulwazi lokuhlinzeka lenkampani yenethiwekhi"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Cupha ukunikezwa kwenkampani yenethiwekhi"</string>
+    <string name="new_device_suggestion_title" msgid="8346563796032837800">"Yini okusha nokujabulisayo?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Hlola izici ezingu-5 eziphezulu"</string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 873576c..5e1a468 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -326,38 +326,6 @@
         <item>Excellent</item>
     </string-array>
 
-    <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
-    <string-array name="wifi_sleep_policy_entries">
-        <!-- Always keep Wi-Fi on when screen turns off. -->
-        <item>Always</item>
-        <!-- Keep Wi-Fi on when screen turns off and plugged in.  When on battery, go to sleep when screen turns off. -->
-        <item>Only when plugged in</item>
-        <!-- Do not keep Wi-Fi on when screen turns off.  [CHAR LIMIT=40] -->
-        <item>Never</item>
-    </string-array>
-
-    <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
-         the device is Wi-Fi-only. [CHAR LIMIT=30] -->
-    <string-array name="wifi_sleep_policy_entries_wifi_only">
-        <!-- Always keep Wi-Fi on when screen turns off. -->
-        <item>Always</item>
-        <!-- Keep Wi-Fi on when screen turns off and plugged in.  When on battery, go to sleep when screen turns off. -->
-        <item>Only when plugged in</item>
-        <!-- Do not keep Wi-Fi on when screen turns off, for Wi-Fi-only devices, no other data connection -->
-        <item>Never</item>
-    </string-array>
-
-    <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. --> <skip />
-    <!-- Do not translate. -->
-    <string-array name="wifi_sleep_policy_values">
-        <!-- Do not translate. -->
-        <item>2</item>
-        <!-- Do not translate. -->
-        <item>1</item>
-        <!-- Do not translate. -->
-        <item>0</item>
-    </string-array>
-
     <!-- Data Usage settings. Range of data usage. -->
     <string-array name="data_usage_data_range">
         <!-- Last 30 days [CHAR LIMIT=25]-->
@@ -1056,4 +1024,18 @@
         <item>90</item>
     </string-array>
 
+    <string-array name="when_to_start_screensaver_entries" translatable="false">
+        <item>@string/screensaver_settings_summary_sleep</item>
+        <item>@string/screensaver_settings_summary_dock</item>
+        <item>@string/screensaver_settings_summary_either_long</item>
+        <item>@string/screensaver_settings_summary_never</item>
+    </string-array>
+
+    <string-array name="when_to_start_screensaver_values" translatable="false">
+        <item>while_charging_only</item>
+        <item>while_docked_only</item>
+        <item>either_charging_or_docked</item>
+        <item>never</item>
+    </string-array>
+
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 9f87d03..acb6ec3 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -94,6 +94,10 @@
 
     <attr name="footerPreferenceStyle" format="reference" />
 
+    <declare-styleable name="FixedLineSummaryPreference">
+        <attr name="summaryLineCount" format="integer" />
+    </declare-styleable>
+
     <!-- For Search -->
     <declare-styleable name="Preference">
         <attr name="keywords" format="string" />
@@ -155,7 +159,16 @@
     </declare-styleable>
 
     <declare-styleable name="TintablePreference">
-        <attr name="android:tint" format="color|reference"/>
+        <attr name="android:tint" format="color|reference" />
+    </declare-styleable>
+
+    <!-- For UsageView -->
+    <declare-styleable name="UsageView">
+        <attr name="android:colorAccent" />
+        <attr name="sideLabels" format="reference" />
+        <attr name="bottomLabels" format="reference" />
+        <attr name="textColor" format="color" />
+        <attr name="android:gravity" />
     </declare-styleable>
 
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ef85925..f63d963 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -110,4 +110,6 @@
     <!-- Color for preference icons on the Wifi Network Details page -->
     <color name="wifi_details_icon_color">#8A000000</color>
 
+    <!-- The fallback color for tinting icons. Only used when colorControlNormal is unavailable -->
+    <color name="fallback_tintColor">#89000000</color>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index f81bf9b..0ec92fc 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -99,4 +99,18 @@
         -->
     </string-array>
 
+    <!-- Whether or not the camera lift trigger is available in the moves menu. -->
+    <bool name="config_cameraLiftTriggerAvailable">false</bool>
+
+    <!-- Whether or not we should tint the icon color on setting pages. -->
+    <bool name="config_tintSettingIcon">true</bool>
+
+    <!-- Whether or not App & Notification screen should display recently used apps -->
+    <bool name="config_display_recent_apps">true</bool>
+
+    <!-- Package name for the storage manager to use from Settings search. -->
+    <string name="config_deletion_helper_package" translatable="false">com.android.storagemanager</string>
+    <!-- Class name for the storage manager's deletion helper class. -->
+    <string name="config_deletion_helper_class" translatable="false">com.android.storagemanager.deletionhelper.DeletionHelperActivity</string>
+
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c8737b9..e3c7032 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -109,8 +109,7 @@
     <dimen name="dashboard_tile_image_size">24dp</dimen>
 
     <!-- Dashboard tile image margin start / end -->
-    <dimen name="dashboard_tile_image_margin_start">16dp</dimen>
-    <dimen name="dashboard_tile_image_margin_end">32dp</dimen>
+    <dimen name="dashboard_tile_image_margin">24dp</dimen>
 
     <!-- SwitchBar margin start / end -->
     <dimen name="switchbar_margin_start">16dp</dimen>
@@ -140,6 +139,12 @@
     <dimen name="search_suggestion_item_image_margin_start">32dp</dimen>
     <dimen name="search_suggestion_item_image_margin_end">32dp</dimen>
 
+    <!-- The following two margins need to match, with the caveat that
+         the second should be negative. The second one ensures that the icons and text
+         align despite the additional padding caused by the search bar's card background. -->
+    <dimen name="search_bar_margin">8dp</dimen>
+    <dimen name="search_bar_negative_margin">-8dp</dimen>
+
     <!-- Dimensions for Wifi Assistant Card -->
     <dimen name="wifi_assistant_padding_top_bottom">16dp</dimen>
     <dimen name="wifi_assistant_padding_start_end">16dp</dimen>
@@ -223,9 +228,6 @@
     <dimen name="fingerprint_progress_bar_max_size">220dp</dimen>
     <dimen name="fingerprint_progress_bar_min_size">120dp</dimen>
     <dimen name="fingerprint_enrolling_content_margin_top">36dp</dimen>
-    <dimen name="fingerprint_in_app_indicator_size">124dp</dimen>
-    <dimen name="fingerprint_in_app_indicator_min_size">124dp</dimen>
-    <dimen name="fingerprint_in_app_indicator_max_size">264dp</dimen>
 
     <dimen name="confirm_credentials_security_method_margin">48dp</dimen>
     <dimen name="confirm_credentials_layout_width">@dimen/match_parent</dimen>
@@ -300,9 +302,6 @@
     <dimen name="support_spacer_height">8dp</dimen>
 
     <dimen name="password_requirement_textsize">14sp</dimen>
-    <!-- Visible vertical space we want to show below password edittext field when ime is shown.
-         The unit is sp as it is related to the text size of password requirement item. -->
-    <dimen name="visible_vertical_space_below_password">20sp</dimen>
 
     <!-- Padding for the escalation card in normal dimens -->
     <dimen name="support_escalation_card_padding_start">40dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e234892..2bbcbc4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -43,6 +43,9 @@
     <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
     <string name="show_dev_already">No need, you are already a developer.</string>
 
+    <!-- [CHAR LIMIT=NONE] Toast message when user attemps to launch developer otions before enabling it. -->
+    <string name="dev_settings_disabled_warning">Please enable developer options first.</string>
+
     <!-- Category headings in left-pane header menu --> <skip />
     <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
     <string name="header_category_wireless_networks">Wireless &amp; networks</string>
@@ -71,6 +74,9 @@
     <!-- Wifi Calling provisioning flag on. Only shown in diagnostic screen, so precise translation is not needed. -->
     <string name="wfc_provisioned_switch_string">Wifi Calling Provisioned</string>
 
+    <!-- EAB provisioning flag on. Only shown in diagnostic screen, so precise translation is not needed. -->
+    <string name="eab_provisioned_switch_string">EAB/Presence Provisioned</string>
+
     <!-- Title for controlling on/off for Mobile phone's radio power. Only shown in diagnostic screen, so precise translation is not needed. -->
     <string name="radio_info_radio_power">Mobile Radio Power</string>
 
@@ -235,15 +241,30 @@
     <!-- Bluetooth settings screen, confirmation button for rename device dialog. [CHAR LIMIT=20] -->
     <string name="bluetooth_rename_button">Rename</string>
     <!-- Bluetooth settings.  Dialog title to confirm disconnecting from all profiles of a device. [CHAR LIMIT=30] -->
-    <string name="bluetooth_disconnect_title">Disconnect?</string>
+    <string name="bluetooth_disconnect_title">Disconnect device?</string>
     <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
-    <string name="bluetooth_disconnect_all_profiles">This will end your connection with:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b></string>
+    <string name="bluetooth_disconnect_all_profiles" product="default">Your phone will disconnect from "<xliff:g id="device_name">%1$s</xliff:g>."</string>
+    <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_disconnect_all_profiles" product="tablet">Your tablet will disconnect from "<xliff:g id="device_name">%1$s</xliff:g>."</string>
+    <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_disconnect_all_profiles" product="device">Your device will disconnect from "<xliff:g id="device_name">%1$s</xliff:g>."</string>
+    <!-- dialog ok button for disconnect dialog [CHAR LIMIT=10] -->
+    <string name="bluetooth_disconnect_dialog_ok">Disconnect</string>
     <!-- Bluetooth Settings. text displayed when user has restriction DISALLOW_CONFIG_BLUETOOTH [CHAR LIMIT=NONE]-->
     <string name="bluetooth_empty_list_user_restricted">You don\u2019t have permission to change Bluetooth settings.</string>
+    <!-- Title for bluetooth pairing item [CHAR LIMIT=60] -->
+    <string name="bluetooth_pairing_pref_title">Pair new device</string>
 
     <!-- Bluetooth Visibility message.  This message informs the user that their device is now visible to other bluetooth devices.  [CHAR LIMIT=NONE] -->
     <string name="bluetooth_is_visible_message"><xliff:g id="device_name">%1$s</xliff:g> is visible to nearby devices while Bluetooth settings is open.</string>
-    <!-- Bluetooth Visibility discoonect question.  Asks the user if they wish to disconnect a paired bluetooth device.  [CHAR LIMIT=50] -->
+    <!-- Bluetooth mac address message.  This message shows the bluetooth mac address for this device.  [CHAR LIMIT=120] -->
+    <string name="bluetooth_footer_mac_message" product="default">Phone\'s Bluetooth address: <xliff:g id="bluetooth_mac_address">%1$s</xliff:g></string>
+    <!-- Bluetooth mac address message.  This message shows the bluetooth mac address for this device.  [CHAR LIMIT=120] -->
+    <string name="bluetooth_footer_mac_message" product="tablet">Tablet\'s Bluetooth address: <xliff:g id="bluetooth_mac_address">%1$s</xliff:g></string>
+    <!-- Bluetooth mac address message.  This message shows the bluetooth mac address for this device.  [CHAR LIMIT=120] -->
+    <string name="bluetooth_footer_mac_message" product="device">Device\'s Bluetooth address: <xliff:g id="bluetooth_mac_address">%1$s</xliff:g></string>
+
+    <!-- Bluetooth Visibility disconnect question.  Asks the user if they wish to disconnect a paired bluetooth device.  [CHAR LIMIT=50] -->
     <string name="bluetooth_is_disconnect_question">Disconnect <xliff:g id="device_name">%1$s</xliff:g>?</string>
     <!-- Bluetooth broadcasting settings, option to enable/disable broadcasting -->
     <string name="bluetooth_broadcasting">Broadcasting</string>
@@ -266,8 +287,8 @@
     <string name="bluetooth_notif_title">Pairing request</string>
     <!-- Notification message when a Bluetooth device wants to pair with us -->
     <string name="bluetooth_notif_message">Tap to pair with <xliff:g id="device_name">%1$s</xliff:g>.</string>
-    <!-- Bluetooth settings screen, menu to show the list of received files [CHAR LIMIT=30] -->
-    <string name="bluetooth_show_received_files">Show received files</string>
+    <!-- Item in bluetooth settings screen, used to show the list of received files [CHAR LIMIT=30] -->
+    <string name="bluetooth_show_received_files">Received files</string>
 
     <!-- Strings for BluetoothDevicePicker [CHAR LIMIT=40]-->
     <string name="device_picker">Choose Bluetooth device</string>
@@ -365,6 +386,14 @@
     <!-- Bluetooth SIM access permission Alert Activity text [CHAR LIMIT=none] -->
     <string name="bluetooth_sap_acceptance_dialog_text"><xliff:g id="device_name">%1$s</xliff:g> wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to <xliff:g id="device_name">%2$s?</xliff:g></string>
 
+    <!-- Description for bluetooth device name summary [CHAR LIMIT=none] -->
+    <string name="bluetooth_device_name_summary">Visible as \'<xliff:g id="device_name">^1</xliff:g>\' to other devices</string>
+
+    <!-- Title for paired device group [CHAR LIMIT=none] -->
+    <string name="bluetooth_paired_device_title">Your devices</string>
+    <!-- Title for pairing bluetooth device page [CHAR LIMIT=none] -->
+    <string name="bluetooth_pairing_page_title">Pair new device</string>
+
     <!-- Date & time settings screen title -->
     <string name="date_and_time">Date &amp; time</string>
     <!-- The title of the activity to pick a time zone. -->
@@ -743,7 +772,7 @@
     <!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
     <string name="account_settings_title">Accounts</string>
     <!-- Main Settings screen setting option title for the item to take you to the security screen -->
-    <string name="security_settings_title">Security &amp; Location</string>
+    <string name="security_settings_title">Security &amp; location</string>
     <!-- Security Settings screen setting option title for the item to take you to the encryption and credential screen -->
     <string name="encryption_and_credential_settings_title">Encryption &amp; credentials</string>
     <!-- Security Settings screen Encryption and crendential summary -->
@@ -787,14 +816,14 @@
     <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=29] -->
+    <!-- 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_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.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN.</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">Just touch the fingerprint sensor to authorize purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: You can\u2019t use your fingerprint to unlock this device. For more information, contact your organization\u2019s admin.</string>
+    <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]-->
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup">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.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN.</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup">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>
     <!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->
     <string name="security_settings_fingerprint_enroll_introduction_cancel">Cancel</string>
     <!-- Button text to continue to the next screen from the introduction [CHAR LIMIT=22] -->
@@ -802,28 +831,27 @@
     <!-- 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] -->
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup">Add fingerprint</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup">Next</string>
     <!-- Dialog text shown when the user tries to skip setting up a screen lock, warning them of potential consequences of not doing so, including loss of factory reset protection. (tablet) [CHAR LIMIT=NONE] -->
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet">Device protection features will not be activated. You won\u2019t be able to prevent others from using this tablet if it\u2019s lost, stolen or wiped.</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet">Device protection features won\u2019t be turned on. You won\u2019t be able to prevent others from using this tablet if it\u2019s lost, stolen or reset.</string>
     <!-- Dialog text shown when the user tries to skip setting up a screen lock, warning them of potential consequences of not doing so, including loss of factory reset protection. (device) [CHAR LIMIT=NONE] -->
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device">Device protection features will not be activated. You won\u2019t be able to prevent others from using this device if it\u2019s lost, stolen or wiped.</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device">Device protection features won\u2019t be turned on. You won\u2019t be able to prevent others from using this device if it\u2019s lost, stolen or reset.</string>
     <!-- Dialog text shown when the user tries to skip setting up a screen lock, warning them of potential consequences of not doing so, including loss of factory reset protection. (phone) [CHAR LIMIT=NONE] -->
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default">Device protection features will not be activated. You won\u2019t be able to prevent others from using this phone if it\u2019s lost, stolen or wiped.</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default">Device protection features won\u2019t be turned on. You won\u2019t be able to prevent others from using this phone if it\u2019s lost, stolen or reset.</string>
     <!-- Dialog text shown when the user tries to skip setting up a screen lock, warning them of potential consequences of not doing so. (tablet) [CHAR LIMIT=NONE] -->
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet">Device protection features will not be activated. You won\u2019t be able to prevent others from using this tablet if it\u2019s lost or stolen.</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet">Device protection features won\u2019t be turned on. You won\u2019t be able to prevent others from using this tablet if it\u2019s lost or stolen.</string>
     <!-- Dialog text shown when the user tries to skip setting up a screen lock, warning them of potential consequences of not doing so. (device) [CHAR LIMIT=NONE] -->
-    <string name="lock_screen_intro_skip_dialog_text" product="device">Device protection features will not be activated. You won\u2019t be able to prevent others from using this device if it\u2019s lost or stolen.</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device">Device protection features won\u2019t be turned on. You won\u2019t be able to prevent others from using this device if it\u2019s lost or stolen.</string>
     <!-- Dialog text shown when the user tries to skip setting up a screen lock, warning them of potential consequences of not doing so. (phone) [CHAR LIMIT=NONE] -->
-    <string name="lock_screen_intro_skip_dialog_text" product="default">Device protection features will not be activated. You won\u2019t be able to prevent others from using this phone if it\u2019s lost or stolen.</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default">Device protection features won\u2019t be turned on. You won\u2019t be able to prevent others from using this phone if it\u2019s lost or stolen.</string>
     <!-- Button for skipping a step after having been warned of a potential concern [CHAR LIMIT=30] -->
     <string name="skip_anyway_button_label">Skip anyway</string>
     <!-- Button for going to the previous screen or step [CHAR LIMIT=20] -->
     <string name="go_back_button_label">Go back</string>
     <!-- Introduction title shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=29] -->
-    <string name="security_settings_fingerprint_enroll_find_sensor_title">Find the sensor</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title">Touch the sensor</string>
     <!-- Message shown in fingerprint enrollment dialog to locate the sensor -->
-    <string name="security_settings_fingerprint_enroll_find_sensor_message">
-        Locate the fingerprint sensor on the back of your phone.</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message">It\u2019s on the back of your phone. Use your index finger.</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] -->
@@ -833,21 +861,17 @@
     <!-- Button text shown in fingerprint dialog that allows the user to delete the fingerprint template [CHAR LIMIT=22] -->
     <string name="security_settings_fingerprint_enroll_dialog_delete">Delete</string>
     <!-- Title shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=29]-->
-    <string name="security_settings_fingerprint_enroll_start_title">Let\u2019s start</string>
+    <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>
-    <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=29] -->
-    <string name="security_settings_fingerprint_enroll_repeat_title">Keep going</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>
     <!-- Message shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=NONE] -->
-    <string name="security_settings_fingerprint_enroll_repeat_message">Move your finger slightly to add all the different parts of your fingerprint</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message">Keep lifting your finger to add the different parts of your 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>
+    <string name="security_settings_fingerprint_enroll_finish_title">Fingerprint added</string>
     <!-- Message shown in fingerprint enrollment dialog once enrollment is completed -->
-    <string name="security_settings_fingerprint_enroll_finish_message">Whenever you see this icon, you can use your fingerprint for identification or to authorize a purchase.</string>
-    <!-- Message shown when fingerprint enrollment is completed during setup wizard [CHAR LIMIT=NONE] -->
-    <string name="setup_fingerprint_enroll_finish_message">Just touch the fingerprint sensor to wake and unlock your device.</string>
-    <!-- Message shown when fingerprint enrollment is completed, telling user about the fingerprint icon that will be shown whenever they can use their fingerprint [CHAR LIMIT=NONE] -->
-    <string name="setup_fingerprint_enroll_finish_message_secondary">When you see this icon, you can also authorize purchases or sign in to apps.</string>
+    <string name="security_settings_fingerprint_enroll_finish_message">When you see this icon, use your fingerprint for identification or to approve purchases.</string>
     <!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] -->
     <string name="setup_fingerprint_enroll_enrolling_skip_title">Skip fingerprint setup?</string>
     <!-- Content of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=NONE] -->
@@ -860,7 +884,7 @@
     <!-- Dialog title for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
     <string name="security_settings_fingerprint_enroll_touch_dialog_title">Whoops, that\u2019s not the sensor</string>
     <!-- Dialog message for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message">Use the fingerprint sensor on your device.</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message">Touch the sensor on the back of your phone. Use your index finger.</string>
     <!-- Dialog message for dialog which shows when finger cannot be enrolled. [CHAR LIMIT=45] -->
     <string name="security_settings_fingerprint_enroll_error_dialog_title">Enrollment was not completed</string>
     <!-- Dialog message for dialog which shows when finger cannot be enrolled due to being idle too long. -->
@@ -1078,6 +1102,12 @@
     <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
     <string name="lock_settings_picker_fingerprint_message">Choose your backup screen lock method</string>
 
+    <!-- Label for button in screen lock settings, allowing users to choose other types of screen locks. [CHAR LIMIT=40] -->
+    <string name="setup_lock_settings_options_button_label">Screen lock options</string>
+
+    <!-- Title for dialog in screen lock settings, allowing users to choose other types of screen locks. [CHAR LIMIT=40] -->
+    <string name="setup_lock_settings_options_dialog_title">Screen lock options</string>
+
     <!--  Main Security lock settings --><skip />
     <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
     <string name="unlock_set_unlock_launch_picker_title">Screen lock</string>
@@ -1219,20 +1249,38 @@
     <!-- Title shown on security settings to allow the user to change their lockscreen password [CHAR LIMIT=22]-->
     <string name="unlock_change_lock_password_title">Change unlock password</string>
 
-    <!-- Message shown when the user incorrectly enters their lock and it counts towards the max attempts before wiping the work profile. -->
-    <string name="lock_profile_wipe_attempts">Try again. Attempt <xliff:g id="current_attempts">%1$d</xliff:g> of <xliff:g id="total_attempts">%2$d</xliff:g>.</string>
-    <!-- Title of a dialog shown when the user only has one attempt left to provide the lock before the work profile is wiped. -->
-    <string name="lock_profile_wipe_warning_title">Last try</string>
-    <!-- Content of the dialog shown when the user only has one attempt left to provide the work pattern before the work profile is wiped. -->
-    <string name="lock_profile_wipe_warning_content_pattern">If you enter an incorrect work pattern on this attempt, your work profile and associated data will be removed from this device.</string>
-    <!-- Content of the dialog shown when the user only has one attempt left to provide the work PIN before the work profile is wiped. -->
-    <string name="lock_profile_wipe_warning_content_pin">If you enter an incorrect work PIN on this attempt, your work profile and associated data will be removed from this device.</string>
-    <!-- Content of the dialog shown when the user only has one attempt left to provide the work password before the work profile is wiped. -->
-    <string name="lock_profile_wipe_warning_content_password">If you enter an incorrect work password on this attempt, your work profile and associated data will be removed from this device.</string>
-    <!-- Content of the dialog shown when the user has failed to provide the work lock too many times and the work profile is wiped. -->
-    <string name="lock_profile_wipe_content">Too many incorrect attempts. Your work profile and associated data will be removed from this device.</string>
+    <!-- Message shown on the lock screen when the user incorrectly enters their lock and it counts towards the max attempts before their data on the device is wiped. [CHAR LIMIT=NONE] -->
+    <string name="lock_failed_attempts_before_wipe">Try again. Attempt <xliff:g id="current_attempts">%1$d</xliff:g> of <xliff:g id="total_attempts">%2$d</xliff:g>.</string>
+
+    <!-- Title of a dialog shown when the user only has one attempt left to provide the lock before the device, one of its users, or a work profile is wiped. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_attempt_before_wipe_warning_title">Your data will be deleted</string>
+    <!-- Content of the dialog shown when the user only has one attempt left to provide the device lock pattern before the device is wiped. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_pattern_attempt_before_wipe_device">If you enter an incorrect pattern on the next attempt, this device's data will be deleted</string>
+    <!-- Content of the dialog shown when the user only has one attempt left to provide the device lock PIN before the device is wiped. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_pin_attempt_before_wipe_device">If you enter an incorrect PIN on the next attempt, this device's data will be deleted</string>
+    <!-- Content of the dialog shown when the user only has one attempt left to provide the device lock password before the device is wiped. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_password_attempt_before_wipe_device">If you enter an incorrect password on the next attempt, this device's data will be deleted</string>
+    <!-- Content of the dialog shown when the user only has one attempt left to provide the user lock pattern before the user is removed. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_pattern_attempt_before_wipe_user">If you enter an incorrect pattern on the next attempt, this user will be deleted</string>
+    <!-- Content of the dialog shown when the user only has one attempt left to provide the user lock PIN before the user is removed. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_pin_attempt_before_wipe_user">If you enter an incorrect PIN on the next attempt, this user will be deleted</string>
+    <!-- Content of the dialog shown when the user only has one attempt left to provide the user lock password before the user is removed. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_password_attempt_before_wipe_user">If you enter an incorrect password on the next attempt, this user will be deleted</string>
+    <!-- Content of the dialog shown when the user only has one attempt left to provide the work lock pattern before the work profile is removed. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_pattern_attempt_before_wipe_profile">If you enter an incorrect pattern on the next attempt, your work profile and its data will be deleted</string>
+    <!-- Content of the dialog shown when the user only has one attempt left to provide the work lock PIN before the work profile is removed. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_pin_attempt_before_wipe_profile">If you enter an incorrect PIN on the next attempt, your work profile and its data will be deleted</string>
+    <!-- Content of the dialog shown when the user only has one attempt left to provide the work lock password before the work profile is removed. [CHAR LIMIT=NONE] -->
+    <string name="lock_last_password_attempt_before_wipe_profile">If you enter an incorrect password on the next attempt, your work profile and its data will be deleted</string>
+
+    <!-- Content of the dialog shown when the user has failed to provide the device lock too many times and the device is wiped. [CHAR LIMIT=NONE] -->
+    <string name="lock_failed_attempts_now_wiping_device">Too many incorrect attempts. This device's data will be deleted.</string>
+    <!-- Content of the dialog shown when the user has failed to provide the user lock too many times and the user is removed. [CHAR LIMIT=NONE] -->
+    <string name="lock_failed_attempts_now_wiping_user">Too many incorrect attempts. This user will be deleted.</string>
+    <!-- Content of the dialog shown when the user has failed to provide the work lock too many times and the work profile is removed. [CHAR LIMIT=NONE] -->
+    <string name="lock_failed_attempts_now_wiping_profile">Too many incorrect attempts. This work profile and its data will be deleted.</string>
     <!-- Button label to dismiss the dialog telling the user the work profile has been wiped. [CHAR LIMIT=40] -->
-    <string name="lock_profile_wipe_dismiss">Dismiss</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss">Dismiss</string>
 
     <!-- Hint shown in dialog screen when password is too short -->
     <string name="lockpassword_password_too_short">Must be at least <xliff:g id="count" example="3">%d</xliff:g> characters</string>
@@ -1469,7 +1517,25 @@
       still detect Bluetooth devices. You can change this in
       <xliff:g id="link_begin">LINK_BEGIN</xliff:g>scanning
       settings<xliff:g id="link_end">LINK_END</xliff:g>.</string>
+    <!-- Bluetooth connecting error message [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_connect_failed">Couldn\'t connect. Try again.</string>
 
+    <!-- Title of device details screen [CHAR LIMIT=40]-->
+    <string name="device_details_title">Device details</string>
+    <!-- Title of the item to show device MAC address -->
+    <string name="bluetooth_device_mac_address">Device\'s Bluetooth address: <xliff:g id="address">%1$s</xliff:g></string>
+    <!-- Bluetooth device details. The title of a confirmation dialog for unpairing a paired device. [CHAR LIMIT=60] -->
+    <string name="bluetooth_unpair_dialog_title">Forget device?</string>
+
+    <!--  Bluetooth device details. The body of a confirmation dialog for unpairing a paired device. -->
+    <string name="bluetooth_unpair_dialog_body" product="default">Your phone will no longer be paired with <xliff:g id="device_name">%1$s</xliff:g></string>
+    <!--  Bluetooth device details. The body of a confirmation dialog for unpairing a paired device. -->
+    <string name="bluetooth_unpair_dialog_body" product="tablet">Your tablet will no longer be paired with <xliff:g id="device_name">%1$s</xliff:g></string>
+    <!--  Bluetooth device details. The body of a confirmation dialog for unpairing a paired device. -->
+    <string name="bluetooth_unpair_dialog_body" product="device">Your device will no longer be paired with <xliff:g id="device_name">%1$s</xliff:g></string>
+
+    <!--  Bluetooth device details. In the confirmation dialog for unpairing a paired device, this is the label on the button that will complete the unpairing action. -->
+    <string name="bluetooth_unpair_dialog_forget_confirm_button">Forget device</string>
 
     <!-- Bluetooth settings.  The title of the screen to pick which profiles to connect to on the device.  For example, headphones may have both A2DP and headset, this allows the user to choose which one he wants to connect to. -->
     <string name="bluetooth_connect_specific_profiles_title">Connect to\u2026</string>
@@ -1818,6 +1884,8 @@
     <string name="wifi_do_not_validate_eap_server">Do not validate</string>
     <!-- Warning message displayed if user choses not to validate the EAP server -->
     <string name="wifi_do_not_validate_eap_server_warning">No certificate specified. Your connection will not be private.</string>
+    <!-- Warning message displayed if network name (ssid) is too long -->
+    <string name="wifi_ssid_too_long">Network name is too long.</string>
     <!-- Warning message displayed if user does not specify a domain for the CA certificate.
          Only displayed if the user also chooses to use system certificates. -->
     <string name="wifi_no_domain_warning">Must specify a domain.</string>
@@ -1880,8 +1948,6 @@
     </plurals>
     <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
     <string name="wifi_advanced_titlebar">Advanced Wi\u2011Fi</string>
-    <!-- Wi-Fi settings screen, configure, settings section.  This is a header shown above configure wifi settings. [CHAR LIMIT=30] -->
-    <string name="wifi_configure_titlebar">Configure Wi\u2011Fi</string>
     <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's MAC address. -->
     <string name="wifi_advanced_mac_address_title">MAC address</string>
     <!-- Title of the screen to adjust IP settings -->
@@ -1960,12 +2026,31 @@
     <string name="wifi_tether_checkbox_text">Portable Wi\u2011Fi hotspot</string>
     <!-- Label for Wifi tether checkbox. Toggles Access Point on/off  [CHAR LIMIT=30] -->
     <string name="wifi_hotspot_checkbox_text">Wi\u2011Fi hotspot</string>
-    <!-- Label for Wifi tether checkbox summary. Toggles Access Point on/off  [CHAR LIMIT=60] -->
-    <string name="wifi_hotspot_checkbox_text_summary">Use mobile connection to provide Wi\u2011Fi network</string>
     <!-- Summary text when turning hotspot off -->
-    <string name="wifi_hotspot_off_subtext" product="tablet">Not sharing this tablet\u2019s Internet connection via hotspot</string>
-    <!-- Summary text when turning hotspot off -->
-    <string name="wifi_hotspot_off_subtext" product="default">Not sharing this phone\u2019s Internet connection via hotspot</string>
+    <string name="wifi_hotspot_off_subtext">Not sharing Internet or content with other devices</string>
+    <!-- Summary text when tethering is on -->
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet">Sharing this tablet\u2019s Internet connection via hotspot</string>
+    <!-- Summary text when tethering is on -->
+    <string name="wifi_hotspot_tethering_on_subtext" product="default">Sharing this phone\u2019s Internet connection via hotspot</string>
+    <!-- Summary text when hotspot is on for local-only -->
+    <string name="wifi_hotspot_on_local_only_subtext">App is sharing content. To share Internet connection, turn hotspot off, then on</string>
+
+    <!-- Wifi hotspot settings -->
+    <!-- Label for Wifi hotspot name. -->
+    <string name="wifi_hotspot_name_title">Wi\u2011Fi name</string>
+    <!-- Summary for Wifi hotspot name when connection is in progress. -->
+    <string name="wifi_hotspot_name_summary_connecting">Turning on <xliff:g id="wifi_hotspot_name">%1$s</xliff:g>...</string>
+    <!-- Summary for Wifi hotspot name when connected. -->
+    <string name="wifi_hotspot_name_summary_connected">Other devices can connect to <xliff:g id="wifi_hotspot_name">%1$s</xliff:g></string>
+    <!-- Label for Wifi hotspot password. -->
+    <string name="wifi_hotspot_password_title">Wi\u2011Fi password</string>
+    <!-- Label for Wifi hotspot AP Band. -->
+    <string name="wifi_hotspot_ap_band_title">AP Band</string>
+    <!-- Wifi hotspot footer info for regular hotspot [CHAR LIMIT=NONE]-->
+    <string name="wifi_hotspot_footer_info_regular">Use hotspot to create a Wi\u2011Fi network for your other devices. Hotspot provides Internet using your mobile data connection. Additional mobile data charges may apply.</string>
+    <!-- Wifi hotspot footer info [CHAR LIMIT=NONE]-->
+    <string name="wifi_hotspot_footer_info_local_only">Apps can create a hotspot to share content with nearby devices.</string>
+
     <!-- Summary text when turning hotspot on -->
     <string name="wifi_tether_starting">Turning hotspot on\u2026</string>
     <!-- Summary text when turning hotspot off -->
@@ -2113,6 +2198,8 @@
     </string-array>
     <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
     <string name="wifi_calling_off_explanation">When Wi-Fi calling is on, your phone can route calls via Wi-Fi networks or your carrier\u2019s network, depending on your preference and which signal is stronger. Before turning on this feature, check with your carrier regarding fees and other details.</string>
+    <!-- Wi-Fi Calling settings. Additional text displayed when Wi-Fi Calling is off. Default empty. [CHAR LIMIT=NONE] -->
+    <string name="wifi_calling_off_explanation_2"></string>
     <!-- Title of a preference for updating emergency address [CHAR LIMIT=40] -->
     <string name="emergency_address_title">Update Emergency Address</string>
     <!-- Summary of Update Emergency Address preference, explaining usage of emergency address [CHAR LIMIT=NONE] -->
@@ -2245,6 +2332,8 @@
     <string name="display_settings">Display</string>
     <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
     <string name="accelerometer_title">Auto-rotate screen</string>
+    <!-- Display settings screen, vivid (or vibrant or saturated) color mode switch label [CHAR LIMIT=30] -->
+    <string name="color_mode_title">Vivid colors</string>
     <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
     <string name="accelerometer_summary_on" product="tablet">Switch orientation automatically when rotating tablet</string>
     <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -2301,40 +2390,38 @@
     <string name="night_display_title">Night Light</string>
     <!-- Night display screen, description of night display feature (renamed "Night Light" with title caps). [CHAR LIMIT=NONE] -->
     <string name="night_display_text">Night Light tints your screen amber. This makes it easier to look at your screen or read in dim light, and may help you fall asleep more easily.</string>
-    <!-- Night display screen, category title for settings to schedule when night display activates automatically. [CHAR LIMIT=30] -->
-    <string name="night_display_category_schedule">Schedule</string>
-    <!-- Night display screen, category title for settings to manually activate night display. [CHAR LIMIT=30] -->
-    <string name="night_display_category_status">Status</string>
     <!-- Night display screen, setting option name to configure whether night display turn on/off automatically. [CHAR LIMIT=30] -->
-    <string name="night_display_auto_mode_title">Turn on automatically</string>
+    <string name="night_display_auto_mode_title">Schedule</string>
     <!-- Night display screen, setting option value for night display to *never* turn on/off automatically. [CHAR LIMIT=30] -->
-    <string name="night_display_auto_mode_never">Never</string>
-    <!-- Night display screen, setting option value for night display to turn on/off automatically according to a user defined schedule. [CHAR LIMIT=30] -->
-    <string name="night_display_auto_mode_custom">Custom schedule</string>
-    <!-- Night display screen, setting option value for night display to turn on/off automatically at sunset/sunrise. [CHAR LIMIT=30] -->
-    <string name="night_display_auto_mode_twilight">Sunset to sunrise</string>
+    <string name="night_display_auto_mode_never">None</string>
+    <!-- Night display screen, setting option value for night display to turn on/off automatically according to a user defined schedule. [CHAR LIMIT=32] -->
+    <string name="night_display_auto_mode_custom">Turns on at custom time</string>
+    <!-- Night display screen, setting option value for night display to turn on/off automatically at sunset/sunrise. [CHAR LIMIT=32] -->
+    <string name="night_display_auto_mode_twilight">Turns on from sunset to sunrise</string>
     <!-- Night display screen, setting option name to configure time to automatically turn on night display. [CHAR LIMIT=30] -->
     <string name="night_display_start_time_title">Start time</string>
     <!-- Night display screen, setting option name to configure time to automatically turn off night display. [CHAR LIMIT=30] -->
     <string name="night_display_end_time_title">End time</string>
+    <!-- Night display screen, setting option name controlling the current activation status. [CHAR LIMIT=30] -->
+    <string name="night_display_status_title">Status</string>
     <!-- Night display screen, setting the color temperature of the display. [CHAR LIMIT=30] -->
     <string name="night_display_temperature_title">Intensity</string>
     <!-- Display settings screen, summary format of night display when off. [CHAR LIMIT=NONE] -->
-    <string name="night_display_summary_off">Off. <xliff:g name="auto_mode_summary" example="Never turn on automatically">%1$s</xliff:g></string>
+    <string name="night_display_summary_off">Off / <xliff:g name="auto_mode_summary" example="Never turn on automatically">%1$s</xliff:g></string>
     <!-- Display settings screen, summary of night display when off and will *never* turn on automatically. [CHAR LIMIT=NONE] -->
-    <string name="night_display_summary_off_auto_mode_never">Will never turn on automatically.</string>
+    <string name="night_display_summary_off_auto_mode_never">Will never turn on automatically</string>
     <!-- Display settings screen, summary format of night display when off and will turn on automatically at a user defined time. [CHAR LIMIT=NONE] -->
-    <string name="night_display_summary_off_auto_mode_custom">Will turn on automatically at <xliff:g name="time" example="6 AM">%1$s</xliff:g>.</string>
+    <string name="night_display_summary_off_auto_mode_custom">Will turn on automatically at <xliff:g name="time" example="6 AM">%1$s</xliff:g></string>
     <!-- Display settings screen, summary of night display when off and will turn on automatically at sunset. [CHAR LIMIT=NONE] -->
-    <string name="night_display_summary_off_auto_mode_twilight">Will turn on automatically at sunset.</string>
+    <string name="night_display_summary_off_auto_mode_twilight">Will turn on automatically at sunset</string>
     <!-- Display settings screen, summary format of night display when on. [CHAR LIMIT=NONE] -->
-    <string name="night_display_summary_on">On. <xliff:g name="auto_mode_summary" example="Never turn off automatically">%1$s</xliff:g></string>
+    <string name="night_display_summary_on">On / <xliff:g name="auto_mode_summary" example="Never turn off automatically">%1$s</xliff:g></string>
     <!-- Display settings screen, summary of night display when on and will *never* turn off automatically. [CHAR LIMIT=NONE] -->
-    <string name="night_display_summary_on_auto_mode_never">Will never turn off automatically.</string>
+    <string name="night_display_summary_on_auto_mode_never">Will never turn off automatically</string>
     <!-- Display settings screen, summary format of night display when on and will turn off automatically at a user defined time. [CHAR LIMIT=NONE] -->
-    <string name="night_display_summary_on_auto_mode_custom">Will turn off automatically at <xliff:g name="time" example="10 PM">%1$s</xliff:g>.</string>
+    <string name="night_display_summary_on_auto_mode_custom">Will turn off automatically at <xliff:g name="time" example="10 PM">%1$s</xliff:g></string>
     <!-- Display settings screen, summary of night display when on and will turn off automatically at sunrise. [CHAR LIMIT=NONE] -->
-    <string name="night_display_summary_on_auto_mode_twilight">Will turn off automatically at sunrise.</string>
+    <string name="night_display_summary_on_auto_mode_twilight">Will turn off automatically at sunrise</string>
 
     <!-- Sound & display settings screen, setting option name to change screen timeout -->
     <string name="screen_timeout">Sleep</string>
@@ -2382,10 +2469,23 @@
     <string name="automatic_brightness">Automatic brightness</string>
     <!-- [CHAR LIMIT=40] Display settings screen, setting option name to change whether the device wakes up when a lift gesture is detected. -->
     <string name="lift_to_wake_title">Lift to wake</string>
-    <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->
-    <string name="doze_title">Ambient display</string>
-    <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->
+
+    <!-- [CHAR LIMIT=30] Title of the preference that opens the Ambient display settings screen. -->
+    <string name="ambient_display_screen_title">Ambient display</string>
+    <!-- [CHAR LIMIT=30] Summary of the preference that opens the Ambient display settings screen, when Ambient display is set to be always on -->
+    <string name="ambient_display_screen_summary_always_on">Always on</string>
+    <!-- [CHAR LIMIT=30] Summary of the preference that opens the Ambient display settings screen, when Ambient display is set to show when new notifications come in. -->
+    <string name="ambient_display_screen_summary_notifications">New notifications</string>
+    <!-- [CHAR LIMIT=30] Category title for the settings that control when Ambient display shows. -->
+    <string name="ambient_display_category_triggers">When to show</string>
+    <!-- [CHAR LIMIT=30] Ambient display screen, title for setting to change whether the ambient display feature is triggered for new incoming notifications. -->
+    <string name="doze_title">New notifications</string>
+    <!-- [CHAR LIMIT=NONE] Ambient display screen, summary for setting to change whether the ambient display feature is triggered for new incoming notifications. -->
     <string name="doze_summary">Wake screen when you receive notifications</string>
+    <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the always-on ambient display feature is enabled. -->
+    <string name="doze_always_on_title">Always on</string>
+    <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the always-on ambient display feature. -->
+    <string name="doze_always_on_summary">Show time, notification icons, and other info</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] -->
@@ -2980,6 +3080,8 @@
     <string name="error_mcc_not3">MCC field must be 3 digits.</string>
     <!-- APN error dialog messages: -->
     <string name="error_mnc_not23">MNC field must be 2 or 3 digits.</string>
+    <!-- APN error dialog messages: -->
+    <string name="error_adding_apn_type">Carrier does not allow adding APNs of type %s.</string>
     <!-- The message of dialog indicated restoring default APN settings in progress -->
     <string name="restore_default_apn">Restoring default APN settings.</string>
     <!-- APNs screen menu option to reset default APN settings -->
@@ -3040,6 +3142,12 @@
     <string name="erase_external_storage_description" product="nosdcard">Erase all the data on the internal USB storage, such as music or photos</string>
     <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
     <string name="erase_external_storage_description" product="default">Erase all the data on the SD card, such as music or photos</string>
+    <!-- SD card & phone storage settings screen, label for check box to erase all the carriers information on the embedded SIM card [CHAR LIMIT=30] -->
+    <string name="erase_esim_storage">Erase eSIMs</string>
+    <!-- SD card & phone storage settings screen, description for check box to erase eSIMs for default devices [CHAR LIMIT=NONE] -->
+    <string name="erase_esim_storage_description" product="default">Erase all eSIMs on the phone. This will not cancel your mobile service plan.</string>
+    <!-- SD card & phone storage settings screen, description for check box to erase eSIMs for tablets [CHAR LIMIT=NONE] -->
+    <string name="erase_esim_storage_description" product="tablet">Erase all eSIMs on the tablet. This will not cancel your mobile service plan.</string>
     <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
     <string name="master_clear_button_text" product="tablet">Reset tablet</string>
     <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
@@ -3088,49 +3196,25 @@
     <!-- USB Tethering options -->
     <string name="usb_title">USB</string>
     <string name="usb_tethering_button_text">USB tethering</string>
-    <!-- USB available subtext - shown when USB is connected but not currently being tethered -->
-    <string name="usb_tethering_available_subtext">USB connected, check to tether</string>
-    <!-- USB tethered subtext - shown when USB is connected and being tethered -->
-    <string name="usb_tethering_active_subtext">Tethered</string>
-    <!-- USB storage subtext - shown when tethering is disabled because USB storage is active -->
-    <string name="usb_tethering_storage_active_subtext">Can\u2019t tether when USB storage is in use</string>
-    <!-- USB unavailable subtext - shown when USB is not connected -->
-    <string name="usb_tethering_unavailable_subtext">USB not connected</string>
-    <!-- USB unavailable subtext - shown when USB is not connected -->
-    <string name="usb_tethering_turnon_subtext">Connect to turn on</string>
-    <!-- USB errored subtext - shown when USB is broken for some reason -->
-    <string name="usb_tethering_errored_subtext">USB tethering error</string>
+    <string name="usb_tethering_subtext" product="default">Share phone\u2019s Internet connection via USB</string>
+    <string name="usb_tethering_subtext" product="tablet">Share tablet\u2019s Internet connection via USB</string>
 
     <!-- Bluetooth Tethering settings-->
     <!-- Label for bluetooth tether checkbox [CHAR LIMIT=25]-->
     <string name="bluetooth_tether_checkbox_text">Bluetooth tethering</string>
-    <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=70]-->
-    <string name="bluetooth_tethering_available_subtext" product="tablet">Sharing this tablet\u2019s Internet connection via Bluetooth</string>
-    <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=70]-->
-    <string name="bluetooth_tethering_available_subtext" product="default">Sharing this phone\u2019s Internet connection via Bluetooth</string>
-    <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=90]-->
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet">Sharing this tablet\u2019s Internet connection to 1 device via Bluetooth</string>
-    <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=90]-->
-    <string name="bluetooth_tethering_device_connected_subtext" product="default">Sharing this phone\u2019s Internet connection to 1 device via Bluetooth</string>
-    <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=90]-->
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet">Sharing this tablet\u2019s Internet connection to <xliff:g id="connectedDeviceCount">%1$d</xliff:g> devices via Bluetooth</string>
-    <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=90]-->
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default">Sharing this phone\u2019s Internet connection to <xliff:g id="connectedDeviceCount">%1$d</xliff:g> devices via Bluetooth</string>
+    <!-- Bluetooth Tethering subtext [CHAR LIMIT=70]-->
+    <string name="bluetooth_tethering_subtext" product="tablet">Share tablet\u2019s Internet connection via Bluetooth</string>
+    <!-- Bluetooth Tethering subtext [CHAR LIMIT=70]-->
+    <string name="bluetooth_tethering_subtext" product="default">Share phone\u2019s Internet connection via Bluetooth</string>
     <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=80]-->
     <string name="bluetooth_tethering_off_subtext_config">Sharing this <xliff:g id="device_name">%1$d</xliff:g>\u2019s Internet connection via Bluetooth</string>
-    <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=80]-->
-    <string name="bluetooth_tethering_off_subtext" product="tablet">Not sharing this tablet\u2019s Internet connection via Bluetooth</string>
-    <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=80]-->
-    <string name="bluetooth_tethering_off_subtext" product="default">Not sharing this phone\u2019s Internet connection via Bluetooth</string>
-    <!-- Bluetooth errored subtext - shown when Bluetooth is broken for some reason [CHAR LIMIT=50]-->
-    <string name="bluetooth_tethering_errored_subtext">Not tethered</string>
     <!-- Bluetooth Tethering settings. Error message shown when trying to connect an 8th device [CHAR LIMIT=50]-->
     <string name="bluetooth_tethering_overflow_error">Can\u2019t tether to more than <xliff:g id="maxConnection">%1$d</xliff:g> devices.</string>
     <!-- Bluetooth Tethering settings.  Message for untethering from a bluetooth device [CHAR LIMIT=50]-->
     <string name="bluetooth_untether_blank"><xliff:g id="device_name">%1$s</xliff:g> will be untethered.</string>
 
     <!-- Tethering footer info [CHAR LIMIT=NONE]-->
-    <string name="tethering_footer_info">Use hotspot and tethering to provide Internet to other devices through your mobile data connection.</string>
+    <string name="tethering_footer_info">Use hotspot and tethering to provide Internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices.</string>
 
     <!-- Tethering help button - calls up a web view with general tethering info -->
     <string name="tethering_help_button_text">Help</string>
@@ -3204,7 +3288,7 @@
     <!-- [CHAR LIMIT=130] Location mode screen, description for battery saving mode -->
     <string name="location_mode_battery_saving_description">Use Wi\u2011Fi, Bluetooth, or mobile networks to determine location</string>
     <!-- [CHAR LIMIT=130] Location mode screen, description for sensors only mode -->
-    <string name="location_mode_sensors_only_description">Use GPS to determine location</string>
+    <string name="location_mode_sensors_only_description">Use GPS and device sensors to determine location</string>
     <!-- [CHAR LIMIT=30] Wireless background scanning settings screen, screen title -->
     <string name="location_scanning_screen_title">Scanning</string>
     <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->
@@ -3309,10 +3393,16 @@
     <!-- Lock Pattern settings -->
     <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
     <string name="lockpassword_choose_your_password_header">Choose your password</string>
+    <!-- Header on first screen of choose password/PIN as backup for fingerprint flow [CHAR LIMIT=30] -->
+    <string name="lockpassword_choose_your_password_header_for_fingerprint">To use fingerprint, set password</string>
     <!-- Header on first screen of choose pattern flow [CHAR LIMIT=30] -->
     <string name="lockpassword_choose_your_pattern_header">Choose your pattern</string>
+    <!-- Header on first screen of choose pattern as backup for fingerprint flow [CHAR LIMIT=30] -->
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint">To use fingerprint, set pattern</string>
     <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
     <string name="lockpassword_choose_your_pin_header">Choose your PIN</string>
+    <!-- Header on first screen of choose password/PIN as backup for fingerprint flow [CHAR LIMIT=30] -->
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint">To use fingerprint, set PIN</string>
     <!-- Header on password confirm screen [CHAR LIMIT=30] -->
     <string name="lockpassword_confirm_your_password_header">Confirm your password</string>
     <!-- Header on pattern confirm screen [CHAR LIMIT=30] -->
@@ -3468,6 +3558,12 @@
     <string name="install_applications">Unknown sources</string>
     <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  [CHAR LIMIT=30] -->
     <string name="install_applications_title">Allow all app sources</string>
+    <!-- Category title listing recently used apps [CHAR_LIMIT=50]-->
+    <string name="recent_app_category_title">Recently opened apps</string>
+    <!-- Preference title for showing all apps on device [CHAR_LIMIT=50]-->
+    <string name="see_all_apps_title">See all <xliff:g id="count" example="3">%1$d</xliff:g> apps</string>
+    <!-- Preference summary for each recently used app, which is the time since last used, i.e. "7 h 20 min ago". Note: ^1 should be used in all translations [CHAR_LIMIT=60] -->
+    <string name="recent_app_summary"><xliff:g id="time">^1</xliff:g> ago</string>
 
     <!-- Warning that appears below the unknown sources switch in settings -->
     <string name="install_all_warning" product="tablet">
@@ -3867,6 +3963,15 @@
         and then on again.</string>
 
     <!-- Languages Settings --> <skip />
+    <!-- Title of Language, input & gestures setting on main settings screen. -->
+    <string name="language_input_gesture_title">Languages, input &amp; gestures</string>
+    <!-- Summary of Language, input & gestures setting on main settings screen when both gesture setting and assistant feature is on. -->
+    <string name="language_input_gesture_summary_on_with_assist"></string>
+    <!-- Summary of Language, input & gestures setting on main settings screen when both gesture setting and non-assistant feature is on. -->
+    <string name="language_input_gesture_summary_on_non_assist"></string>
+    <!-- Summary of Language, input & gestures setting on main settings screen when gesture setting is off. -->
+    <string name="language_input_gesture_summary_off"></string>
+
     <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
     <string name="language_settings">Languages&#160;&amp; input</string>
     <!-- Title of Languages & input settings screen -->
@@ -4369,6 +4474,12 @@
         <item quantity="other"><xliff:g id="count">%1$d</xliff:g> print services on</item>
     </plurals>
 
+    <!-- Print setting summary in settings screenm indicating how many print jobs are active [CHAR LIMIT=None] -->
+    <plurals name="print_jobs_summary">
+        <item quantity="one">1 print job</item>
+        <item quantity="other"><xliff:g id="count">%1$d</xliff:g> print jobs</item>
+    </plurals>
+
     <!-- Title for print service settings screen [CHAR LIMIT=25] -->
     <string name="print_settings_title">Print services</string>
 
@@ -4532,6 +4643,53 @@
     <!-- Subtitle for list of packages -->
     <string name="packages_subtitle">Included packages</string>
 
+    <!-- Activity title for battery abnormal details page [CHAR LIMIT=60] -->
+    <string name="battery_abnormal_details_title">Apps draining battery</string>
+
+    <!-- Summary for wakelock anomaly, means device been kept awake [CHAR LIMIT=60] -->
+    <string name="battery_abnormal_wakelock_summary">Keeping device awake</string>
+    <!-- Summary for wakeup alarm anomaly, meaning device been wakeup in the background [CHAR LIMIT=60] -->
+    <string name="battery_abnormal_wakeup_alarm_summary">Waking up device in background</string>
+    <!-- Summary for location anomaly, meaning device is requesting location too frequently [CHAR LIMIT=60] -->
+    <string name="battery_abnormal_location_summary">Requesting location frequently</string>
+    <!-- Summary for anomalies, meaning some apps behaving abnormally  [CHAR LIMIT=80] -->
+    <string name="battery_abnormal_apps_summary"><xliff:g id="number">%1$d</xliff:g> apps misbehaving</string>
+
+    <!-- Title for force stop dialog [CHAR LIMIT=30] -->
+    <string name="dialog_stop_title">Stop app?</string>
+    <!-- Message body for force stop dialog [CHAR LIMIT=NONE] -->
+    <string name="dialog_stop_message" product="default">Your phone can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> is keeping your phone awake.\n\nTo try to fix this issue, you can force stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance.</string>
+    <!-- Message body for force stop dialog [CHAR LIMIT=NONE] -->
+    <string name="dialog_stop_message" product="tablet">Your tablet can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> is keeping your tablet awake.\n\nTo try to fix this issue, you can force stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance.</string>
+    <!-- Message body for force stop dialog [CHAR LIMIT=NONE] -->
+    <string name="dialog_stop_message" product="device">Your device can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> is keeping your device awake.\n\nTo try to fix this issue, you can force stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance.</string>
+
+    <!-- Text for OK button in force stop dialog [CHAR LIMIT=30] -->
+    <string name="dialog_stop_ok">Stop app</string>
+
+    <!-- Title for background usage dialog [CHAR LIMIT=60] -->
+    <string name="dialog_background_check_title">Turn off background usage?</string>
+    <!-- Message body for background usage dialog [CHAR LIMIT=NONE] -->
+    <string name="dialog_background_check_message" product="default">Your phone can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> keeps waking up your phone.\n\nTo address this issue, your phone can prevent this app from running in the background.</string>
+    <!-- Message body for background usage dialog [CHAR LIMIT=NONE] -->
+    <string name="dialog_background_check_message" product="tablet">Your tablet can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> keeps waking up your tablet.\n\nTo address this issue, your tablet can prevent this app from running in the background.</string>
+    <!-- Message body for background usage dialog [CHAR LIMIT=NONE] -->
+    <string name="dialog_background_check_message" product="device">Your device can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> keeps waking up your device.\n\nTo address this issue, your device can prevent this app from running in the background.</string>
+    <!-- Text for OK button in background usage dialog [CHAR LIMIT=30] -->
+    <string name="dialog_background_check_ok">Turn off</string>
+
+    <!-- Title for location dialog [CHAR LIMIT=60] -->
+    <string name="dialog_location_title">Turn off location?</string>
+    <!-- Message body for location dialog [CHAR LIMIT=NONE] -->
+    <string name="dialog_location_message" product="default">Your phone can’t manage battery normally because <xliff:g id="app">%1$s</xliff:g> keeps requesting your location when you're not using the app.\n\nTo fix this issue, you can turn off location for this app.</string>
+    <!-- Message body for location dialog [CHAR LIMIT=NONE] -->
+    <string name="dialog_location_message" product="tablet">Your tablet can’t manage battery normally because <xliff:g id="app">%1$s</xliff:g> keeps requesting your location when you're not using the app.\n\nTo fix this issue, you can turn off location for this app.</string>
+    <!-- Message body for location dialog [CHAR LIMIT=NONE] -->
+    <string name="dialog_location_message" product="device">Your device can’t manage battery normally because <xliff:g id="app">%1$s</xliff:g> keeps requesting your location when you're not using the app.\n\nTo fix this issue, you can turn off location for this app.</string>
+
+    <!-- Text for OK button in location dialog [CHAR LIMIT=30] -->
+    <string name="dialog_location_ok">Turn off</string>
+
     <!-- Label for power consumed by the screen -->
     <string name="power_screen">Screen</string>
     <!-- Label for power consumed by the flashlight -->
@@ -4561,7 +4719,7 @@
     <!-- Label for power consumed by system [CHAR LIMIT=30] -->
     <string name="power_system">System</string>
     <!-- Label for power consumed by user [CHAR LIMIT=30] -->
-    <string name="power_user">User</string>
+    <string name="power_user">Other users</string>
 
     <!-- Label for CPU usage time -->
     <string name="usage_type_cpu">CPU total</string>
@@ -4681,6 +4839,8 @@
 
     <!-- Description for battery usage time for an app, i.e. Used for 30min. Note: ^1 should be used in all translations [CHAR LIMIT=60] -->
     <string name="battery_used_for">Used for <xliff:g id="time">^1</xliff:g></string>
+    <!-- Description for battery usage background time for an app, i.e. Active for 30min. Note: ^1 should be used in all translations [CHAR LIMIT=60] -->
+    <string name="battery_active_for">Active for <xliff:g id="time">^1</xliff:g></string>
     <!-- Description for battery screen usage time for an app, i.e. Screen usage 30min. Note: ^1 should be used in all translations [CHAR LIMIT=60] -->
     <string name="battery_screen_usage">Screen usage <xliff:g id="time">^1</xliff:g></string>
     <!-- Description for battery usage info for an app, i.e. 60% used by facebook. [CHAR LIMIT=60] -->
@@ -5972,7 +6132,7 @@
     <string name="help_label">Help &amp; feedback</string>
 
     <!-- Summary text for support setting tile [CHAR LIMIT=None] -->
-    <string name="support_summary">Help articles, phone &amp; chat support</string>
+    <string name="support_summary">Help articles, phone &amp; chat, getting started</string>
 
     <!-- Help URI, Default [DO NOT TRANSLATE] -->
     <string name="help_uri_default" translatable="false"></string>
@@ -6033,6 +6193,8 @@
     <string name="help_url_location_access" translatable="false"></string>
     <!-- Help URL, Security settings [DO NOT TRANSLATE] -->
     <string name="help_url_security" translatable="false"></string>
+    <!-- Help URL, Encryption settings [DO NOT TRANSLATE] -->
+    <string name="help_url_encryption" translatable="false"></string>
     <!-- Help URL, Tap & pay [DO NOT TRANSLATE] -->
     <string name="help_url_nfc_payment" translatable="false"></string>
     <!-- Help URL, Remote display [DO NOT TRANSLATE] -->
@@ -6045,6 +6207,30 @@
     <string name="help_url_manage_storage" translatable="false"></string>
     <!-- Help URL, Android is upgrading [DO NOT TRANSLATE] -->
     <string name="help_url_upgrading" translatable="false"></string>
+    <!-- Help URL, Font size [DO NOT TRANSLATE] -->
+    <string name="help_url_font_size" translatable="false"></string>
+    <!-- Help URL, Display size [DO NOT TRANSLATE] -->
+    <string name="help_url_display_size" translatable="false"></string>
+
+    <string name="help_url_network_dashboard" translatable="false"></string>
+    <string name="help_url_connected_devices" translatable="false"></string>
+    <string name="help_url_apps_and_notifications" translatable="false"></string>
+    <string name="help_url_night_display" translatable="false"></string>
+    <string name="help_url_screen_saver" translatable="false"></string>
+    <string name="help_url_pickup_gesture" translatable="false"></string>
+    <string name="help_url_storage_dashboard" translatable="false"></string>
+    <string name="help_url_lockscreen" translatable="false"></string>
+    <string name="help_url_trust_agent" translatable="false"></string>
+    <string name="help_url_usage_access" translatable="false"></string>
+    <string name="help_url_screen_pinning" translatable="false"></string>
+    <string name="help_url_user_and_account_dashboard" translatable="false"></string>
+    <string name="help_url_accessibility_shortcut" translatable="false"></string>
+    <string name="help_url_magnification" translatable="false"></string>
+    <string name="help_url_color_correction" translatable="false"></string>
+    <string name="help_url_autoclick" translatable="false"></string>
+    <string name="help_url_system_dashboard" translatable="false"></string>
+    <string name="help_url_double_tap_screen" translatable="false"></string>
+    <string name="help_url_account_detail" translatable="false"></string>
 
     <!-- User account title [CHAR LIMIT=30] -->
     <string name="user_account_title">Account for content</string>
@@ -6232,12 +6418,19 @@
 
     <!-- Title for setting tile leading to network and Internet settings [CHAR LIMIT=40]-->
     <string name="network_dashboard_title">Network &amp; Internet</string>
-    <!-- Summary for Network and Internet settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
-    <string name="network_dashboard_summary">Wi-Fi, mobile, data usage, hotspot</string>
+    <!-- Summary for Network and Internet settings, explaining it contains mobile network setting [CHAR LIMIT=NONE]-->
+    <string name="network_dashboard_summary_mobile">mobile</string>
+    <!-- Summary for Network and Internet settings, explaining it contains network data usage setting [CHAR LIMIT=NONE]-->
+    <string name="network_dashboard_summary_data_usage">data usage</string>
+    <!-- Summary for Network and Internet settings, explaining it contains hotspot (tethering) setting [CHAR LIMIT=NONE]-->
+    <string name="network_dashboard_summary_hotspot">hotspot</string>
+
     <!-- Title for setting tile leading to Connected devices settings [CHAR LIMIT=40]-->
     <string name="connected_devices_dashboard_title">Connected devices</string>
     <!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
     <string name="connected_devices_dashboard_summary">Bluetooth, Cast, NFC</string>
+    <!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
+    <string name="connected_devices_dashboard_no_nfc_summary">Bluetooth, Cast</string>
     <!-- Title for setting tile leading to Apps & Notification settings [CHAR LIMIT=40]-->
     <string name="app_and_notification_dashboard_title">Apps &amp; notifications</string>
     <!-- Summary for Apps & Notification settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
@@ -6307,6 +6500,9 @@
     <string name="keywords_gesture">gesture</string>
     <string name="keywords_payment_settings">pay, tap, payments</string>
     <string name="keywords_backup">backup, back up</string>
+    <string name="keywords_squeeze_to_launch_gesture">gesture, edge, side, active edge, squeeze, grip, assist, assistant, squeezy, squeezie, squeezey, squeezee, ok google, google assistant</string>
+    <string name="keywords_wake_squeeze_gesture">gesture, wake, notifications, screen, display, screen off, screen on, squeeze, edge, asleep, sleep, grip</string>
+    <string name="keywords_alarm_silence_gesture">gesture, silence, snooze, alarm, incoming call, quiet, display, lockscreen, squeeze, grip, edge, stop</string>
 
     <!-- NFC Wi-Fi pairing/setup strings-->
 
@@ -6561,8 +6757,11 @@
     <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Title for the screen asking the user how they want their profile notifications to appear when the device is locked [CHAR LIMIT=30] -->
     <string name="lock_screen_notifications_interstitial_title_profile">Profile notifications</string>
 
+    <!-- Notification Settings: Title for an individual app's notification settings. [CHAR LIMIT=30] -->
+    <string name="notifications_title">Notifications</string>
+
     <!-- Notification Settings: Title for the option managing notifications per application. [CHAR LIMIT=30] -->
-    <string name="app_notifications_title">Notifications</string>
+    <string name="app_notifications_title">App notifications</string>
 
     <!-- [CHAR LIMIT=100] Notification channel title -->
     <string name="notification_channel_title">Notification category</string>
@@ -6615,6 +6814,20 @@
     <!-- [CHAR LIMIT=180] Notification importance summary -->
     <string name="show_silently_summary">Don\'t make sound, vibrate, or peek these notifications into view on the current screen.</string>
 
+    <!-- Channel summaries for the app notification page -->
+
+    <!-- [CHAR LIMIT=100] Notification Importance title: min importance level title -->
+    <string name="notification_channel_summary_min">Low importance</string>
+
+    <!-- [CHAR LIMIT=100] Notification Importance title: low importance level title -->
+    <string name="notification_channel_summary_low">Medium importance</string>
+
+    <!-- [CHAR LIMIT=100] Notification Importance title: normal importance level title -->
+    <string name="notification_channel_summary_default">High importance</string>
+
+    <!-- [CHAR LIMIT=100] Notification Importance title: high importance level title -->
+    <string name="notification_channel_summary_high">Urgent importance</string>
+
     <!-- Default Apps > Default notification assistant -->
     <string name="default_notification_assistant">Notification assistant</string>
 
@@ -6701,12 +6914,6 @@
     <!-- Apps > App Details > Picture-in-picture > Description. [CHAR LIMIT=NONE] -->
     <string name="picture_in_picture_app_detail_summary">Allow this app to create a picture-in-picture window while the app is open or after you leave it (for example, to continue watching a video).  This window displays on top of other apps you're using.</string>
 
-    <!-- Summary of app allowed to enter picture-in-picture. [CHAR LIMIT=60] -->
-    <string name="picture_in_picture_on">Yes</string>
-
-    <!-- Summary of app not allowed to enter picture-in-picture. [CHAR LIMIT=60] -->
-    <string name="picture_in_picture_off">No</string>
-
     <!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->
     <string name="manage_zen_access_title">Do Not Disturb access</string>
 
@@ -7065,46 +7272,38 @@
     <!-- Summary Title for saying that the preference is experimental and will evolve over time due to User feedback. [CHAR LIMIT=NONE] -->
     <string name="experimental_preference">(Experimental)</string>
 
-    <!-- [CHAR LIMIT=45] Auto-rotate setting title -->
-    <string name="display_auto_rotate_title">Device rotation</string>
-    <!-- [CHAR LIMIT=70] Rotate when screen is turned option -->
-    <string name="display_auto_rotate_rotate">Rotate the contents of the screen</string>
-    <!-- [CHAR LIMIT=70] Keep the screen in portrait when rotated -->
-    <string name="display_auto_rotate_stay_in_portrait">Stay in portrait view</string>
-    <!-- [CHAR LIMIT=70] Keep the screen in landscape when rotated -->
-    <string name="display_auto_rotate_stay_in_landscape">Stay in landscape view</string>
-    <!-- [CHAR LIMIT=70] Don't rotate when screen is turned option -->
-    <string name="display_auto_rotate_stay_in_current">Stay in current orientation</string>
-
     <!-- Encryption interstitial title. This screen asks the user whether the device will ask for a PIN / pattern / password before the device starts up. [CHAR LIMIT=30] -->
     <string name="encryption_interstitial_header">Secure start-up</string>
 
     <!-- Encryption interstitial button to continue with the shown setting.  Appears on screen that asks the user to opt in/out of encrypting device with a pin/pattern/password. [CHAR LIMIT=NONE] -->
     <string name="encryption_continue_button">Continue</string>
 
-    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device. [CHAR LIMIT=NONE] [BACKUP_MESSAGE_ID=2317181134653424679] -->
-    <string name="encryption_interstitial_message_pin">You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.
+    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device. [CHAR LIMIT=NONE] -->
+    <string name="encryption_interstitial_message_pin">
+   You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.
    \n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?
    </string>
-    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device. [CHAR LIMIT=NONE] [BACKUP_MESSAGE_ID=7081249914068568570] -->
-    <string name="encryption_interstitial_message_pattern">You can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.
+    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device. [CHAR LIMIT=NONE] -->
+    <string name="encryption_interstitial_message_pattern">
+   You can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.
    \n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?
    </string>
-    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device. [CHAR LIMIT=NONE] [BACKUP_MESSAGE_ID=7796567133897436443] -->
-    <string name="encryption_interstitial_message_password">You can further protect this device by requiring your password before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.
+    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device. [CHAR LIMIT=NONE] -->
+    <string name="encryption_interstitial_message_password">
+   You can further protect this device by requiring your password before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.
    \n\nThis helps protect data on lost or stolen devices. Require password to start your device?
    </string>
 
-    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] [BACKUP_MESSAGE_ID=4550632760119547492] -->
+    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
     <string name="encryption_interstitial_message_pin_for_fingerprint">In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?</string>
-    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] [BACKUP_MESSAGE_ID=932184823193006087] -->
+    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
     <string name="encryption_interstitial_message_pattern_for_fingerprint">In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?</string>
-    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] [BACKUP_MESSAGE_ID=5560954719370251702] -->
-    <string name="encryption_interstitial_message_password_for_fingerprint">In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device></string>
+    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+    <string name="encryption_interstitial_message_password_for_fingerprint">In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?</string>
 
-    <!-- Button label to say yes to the question of whether to require PIN/password/pattern to start your device. [CHAR LIMIT=20] [BACKUP_MESSAGE_ID=4439509435889513411] -->
+    <!-- Button label to say yes to the question of whether to require PIN/password/pattern to start your device. [CHAR LIMIT=20] -->
     <string name="encryption_interstitial_yes">Yes</string>
-    <!-- Button label to say no to the question of whether to require PIN/password/pattern to start your device. [CHAR LIMIT=20] [BACKUP_MESSAGE_ID=8935031349097025137] -->
+    <!-- Button label to say no to the question of whether to require PIN/password/pattern to start your device. [CHAR LIMIT=20] -->
     <string name="encryption_interstitial_no">No</string>
 
    <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
@@ -7400,6 +7599,21 @@
     <!-- Label for menu to show app usage [CHAR LIMIT=30] -->
     <string name="hide_extra_apps">Show app usage</string>
 
+    <!-- Title for high usage item, which means power high usage [CHAR LIMIT=30] -->
+    <string name="power_high_usage_title">High usage</string>
+
+    <!-- Summary for high usage item, showing app/apps are behaving abnormally [CHAR LIMIT=80] -->
+    <plurals name="power_high_usage_summary">
+        <item quantity="one"><xliff:g id="app">%1$s</xliff:g> behaving abnormally</item>
+        <item quantity="other"><xliff:g id="number">%2$d</xliff:g> apps behaving abnormally</item>
+    </plurals>
+
+    <!-- Title for high usage item, showing app/apps are draining battery [CHAR LIMIT=80] -->
+    <plurals name="power_high_usage_title">
+        <item quantity="one"><xliff:g id="app">%1$s</xliff:g> draining battery</item>
+        <item quantity="other">Apps draining battery</item>
+    </plurals>
+
     <!-- Filter for apps allowed to use a lot of power [CHAR LIMIT=25] -->
     <string name="high_power_filter_on">Not optimized</string>
 
@@ -7666,10 +7880,12 @@
 
     <!-- Label for showing apps that can display over other apps [CHAR LIMIT=45] -->
     <string name="filter_overlay_apps">Apps with permission</string>
-    <!-- Summary of app allowed to display over other apps [CHAR LIMIT=60] -->
-    <string name="system_alert_window_on">Yes</string>
-    <!-- Summary of app not allowed to display over other apps [CHAR LIMIT=60] -->
-    <string name="system_alert_window_off">No</string>
+
+    <!-- Preference summary text for an app when it is allowed for a permission. [CHAR LIMIT=45] -->
+    <string name="app_permission_summary_allowed">Allowed</string>
+
+    <!-- Preference summary text for an app when it is disallowed for a permission. [CHAR LIMIT=45] -->
+    <string name="app_permission_summary_not_allowed">Not allowed</string>
 
     <!-- Keywords for setting screen for controlling apps that can install other apps on device -->
     <string name="keywords_install_other_apps">install apps unknown sources</string>
@@ -7895,12 +8111,30 @@
     <!-- Summary of condition that night display is on (renamed "Night Light" with title caps). [CHAR LIMIT=NONE] -->
     <string name="condition_night_display_summary">Screen is tinted amber. This may help you fall asleep.</string>
 
+    <!-- Summary for the condition section on the dashboard, representing number of conditions. [CHAR LIMIT=10] -->
+    <string name="condition_summary" translatable="false"><xliff:g name="count" example="3">%1$d</xliff:g></string>
+
     <!-- Title for the suggestions section on the dashboard [CHAR LIMIT=30] -->
     <string name="suggestions_title">Suggestions</string>
 
     <!-- Summary for the suggestions section on the dashboard, representing number of suggestions. [CHAR LIMIT=10] -->
     <string name="suggestions_summary">+<xliff:g name="count" example="3">%1$d</xliff:g></string>
 
+    <!-- Title for the suggestions section on the dashboard, representing number of suggestions to show when expanded. [CHAR LIMIT=10] -->
+    <string name="suggestions_more_title">+<xliff:g name="count" example="3">%1$d</xliff:g> more</string>
+
+    <!-- Title for the collapsed suggestions section on the dashboard, representing number of suggestions. [CHAR LIMIT=30] -->
+    <plurals name="suggestions_collapsed_title">
+        <item quantity="one">1 suggestion</item>
+        <item quantity="other"><xliff:g id="count" example="10">%1$d</xliff:g> suggestions</item>
+    </plurals>
+
+    <!-- Summary for the collapsed suggestions section on the dashboard, representing number of suggestions. [CHAR LIMIT=30] -->
+    <plurals name="suggestions_collapsed_summary">
+        <item quantity="one">+1 suggestion</item>
+        <item quantity="other">+<xliff:g id="count" example="10">%1$d</xliff:g> suggestions</item>
+    </plurals>
+
     <!-- Name of option to remove a suggestion from the list [CHAR LIMIT=30] -->
     <string name="suggestion_remove">Remove</string>
 
@@ -7956,10 +8190,7 @@
     <string name="billing_cycle">Billing cycle</string>
 
     <!-- Summary describing when the billing cycle for their phone carrier starts [CHAR LIMIT=NONE] -->
-    <string name="billing_cycle_summary">Monthly cycle starts on the <xliff:g name="day" example="1st">%1$s</xliff:g> of every month</string>
-
-    <!-- Summary describing when the billing cycle for their phone carrier starts [CHAR LIMIT=NONE] -->
-    <string name="billing_cycle_fragment_summary">Monthly starting <xliff:g name="day_of_month" example="1st">%1$s</xliff:g></string>
+    <string name="billing_cycle_fragment_summary">Monthly on day <xliff:g name="day_of_month" example="17">%1$s</xliff:g></string>
 
     <!-- Title of button and screen for which wifi networks have data restrictions [CHAR LIMIT=30 -->
     <string name="network_restrictions">Network restrictions</string>
@@ -8008,7 +8239,7 @@
     <string name="data_saver_title">Data saver</string>
 
     <!-- Button that leads to list of apps with unrestricted data access [CHAR LIMIT=60] -->
-    <string name="unrestricted_data_saver">Unrestricted data access</string>
+    <string name="unrestricted_data_saver">Unrestricted data</string>
 
     <!-- Description of message shown when app is blacklisted for background data access [CHAR LIMIT=NONE] -->
     <string name="restrict_background_blacklisted">Background data is turned off</string>
@@ -8169,11 +8400,11 @@
     <string name="notification_suggestion_summary">Show or hide notification content</string>
     <!-- Setting tab title for all setting options. [CHAR LIMIT=20] -->
     <string name="page_tab_title_summary">All</string>
-    <!-- Setting tab title for support setting options. [CHAR LIMIT=20] -->
-    <string name="page_tab_title_support">Support</string>
+    <!-- Setting tab title for support setting options. [CHAR LIMIT=25] -->
+    <string name="page_tab_title_support">Support &amp; tips</string>
 
     <!-- Summary of developer options to set the smallest width of the screen [CHAR LIMIT=60]-->
-    <string name="developer_density_summary"><xliff:g name="count" example="320">%d</xliff:g> dp</string>
+    <string name="density_pixel_summary" translatable="false"><xliff:g name="count" example="320">%1$s</xliff:g> dp</string>
 
     <!-- Title of developer options to set the smallest width of the screen [CHAR LIMIT=60]-->
     <string name="developer_smallest_width">Smallest width</string>
@@ -8359,8 +8590,8 @@
     <!-- Preference menu title for accessing the deletion helper from the storage manager settings. [CHAR LIMIT=30]-->
     <string name="deletion_helper_preference_title">Free up space now</string>
 
-    <!-- Preference title for gesture settings [CHAR LIMIT=25]-->
-    <string name="gesture_preference_title">Gestures</string>
+    <!-- Preference title for gesture settings [CHAR LIMIT=40]-->
+    <string name="gesture_preference_title">Gesture shortcuts</string>
 
     <!-- Preference summary for gesture settings (phone) [CHAR LIMIT=NONE]-->
     <string name="gesture_preference_summary" product="default">Quick gestures to control your phone</string>
@@ -8375,35 +8606,57 @@
     <!-- Summary text for double tap power for camera [CHAR LIMIT=160]-->
     <string name="double_tap_power_for_camera_summary">To quickly open camera, press the power button twice. Works from any screen.</string>
 
+    <!-- Title for settings suggestion for double tap power for camera [CHAR LIMIT=60] -->
+    <string name="double_tap_power_for_camera_suggestion_title">Open camera quickly</string>
+
+    <!-- Summary for settings suggestion for double tap power for camera [CHAR LIMIT=60] -->
+    <string name="double_tap_power_for_camera_suggestion_summary">Press power button twice to open camera</string>
+
     <!-- Title text for double twist for camera mode [CHAR LIMIT=60]-->
     <string name="double_twist_for_camera_mode_title">Flip camera</string>
 
     <!-- Summary text for double twist for camera mode  [CHAR LIMIT=160]-->
     <string name="double_twist_for_camera_mode_summary"></string>
 
-    <!-- Title text for ambient display double tap (phone) [CHAR LIMIT=60]-->
+    <!-- Title for settings suggestion for double twist for camera [CHAR LIMIT=60] -->
+    <string name="double_twist_for_camera_suggestion_title">Take selfies faster</string>
+
+    <!-- Summary for settings suggestion for double twist for camera (phone) [CHAR LIMIT=60] -->
+    <string name="double_twist_for_camera_suggestion_summary" product="default">Double-twist phone for selfie mode</string>
+    <!-- Summary for settings suggestion for double twist for camera (tablet) [CHAR LIMIT=60] -->
+    <string name="double_twist_for_camera_suggestion_summary" product="tablet">Double-twist tablet for selfie mode</string>
+    <!-- Summary for settings suggestion for double twist for camera (device) [CHAR LIMIT=60] -->
+    <string name="double_twist_for_camera_suggestion_summary" product="device">Double-twist device for selfie mode</string>
+
+    <!-- Preference and settings suggestion title text for ambient display double tap (phone) [CHAR LIMIT=60]-->
     <string name="ambient_display_title" product="default">Double-tap to check phone</string>
-    <!-- Title text for ambient display double tap (tablet) [CHAR LIMIT=60]-->
+    <!-- Preference and settings suggestion title text for ambient display double tap (tablet) [CHAR LIMIT=60]-->
     <string name="ambient_display_title" product="tablet">Double-tap to check tablet</string>
-    <!-- Title text for ambient display double tap (device) [CHAR LIMIT=60]-->
+    <!-- Preference and settings suggestion title text for ambient display double tap (device) [CHAR LIMIT=60]-->
     <string name="ambient_display_title" product="device">Double-tap to check device</string>
 
-    <!-- Summary text for ambient display double tap [CHAR LIMIT=160]-->
-    <string name="ambient_display_summary">To quickly check your notifications, double-tap your screen.</string>
+    <!-- Summary text for ambient display double tap [CHAR LIMIT=NONE]-->
+    <string name="ambient_display_summary">To check time, notification icons, and other info, double-tap your screen.</string>
 
-    <!-- Title text for ambient display pick up (phone) [CHAR LIMIT=60]-->
+    <!-- Summary for settings suggestion for double tap power for camera [CHAR LIMIT=60] -->
+    <string name="ambient_display_suggestion_summary">Check notifications when screen is off</string>
+
+    <!-- Preference and settings suggestion title text for ambient display pick up (phone) [CHAR LIMIT=60]-->
     <string name="ambient_display_pickup_title" product="default">Lift to check phone</string>
-    <!-- Title text for ambient display pick up (tablet) [CHAR LIMIT=60]-->
+    <!-- Preference and settings suggestion title text for ambient display pick up (tablet) [CHAR LIMIT=60]-->
     <string name="ambient_display_pickup_title" product="tablet">Lift to check tablet</string>
-    <!-- Title text for ambient display pick up (device) [CHAR LIMIT=60]-->
+    <!-- Preference and settings suggestion title text for ambient display pick up (device) [CHAR LIMIT=60]-->
     <string name="ambient_display_pickup_title" product="device">Lift to check device</string>
 
-    <!-- Summary text for ambient display (phone) [CHAR LIMIT=160]-->
-    <string name="ambient_display_pickup_summary" product="default">To quickly check your notifications, pick up your phone.</string>
-    <!-- Summary text for ambient display (tablet) [CHAR LIMIT=160]-->
-    <string name="ambient_display_pickup_summary" product="tablet">To quickly check your notifications, pick up your tablet.</string>
-    <!-- Summary text for ambient display (device) [CHAR LIMIT=160]-->
-    <string name="ambient_display_pickup_summary" product="device">To quickly check your notifications, pick up your device.</string>
+    <!-- Summary text for ambient display (phone) [CHAR LIMIT=NONE]-->
+    <string name="ambient_display_pickup_summary" product="default">To check time, notification icons, and other info, pick up your phone.</string>
+    <!-- Summary text for ambient display (tablet) [CHAR LIMIT=NONE]-->
+    <string name="ambient_display_pickup_summary" product="tablet">To check time, notification icons, and other info, pick up your tablet.</string>
+    <!-- Summary text for ambient display (device) [CHAR LIMIT=NONE]-->
+    <string name="ambient_display_pickup_summary" product="device">To check time, notification icons, and other info, pick up your device.</string>
+
+    <!-- Summary for settings suggestion for ambient display pick up [CHAR LIMIT=60] -->
+    <string name="ambient_display_pickup_suggestion_summary">Check notifications when screen is off</string>
 
     <!-- Title text for swiping downwards on fingerprint sensor for notifications [CHAR LIMIT=80]-->
     <string name="fingerprint_swipe_for_notifications_title">Swipe fingerprint for notifications</string>
@@ -8415,6 +8668,21 @@
     <!-- Summary text for fingerprint swipe for notifications (device) [CHAR LIMIT=160]-->
     <string name="fingerprint_swipe_for_notifications_summary" product="device">To check your notifications, swipe down on the fingerprint sensor on the back of your device.</string>
 
+    <!-- Title for settings suggestion for fingerprint swipe for notifications [CHAR LIMIT=60] -->
+    <string name="fingerprint_swipe_for_notifications_suggestion_title">See notifications quickly</string>
+
+    <!-- Summary for settings suggestion for fingerprint swipe for notifications [CHAR LIMIT=60] -->
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary">Swipe down on the fingerprint sensor</string>
+
+    <!-- Title and settings suggestion title text for opening camera when lifting the phone to a photo-taking position [CHAR LIMIT=60]-->
+    <string name="camera_lift_trigger_title">Raise to open camera</string>
+
+    <!-- Summary text for opening camera when lifting the phone to a photo-taking position [CHAR LIMIT=none]-->
+    <string name="camera_lift_trigger_summary">To open the camera automatically, lift up your phone into a photo-taking position (landscape or portrait). Works when your phone is asleep or locked.</string>
+
+    <!-- Settings suggestion summary text for opening camera when lifting the phone to a photo-taking position [CHAR LIMIT=60]-->
+    <string name="camera_lift_trigger_suggestion_summary">Take photos when phone is asleep or locked</string>
+
     <!-- Title text for the assist gesture [CHAR LIMIT=60]-->
     <string name="assist_gesture_title">Assist gesture</string>
 
@@ -8629,6 +8897,9 @@
     <!-- Title for audio files preference. [CHAR LIMIT=50] -->
     <string name="audio_files_title">Audio files</string>
 
+    <!-- Title for the installed app info storage page. The total storage space taken up by this app. [CHAR LIMIT=40]-->
+    <string name="app_info_storage_title">Space used</string>
+
     <!-- UI webview setting: WebView uninstalled-for-user explanatory text [CHAR LIMIT=30] -->
     <string name="webview_uninstalled_for_user">(uninstalled for user <xliff:g id="user" example="John Doe">%s</xliff:g>)</string>
     <!-- UI webview setting: WebView disabled-for-user explanatory text [CHAR LIMIT=30] -->
@@ -8676,11 +8947,20 @@
     <!-- Preference label for the Movies & TV apps section [CHAR LIMIT=50] -->
     <string name="storage_movies_tv">Movie &amp; TV apps</string>
 
-    <!-- Title for the installed app info storage page. The total storage space taken up by this app. [CHAR LIMIT=40]-->
-    <string name="app_info_storage_title">Space used</string>
+    <!-- Carrier Provisioning Info [CHAR LIMIT=NONE] -->
+    <string name="carrier_provisioning">Carrier Provisioning Info</string>
+    <!-- Trigger Carrier Provisioning [CHAR LIMIT=NONE] -->
+    <string name="trigger_carrier_provisioning">Trigger Carrier Provisioning</string>
+
+    <!-- Help URI, USB Audio [DO NOT TRANSLATE] -->
+    <string name="help_url_audio_accessory_not_supported" translatable="false"></string>
+
+    <!-- Title label for new device suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->
+    <string name="new_device_suggestion_title">What's new and exciting?</string>
+
+    <!-- Summary label for new device suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->
+    <string name="new_device_suggestion_summary">Check out the top 5 features</string>
 
     <!-- The divider symbol between different parts of the notification header including spaces. not translatable [CHAR LIMIT=3] -->
     <string name="notification_header_divider_symbol_with_spaces" translatable="false">" • "</string>
-
-
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index bae36b3..398bdbd 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -282,6 +282,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
         <item name="android:singleLine">true</item>
+        <item name="android:textAlignment">viewStart</item>
     </style>
 
     <style name="vpn_warning">
@@ -421,6 +422,8 @@
 
     <style name="AppActionPrimaryButton" parent="android:Widget.Material.Button.Colored"/>
 
+    <style name="DreamStartButton" parent="android:Widget.Material.Button" />
+
     <style name="LockPatternStyle">
         <item name="*android:regularColor">@color/lock_pattern_view_regular_color</item>
         <item name="*android:successColor">@color/lock_pattern_view_success_color</item>
@@ -446,4 +449,13 @@
         <item name="*android:successColor">@color/setup_lock_pattern_view_success_color_light</item>
     </style>
 
+    <!-- Overridden in sw400dp -->
+    <style name="LockPatternIconStyle" parent="SuwGlifIcon">
+        <item name="android:visibility">gone</item>
+    </style>
+
+    <style name="SuggestionConditionStyle">
+        <item name="android:background">@color/material_grey_300</item>
+    </style>
+
 </resources>
diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml
index d9124c5..31e2e79 100644
--- a/res/values/styles_preference.xml
+++ b/res/values/styles_preference.xml
@@ -28,11 +28,11 @@
     </style>
 
     <!-- Preferences -->
-    <style name="SettingsPreference">
+    <style name="SettingsPreference" parent="@style/Preference.Material">
         <item name="allowDividerAbove">false</item>
         <item name="allowDividerBelow">true</item>
         <item name="singleLineTitle">false</item>
-        <item name="android:layout">@layout/preference_material_settings</item>
+        <item name="iconSpaceReserved">true</item>
     </style>
 
     <style name="ApnPreference" parent="SettingsPreference">
@@ -48,7 +48,7 @@
            parent="@style/Preference.DialogPreference.EditTextPreference.Material">
         <item name="allowDividerAbove">false</item>
         <item name="allowDividerBelow">true</item>
-        <item name="android:layout">@layout/preference_material_settings</item>
+        <item name="iconSpaceReserved">true</item>
         <item name="android:dialogLayout">@layout/preference_dialog_edittext</item>
     </style>
 
@@ -68,10 +68,10 @@
         <item name="android:layout">@layout/preference_widget_seekbar_settings</item>
     </style>
 
-    <style name="SettingsSwitchPreference" parent="SettingsPreference">
-        <item name="widgetLayout">@*android:layout/preference_widget_switch</item>
-        <item name="switchTextOn">@*android:string/capital_on</item>
-        <item name="switchTextOff">@*android:string/capital_off</item>
+    <style name="SettingsSwitchPreference" parent="@style/Preference.SwitchPreference.Material">
+        <item name="allowDividerAbove">false</item>
+        <item name="allowDividerBelow">true</item>
+        <item name="iconSpaceReserved">true</item>
     </style>
 
     <style name="SyncSwitchPreference" parent="SettingsPreference">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 3dbaa8b..0b883e4 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -22,7 +22,7 @@
     <attr name="side_margin" format="reference|dimension" />
     <attr name="wifi_signal_color" format="reference" />
 
-    <style name="SetupWizardTheme" parent="SuwThemeGlif">
+    <style name="GlifTheme" parent="SuwThemeGlif">
         <!-- For all Alert Dialogs -->
         <item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
         <item name="android:colorPrimary">@color/suw_color_accent_dark</item>
@@ -43,7 +43,7 @@
         <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
     </style>
 
-    <style name="SetupWizardTheme.Light" parent="SuwThemeGlif.Light">
+    <style name="GlifTheme.Light" parent="SuwThemeGlif.Light">
         <!-- For all Alert Dialogs -->
         <item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
         <item name="android:colorPrimary">@color/suw_color_accent_light</item>
@@ -63,14 +63,55 @@
         <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
     </style>
 
-    <style name="SetupWizardTheme.Transparent" parent="SetupWizardTheme">
+    <style name="GlifV2Theme" parent="SuwThemeGlifV2">
+        <!-- For all Alert Dialogs -->
+        <item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
+        <item name="android:colorPrimary">@color/suw_color_accent_dark</item>
+        <item name="android:windowBackground">?android:attr/colorBackground</item>
+        <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
+        <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
+        <item name="ic_wps">@drawable/ic_wps_dark</item>
+        <item name="setup_divider_color">@color/setup_divider_color_dark</item>
+        <item name="side_margin">0dip</item>
+        <item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
+        <item name="wifi_signal">@drawable/wifi_signal</item>
+        <item name="wifi_friction">@drawable/wifi_friction</item>
+        <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
+        <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
+
+        <!-- LockPatternView colors -->
+        <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
+    </style>
+
+    <style name="GlifV2Theme.Light" parent="SuwThemeGlifV2.Light">
+        <!-- For all Alert Dialogs -->
+        <item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
+        <item name="android:colorPrimary">@color/suw_color_accent_light</item>
+        <item name="android:windowBackground">?android:attr/colorBackground</item>
+        <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
+        <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
+        <item name="ic_wps">@drawable/ic_wps_light</item>
+        <item name="setup_divider_color">@color/setup_divider_color_light</item>
+        <item name="side_margin">0dip</item>
+        <item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
+        <item name="wifi_signal">@drawable/wifi_signal</item>
+        <item name="wifi_friction">@drawable/wifi_friction</item>
+        <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
+        <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
+
+        <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
+    </style>
+
+    <style name="SetupWizardTheme.Transparent" parent="GlifTheme">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowAnimationStyle">@null</item>
     </style>
 
-    <style name="SetupWizardTheme.Light.Transparent" parent="SetupWizardTheme.Light">
+    <style name="SetupWizardTheme.Light.Transparent" parent="GlifTheme.Light">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
@@ -165,6 +206,12 @@
         <item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.SubSettings</item>
     </style>
 
+    <!-- Variant of the settings theme with no action bar. -->
+    <style name="Theme.Settings.NoActionBar">
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
+    </style>
+
     <style name="Theme.ProvisioningActivity" parent="@android:style/Theme.Translucent.NoTitleBar">
         <item name="android:windowAnimationStyle">@null</item>
         <item name="android:windowIsTranslucent">true</item>
diff --git a/res/xml/accessibility_autoclick_settings.xml b/res/xml/accessibility_autoclick_settings.xml
index f774335..6bd6c4d 100644
--- a/res/xml/accessibility_autoclick_settings.xml
+++ b/res/xml/accessibility_autoclick_settings.xml
@@ -18,7 +18,7 @@
                   android:title="@string/accessibility_autoclick_preference_title">
 
 
-    <com.android.settings.SeekBarPreference
+    <com.android.settings.widget.SeekBarPreference
         android:key="autoclick_delay"
         android:title="@string/accessibility_autoclick_delay_preference_title"/>
 
diff --git a/res/xml/accessibility_daltonizer_settings.xml b/res/xml/accessibility_daltonizer_settings.xml
index 9f08400..9b553ac 100644
--- a/res/xml/accessibility_daltonizer_settings.xml
+++ b/res/xml/accessibility_daltonizer_settings.xml
@@ -17,12 +17,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/accessibility_display_daltonizer_preference_title" >
 
-    <Preference
-        android:summary="@string/accessibility_display_daltonizer_preference_subtitle"
-        android:layout="@layout/text_description_preference"
-        android:persistent="false"
-        android:selectable="false" />
-
     <ListPreference
         android:entries="@array/daltonizer_type_entries"
         android:entryValues="@array/daltonizer_type_values"
diff --git a/res/xml/account_type_settings.xml b/res/xml/account_type_settings.xml
index ab997a5..0ba961f 100644
--- a/res/xml/account_type_settings.xml
+++ b/res/xml/account_type_settings.xml
@@ -19,11 +19,11 @@
         android:title="@string/account_settings_title"
         settings:keywords="@string/keywords_accounts">
 
-    <Preference
-      android:key="account_header"
-      android:layout="@layout/account_header"
-      android:selectable="false"
-      android:order="-10000"/>
+    <com.android.settings.applications.LayoutPreference
+        android:key="account_header"
+        android:layout="@layout/settings_entity_header"
+        android:selectable="false"
+        android:order="-10000"/>
 
     <Preference
         android:key="account_sync"
diff --git a/res/xml/ambient_display_settings.xml b/res/xml/ambient_display_settings.xml
new file mode 100644
index 0000000..47fed8a
--- /dev/null
+++ b/res/xml/ambient_display_settings.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+
+<PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/ambient_display_screen_title">
+
+    <PreferenceCategory
+            android:title="@string/ambient_display_category_triggers">
+
+        <SwitchPreference
+            android:key="ambient_display_always_on"
+            android:title="@string/doze_always_on_title"
+            android:summary="@string/doze_always_on_summary" />
+
+        <Preference
+            android:key="ambient_display_double_tap"
+            android:title="@string/ambient_display_title"
+            android:fragment="com.android.settings.gestures.DoubleTapScreenSettings" />
+
+        <Preference
+            android:key="ambient_display_pick_up"
+            android:title="@string/ambient_display_pickup_title"
+            android:fragment="com.android.settings.gestures.PickupGestureSettings" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory>
+
+        <SwitchPreference
+            android:key="ambient_display_notification"
+            android:title="@string/doze_title"
+            android:summary="@string/doze_summary" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml
index 639735d..47fc378 100644
--- a/res/xml/app_and_notification.xml
+++ b/res/xml/app_and_notification.xml
@@ -20,6 +20,26 @@
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
     android:title="@string/app_and_notification_dashboard_title">
 
+    <PreferenceCategory
+        android:key="recent_apps_category"
+        android:title="@string/recent_app_category_title"
+        android:order="-200">
+        <!-- Placeholder for a list of recent apps -->
+
+        <!-- See all apps button -->
+        <Preference
+            android:title="@string/applications_settings"
+            android:key="all_app_info"
+            android:order="20">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.Settings$ManageApplicationsActivity">
+                <extra android:name="show_drawer_menu" android:value="true" />
+            </intent>
+        </Preference>
+    </PreferenceCategory>
+
     <Preference
         android:key="manage_perms"
         android:title="@string/app_permissions"
diff --git a/res/xml/app_list_disclosure_settings.xml b/res/xml/app_list_disclosure_settings.xml
index 2aae95e..1daf15d 100644
--- a/res/xml/app_list_disclosure_settings.xml
+++ b/res/xml/app_list_disclosure_settings.xml
@@ -21,7 +21,7 @@
     <PreferenceCategory
             android:key="dashboard_tile_placeholder"/>
 
-    <com.android.settings.widget.FooterPreference
+    <com.android.settingslib.widget.FooterPreference
             android:title="@string/enterprise_privacy_apps_count_estimation_info"
             android:selectable="false"/>
 </PreferenceScreen>
diff --git a/res/xml/assist_gesture_settings.xml b/res/xml/assist_gesture_settings.xml
index 52ee247..d941c80 100644
--- a/res/xml/assist_gesture_settings.xml
+++ b/res/xml/assist_gesture_settings.xml
@@ -17,6 +17,7 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:app="http://schemas.android.com/apk/res-auto"
+                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
                   android:title="@string/assist_gesture_title">
 
     <com.android.settings.widget.VideoPreference
@@ -27,12 +28,13 @@
     <SwitchPreference
         android:key="gesture_assist"
         android:title="@string/assist_gesture_title"
-        android:summary="@string/assist_gesture_summary" />
+        android:summary="@string/assist_gesture_summary"
+        app:keywords="@string/keywords_squeeze_to_launch_gesture"/>
 
-    <com.android.settings.SeekBarPreference
+    <com.android.settings.widget.SeekBarPreference
         android:key="gesture_assist_sensitivity"
         android:title="@string/assist_gesture_sensitivity_title"
-        android:defaultValue="2"
-        android:max="4" />
+        android:defaultValue="5"
+        android:max="10" />
 
 </PreferenceScreen>
diff --git a/res/xml/empty_settings.xml b/res/xml/bluetooth_device_details_fragment.xml
similarity index 61%
rename from res/xml/empty_settings.xml
rename to res/xml/bluetooth_device_details_fragment.xml
index d63f7d6..098daaa 100644
--- a/res/xml/empty_settings.xml
+++ b/res/xml/bluetooth_device_details_fragment.xml
@@ -14,5 +14,16 @@
   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/bluetooth_device_advanced_title">
 
-<PreferenceScreen />
+    <com.android.settings.applications.LayoutPreference
+        android:key="action_buttons"
+        android:layout="@layout/app_action_buttons"
+        android:selectable="false"/>
+
+    <PreferenceCategory
+        android:key="bluetooth_profiles"/>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/bluetooth_pairing_detail.xml b/res/xml/bluetooth_pairing_detail.xml
new file mode 100644
index 0000000..30eaf09
--- /dev/null
+++ b/res/xml/bluetooth_pairing_detail.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/bluetooth_settings">
+
+    <Preference
+        android:key="device_name"/>
+
+    <com.android.settings.bluetooth.BluetoothProgressCategory
+        android:key="available_devices"
+        android:title="@string/bluetooth_paired_device_title"/>
+
+    <com.android.settingslib.widget.FooterPreference/>
+
+</PreferenceScreen>
diff --git a/res/xml/bluetooth_settings.xml b/res/xml/bluetooth_settings.xml
index 783a860..046295b 100644
--- a/res/xml/bluetooth_settings.xml
+++ b/res/xml/bluetooth_settings.xml
@@ -4,9 +4,9 @@
      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.
@@ -16,6 +16,15 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/bluetooth_settings" >
+    android:title="@string/bluetooth_settings">
+
+    <Preference
+        android:key="device_name"/>
+
+    <PreferenceCategory
+        android:key="paired_devices"
+        android:title="@string/bluetooth_paired_device_title"/>
+
+    <com.android.settingslib.widget.FooterPreference/>
 
 </PreferenceScreen>
diff --git a/res/layout/account_type_preference.xml b/res/xml/bluetooth_settings_obsolete.xml
similarity index 63%
copy from res/layout/account_type_preference.xml
copy to res/xml/bluetooth_settings_obsolete.xml
index f7ba859..55a099c 100644
--- a/res/layout/account_type_preference.xml
+++ b/res/xml/bluetooth_settings_obsolete.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- 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.
@@ -14,9 +14,8 @@
      limitations under the License.
 -->
 
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/accountTypeIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:contentDescription="@null" />
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/bluetooth_settings" >
+
+</PreferenceScreen>
diff --git a/res/xml/camera_lift_trigger_settings.xml b/res/xml/camera_lift_trigger_settings.xml
new file mode 100644
index 0000000..d9de14f
--- /dev/null
+++ b/res/xml/camera_lift_trigger_settings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  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.
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:app="http://schemas.android.com/apk/res-auto"
+                  android:title="@string/camera_lift_trigger_title">
+
+    <com.android.settings.widget.VideoPreference
+        android:key="gesture_camera_lift_trigger_video"
+        app:animation="@raw/gesture_camera_lift"
+        app:preview="@drawable/gesture_camera_lift"/>
+
+    <SwitchPreference
+        android:key="gesture_camera_lift_trigger"
+        android:title="@string/camera_lift_trigger_title"
+        android:summary="@string/camera_lift_trigger_summary"
+        app:keywords="@string/keywords_gesture"/>
+
+</PreferenceScreen>
diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml
index d70cc33..ecbcbd1 100644
--- a/res/xml/connected_devices.xml
+++ b/res/xml/connected_devices.xml
@@ -19,7 +19,6 @@
     android:title="@string/connected_devices_dashboard_title">
 
     <com.android.settings.widget.MasterSwitchPreference
-      android:fragment="com.android.settings.bluetooth.BluetoothSettings"
       android:key="toggle_bluetooth"
       android:title="@string/bluetooth_settings_title"
       android:icon="@drawable/ic_settings_bluetooth"
diff --git a/res/xml/data_usage_metered_prefs.xml b/res/xml/data_usage_metered_prefs.xml
index a1f3110..aca87fb 100644
--- a/res/xml/data_usage_metered_prefs.xml
+++ b/res/xml/data_usage_metered_prefs.xml
@@ -35,7 +35,7 @@
 
     </PreferenceCategory>
 
-    <com.android.settings.widget.FooterPreference
+    <com.android.settingslib.widget.FooterPreference
         android:title="@string/data_usage_metered_body"
         android:selectable="false" />
 
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index a60276c..e443027 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -16,6 +16,7 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:key="development_prefs_screen"
         android:title="@string/development_settings_title">
     <com.android.settings.BugreportPreference
             android:key="bugreport"
@@ -70,7 +71,7 @@
         android:fragment="com.android.settings.applications.ConvertToFbe" />
 
     <com.android.settings.development.ColorModePreference
-        android:key="color_mode"
+        android:key="picture_color_mode"
         android:title="@string/picture_color_mode"
         android:summary="@string/picture_color_mode_desc" />
 
@@ -411,12 +412,12 @@
             android:entries="@array/app_process_limit_entries"
             android:entryValues="@array/app_process_limit_values" />
 
-        <!-- hiding for now.
+
         <Preference
                 android:key="background_check"
                 android:fragment="com.android.settings.applications.BackgroundCheckSummary"
                 android:title="@string/background_check_pref" />
-        -->
+
 
         <SwitchPreference
             android:key="show_all_anrs"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 50e6891..0462e94 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -31,6 +31,7 @@
         android:key="night_display"
         android:title="@string/night_display_title"
         android:fragment="com.android.settings.display.NightDisplaySettings"
+        android:widgetLayout="@null"
         settings:widgetLayout="@null"
         settings:keywords="@string/keywords_display_night_display" />
 
@@ -57,10 +58,13 @@
         android:entries="@array/screen_timeout_entries"
         android:entryValues="@array/screen_timeout_values" />
 
-    <DropDownPreference
+    <SwitchPreference
         android:key="auto_rotate"
-        android:summary="@string/summary_placeholder"
-        android:title="@string/display_auto_rotate_title" />
+        android:title="@string/accelerometer_title" />
+
+    <SwitchPreference
+        android:key="color_mode"
+        android:title="@string/color_mode_title" />
 
     <Preference
         android:key="font_size"
@@ -76,7 +80,12 @@
     <Preference
         android:key="screensaver"
         android:title="@string/screensaver_settings_title"
-        android:fragment="com.android.settings.DreamSettings" />
+        android:fragment="com.android.settings.dream.DreamSettings" />
+
+    <Preference
+        android:key="ambient_display"
+        android:title="@string/ambient_display_screen_title"
+        android:fragment="com.android.settings.display.AmbientDisplaySettings" />
 
     <!-- Hide night mode for now
     <ListPreference
@@ -96,21 +105,6 @@
         android:key="lift_to_wake"
         android:title="@string/lift_to_wake_title" />
 
-    <Preference
-        android:key="gesture_double_tap_screen_display_summary"
-        android:title="@string/ambient_display_title"
-        android:fragment="com.android.settings.gestures.DoubleTapScreenSettings" />
-
-    <Preference
-        android:key="gesture_pick_up_display_summary"
-        android:title="@string/ambient_display_pickup_title"
-        android:fragment="com.android.settings.gestures.PickupGestureSettings" />
-
-    <SwitchPreference
-        android:key="doze"
-        android:title="@string/doze_title"
-        android:summary="@string/doze_summary" />
-
     <SwitchPreference
         android:key="tap_to_wake"
         android:title="@string/tap_to_wake"
diff --git a/res/xml/double_tap_power_settings.xml b/res/xml/double_tap_power_settings.xml
index 54854a8..4d89de6 100644
--- a/res/xml/double_tap_power_settings.xml
+++ b/res/xml/double_tap_power_settings.xml
@@ -22,11 +22,12 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_double_tap_power_video"
         app:animation="@raw/gesture_double_tap"
-        app:preview="@drawable/gesture_double_tap"/>
+        app:preview="@drawable/gesture_double_tap" />
 
     <SwitchPreference
         android:key="gesture_double_tap_power"
         android:title="@string/double_tap_power_for_camera_title"
-        android:summary="@string/double_tap_power_for_camera_summary"/>
+        android:summary="@string/double_tap_power_for_camera_summary"
+        app:keywords="@string/keywords_gesture" />
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/double_tap_screen_settings.xml b/res/xml/double_tap_screen_settings.xml
index f7fe853..1601aae 100644
--- a/res/xml/double_tap_screen_settings.xml
+++ b/res/xml/double_tap_screen_settings.xml
@@ -27,6 +27,7 @@
     <SwitchPreference
         android:key="gesture_double_tap_screen"
         android:title="@string/ambient_display_title"
-        android:summary="@string/ambient_display_summary"/>
+        android:summary="@string/ambient_display_summary"
+        app:keywords="@string/keywords_gesture"/>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/double_twist_gesture_settings.xml b/res/xml/double_twist_gesture_settings.xml
index f77d778..94d9782 100644
--- a/res/xml/double_twist_gesture_settings.xml
+++ b/res/xml/double_twist_gesture_settings.xml
@@ -27,6 +27,7 @@
     <SwitchPreference
         android:key="gesture_double_twist"
         android:title="@string/double_twist_for_camera_mode_title"
-        android:summary="@string/double_twist_for_camera_mode_summary"/>
+        android:summary="@string/double_twist_for_camera_mode_summary"
+        app:keywords="@string/keywords_gesture"/>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/dream_fragment_overview.xml b/res/xml/dream_fragment_overview.xml
new file mode 100644
index 0000000..d27a6e3
--- /dev/null
+++ b/res/xml/dream_fragment_overview.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/screensaver_settings_title" >
+
+    <com.android.settings.widget.GearPreference
+        android:key="current_screensaver"
+        android:title="@string/screensaver_settings_current"
+        android:fragment="com.android.settings.dream.CurrentDreamPicker" />
+
+    <Preference
+        android:key="when_to_start"
+        android:title="@string/screensaver_settings_when_to_dream"
+        android:fragment="com.android.settings.dream.WhenToDreamPicker" />
+
+
+    <!-- Layout preference doesn't obey allowDividerAbove, so put it in a PreferenceCategory -->
+    <PreferenceCategory>
+        <com.android.settings.applications.LayoutPreference
+            android:key="dream_start_now_button_container"
+            android:selectable="false"
+            android:layout="@layout/dream_start_button" />
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/installed_app_details_ia.xml b/res/xml/installed_app_details.xml
similarity index 87%
rename from res/xml/installed_app_details_ia.xml
rename to res/xml/installed_app_details.xml
index 538205f..865f41f 100644
--- a/res/xml/installed_app_details_ia.xml
+++ b/res/xml/installed_app_details.xml
@@ -15,11 +15,13 @@
   limitations under the License.
   -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <com.android.settings.applications.LayoutPreference
         android:key="header_view"
-        android:layout="@layout/app_details"
+        android:layout="@layout/settings_entity_header"
         android:selectable="false"
         android:order="-10000"/>
 
@@ -40,11 +42,12 @@
         android:title="@string/notifications_label"
         android:selectable="true"/>
 
-    <Preference
+    <com.android.settings.widget.FixedLineSummaryPreference
         android:key="permission_settings"
         android:title="@string/permissions_label"
-        android:summary="@string/summary_placeholder"
-        android:selectable="true"/>
+        android:summary="@string/summary_two_lines_placeholder"
+        android:selectable="true"
+        app:summaryLineCount="2" />
 
     <Preference
         android:key="storage_settings"
diff --git a/res/xml/language_and_input.xml b/res/xml/language_and_input.xml
index 6e65da6..5ea8836 100644
--- a/res/xml/language_and_input.xml
+++ b/res/xml/language_and_input.xml
@@ -18,7 +18,7 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-    android:title="@string/language_keyboard_settings_title" >
+    android:title="@string/language_input_gesture_title" >
 
     <Preference
         android:key="phone_language"
@@ -63,37 +63,43 @@
 
     <PreferenceCategory
         android:key="gesture_settings_category"
-        android:title="@string/gesture_preference_title">
+        android:title="@string/gesture_preference_title"
+        settings:keywords="@string/keywords_gesture">
 
         <Preference
             android:key="gesture_assist_input_summary"
             android:title="@string/assist_gesture_title"
-            android:fragment="com.android.settings.gestures.AssistGestureSettings"/>
+            android:fragment="com.android.settings.gestures.AssistGestureSettings" />
 
         <Preference
             android:key="gesture_swipe_down_fingerprint_input_summary"
             android:title="@string/fingerprint_swipe_for_notifications_title"
-            android:fragment="com.android.settings.gestures.SwipeToNotificationSettings"/>
-
-        <Preference
-            android:key="gesture_double_tap_power_input_summary"
-            android:title="@string/double_tap_power_for_camera_title"
-            android:fragment="com.android.settings.gestures.DoubleTapPowerSettings"/>
-
-        <Preference
-            android:key="gesture_double_twist_input_summary"
-            android:title="@string/double_twist_for_camera_mode_title"
-            android:fragment="com.android.settings.gestures.DoubleTwistGestureSettings"/>
+            android:fragment="com.android.settings.gestures.SwipeToNotificationSettings" />
 
         <Preference
             android:key="gesture_double_tap_screen_input_summary"
             android:title="@string/ambient_display_title"
-            android:fragment="com.android.settings.gestures.DoubleTapScreenSettings"/>
+            android:fragment="com.android.settings.gestures.DoubleTapScreenSettings" />
 
         <Preference
             android:key="gesture_pick_up_input_summary"
             android:title="@string/ambient_display_pickup_title"
-            android:fragment="com.android.settings.gestures.PickupGestureSettings"/>
+            android:fragment="com.android.settings.gestures.PickupGestureSettings" />
+
+        <Preference
+            android:key="gesture_camera_lift_trigger_summary"
+            android:title="@string/camera_lift_trigger_title"
+            android:fragment="com.android.settings.gestures.CameraLiftTriggerSettings" />
+
+        <Preference
+            android:key="gesture_double_tap_power_input_summary"
+            android:title="@string/double_tap_power_for_camera_title"
+            android:fragment="com.android.settings.gestures.DoubleTapPowerSettings" />
+
+        <Preference
+            android:key="gesture_double_twist_input_summary"
+            android:title="@string/double_twist_for_camera_mode_title"
+            android:fragment="com.android.settings.gestures.DoubleTwistGestureSettings" />
 
     </PreferenceCategory>
 
diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index 7feffca..ee25bee 100644
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -34,6 +34,7 @@
     <com.android.settingslib.RestrictedPreference
         android:key="mobile_network_settings"
         android:title="@string/network_settings_title"
+        android:summary="@string/summary_placeholder"
         android:icon="@drawable/ic_network_cell"
         android:dependency="toggle_airplane"
         android:order="-15"
diff --git a/res/xml/night_display_settings.xml b/res/xml/night_display_settings.xml
index f78a769..dc4fecd 100644
--- a/res/xml/night_display_settings.xml
+++ b/res/xml/night_display_settings.xml
@@ -18,35 +18,25 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/night_display_title">
 
-    <PreferenceCategory
-            android:title="@string/night_display_category_schedule">
+    <DropDownPreference
+            android:key="night_display_auto_mode"
+            android:title="@string/night_display_auto_mode_title"
+            android:summary="%s" />
 
-        <DropDownPreference
-                android:key="night_display_auto_mode"
-                android:title="@string/night_display_auto_mode_title"
-                android:summary="%s" />
+    <Preference
+            android:key="night_display_start_time"
+            android:title="@string/night_display_start_time_title" />
 
-        <Preference
-                android:key="night_display_start_time"
-                android:title="@string/night_display_start_time_title" />
+    <Preference
+            android:key="night_display_end_time"
+            android:title="@string/night_display_end_time_title" />
 
-        <Preference
-                android:key="night_display_end_time"
-                android:title="@string/night_display_end_time_title" />
+    <com.android.settings.display.NightDisplayPreference
+            android:key="night_display_activated"
+            android:title="@string/night_display_status_title" />
 
-    </PreferenceCategory>
-
-    <PreferenceCategory
-            android:title="@string/night_display_category_status">
-
-        <com.android.settings.display.NightDisplayPreference
-                android:key="night_display_activated"
-                android:title="@string/night_display_title" />
-
-        <com.android.settings.SeekBarPreference
+    <com.android.settings.widget.SeekBarPreference
             android:key="night_display_temperature"
             android:title="@string/night_display_temperature_title"/>
 
-    </PreferenceCategory>
-
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/pick_up_gesture_settings.xml b/res/xml/pick_up_gesture_settings.xml
index 78122aa..0b4a1de 100644
--- a/res/xml/pick_up_gesture_settings.xml
+++ b/res/xml/pick_up_gesture_settings.xml
@@ -23,11 +23,12 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_pick_up_video"
         app:animation="@raw/gesture_ambient_lift"
-        app:preview="@drawable/gesture_ambient_lift"/>
+        app:preview="@drawable/gesture_ambient_lift" />
 
     <SwitchPreference
         android:key="gesture_pick_up"
         android:title="@string/ambient_display_pickup_title"
-        android:summary="@string/ambient_display_pickup_summary"/>
+        android:summary="@string/ambient_display_pickup_summary"
+        app:keywords="@string/keywords_gesture" />
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/layout/account_type_preference.xml b/res/xml/power_abnormal_detail.xml
similarity index 63%
copy from res/layout/account_type_preference.xml
copy to res/xml/power_abnormal_detail.xml
index f7ba859..de918a9 100644
--- a/res/layout/account_type_preference.xml
+++ b/res/xml/power_abnormal_detail.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- 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.
@@ -14,9 +14,11 @@
      limitations under the License.
 -->
 
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/accountTypeIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:contentDescription="@null" />
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/battery_abnormal_details_title">
+
+    <PreferenceCategory
+        android:key="app_abnormal_list"/>
+
+</PreferenceScreen>
diff --git a/res/xml/power_usage_detail_ia.xml b/res/xml/power_usage_detail.xml
similarity index 97%
rename from res/xml/power_usage_detail_ia.xml
rename to res/xml/power_usage_detail.xml
index 39e6c38..b7865d2 100644
--- a/res/xml/power_usage_detail_ia.xml
+++ b/res/xml/power_usage_detail.xml
@@ -19,7 +19,7 @@
 
     <com.android.settings.applications.LayoutPreference
         android:key="header_view"
-        android:layout="@layout/app_details"
+        android:layout="@layout/settings_entity_header"
         android:selectable="false"
         android:order="-10000"/>
 
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index abd659e..978fff8 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -25,6 +25,11 @@
         android:selectable="true"
         android:layout="@layout/battery_header"/>
 
+    <Preference
+        android:key="high_usage"
+        android:icon="@drawable/ic_battery_alert_24dp"
+        android:title="@string/power_high_usage_title"/>
+
     <PreferenceCategory
         android:key="device_usage_list">
 
diff --git a/res/xml/suggestion_ordering.xml b/res/xml/suggestion_ordering.xml
index 1eeafba..e21fe5b 100644
--- a/res/xml/suggestion_ordering.xml
+++ b/res/xml/suggestion_ordering.xml
@@ -15,13 +15,21 @@
 -->
 
 <optional-steps>
+    <step category="com.android.settings.suggested.category.DEFERRED_SETUP"
+          exclusive="true" />
+    <step category="com.android.settings.suggested.category.FIRST_IMPRESSION"
+          exclusiveExpireDays="14"
+          exclusive="true"
+          multiple="true" />
     <step category="com.android.settings.suggested.category.LOCK_SCREEN" />
+    <step category="com.android.settings.suggested.category.TRUST_AGENT" />
     <step category="com.android.settings.suggested.category.EMAIL" />
     <step category="com.android.settings.suggested.category.PARTNER_ACCOUNT"
-        multiple="true" />
+          multiple="true" />
+    <step category="com.android.settings.suggested.category.GESTURE" />
     <step category="com.android.settings.suggested.category.HOTWORD" />
     <step category="com.android.settings.suggested.category.DEFAULT"
-        multiple="true" />
+          multiple="true" />
     <step category="com.android.settings.suggested.category.SETTINGS_ONLY"
-        multiple="true" />
+          multiple="true" />
 </optional-steps>
diff --git a/res/xml/swipe_to_notification_settings.xml b/res/xml/swipe_to_notification_settings.xml
index b26af38..6269bdc 100644
--- a/res/xml/swipe_to_notification_settings.xml
+++ b/res/xml/swipe_to_notification_settings.xml
@@ -27,6 +27,7 @@
     <SwitchPreference
         android:key="gesture_swipe_down_fingerprint"
         android:title="@string/fingerprint_swipe_for_notifications_title"
-        android:summary="@string/fingerprint_swipe_for_notifications_summary"/>
+        android:summary="@string/fingerprint_swipe_for_notifications_summary"
+        app:keywords="@string/keywords_gesture"/>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index a936a50..a506291 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml
@@ -19,7 +19,8 @@
 
     <SwitchPreference
         android:key="usb_tether_settings"
-        android:title="@string/usb_tethering_button_text" />
+        android:title="@string/usb_tethering_button_text"
+        android:summary="@string/usb_tethering_subtext"/>
 
     <SwitchPreference
         android:key="enable_wifi_ap"
@@ -33,7 +34,8 @@
 
     <SwitchPreference
         android:key="enable_bluetooth_tethering"
-        android:title="@string/bluetooth_tether_checkbox_text" />
+        android:title="@string/bluetooth_tether_checkbox_text"
+        android:summary="@string/bluetooth_tethering_subtext"/>
 
     <Preference
         android:key="disabled_on_data_saver"
diff --git a/res/xml/tts_settings.xml b/res/xml/tts_settings.xml
index 78c4c44..c141dad 100644
--- a/res/xml/tts_settings.xml
+++ b/res/xml/tts_settings.xml
@@ -37,14 +37,14 @@
 
         <!-- The max value for seek bars here should be kept in sync
              with the max value specified in TextToSpeechSettings class. -->
-        <com.android.settings.SeekBarPreference
+        <com.android.settings.widget.SeekBarPreference
             android:key="tts_default_rate"
             android:title="@string/tts_default_rate_title"
             android:summary="@string/tts_default_rate_summary"
             android:defaultValue="50"
             android:max="600"/>
 
-        <com.android.settings.SeekBarPreference
+        <com.android.settings.widget.SeekBarPreference
             android:key="tts_default_pitch"
             android:title="@string/tts_default_pitch_title"
             android:summary="@string/tts_default_pitch_summary"
diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml
index ac992d7..1747b63 100644
--- a/res/xml/wifi_configure_settings.xml
+++ b/res/xml/wifi_configure_settings.xml
@@ -17,7 +17,7 @@
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/wifi_configure_titlebar">
+        android:title="@string/wifi_configure_settings_preference_title">
 
     <SwitchPreference
             android:key="enable_wifi_wakeup"
@@ -42,12 +42,6 @@
         android:title="@string/wifi_cellular_data_fallback_title"
         android:summary="@string/wifi_cellular_data_fallback_summary"/>
 
-    <ListPreference
-            android:key="sleep_policy"
-            android:title="@string/wifi_setting_sleep_policy_title"
-            android:entries="@array/wifi_sleep_policy_entries"
-            android:entryValues="@array/wifi_sleep_policy_values" />
-
     <Preference
             android:key="install_credentials"
             android:title="@string/wifi_install_credentials">
@@ -71,10 +65,8 @@
 
     <Preference
             android:key="wifi_direct"
-            android:title="@string/wifi_menu_p2p">
-        <intent android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.Settings$WifiP2pSettingsActivity"/>
-    </Preference>
+            android:title="@string/wifi_menu_p2p"
+            android:fragment="com.android.settings.wifi.p2p.WifiP2pSettings"/>
 
     <Preference
             android:key="wps_push_button"
diff --git a/res/xml/wifi_p2p_settings.xml b/res/xml/wifi_p2p_settings.xml
index 2b19ee9..0bdc1cf 100644
--- a/res/xml/wifi_p2p_settings.xml
+++ b/res/xml/wifi_p2p_settings.xml
@@ -15,5 +15,13 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
+    <Preference
+        android:key="p2p_this_device"
+        android:selectable="false" />
+    <PreferenceCategory
+        android:key="p2p_peer_devices"
+        android:title="@string/wifi_p2p_peer_devices" />
+    <PreferenceCategory
+        android:key="p2p_persistent_group"
+        android:title="@string/wifi_p2p_remembered_groups" />
 </PreferenceScreen>
diff --git a/src/com/android/settings/AllowBindAppWidgetActivity.java b/src/com/android/settings/AllowBindAppWidgetActivity.java
index 2f98ab3..52e7870 100644
--- a/src/com/android/settings/AllowBindAppWidgetActivity.java
+++ b/src/com/android/settings/AllowBindAppWidgetActivity.java
@@ -52,9 +52,8 @@
     private boolean mClicked;
 
     public void onClick(DialogInterface dialog, int which) {
+        mClicked = true;
         if (which == AlertDialog.BUTTON_POSITIVE) {
-            // By default, set the result to cancelled
-            setResult(RESULT_CANCELED);
             if (mAppWidgetId != -1 && mComponentName != null && mCallingPackage != null) {
                 try {
                     final boolean bound = mAppWidgetManager.bindAppWidgetIdIfAllowed(mAppWidgetId,
@@ -80,15 +79,18 @@
         finish();
     }
 
+    @Override
     protected void onPause() {
-        if (isDestroyed() && !mClicked) {
-            setResult(RESULT_CANCELED);
+        if (!mClicked) { // RESULT_CANCELED
+            finish();
         }
-        super.onDestroy();
+        super.onPause();
     }
 
+    @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setResult(RESULT_CANCELED); // By default, set the result to cancelled
         Intent intent = getIntent();
         CharSequence label = "";
         if (intent != null) {
@@ -112,7 +114,6 @@
                 mComponentName = null;
                 mCallingPackage = null;
                 Log.v("BIND_APPWIDGET", "Error getting parameters");
-                setResult(RESULT_CANCELED);
                 finish();
                 return;
             }
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index d5affa8..c8f9dd1 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -213,6 +213,18 @@
         mReadOnlyApnTypes = null;
         mReadOnlyApnFields = null;
 
+        CarrierConfigManager configManager = (CarrierConfigManager)
+                getSystemService(Context.CARRIER_CONFIG_SERVICE);
+        if (configManager != null) {
+            PersistableBundle b = configManager.getConfig();
+            if (b != null) {
+                mReadOnlyApnTypes = b.getStringArray(
+                        CarrierConfigManager.KEY_READ_ONLY_APN_TYPES_STRING_ARRAY);
+                mReadOnlyApnFields = b.getStringArray(
+                        CarrierConfigManager.KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY);
+            }
+        }
+
         if (action.equals(Intent.ACTION_EDIT)) {
             Uri uri = intent.getData();
             if (!uri.isPathPrefixMatch(Telephony.Carriers.CONTENT_URI)) {
@@ -220,17 +232,6 @@
                 finish();
                 return;
             }
-            CarrierConfigManager configManager = (CarrierConfigManager)
-                    getSystemService(Context.CARRIER_CONFIG_SERVICE);
-            if (configManager != null) {
-                PersistableBundle b = configManager.getConfig();
-                if (b != null) {
-                    mReadOnlyApnTypes = b.getStringArray(
-                            CarrierConfigManager.KEY_READ_ONLY_APN_TYPES_STRING_ARRAY);
-                    mReadOnlyApnFields = b.getStringArray(
-                            CarrierConfigManager.KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY);
-                }
-            }
             mUri = uri;
         } else if (action.equals(Intent.ACTION_INSERT)) {
             if (mFirstTime || icicle.getInt(SAVED_POS) == 0) {
@@ -295,7 +296,7 @@
      * @param apnTypes array of APN types. "*" indicates all types.
      * @return true if all apn types are included in the array, false otherwise
      */
-    private boolean hasAllApns(String[] apnTypes) {
+    static boolean hasAllApns(String[] apnTypes) {
         if (ArrayUtils.isEmpty(apnTypes)) {
             return false;
         }
@@ -1052,6 +1053,24 @@
             errorMsg = mRes.getString(R.string.error_mnc_not23);
         }
 
+        if (errorMsg == null) {
+            // if carrier does not allow editing certain apn types, make sure type does not include
+            // those
+            if (!ArrayUtils.isEmpty(mReadOnlyApnTypes)
+                    && apnTypesMatch(mReadOnlyApnTypes, mApnType.getText())) {
+                StringBuilder stringBuilder = new StringBuilder();
+                for (String type : mReadOnlyApnTypes) {
+                    stringBuilder.append(type).append(", ");
+                }
+                // remove last ", "
+                if (stringBuilder.length() >= 2) {
+                    stringBuilder.delete(stringBuilder.length() - 2, stringBuilder.length());
+                }
+                errorMsg = String.format(mRes.getString(R.string.error_adding_apn_type),
+                        stringBuilder);
+            }
+        }
+
         return errorMsg;
     }
 
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index b460050..d554301 100755
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -173,6 +173,15 @@
         PersistableBundle b = configManager.getConfig();
         mHideImsApn = b.getBoolean(CarrierConfigManager.KEY_HIDE_IMS_APN_BOOL);
         mAllowAddingApns = b.getBoolean(CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL);
+        if (mAllowAddingApns) {
+            String[] readOnlyApnTypes = b.getStringArray(
+                    CarrierConfigManager.KEY_READ_ONLY_APN_TYPES_STRING_ARRAY);
+            // if no apn type can be edited, do not allow adding APNs
+            if (ApnEditor.hasAllApns(readOnlyApnTypes)) {
+                Log.d(TAG, "not allowing adding APN because all APN types are read only");
+                mAllowAddingApns = false;
+            }
+        }
         mUserManager = UserManager.get(activity);
     }
 
@@ -184,7 +193,7 @@
         mUnavailable = isUiRestricted();
         setHasOptionsMenu(!mUnavailable);
         if (mUnavailable) {
-            addPreferencesFromResource(R.xml.empty_settings);
+            addPreferencesFromResource(R.xml.placeholder_prefs);
             return;
         }
 
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index d662c2e..e5d40b7 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -47,14 +47,16 @@
 import com.android.internal.widget.LockPatternUtils;
 import com.android.org.bouncycastle.asn1.ASN1InputStream;
 import com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.security.ConfigureKeyGuardDialog;
 import com.android.settings.vpn2.VpnUtils;
 
-import sun.security.util.ObjectIdentifier;
-import sun.security.x509.AlgorithmId;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
+import sun.security.util.ObjectIdentifier;
+import sun.security.x509.AlgorithmId;
+
 /**
  * CredentialStorage handles KeyStore reset, unlock, and install.
  *
@@ -72,14 +74,14 @@
  * KeyGuard: ON
  * Action:   confirm key guard
  * Notes:    user had key guard but no keystore and upgraded from pre-ICS
- *           OR user had key guard and pre-ICS keystore password which was then reset
+ * OR user had key guard and pre-ICS keystore password which was then reset
  *
  * KeyStore: LOCKED
  * KeyGuard: OFF/ON
  * Action:   old unlock dialog
  * Notes:    assume old password, need to use it to unlock.
- *           if unlock, ensure key guard before install.
- *           if reset, treat as UNINITALIZED/OFF
+ * if unlock, ensure key guard before install.
+ * if reset, treat as UNINITALIZED/OFF
  *
  * KeyStore: UNLOCKED
  * KeyGuard: OFF
@@ -101,7 +103,7 @@
 
     // This is the minimum acceptable password quality.  If the current password quality is
     // lower than this, keystore should not be activated.
-    static final int MIN_PASSWORD_QUALITY = DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
+    public static final int MIN_PASSWORD_QUALITY = DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
 
     private static final int CONFIRM_KEY_GUARD_REQUEST = 1;
     private static final int CONFIRM_CLEAR_SYSTEM_CREDENTIAL_REQUEST = 2;
@@ -169,7 +171,8 @@
             }
             case UNLOCKED: {
                 if (!checkKeyGuardQuality()) {
-                    new ConfigureKeyGuardDialog();
+                    final ConfigureKeyGuardDialog dialog = new ConfigureKeyGuardDialog();
+                    dialog.show(getFragmentManager(), ConfigureKeyGuardDialog.TAG);
                     return;
                 }
                 installIfAvailable();
@@ -188,7 +191,8 @@
     private void ensureKeyGuard() {
         if (!checkKeyGuardQuality()) {
             // key guard not setup, doing so will initialize keystore
-            new ConfigureKeyGuardDialog();
+            final ConfigureKeyGuardDialog dialog = new ConfigureKeyGuardDialog();
+            dialog.show(getFragmentManager(), ConfigureKeyGuardDialog.TAG);
             // will return to onResume after Activity
             return;
         }
@@ -306,8 +310,7 @@
      * Prompt for reset confirmation, resetting on confirmation, finishing otherwise.
      */
     private class ResetDialog
-            implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener
-    {
+            implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
         private boolean mResetConfirmed;
 
         private ResetDialog() {
@@ -321,11 +324,13 @@
             dialog.show();
         }
 
-        @Override public void onClick(DialogInterface dialog, int button) {
+        @Override
+        public void onClick(DialogInterface dialog, int button) {
             mResetConfirmed = (button == DialogInterface.BUTTON_POSITIVE);
         }
 
-        @Override public void onDismiss(DialogInterface dialog) {
+        @Override
+        public void onDismiss(DialogInterface dialog) {
             if (mResetConfirmed) {
                 mResetConfirmed = false;
                 if (confirmKeyGuard(CONFIRM_CLEAR_SYSTEM_CREDENTIAL_REQUEST)) {
@@ -342,7 +347,8 @@
      */
     private class ResetKeyStoreAndKeyChain extends AsyncTask<Void, Void, Boolean> {
 
-        @Override protected Boolean doInBackground(Void... unused) {
+        @Override
+        protected Boolean doInBackground(Void... unused) {
 
             // Clear all the users credentials could have been installed in for this user.
             new LockPatternUtils(CredentialStorage.this).resetKeyStore(UserHandle.myUserId());
@@ -362,14 +368,15 @@
             }
         }
 
-        @Override protected void onPostExecute(Boolean success) {
+        @Override
+        protected void onPostExecute(Boolean success) {
             if (success) {
                 Toast.makeText(CredentialStorage.this,
-                               R.string.credentials_erased, Toast.LENGTH_SHORT).show();
+                        R.string.credentials_erased, Toast.LENGTH_SHORT).show();
                 clearLegacyVpnIfEstablished();
             } else {
                 Toast.makeText(CredentialStorage.this,
-                               R.string.credentials_not_erased, Toast.LENGTH_SHORT).show();
+                        R.string.credentials_not_erased, Toast.LENGTH_SHORT).show();
             }
             finish();
         }
@@ -384,42 +391,6 @@
     }
 
     /**
-     * Prompt for key guard configuration confirmation.
-     */
-    private class ConfigureKeyGuardDialog
-            implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener
-    {
-        private boolean mConfigureConfirmed;
-
-        private ConfigureKeyGuardDialog() {
-            AlertDialog dialog = new AlertDialog.Builder(CredentialStorage.this)
-                    .setTitle(android.R.string.dialog_alert_title)
-                    .setMessage(R.string.credentials_configure_lock_screen_hint)
-                    .setPositiveButton(android.R.string.ok, this)
-                    .setNegativeButton(android.R.string.cancel, this)
-                    .create();
-            dialog.setOnDismissListener(this);
-            dialog.show();
-        }
-
-        @Override public void onClick(DialogInterface dialog, int button) {
-            mConfigureConfirmed = (button == DialogInterface.BUTTON_POSITIVE);
-        }
-
-        @Override public void onDismiss(DialogInterface dialog) {
-            if (mConfigureConfirmed) {
-                mConfigureConfirmed = false;
-                Intent intent = new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD);
-                intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
-                                MIN_PASSWORD_QUALITY);
-                startActivity(intent);
-                return;
-            }
-            finish();
-        }
-    }
-
-    /**
      * Check that the caller is either certinstaller or Settings running in a profile of this user.
      */
     private boolean checkCallerIsCertInstallerOrSelfInProfile() {
@@ -504,8 +475,7 @@
      * On unsuccessful unlock, retry by calling handleUnlockOrInstall.
      */
     private class UnlockDialog implements TextWatcher,
-            DialogInterface.OnClickListener, DialogInterface.OnDismissListener
-    {
+            DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
         private boolean mUnlockConfirmed;
 
         private final Button mButton;
@@ -544,21 +514,26 @@
             mButton.setEnabled(false);
         }
 
-        @Override public void afterTextChanged(Editable editable) {
+        @Override
+        public void afterTextChanged(Editable editable) {
             mButton.setEnabled(mOldPassword == null || mOldPassword.getText().length() > 0);
         }
 
-        @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
         }
 
-        @Override public void onTextChanged(CharSequence s,int start, int before, int count) {
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
         }
 
-        @Override public void onClick(DialogInterface dialog, int button) {
+        @Override
+        public void onClick(DialogInterface dialog, int button) {
             mUnlockConfirmed = (button == DialogInterface.BUTTON_POSITIVE);
         }
 
-        @Override public void onDismiss(DialogInterface dialog) {
+        @Override
+        public void onDismiss(DialogInterface dialog) {
             if (mUnlockConfirmed) {
                 mUnlockConfirmed = false;
                 mError.setVisibility(View.VISIBLE);
@@ -567,16 +542,16 @@
                 if (error == KeyStore.NO_ERROR) {
                     mRetriesRemaining = -1;
                     Toast.makeText(CredentialStorage.this,
-                                   R.string.credentials_enabled,
-                                   Toast.LENGTH_SHORT).show();
+                            R.string.credentials_enabled,
+                            Toast.LENGTH_SHORT).show();
                     // aha, now we are unlocked, switch to key guard.
                     // we'll end up back in onResume to install
                     ensureKeyGuard();
                 } else if (error == KeyStore.UNINITIALIZED) {
                     mRetriesRemaining = -1;
                     Toast.makeText(CredentialStorage.this,
-                                   R.string.credentials_erased,
-                                   Toast.LENGTH_SHORT).show();
+                            R.string.credentials_erased,
+                            Toast.LENGTH_SHORT).show();
                     // we are reset, we can now set new password with key guard
                     handleUnlockOrInstall();
                 } else if (error >= KeyStore.WRONG_PASSWORD) {
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 99c6e8b..1f331d7 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -888,7 +888,7 @@
             mPasswordEntry.setEnabled(false);
             setBackFunctionality(false);
 
-            if (password.length() >= LockPatternUtils.MIN_LOCK_PATTERN_SIZE) {
+            if (password.length() >= LockPatternUtils.MIN_LOCK_PASSWORD_SIZE) {
                 new DecryptTask().execute(password);
             } else {
                 // Allow user to make as many of these as they want.
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java
index d9b98f0..e11bccd 100644
--- a/src/com/android/settings/CryptKeeperSettings.java
+++ b/src/com/android/settings/CryptKeeperSettings.java
@@ -37,6 +37,8 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.core.InstrumentedPreferenceFragment;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.password.ConfirmLockPattern;
 
 public class CryptKeeperSettings extends InstrumentedPreferenceFragment {
     private static final String TAG = "CryptKeeper";
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 8dfb02b..0805e4b 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -24,7 +24,6 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.deviceinfo.AdditionalSystemUpdatePreferenceController;
@@ -42,6 +41,7 @@
 import com.android.settings.deviceinfo.SecurityPatchPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 1ef3b53..9ce4c4a 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -17,18 +17,18 @@
 package com.android.settings;
 
 import android.content.Context;
-import android.os.UserHandle;
 import android.provider.SearchIndexableResource;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.display.AmbientDisplayPreferenceController;
 import com.android.settings.display.AutoBrightnessPreferenceController;
 import com.android.settings.display.AutoRotatePreferenceController;
+import com.android.settings.display.BrightnessLevelPreferenceController;
 import com.android.settings.display.CameraGesturePreferenceController;
-import com.android.settings.display.DozePreferenceController;
+import com.android.settings.display.ColorModePreferenceController;
 import com.android.settings.display.FontSizePreferenceController;
 import com.android.settings.display.LiftToWakePreferenceController;
 import com.android.settings.display.NightDisplayPreferenceController;
@@ -39,10 +39,9 @@
 import com.android.settings.display.TimeoutPreferenceController;
 import com.android.settings.display.VrDisplayPreferenceController;
 import com.android.settings.display.WallpaperPreferenceController;
-import com.android.settings.gestures.DoubleTapScreenPreferenceController;
-import com.android.settings.gestures.PickupGesturePreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -50,12 +49,11 @@
 public class DisplaySettings extends DashboardFragment {
     private static final String TAG = "DisplaySettings";
 
+    public static final String KEY_AUTO_BRIGHTNESS = "auto_brightness";
     public static final String KEY_DISPLAY_SIZE = "screen_zoom";
 
-    private static final String KEY_AUTO_BRIGHTNESS = "auto_brightness";
     private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
-    private static final String KEY_PICK_UP = "gesture_pick_up_display_summary";
-    private static final String KEY_DOUBLE_TAP_SCREEN = "gesture_double_tap_screen_display_summary";
+    private static final String KEY_AMBIENT_DISPLAY = "ambient_display";
 
     @Override
     public int getMetricsCategory() {
@@ -91,26 +89,24 @@
     private static List<PreferenceController> buildPreferenceControllers(
             Context context, Lifecycle lifecycle) {
         final List<PreferenceController> controllers = new ArrayList<>();
+        final AmbientDisplayConfiguration ambientDisplayConfig = new AmbientDisplayConfiguration(context);
         controllers.add(new AutoBrightnessPreferenceController(context, KEY_AUTO_BRIGHTNESS));
-        controllers.add(new AutoRotatePreferenceController(context));
+        controllers.add(new AutoRotatePreferenceController(context, lifecycle));
         controllers.add(new CameraGesturePreferenceController(context));
-        controllers.add(new DozePreferenceController(context));
         controllers.add(new FontSizePreferenceController(context));
         controllers.add(new LiftToWakePreferenceController(context));
         controllers.add(new NightDisplayPreferenceController(context));
         controllers.add(new NightModePreferenceController(context));
         controllers.add(new ScreenSaverPreferenceController(context));
-        AmbientDisplayConfiguration ambientDisplayConfig = new AmbientDisplayConfiguration(context);
-        controllers.add(new PickupGesturePreferenceController(
-                context, lifecycle, ambientDisplayConfig, UserHandle.myUserId(), KEY_PICK_UP));
-        controllers.add(new DoubleTapScreenPreferenceController(
-                context, lifecycle, ambientDisplayConfig, UserHandle.myUserId(),
-                KEY_DOUBLE_TAP_SCREEN));
+        controllers.add(new AmbientDisplayPreferenceController(context, ambientDisplayConfig,
+                KEY_AMBIENT_DISPLAY));
         controllers.add(new TapToWakePreferenceController(context));
         controllers.add(new TimeoutPreferenceController(context, KEY_SCREEN_TIMEOUT));
         controllers.add(new VrDisplayPreferenceController(context));
         controllers.add(new WallpaperPreferenceController(context));
         controllers.add(new ThemePreferenceController(context));
+        controllers.add(new BrightnessLevelPreferenceController(context, lifecycle));
+        controllers.add(new ColorModePreferenceController(context));
         return controllers;
     }
 
diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
deleted file mode 100644
index bb9e978..0000000
--- a/src/com/android/settings/DreamSettings.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * Copyright (C) 2012 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;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.MenuItem.OnMenuItemClickListener;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnTouchListener;
-import android.widget.ImageView;
-import android.widget.RadioButton;
-import android.widget.Switch;
-import android.widget.TextView;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.widget.SwitchBar;
-import com.android.settingslib.dream.DreamBackend;
-import com.android.settingslib.dream.DreamBackend.DreamInfo;
-
-import java.util.List;
-
-public class DreamSettings extends SettingsPreferenceFragment implements
-        SwitchBar.OnSwitchChangeListener {
-    private static final String TAG = DreamSettings.class.getSimpleName();
-    static final boolean DEBUG = false;
-    private static final int DIALOG_WHEN_TO_DREAM = 1;
-    private static final String PACKAGE_SCHEME = "package";
-
-    private final PackageReceiver mPackageReceiver = new PackageReceiver();
-
-    private Context mContext;
-    private DreamBackend mBackend;
-    private SwitchBar mSwitchBar;
-    private MenuItem[] mMenuItemsWhenEnabled;
-    private boolean mRefreshing;
-
-    @Override
-    public int getHelpResource() {
-        return R.string.help_url_dreams;
-    }
-
-    @Override
-    public void onAttach(Activity activity) {
-        logd("onAttach(%s)", activity.getClass().getSimpleName());
-        super.onAttach(activity);
-        mContext = activity;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.DREAM;
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        logd("onCreate(%s)", icicle);
-        super.onCreate(icicle);
-
-        mBackend = new DreamBackend(getActivity());
-
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    public void onSwitchChanged(Switch switchView, boolean isChecked) {
-        if (!mRefreshing) {
-            mBackend.setEnabled(isChecked);
-            refreshFromBackend();
-        }
-    }
-
-    @Override
-    public void onStart() {
-        logd("onStart()");
-        super.onStart();
-    }
-
-    @Override
-    public void onDestroyView() {
-        logd("onDestroyView()");
-        super.onDestroyView();
-
-        mSwitchBar.removeOnSwitchChangeListener(this);
-        mSwitchBar.hide();
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        logd("onActivityCreated(%s)", savedInstanceState);
-        super.onActivityCreated(savedInstanceState);
-
-        TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
-        emptyView.setText(R.string.screensaver_settings_disabled_prompt);
-        setEmptyView(emptyView);
-
-        final SettingsActivity sa = (SettingsActivity) getActivity();
-        mSwitchBar = sa.getSwitchBar();
-        mSwitchBar.addOnSwitchChangeListener(this);
-        mSwitchBar.show();
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        logd("onCreateOptionsMenu()");
-
-        boolean isEnabled = mBackend.isEnabled();
-
-        // create "start" action
-        MenuItem start = createMenuItem(menu, R.string.screensaver_settings_dream_start,
-                MenuItem.SHOW_AS_ACTION_NEVER,
-                isEnabled, new Runnable(){
-                    @Override
-                    public void run() {
-                        mBackend.startDreaming();
-                    }});
-
-        // create "when to dream" overflow menu item
-        MenuItem whenToDream = createMenuItem(menu,
-                R.string.screensaver_settings_when_to_dream,
-                MenuItem.SHOW_AS_ACTION_NEVER,
-                isEnabled,
-                new Runnable() {
-                    @Override
-                    public void run() {
-                        showDialog(DIALOG_WHEN_TO_DREAM);
-                    }});
-
-        // create "help" overflow menu item (make sure it appears last)
-        super.onCreateOptionsMenu(menu, inflater);
-
-        mMenuItemsWhenEnabled = new MenuItem[] { start, whenToDream };
-    }
-
-    private MenuItem createMenuItem(Menu menu,
-            int titleRes, int actionEnum, boolean isEnabled, final Runnable onClick) {
-        MenuItem item = menu.add(titleRes);
-        item.setShowAsAction(actionEnum);
-        item.setEnabled(isEnabled);
-        item.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem item) {
-                onClick.run();
-                return true;
-            }
-        });
-        return item;
-    }
-
-    @Override
-    public Dialog onCreateDialog(int dialogId) {
-        logd("onCreateDialog(%s)", dialogId);
-        if (dialogId == DIALOG_WHEN_TO_DREAM)
-            return createWhenToDreamDialog();
-        return super.onCreateDialog(dialogId);
-    }
-
-    @Override
-    public int getDialogMetricsCategory(int dialogId) {
-        if (dialogId == DIALOG_WHEN_TO_DREAM) {
-            return MetricsEvent.DIALOG_DREAM_START_DELAY;
-        }
-        return 0;
-    }
-
-    private Dialog createWhenToDreamDialog() {
-        final CharSequence[] items = {
-                mContext.getString(R.string.screensaver_settings_summary_dock),
-                mContext.getString(R.string.screensaver_settings_summary_sleep),
-                mContext.getString(R.string.screensaver_settings_summary_either_short)
-        };
-
-        int initialSelection = mBackend.isActivatedOnDock() && mBackend.isActivatedOnSleep() ? 2
-                : mBackend.isActivatedOnDock() ? 0
-                : mBackend.isActivatedOnSleep() ? 1
-                : -1;
-
-        return new AlertDialog.Builder(mContext)
-                .setTitle(R.string.screensaver_settings_when_to_dream)
-                .setSingleChoiceItems(items, initialSelection, new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int item) {
-                        mBackend.setActivatedOnDock(item == 0 || item == 2);
-                        mBackend.setActivatedOnSleep(item == 1 || item == 2);
-                        dialog.dismiss();
-                    }
-                })
-                .create();
-    }
-
-    @Override
-    public void onPause() {
-        logd("onPause()");
-        super.onPause();
-
-        mContext.unregisterReceiver(mPackageReceiver);
-    }
-
-    @Override
-    public void onResume() {
-        logd("onResume()");
-        super.onResume();
-        refreshFromBackend();
-
-        // listen for package changes
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(Intent.ACTION_PACKAGE_ADDED);
-        filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
-        filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
-        filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
-        filter.addDataScheme(PACKAGE_SCHEME);
-        mContext.registerReceiver(mPackageReceiver , filter);
-    }
-
-    public static int getSummaryResource(Context context) {
-        DreamBackend backend = new DreamBackend(context);
-        boolean isEnabled = backend.isEnabled();
-        boolean activatedOnSleep = backend.isActivatedOnSleep();
-        boolean activatedOnDock = backend.isActivatedOnDock();
-        boolean activatedOnEither = activatedOnSleep && activatedOnDock;
-        return !isEnabled ? R.string.screensaver_settings_summary_off
-                : activatedOnEither ? R.string.screensaver_settings_summary_either_long
-                : activatedOnSleep ? R.string.screensaver_settings_summary_sleep
-                : activatedOnDock ? R.string.screensaver_settings_summary_dock
-                : 0;
-    }
-
-    public static CharSequence getSummaryTextWithDreamName(Context context) {
-        DreamBackend backend = new DreamBackend(context);
-        boolean isEnabled = backend.isEnabled();
-        if (!isEnabled) {
-            return context.getString(R.string.screensaver_settings_summary_off);
-        } else {
-            return backend.getActiveDreamName();
-        }
-    }
-
-    private void refreshFromBackend() {
-        logd("refreshFromBackend()");
-        mRefreshing = true;
-        boolean dreamsEnabled = mBackend.isEnabled();
-        if (mSwitchBar.isChecked() != dreamsEnabled) {
-            mSwitchBar.setChecked(dreamsEnabled);
-        }
-
-        if (getPreferenceScreen() == null) {
-            setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getContext()));
-        }
-        getPreferenceScreen().removeAll();
-        if (dreamsEnabled) {
-            List<DreamBackend.DreamInfo> dreamInfos = mBackend.getDreamInfos();
-            final int N = dreamInfos.size();
-            for (int i = 0; i < N; i++) {
-                getPreferenceScreen().addPreference(
-                        new DreamInfoPreference(getPrefContext(), dreamInfos.get(i)));
-            }
-        }
-        if (mMenuItemsWhenEnabled != null) {
-            for (MenuItem menuItem : mMenuItemsWhenEnabled) {
-                menuItem.setEnabled(dreamsEnabled);
-            }
-        }
-        mRefreshing = false;
-    }
-
-    private static void logd(String msg, Object... args) {
-        if (DEBUG) Log.d(TAG, args == null || args.length == 0 ? msg : String.format(msg, args));
-    }
-
-    private class DreamInfoPreference extends Preference {
-
-        private final DreamInfo mInfo;
-
-        public DreamInfoPreference(Context context, DreamInfo info) {
-            super(context);
-            mInfo = info;
-            setLayoutResource(R.layout.dream_info_row);
-            setTitle(mInfo.caption);
-            setIcon(mInfo.icon);
-        }
-
-        public void onBindViewHolder(final PreferenceViewHolder holder) {
-            super.onBindViewHolder(holder);
-
-            // bind radio button
-            RadioButton radioButton = (RadioButton) holder.findViewById(android.R.id.button1);
-            radioButton.setChecked(mInfo.isActive);
-            radioButton.setOnTouchListener(new OnTouchListener() {
-                @Override
-                public boolean onTouch(View v, MotionEvent event) {
-                    holder.itemView.onTouchEvent(event);
-                    return false;
-                }
-            });
-
-            // bind settings button + divider
-            boolean showSettings = mInfo.settingsComponentName != null;
-            View settingsDivider = holder.findViewById(R.id.divider);
-            settingsDivider.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
-
-            ImageView settingsButton = (ImageView) holder.findViewById(android.R.id.button2);
-            settingsButton.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
-            settingsButton.setAlpha(mInfo.isActive ? 1f : Utils.DISABLED_ALPHA);
-            settingsButton.setEnabled(mInfo.isActive);
-            settingsButton.setFocusable(mInfo.isActive);
-            settingsButton.setOnClickListener(new OnClickListener(){
-                @Override
-                public void onClick(View v) {
-                    mBackend.launchSettings(mInfo);
-                }
-            });
-        }
-
-        @Override
-        public void performClick() {
-            if (mInfo.isActive)
-                return;
-            for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
-                DreamInfoPreference preference =
-                        (DreamInfoPreference) getPreferenceScreen().getPreference(i);
-                preference.mInfo.isActive = false;
-                preference.notifyChanged();
-            }
-            mInfo.isActive = true;
-            mBackend.setActiveDream(mInfo.componentName);
-            notifyChanged();
-        }
-    }
-
-    private class PackageReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            logd("PackageReceiver.onReceive");
-            refreshFromBackend();
-        }
-    }
-}
diff --git a/src/com/android/settings/EncryptionAndCredential.java b/src/com/android/settings/EncryptionAndCredential.java
index 1750e75..3cb2740 100644
--- a/src/com/android/settings/EncryptionAndCredential.java
+++ b/src/com/android/settings/EncryptionAndCredential.java
@@ -168,7 +168,7 @@
 
     @Override
     protected int getHelpResource() {
-        return R.string.help_url_security;
+        return R.string.help_url_encryption;
     }
 
     /**
@@ -253,7 +253,7 @@
 
         @Override
         public List<String> getNonIndexableKeys(Context context) {
-            final List<String> keys = new ArrayList<String>();
+            final List<String> keys = super.getNonIndexableKeys(context);
 
             final UserManager um = UserManager.get(context);
 
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index 42ca516..c352bf0 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -17,6 +17,7 @@
 package com.android.settings;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.admin.DevicePolicyManager;
@@ -29,11 +30,13 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityManager;
-import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.setupwizardlib.GlifLayout;
 
 import java.util.List;
@@ -74,10 +77,8 @@
         layout.setFitsSystemWindows(false);
     }
 
-    public static class EncryptionInterstitialFragment extends SettingsPreferenceFragment
-            implements View.OnClickListener, DialogInterface.OnClickListener {
-
-        private static final int ACCESSIBILITY_WARNING_DIALOG = 1;
+    public static class EncryptionInterstitialFragment extends InstrumentedFragment
+            implements View.OnClickListener {
 
         private View mRequirePasswordToDecrypt;
         private View mDontRequirePasswordToDecrypt;
@@ -164,7 +165,10 @@
                 final boolean accEn = AccessibilityManager.getInstance(getActivity()).isEnabled();
                 if (accEn && !mPasswordRequired) {
                     setRequirePasswordState(false); // clear the UI state
-                    showDialog(ACCESSIBILITY_WARNING_DIALOG);
+                    AccessibilityWarningDialogFragment.newInstance(mRequestedPasswordQuality)
+                            .show(
+                                    getChildFragmentManager(),
+                                    AccessibilityWarningDialogFragment.TAG);
                 } else {
                     setRequirePasswordState(true);
                     startLockIntent();
@@ -175,72 +179,93 @@
             }
         }
 
-        @Override
-        public Dialog onCreateDialog(int dialogId) {
-            switch(dialogId) {
-                case ACCESSIBILITY_WARNING_DIALOG: {
-                    final int titleId;
-                    final int messageId;
-                    switch (mRequestedPasswordQuality) {
-                        case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
-                            titleId = R.string.encrypt_talkback_dialog_require_pattern;
-                            messageId = R.string.encrypt_talkback_dialog_message_pattern;
-                            break;
-                        case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
-                        case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
-                            titleId = R.string.encrypt_talkback_dialog_require_pin;
-                            messageId = R.string.encrypt_talkback_dialog_message_pin;
-                            break;
-                        default:
-                            titleId = R.string.encrypt_talkback_dialog_require_password;
-                            messageId = R.string.encrypt_talkback_dialog_message_password;
-                            break;
-                    }
-
-
-                    List<AccessibilityServiceInfo> list =
-                            AccessibilityManager.getInstance(getActivity())
-                            .getEnabledAccessibilityServiceList(
-                                    AccessibilityServiceInfo.FEEDBACK_ALL_MASK);
-                    final CharSequence exampleAccessibility;
-                    if (list.isEmpty()) {
-                        // This should never happen.  But we shouldn't crash
-                        exampleAccessibility = "";
-                    } else {
-                        exampleAccessibility = list.get(0).getResolveInfo()
-                                .loadLabel(getPackageManager());
-                    }
-                    return new AlertDialog.Builder(getActivity())
-                        .setTitle(titleId)
-                        .setMessage(getString(messageId, exampleAccessibility))
-                        .setCancelable(true)
-                        .setPositiveButton(android.R.string.ok, this)
-                        .setNegativeButton(android.R.string.cancel, this)
-                        .create();
-                }
-                default: throw new IllegalArgumentException();
-            }
-        }
-
-        @Override
-        public int getDialogMetricsCategory(int dialogId) {
-            if (dialogId == ACCESSIBILITY_WARNING_DIALOG) {
-                return MetricsEvent.DIALOG_ENCRYPTION_INTERSTITIAL_ACCESSIBILITY;
-            }
-            return 0;
-        }
-
         private void setRequirePasswordState(boolean required) {
             mPasswordRequired = required;
         }
 
+        public void finish() {
+            Activity activity = getActivity();
+            if (activity == null) return;
+            if (getFragmentManager().getBackStackEntryCount() > 0) {
+                getFragmentManager().popBackStack();
+            } else {
+                activity.finish();
+            }
+        }
+    }
+
+    public static class AccessibilityWarningDialogFragment extends InstrumentedDialogFragment
+            implements DialogInterface.OnClickListener {
+
+        public static final String TAG = "AccessibilityWarningDialog";
+
+        public static AccessibilityWarningDialogFragment newInstance(int passwordQuality) {
+            AccessibilityWarningDialogFragment fragment = new AccessibilityWarningDialogFragment();
+            Bundle args = new Bundle(1);
+            args.putInt(EXTRA_PASSWORD_QUALITY, passwordQuality);
+            fragment.setArguments(args);
+            return fragment;
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final int titleId;
+            final int messageId;
+            switch (getArguments().getInt(EXTRA_PASSWORD_QUALITY)) {
+                case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
+                    titleId = R.string.encrypt_talkback_dialog_require_pattern;
+                    messageId = R.string.encrypt_talkback_dialog_message_pattern;
+                    break;
+                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
+                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
+                    titleId = R.string.encrypt_talkback_dialog_require_pin;
+                    messageId = R.string.encrypt_talkback_dialog_message_pin;
+                    break;
+                default:
+                    titleId = R.string.encrypt_talkback_dialog_require_password;
+                    messageId = R.string.encrypt_talkback_dialog_message_password;
+                    break;
+            }
+
+
+            final Activity activity = getActivity();
+            List<AccessibilityServiceInfo> list =
+                    AccessibilityManager.getInstance(activity)
+                            .getEnabledAccessibilityServiceList(
+                                    AccessibilityServiceInfo.FEEDBACK_ALL_MASK);
+            final CharSequence exampleAccessibility;
+            if (list.isEmpty()) {
+                // This should never happen.  But we shouldn't crash
+                exampleAccessibility = "";
+            } else {
+                exampleAccessibility = list.get(0).getResolveInfo()
+                        .loadLabel(activity.getPackageManager());
+            }
+            return new AlertDialog.Builder(activity)
+                    .setTitle(titleId)
+                    .setMessage(getString(messageId, exampleAccessibility))
+                    .setCancelable(true)
+                    .setPositiveButton(android.R.string.ok, this)
+                    .setNegativeButton(android.R.string.cancel, this)
+                    .create();
+        }
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_ENCRYPTION_INTERSTITIAL_ACCESSIBILITY;
+        }
+
         @Override
         public void onClick(DialogInterface dialog, int which) {
-            if (which == DialogInterface.BUTTON_POSITIVE) {
-                setRequirePasswordState(true);
-                startLockIntent();
-            } else if (which == DialogInterface.BUTTON_NEGATIVE) {
-                setRequirePasswordState(false);
+            EncryptionInterstitialFragment fragment =
+                    (EncryptionInterstitialFragment) getParentFragment();
+            if (fragment != null) {
+                if (which == DialogInterface.BUTTON_POSITIVE) {
+                    fragment.setRequirePasswordState(true);
+                    fragment.startLockIntent();
+                } else if (which == DialogInterface.BUTTON_NEGATIVE) {
+                    fragment.setRequirePasswordState(false);
+                }
             }
         }
     }
diff --git a/src/com/android/settings/HelpTrampoline.java b/src/com/android/settings/HelpTrampoline.java
index 7eb28a0..0de15e3 100644
--- a/src/com/android/settings/HelpTrampoline.java
+++ b/src/com/android/settings/HelpTrampoline.java
@@ -39,7 +39,11 @@
 
             final Intent intent = HelpUtils.getHelpIntent(this, value, null);
             if (intent != null) {
-                startActivity(intent);
+                /*
+                 * TODO: b/38230998.
+                 * Move to startActivity once the HelpUtils.getHelpIntent is refactored
+                 */
+                startActivityForResult(intent, 0);
             }
 
         } catch (Resources.NotFoundException | ActivityNotFoundException e) {
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index ef0f8b3..d7de8fb 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -247,11 +247,15 @@
     }
 
     private void updatePreferences() {
-        mPinDialog.setEnabled(mPhone != null);
-        mPinToggle.setEnabled(mPhone != null);
+        if (mPinDialog != null) {
+            mPinDialog.setEnabled(mPhone != null);
+        }
+        if (mPinToggle != null) {
+            mPinToggle.setEnabled(mPhone != null);
 
-        if (mPhone != null) {
-            mPinToggle.setChecked(mPhone.getIccCard().getIccLockEnabled());
+            if (mPhone != null) {
+                mPinToggle.setChecked(mPhone.getIccCard().getIccLockEnabled());
+            }
         }
     }
 
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 69f563e..dc4c995 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -16,11 +16,14 @@
 
 package com.android.settings;
 
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorDescription;
 import android.app.Activity;
 import android.app.FragmentManager;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -32,7 +35,9 @@
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
+import android.telephony.euicc.EuiccManager;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -47,13 +52,13 @@
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.password.ConfirmLockPattern;
 import com.android.settings.widget.CarrierDemoPasswordDialogFragment;
 import com.android.settingslib.RestrictedLockUtils;
 
 import java.util.List;
 
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
 /**
  * Confirm and execute a reset of the device to a clean "just out of the box"
  * state.  Multiple confirmations are required: first, a general "are you sure
@@ -71,11 +76,14 @@
     private static final int KEYGUARD_REQUEST = 55;
 
     static final String ERASE_EXTERNAL_EXTRA = "erase_sd";
+    static final String ERASE_ESIMS_EXTRA = "erase_esim";
 
     private View mContentView;
     private Button mInitiateButton;
     private View mExternalStorageContainer;
-    private CheckBox mExternalStorage;
+    @VisibleForTesting CheckBox mExternalStorage;
+    private View mEsimStorageContainer;
+    @VisibleForTesting CheckBox mEsimStorage;
     private ScrollView mScrollView;
 
     private final OnGlobalLayoutListener mOnGlobalLayoutListener = new OnGlobalLayoutListener() {
@@ -115,9 +123,11 @@
         }
     }
 
-    private void showFinalConfirmation() {
+    @VisibleForTesting
+    void showFinalConfirmation() {
         Bundle args = new Bundle();
         args.putBoolean(ERASE_EXTERNAL_EXTRA, mExternalStorage.isChecked());
+        args.putBoolean(ERASE_ESIMS_EXTRA, mEsimStorage.isChecked());
         ((SettingsActivity) getActivity()).startPreferencePanel(
                 this, MasterClearConfirm.class.getName(),
                 args, R.string.master_clear_confirm_title, null, null, 0);
@@ -165,6 +175,8 @@
         mInitiateButton.setOnClickListener(mInitiateListener);
         mExternalStorageContainer = mContentView.findViewById(R.id.erase_external_container);
         mExternalStorage = (CheckBox) mContentView.findViewById(R.id.erase_external);
+        mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
+        mEsimStorage = (CheckBox) mContentView.findViewById(R.id.erase_esim);
         mScrollView = (ScrollView) mContentView.findViewById(R.id.master_clear_scrollview);
 
         /*
@@ -198,6 +210,18 @@
             });
         }
 
+        if (showWipeEuicc()) {
+            mEsimStorageContainer.setOnClickListener(new View.OnClickListener() {
+
+                @Override
+                public void onClick(View v) {
+                    mEsimStorage.toggle();
+                }
+            });
+        } else {
+            mEsimStorageContainer.setVisibility(View.GONE);
+        }
+
         final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
         loadAccountList(um);
         StringBuffer contentDescription = new StringBuffer();
@@ -220,6 +244,30 @@
         mScrollView.getViewTreeObserver().addOnGlobalLayoutListener(mOnGlobalLayoutListener);
     }
 
+    /**
+     * Whether to show the checkbox to wipe the eUICC.
+     *
+     * <p>We show the checkbox on any device which supports eUICC as long as either the eUICC was
+     * ever provisioned (that is, at least one profile was ever downloaded onto it), or if the user
+     * has enabled development mode.
+     */
+    @VisibleForTesting
+    boolean showWipeEuicc() {
+        Context context = getContext();
+        if (!isEuiccEnabled(context)) {
+            return false;
+        }
+        ContentResolver cr = context.getContentResolver();
+        return Settings.Global.getInt(cr, Settings.Global.EUICC_PROVISIONED, 0) != 0
+                || Settings.Global.getInt(cr, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
+    }
+
+    @VisibleForTesting
+    protected boolean isEuiccEnabled(Context context) {
+        EuiccManager euiccManager = (EuiccManager) context.getSystemService(Context.EUICC_SERVICE);
+        return euiccManager.isEnabled();
+    }
+
     @VisibleForTesting
     boolean hasReachedBottom(final ScrollView scrollView) {
         if (scrollView.getChildCount() < 1) {
diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index 218ebbb..7a85dbe 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -25,6 +25,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
+import android.service.oemlock.OemLockManager;
 import android.service.persistentdata.PersistentDataBlockManager;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -51,6 +52,7 @@
 
     private View mContentView;
     private boolean mEraseSdCard;
+    private boolean mEraseEsims;
 
     /**
      * The user has gone through the multiple confirmation, so now we go ahead
@@ -66,12 +68,14 @@
 
             final PersistentDataBlockManager pdbManager = (PersistentDataBlockManager)
                     getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
+            final OemLockManager oemLockManager = (OemLockManager)
+                    getActivity().getSystemService(Context.OEM_LOCK_SERVICE);
 
-            if (pdbManager != null && !pdbManager.getOemUnlockEnabled() &&
+            if (pdbManager != null && !oemLockManager.isOemUnlockAllowed() &&
                     Utils.isDeviceProvisioned(getActivity())) {
-                // if OEM unlock is enabled, this will be wiped during FR process. If disabled, it
-                // will be wiped here, unless the device is still being provisioned, in which case
-                // the persistent data block will be preserved.
+                // if OEM unlock is allowed, the persistent data block will be wiped during FR
+                // process. If disabled, it will be wiped here, unless the device is still being
+                // provisioned, in which case the persistent data block will be preserved.
                 new AsyncTask<Void, Void, Void>() {
                     int mOldOrientation;
                     ProgressDialog mProgressDialog;
@@ -125,6 +129,7 @@
         intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
         intent.putExtra(Intent.EXTRA_REASON, "MasterClearConfirm");
         intent.putExtra(Intent.EXTRA_WIPE_EXTERNAL_STORAGE, mEraseSdCard);
+        intent.putExtra(Intent.EXTRA_WIPE_ESIMS, mEraseEsims);
         getActivity().sendBroadcast(intent);
         // Intent handling is asynchronous -- assume it will happen soon.
     }
@@ -175,6 +180,8 @@
         Bundle args = getArguments();
         mEraseSdCard = args != null
                 && args.getBoolean(MasterClear.ERASE_EXTERNAL_EXTRA);
+        mEraseEsims = args != null
+                && args.getBoolean(MasterClear.ERASE_ESIMS_EXTRA);
     }
 
     @Override
diff --git a/src/com/android/settings/PreviewPagerAdapter.java b/src/com/android/settings/PreviewPagerAdapter.java
index 5001518..bb68055 100644
--- a/src/com/android/settings/PreviewPagerAdapter.java
+++ b/src/com/android/settings/PreviewPagerAdapter.java
@@ -74,7 +74,7 @@
                 // Create a new configuration for the specified value. It won't
                 // have any theme set, so manually apply the current theme.
                 final Context configContext = context.createConfigurationContext(configurations[j]);
-                configContext.setTheme(context.getThemeResId());
+                configContext.getTheme().setTo(context.getTheme());
 
                 final LayoutInflater configInflater = LayoutInflater.from(configContext);
                 final ViewStub sampleViewStub = new ViewStub(configContext);
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index ddf0dec..406d293 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -20,6 +20,8 @@
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.QueuedWork;
+import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
@@ -31,6 +33,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.telephony.CarrierConfigManager;
 import android.telephony.CellInfo;
 import android.telephony.CellInfoCdma;
 import android.telephony.CellInfoGsm;
@@ -129,6 +132,9 @@
     private static final int IMS_WFC_PROVISIONED_CONFIG_ID =
         ImsConfig.ConfigConstants.VOICE_OVER_WIFI_SETTING_ENABLED;
 
+    private static final int EAB_PROVISIONED_CONFIG_ID =
+        ImsConfig.ConfigConstants.EAB_SETTING_ENABLED;
+
     //Values in must match mCellInfoRefreshRates
     private static final String[] mCellInfoRefreshRateLabels = {
             "Disabled",
@@ -195,9 +201,12 @@
     private Button updateSmscButton;
     private Button refreshSmscButton;
     private Button oemInfoButton;
+    private Button carrierProvisioningButton;
+    private Button triggercarrierProvisioningButton;
     private Switch imsVolteProvisionedSwitch;
     private Switch imsVtProvisionedSwitch;
     private Switch imsWfcProvisionedSwitch;
+    private Switch eabProvisionedSwitch;
     private Spinner preferredNetworkType;
     private Spinner cellInfoRefreshRateSpinner;
 
@@ -403,6 +412,7 @@
         imsVolteProvisionedSwitch = (Switch) findViewById(R.id.volte_provisioned_switch);
         imsVtProvisionedSwitch = (Switch) findViewById(R.id.vt_provisioned_switch);
         imsWfcProvisionedSwitch = (Switch) findViewById(R.id.wfc_provisioned_switch);
+        eabProvisionedSwitch = (Switch) findViewById(R.id.eab_provisioned_switch);
 
         radioPowerOnSwitch = (Switch) findViewById(R.id.radio_power);
 
@@ -414,6 +424,11 @@
         refreshSmscButton.setOnClickListener(mRefreshSmscButtonHandler);
         dnsCheckToggleButton = (Button) findViewById(R.id.dns_check_toggle);
         dnsCheckToggleButton.setOnClickListener(mDnsCheckButtonHandler);
+        carrierProvisioningButton = (Button) findViewById(R.id.carrier_provisioning);
+        carrierProvisioningButton.setOnClickListener(mCarrierProvisioningButtonHandler);
+        triggercarrierProvisioningButton = (Button) findViewById(R.id.trigger_carrier_provisioning);
+        triggercarrierProvisioningButton.setOnClickListener(
+                mTriggerCarrierProvisioningButtonHandler);
 
         oemInfoButton = (Button) findViewById(R.id.oem_info);
         oemInfoButton.setOnClickListener(mOemInfoButtonHandler);
@@ -470,6 +485,7 @@
         imsVolteProvisionedSwitch.setOnCheckedChangeListener(mImsVolteCheckedChangeListener);
         imsVtProvisionedSwitch.setOnCheckedChangeListener(mImsVtCheckedChangeListener);
         imsWfcProvisionedSwitch.setOnCheckedChangeListener(mImsWfcCheckedChangeListener);
+        eabProvisionedSwitch.setOnCheckedChangeListener(mEabCheckedChangeListener);
 
         mTelephonyManager.listen(mPhoneStateListener,
                   PhoneStateListener.LISTEN_CALL_STATE
@@ -1162,6 +1178,11 @@
         setImsConfigProvisionedState(IMS_WFC_PROVISIONED_CONFIG_ID, state);
     }
 
+    void setEabProvisionedState(boolean state) {
+        Log.d(TAG, "setEabProvisioned() state: " + ((state)? "on":"off"));
+        setImsConfigProvisionedState(EAB_PROVISIONED_CONFIG_ID, state);
+    }
+
     void setImsConfigProvisionedState(int configItem, boolean state) {
         if (phone != null && mImsManager != null) {
             QueuedWork.queue(new Runnable() {
@@ -1231,6 +1252,48 @@
         }
     };
 
+    private boolean isEabProvisioned() {
+        return isFeatureProvisioned(EAB_PROVISIONED_CONFIG_ID, false);
+    }
+
+    OnCheckedChangeListener mEabCheckedChangeListener = new OnCheckedChangeListener() {
+        @Override
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            setEabProvisionedState(isChecked);
+        }
+    };
+
+    private boolean isFeatureProvisioned(int featureId, boolean defaultValue) {
+        boolean provisioned = defaultValue;
+        if (mImsManager != null) {
+            try {
+                ImsConfig imsConfig = mImsManager.getConfigInterface();
+                if (imsConfig != null) {
+                    provisioned =
+                            (imsConfig.getProvisionedValue(featureId)
+                                    == ImsConfig.FeatureValueConstants.ON);
+                }
+            } catch (ImsException ex) {
+                Log.e(TAG, "isFeatureProvisioned() exception:", ex);
+            }
+        }
+
+        log("isFeatureProvisioned() featureId=" + featureId + " provisioned=" + provisioned);
+        return provisioned;
+    }
+
+    private static boolean isEabEnabledByPlatform(Context context) {
+        if (context != null) {
+            CarrierConfigManager configManager = (CarrierConfigManager)
+                    context.getSystemService(Context.CARRIER_CONFIG_SERVICE);
+            if (configManager != null && configManager.getConfig().getBoolean(
+                        CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private void updateImsProvisionedState() {
         log("updateImsProvisionedState isImsVolteProvisioned()=" + isImsVolteProvisioned());
         //delightful hack to prevent on-checked-changed calls from
@@ -1252,6 +1315,11 @@
         imsWfcProvisionedSwitch.setOnCheckedChangeListener(mImsWfcCheckedChangeListener);
         imsWfcProvisionedSwitch.setEnabled(
             mImsManager.isWfcEnabledByPlatform(phone.getContext()));
+
+        eabProvisionedSwitch.setOnCheckedChangeListener(null);
+        eabProvisionedSwitch.setChecked(isEabProvisioned());
+        eabProvisionedSwitch.setOnCheckedChangeListener(mEabCheckedChangeListener);
+        eabProvisionedSwitch.setEnabled(isEabEnabledByPlatform(phone.getContext()));
     }
 
     OnClickListener mDnsCheckButtonHandler = new OnClickListener() {
@@ -1295,6 +1363,30 @@
         }
     };
 
+    OnClickListener mCarrierProvisioningButtonHandler = new OnClickListener() {
+        public void onClick(View v) {
+            final Intent intent = new Intent();
+            final ComponentName serviceComponent = new ComponentName("com.android.omadm.service",
+                    "DMIntentReceiver");
+            intent.setComponent(serviceComponent);
+            intent.setAction("com.android.settings.CARRIER_PROVISIONING");
+            getApplicationContext().sendBroadcast(
+                    intent, android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE);
+        }
+    };
+
+    OnClickListener mTriggerCarrierProvisioningButtonHandler = new OnClickListener() {
+        public void onClick(View v) {
+            final Intent intent = new Intent();
+            final ComponentName serviceComponent = new ComponentName("com.android.omadm.service",
+                    "DMIntentReceiver");
+            intent.setComponent(serviceComponent);
+            intent.setAction("com.android.settings.TRIGGER_CARRIER_PROVISIONING");
+            getApplicationContext().sendBroadcast(
+                    intent, android.Manifest.permission.MODIFY_PHONE_STATE);
+        }
+    };
+
     AdapterView.OnItemSelectedListener mPreferredNetworkHandler =
             new AdapterView.OnItemSelectedListener() {
 
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index 45490ab..1529e77 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -34,13 +34,14 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.telephony.PhoneConstants;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.password.ConfirmLockPattern;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
 /**
  * Confirm and execute a reset of the device's network settings to a clean "just out of the box"
  * state.  Multiple confirmations are required: first, a general "are you sure you want to do this?"
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index d220e73..f70d3c2 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -18,9 +18,11 @@
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothManager;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkPolicyManager;
+import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.UserHandle;
@@ -104,6 +106,7 @@
             }
 
             ImsManager.factoryReset(context);
+            restoreDefaultApn(context);
 
             Toast.makeText(context, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
                     .show();
@@ -111,6 +114,20 @@
     };
 
     /**
+     * Restore APN settings to default.
+     */
+    private void restoreDefaultApn(Context context) {
+        Uri uri = Uri.parse(ApnSettings.RESTORE_CARRIERS_URI);
+
+        if (SubscriptionManager.isUsableSubIdValue(mSubId)) {
+            uri = Uri.withAppendedPath(uri, "subId/" + String.valueOf(mSubId));
+        }
+
+        ContentResolver resolver = context.getContentResolver();
+        resolver.delete(uri, null, null);
+    }
+
+    /**
      * Configure the UI for the final confirmation interaction
      */
     private void establishFinalConfirmationState() {
diff --git a/src/com/android/settings/RestrictedSettingsFragment.java b/src/com/android/settings/RestrictedSettingsFragment.java
index ce8a4ad..bbb317b 100644
--- a/src/com/android/settings/RestrictedSettingsFragment.java
+++ b/src/com/android/settings/RestrictedSettingsFragment.java
@@ -17,7 +17,6 @@
 package com.android.settings;
 
 import android.app.Activity;
-import android.app.admin.DevicePolicyManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -27,10 +26,10 @@
 import android.os.PersistableBundle;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.view.Gravity;
 import android.view.View;
 import android.widget.TextView;
 
+import com.android.settings.dashboard.RestrictedDashboardFragment;
 import com.android.settingslib.RestrictedLockUtils;
 
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -46,7 +45,10 @@
  * If this settings screen should be pin protected whenever
  * {@link RestrictionsManager.hasRestrictionsProvider()} returns true, pass in
  * {@link RESTRICT_IF_OVERRIDABLE} to the constructor instead of a restrictions key.
+ *
+ * @deprecated Use {@link RestrictedDashboardFragment} instead
  */
+@Deprecated
 public abstract class RestrictedSettingsFragment extends SettingsPreferenceFragment {
 
     protected static final String RESTRICT_IF_OVERRIDABLE = "restrict_if_overridable";
diff --git a/src/com/android/settings/ScreenPinningSettings.java b/src/com/android/settings/ScreenPinningSettings.java
index d74a07f..5209cc7 100644
--- a/src/com/android/settings/ScreenPinningSettings.java
+++ b/src/com/android/settings/ScreenPinningSettings.java
@@ -33,6 +33,7 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.password.ChooseLockGeneric;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
@@ -74,6 +75,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_screen_pinning;
+    }
+
+    @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         ViewGroup parent = (ViewGroup) view.findViewById(android.R.id.list_container);
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 678a63b..736b85c 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -17,6 +17,7 @@
 package com.android.settings;
 
 import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
+
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 import android.app.Activity;
@@ -65,6 +66,9 @@
 import com.android.settings.location.LocationPreferenceController;
 import com.android.settings.notification.LockScreenNotificationPreferenceController;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.password.ManagedLockPasswordProvider;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
@@ -104,6 +108,7 @@
     static final String KEY_LOCKSCREEN_PREFERENCES = "lockscreen_preferences";
     private static final String KEY_ENCRYPTION_AND_CREDENTIALS = "encryption_and_credential";
     private static final String KEY_LOCATION_SCANNING  = "location_scanning";
+    private static final String KEY_LOCATION = "location";
 
     private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST = 123;
     private static final int CHANGE_TRUST_AGENT_SETTINGS = 126;
@@ -178,6 +183,12 @@
     }
 
     @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mLocationcontroller = new LocationPreferenceController(context, getLifecycle());
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
@@ -207,7 +218,6 @@
             mTrustAgentClickIntent = savedInstanceState.getParcelable(TRUST_AGENT_CLICK_INTENT);
         }
 
-        mLocationcontroller = new LocationPreferenceController(activity);
         mManageDeviceAdminPreferenceController
                 = new ManageDeviceAdminPreferenceController(activity);
         mEnterprisePrivacyPreferenceController
@@ -632,7 +642,7 @@
                     return false;
                 }
             }
-            startFragment(this, "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment",
+            startFragment(this, ChooseLockGenericFragment.class.getName(),
                     R.string.lock_settings_picker_title, SET_OR_CHANGE_LOCK_METHOD_REQUEST, null);
         } else if (KEY_UNLOCK_SET_OR_CHANGE_PROFILE.equals(key)) {
             if (Utils.startQuietModeDialogIfNecessary(this.getActivity(), mUm,
@@ -641,7 +651,7 @@
             }
             Bundle extras = new Bundle();
             extras.putInt(Intent.EXTRA_USER_ID, mProfileChallengeUserId);
-            startFragment(this, "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment",
+            startFragment(this, ChooseLockGenericFragment.class.getName(),
                     R.string.lock_settings_picker_title_profile,
                     SET_OR_CHANGE_LOCK_METHOD_REQUEST_PROFILE, extras);
         } else if (KEY_TRUST_AGENT.equals(key)) {
@@ -741,7 +751,7 @@
     private void unifyUncompliantLocks() {
         mLockPatternUtils.setSeparateProfileChallengeEnabled(mProfileChallengeUserId, false,
                 mCurrentProfilePassword);
-        startFragment(this, "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment",
+        startFragment(this, ChooseLockGenericFragment.class.getName(),
                 R.string.lock_settings_picker_title, SET_OR_CHANGE_LOCK_METHOD_REQUEST, null);
     }
 
@@ -749,7 +759,7 @@
         Bundle extras = new Bundle();
         extras.putInt(Intent.EXTRA_USER_ID, mProfileChallengeUserId);
         startFragment(this,
-                "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment",
+                ChooseLockGenericFragment.class.getName(),
                 R.string.lock_settings_picker_title_profile,
                 SET_OR_CHANGE_LOCK_METHOD_REQUEST_PROFILE, extras);
     }
@@ -957,7 +967,7 @@
             // Duplicate in special app access
             keys.add(KEY_MANAGE_DEVICE_ADMIN);
             // Duplicates between parent-child
-            keys.add((new LocationPreferenceController(context)).getPreferenceKey());
+            keys.add(KEY_LOCATION);
             keys.add(KEY_ENCRYPTION_AND_CREDENTIALS);
             keys.add(KEY_SCREEN_PINNING);
             keys.add(KEY_LOCATION_SCANNING);
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 1db185e..38b6e1b 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -22,6 +22,7 @@
 import com.android.settings.enterprise.EnterprisePrivacySettings;
 import com.android.settings.fingerprint.FingerprintEnrollIntroduction;
 import com.android.settings.fingerprint.FingerprintSettings;
+import com.android.settings.password.ChooseLockGeneric;
 
 /**
  * Top-level Settings activity
@@ -145,6 +146,7 @@
         /* empty */
     }
     public static class ScreenLockSuggestionActivity extends ChooseLockGeneric { /* empty */ }
+    public static class CameraLiftTriggerSuggestionActivity extends SettingsActivity { /* empty */ }
     public static class WallpaperSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ManagedProfileSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DeletionHelperActivity extends SettingsActivity { /* empty */ }
@@ -168,6 +170,7 @@
         }
     }
     public static class WebViewAppPickerActivity extends SettingsActivity { /* empty */ }
+    public static class LegacySupportActivity extends SettingsActivity{ /* empty */ }
 
     // Top level categories for new IA
     public static class NetworkDashboardActivity extends SettingsActivity {}
@@ -176,6 +179,5 @@
     public static class StorageDashboardActivity extends SettingsActivity {}
     public static class UserAndAccountDashboardActivity extends SettingsActivity {}
     public static class SystemDashboardActivity extends SettingsActivity {}
-    public static class SupportDashboardActivity extends SettingsActivity {}
 
 }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 4045fd2..f61dfd3 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -50,6 +50,7 @@
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.Toolbar;
 
 import com.android.internal.util.ArrayUtils;
 import com.android.settings.Settings.WifiSettingsActivity;
@@ -62,7 +63,8 @@
 import com.android.settings.development.DevelopmentSettings;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.DynamicIndexableContentMonitor;
-import com.android.settings.search2.SearchFeatureProvider;
+import com.android.settings.search.SearchActivity;
+import com.android.settings.search.SearchFeatureProvider;
 import com.android.settings.wfd.WifiDisplaySettings;
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.drawer.DashboardCategory;
@@ -75,7 +77,7 @@
 public class SettingsActivity extends SettingsDrawerActivity
         implements PreferenceManager.OnPreferenceTreeClickListener,
         PreferenceFragment.OnPreferenceStartFragmentCallback,
-        ButtonBarHandler, FragmentManager.OnBackStackChangedListener {
+        ButtonBarHandler, FragmentManager.OnBackStackChangedListener, OnClickListener {
 
     private static final String LOG_TAG = "Settings";
 
@@ -345,6 +347,14 @@
             launchSettingFragment(initialFragmentName, isSubSettings, intent);
         }
 
+        if (mIsShowingDashboard) {
+            findViewById(R.id.search_bar).setVisibility(View.VISIBLE);
+            findViewById(R.id.action_bar).setVisibility(View.GONE);
+            Toolbar toolbar = findViewById(R.id.search_action_bar);
+            toolbar.setOnClickListener(this);
+            setActionBar(toolbar);
+        }
+
         mActionBar = getActionBar();
         if (mActionBar != null) {
             mActionBar.setDisplayHomeAsUpEnabled(mDisplayHomeAsUpEnabled);
@@ -432,10 +442,10 @@
             switchToFragment(initialFragmentName, initialArguments, true, false,
                 mInitialTitleResId, mInitialTitle, false);
         } else {
-            // No UP affordance if we are displaying the main Dashboard
-            mDisplayHomeAsUpEnabled = false;
-            // Show Search affordance
-            mDisplaySearch = true;
+            // Show search icon as up affordance if we are displaying the main Dashboard
+            mDisplayHomeAsUpEnabled = true;
+            // toolbar is search affordance so don't show search
+            mDisplaySearch = false;
             mInitialTitleResId = R.string.dashboard_title;
 
             switchToFragment(DashboardSummary.class.getName(), null /* args */, false, false,
@@ -939,4 +949,10 @@
 
         return bitmap;
     }
-}
\ No newline at end of file
+
+    @Override
+    public void onClick(View v) {
+        Intent intent = new Intent(this, SearchActivity.class);
+        startActivity(intent);
+    }
+}
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 9d5e343..7319908 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -49,8 +49,8 @@
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.core.instrumentation.Instrumentable;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settings.widget.FooterPreferenceMixin;
 import com.android.settingslib.HelpUtils;
+import com.android.settingslib.widget.FooterPreferenceMixin;
 
 import java.util.UUID;
 
@@ -321,12 +321,15 @@
         }
     }
 
-    private void updateEmptyView() {
+    @VisibleForTesting
+    void updateEmptyView() {
         if (mEmptyView == null) return;
         if (getPreferenceScreen() != null) {
+            final View listContainer = getActivity().findViewById(android.R.id.list_container);
             boolean show = (getPreferenceScreen().getPreferenceCount()
                     - (mHeader != null ? 1 : 0)
-                    - (mFooterPreferenceMixin.hasFooter() ? 1 : 0)) <= 0;
+                    - (mFooterPreferenceMixin.hasFooter() ? 1 : 0)) <= 0
+                    || (listContainer != null && listContainer.getVisibility() != View.VISIBLE);
             mEmptyView.setVisibility(show ? View.VISIBLE : View.GONE);
         } else {
             mEmptyView.setVisibility(View.VISIBLE);
diff --git a/src/com/android/settings/SetupChooseLockPassword.java b/src/com/android/settings/SetupChooseLockPassword.java
deleted file mode 100644
index f2c24d0..0000000
--- a/src/com/android/settings/SetupChooseLockPassword.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2014 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;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.widget.LinearLayout;
-
-/**
- * Setup Wizard's version of ChooseLockPassword screen. It inherits the logic and basic structure
- * from ChooseLockPassword class, and should remain similar to that behaviorally. This class should
- * only overload base methods for minor theme and behavior differences specific to Setup Wizard.
- * Other changes should be done to ChooseLockPassword class instead and let this class inherit
- * those changes.
- */
-public class SetupChooseLockPassword extends ChooseLockPassword {
-
-    public static Intent createIntent(Context context, int quality,
-            int minLength, final int maxLength, boolean requirePasswordToDecrypt,
-            boolean confirmCredentials) {
-        Intent intent = ChooseLockPassword.createIntent(context, quality, minLength,
-                maxLength, requirePasswordToDecrypt, confirmCredentials);
-        intent.setClass(context, SetupChooseLockPassword.class);
-        intent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false);
-        return intent;
-    }
-
-    public static Intent createIntent(Context context, int quality,
-            int minLength, final int maxLength, boolean requirePasswordToDecrypt, String password) {
-        Intent intent = ChooseLockPassword.createIntent(context, quality, minLength, maxLength,
-                requirePasswordToDecrypt, password);
-        intent.setClass(context, SetupChooseLockPassword.class);
-        intent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false);
-        return intent;
-    }
-
-    public static Intent createIntent(Context context, int quality,
-            int minLength, final int maxLength, boolean requirePasswordToDecrypt, long challenge) {
-        Intent intent = ChooseLockPassword.createIntent(context, quality, minLength, maxLength,
-                requirePasswordToDecrypt, challenge);
-        intent.setClass(context, SetupChooseLockPassword.class);
-        intent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false);
-        return intent;
-    }
-
-    @Override
-    protected boolean isValidFragment(String fragmentName) {
-        return SetupChooseLockPasswordFragment.class.getName().equals(fragmentName);
-    }
-
-    @Override
-    /* package */ Class<? extends Fragment> getFragmentClass() {
-        return SetupChooseLockPasswordFragment.class;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstance) {
-        super.onCreate(savedInstance);
-        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
-        layout.setFitsSystemWindows(false);
-    }
-
-    @Override
-    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
-    }
-
-    public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment {
-
-        @Override
-        protected Intent getRedactionInterstitialIntent(Context context) {
-            // Setup wizard's redaction interstitial is deferred to optional step. Enable that
-            // optional step if the lock screen was set up.
-            SetupRedactionInterstitial.setEnabled(context, true);
-            return null;
-        }
-    }
-}
diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java
index a0a3719..7edffed 100644
--- a/src/com/android/settings/SetupWizardUtils.java
+++ b/src/com/android/settings/SetupWizardUtils.java
@@ -23,11 +23,20 @@
 public class SetupWizardUtils {
 
     public static int getTheme(Intent intent) {
-        if (WizardManagerHelper.isLightTheme(intent, true)) {
-            return R.style.SetupWizardTheme_Light;
-        } else {
-            return R.style.SetupWizardTheme;
+        String theme = intent.getStringExtra(WizardManagerHelper.EXTRA_THEME);
+        if (theme != null) {
+            switch (theme) {
+                case WizardManagerHelper.THEME_GLIF_V2_LIGHT:
+                    return R.style.GlifV2Theme_Light;
+                case WizardManagerHelper.THEME_GLIF_V2:
+                    return R.style.GlifV2Theme;
+                case WizardManagerHelper.THEME_GLIF_LIGHT:
+                    return R.style.GlifTheme_Light;
+                case WizardManagerHelper.THEME_GLIF:
+                    return R.style.GlifTheme;
+            }
         }
+        return R.style.GlifTheme_Light;
     }
 
     public static int getTransparentTheme(Intent intent) {
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 9475f45..708e17f 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -400,7 +400,7 @@
     private void updateState(String[] available, String[] tethered,
             String[] errored) {
         updateUsbState(available, tethered, errored);
-        updateBluetoothState(available, tethered, errored);
+        updateBluetoothState();
     }
 
 
@@ -431,41 +431,18 @@
         }
 
         if (usbTethered) {
-            mUsbTether.setSummary(R.string.usb_tethering_active_subtext);
             mUsbTether.setEnabled(!mDataSaverEnabled);
             mUsbTether.setChecked(true);
         } else if (usbAvailable) {
-            if (usbError == ConnectivityManager.TETHER_ERROR_NO_ERROR) {
-                mUsbTether.setSummary(R.string.usb_tethering_available_subtext);
-            } else {
-                mUsbTether.setSummary(R.string.usb_tethering_errored_subtext);
-            }
             mUsbTether.setEnabled(!mDataSaverEnabled);
             mUsbTether.setChecked(false);
-        } else if (usbErrored) {
-            mUsbTether.setSummary(R.string.usb_tethering_errored_subtext);
-            mUsbTether.setEnabled(false);
-            mUsbTether.setChecked(false);
-        } else if (mMassStorageActive) {
-            mUsbTether.setSummary(R.string.usb_tethering_storage_active_subtext);
-            mUsbTether.setEnabled(false);
-            mUsbTether.setChecked(false);
         } else {
-            mUsbTether.setSummary(R.string.usb_tethering_unavailable_subtext);
             mUsbTether.setEnabled(false);
             mUsbTether.setChecked(false);
         }
     }
 
-    private void updateBluetoothState(String[] available, String[] tethered,
-            String[] errored) {
-        boolean bluetoothErrored = false;
-        for (String s: errored) {
-            for (String regex : mBluetoothRegexs) {
-                if (s.matches(regex)) bluetoothErrored = true;
-            }
-        }
-
+    private void updateBluetoothState() {
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
         if (adapter == null) {
             return;
@@ -473,34 +450,17 @@
         int btState = adapter.getState();
         if (btState == BluetoothAdapter.STATE_TURNING_OFF) {
             mBluetoothTether.setEnabled(false);
-            mBluetoothTether.setSummary(R.string.bluetooth_turning_off);
         } else if (btState == BluetoothAdapter.STATE_TURNING_ON) {
             mBluetoothTether.setEnabled(false);
-            mBluetoothTether.setSummary(R.string.bluetooth_turning_on);
         } else {
             BluetoothPan bluetoothPan = mBluetoothPan.get();
             if (btState == BluetoothAdapter.STATE_ON && bluetoothPan != null
                     && bluetoothPan.isTetheringOn()) {
                 mBluetoothTether.setChecked(true);
                 mBluetoothTether.setEnabled(!mDataSaverEnabled);
-                int bluetoothTethered = bluetoothPan.getConnectedDevices().size();
-                if (bluetoothTethered > 1) {
-                    String summary = getString(
-                            R.string.bluetooth_tethering_devices_connected_subtext,
-                            bluetoothTethered);
-                    mBluetoothTether.setSummary(summary);
-                } else if (bluetoothTethered == 1) {
-                    mBluetoothTether.setSummary(
-                            R.string.bluetooth_tethering_device_connected_subtext);
-                } else if (bluetoothErrored) {
-                    mBluetoothTether.setSummary(R.string.bluetooth_tethering_errored_subtext);
-                } else {
-                    mBluetoothTether.setSummary(R.string.bluetooth_tethering_available_subtext);
-                }
             } else {
                 mBluetoothTether.setEnabled(!mDataSaverEnabled);
                 mBluetoothTether.setChecked(false);
-                mBluetoothTether.setSummary(R.string.bluetooth_tethering_off_subtext);
             }
         }
     }
diff --git a/src/com/android/settings/TrustAgentSettings.java b/src/com/android/settings/TrustAgentSettings.java
index 2f4660e..0e5cd2c 100644
--- a/src/com/android/settings/TrustAgentSettings.java
+++ b/src/com/android/settings/TrustAgentSettings.java
@@ -35,7 +35,6 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.security.SecurityFeatureProvider;
 import com.android.settings.trustagent.TrustAgentManager;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
@@ -79,6 +78,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_trust_agent;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         mDpm = getActivity().getSystemService(DevicePolicyManager.class);
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 8a77fea..15e4eb3 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -1036,7 +1036,24 @@
             return getCredentialOwnerUserId(context);
         }
         int userId = bundle.getInt(Intent.EXTRA_USER_ID, UserHandle.myUserId());
-        return enforceSameOwner(context, userId);
+        if (userId == LockPatternUtils.USER_FRP) {
+            return enforceSystemUser(context, userId);
+        } else {
+            return enforceSameOwner(context, userId);
+        }
+    }
+
+    /**
+     * Returns the given user id if the current user is the system user.
+     *
+     * @throws SecurityException if the current user is not the system user.
+     */
+    public static int enforceSystemUser(Context context, int userId) {
+        if (UserHandle.myUserId() == UserHandle.USER_SYSTEM) {
+            return userId;
+        }
+        throw new SecurityException("Given user id " + userId + " must only be used from "
+                + "USER_SYSTEM, but current user is " + UserHandle.myUserId());
     }
 
     /**
@@ -1311,8 +1328,6 @@
         }
     }
 
-
-
     private static boolean isVolumeValid(VolumeInfo volume) {
         return (volume != null) && (volume.getType() == VolumeInfo.TYPE_PRIVATE)
                 && volume.isMountedReadable();
diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index 78f9de6..cb661ed 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -152,7 +152,9 @@
 
         mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
         setEmptyView(mEmptyView);
-        mEmptyView.setText(R.string.wifi_calling_off_explanation);
+        String emptyViewText = activity.getString(R.string.wifi_calling_off_explanation)
+                + activity.getString(R.string.wifi_calling_off_explanation_2);
+        mEmptyView.setText(emptyViewText);
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
index e0d2c69..0a6932f 100644
--- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
+++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
@@ -55,7 +55,7 @@
         final View.OnTouchListener filterTouchListener = (View v, MotionEvent event) -> {
             // Filter obscured touches by consuming them.
             if (((event.getFlags() & MotionEvent.FLAG_WINDOW_IS_OBSCURED) != 0)
-                || ((event.getFlags() & MotionEvent.FLAG_WINDOW_IS_PARTIALLY_OBSCURED) != 0)) {
+                    || ((event.getFlags() & MotionEvent.FLAG_WINDOW_IS_PARTIALLY_OBSCURED) != 0)) {
                 if (event.getAction() == MotionEvent.ACTION_UP) {
                     Toast.makeText(v.getContext(), R.string.touch_filtered_warning,
                             Toast.LENGTH_SHORT).show();
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 342b384..0766b1a 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -211,6 +211,18 @@
 
     private DevicePolicyManager mDpm;
 
+    /**
+     * Check if the color transforms are color accelerated. Some transforms are experimental only
+     * on non-accelerated platforms due to the performance implications.
+     *
+     * @param context The current context
+     * @return
+     */
+    public static boolean isColorTransformAccelerated(Context context) {
+        return context.getResources()
+                .getBoolean(com.android.internal.R.bool.config_setColorTransformAccelerated);
+    }
+
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.ACCESSIBILITY;
@@ -618,11 +630,6 @@
         updateAccessibilityShortcut(mAccessibilityShortcutPreferenceScreen);
     }
 
-    private boolean isColorTransformAccelerated(Context context) {
-        return context.getResources()
-                .getBoolean(com.android.internal.R.bool.config_setColorTransformAccelerated);
-    }
-
     private void updateMagnificationSummary(Preference pref) {
         final boolean tripleTapEnabled = Settings.Secure.getInt(getContentResolver(),
                 Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1;
@@ -767,10 +774,9 @@
 
         @Override
         public List<String> getNonIndexableKeys(Context context) {
-            List<String> keys = new ArrayList<>();
+            List<String> keys = super.getNonIndexableKeys(context);
             // Duplicates in Display
             keys.add(FONT_SIZE_PREFERENCE_SCREEN);
-            // TODO (b/37741509) Remove this non-indexble key when bug is resolved.
             keys.add(DisplaySettings.KEY_DISPLAY_SIZE);
 
             return keys;
diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
index 21ead46..da47a95 100644
--- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
@@ -52,6 +52,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_accessibility_shortcut;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
index 68979ad..9715559 100644
--- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
@@ -31,11 +31,9 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -68,6 +66,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_magnification;
+    }
+
+    @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
index 38e6b0f..ae57f06 100644
--- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
+++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
@@ -16,7 +16,6 @@
 package com.android.settings.accessibility;
 
 import static android.content.DialogInterface.BUTTON_POSITIVE;
-
 import static com.android.settings.Utils.setOverlayAllowed;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index da4bdcf..976a743 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.accessibility;
 
-import static com.android.settings.Utils.setOverlayAllowed;
-
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -38,19 +36,20 @@
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.accessibility.AccessibilityManager;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.ConfirmDeviceCredentialActivity;
 import com.android.settings.R;
+import com.android.settings.password.ConfirmDeviceCredentialActivity;
 import com.android.settings.widget.ToggleSwitch;
 import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener;
 import com.android.settingslib.accessibility.AccessibilityUtils;
 
 import java.util.List;
 
+import static com.android.settings.Utils.setOverlayAllowed;
+
 public class ToggleAccessibilityServicePreferenceFragment
         extends ToggleFeaturePreferenceFragment implements DialogInterface.OnClickListener {
 
@@ -85,14 +84,6 @@
         // Do not call super. We don't want to see the "Help & feedback" option on this page so as
         // not to confuse users who think they might be able to send feedback about a specific
         // accessibility service from this page.
-
-        // We still want to show the "Settings" menu.
-        if (mSettingsTitle != null && mSettingsIntent != null) {
-            MenuItem menuItem = menu.add(mSettingsTitle);
-            menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            menuItem.setIntent(mSettingsIntent);
-        }
-
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
index 6b2c6c8..16df03e 100644
--- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
@@ -26,7 +26,7 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SeekBarPreference;
+import com.android.settings.widget.SeekBarPreference;
 import com.android.settings.widget.SwitchBar;
 
 
@@ -105,6 +105,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_autoclick;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 3813641..64d38af 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -42,6 +42,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_color_correction;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
@@ -49,6 +54,10 @@
 
         mType = (ListPreference) findPreference("type");
 
+        if (!AccessibilitySettings.isColorTransformAccelerated(getActivity())) {
+            mFooterPreferenceMixin.createFooterPreference().setTitle(
+                    R.string.accessibility_display_daltonizer_preference_subtitle);
+        }
         initPreferences();
     }
 
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 6a4eb5f..f66fb4d 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -42,7 +42,6 @@
     protected ToggleSwitch mToggleSwitch;
 
     protected String mPreferenceKey;
-    protected Preference mSummaryPreference;
 
     protected CharSequence mSettingsTitle;
     protected Intent mSettingsIntent;
@@ -53,36 +52,6 @@
         PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(
                 getActivity());
         setPreferenceScreen(preferenceScreen);
-        mSummaryPreference = new Preference(getPrefContext()) {
-            @Override
-            public void onBindViewHolder(PreferenceViewHolder view) {
-                super.onBindViewHolder(view);
-                view.setDividerAllowedAbove(false);
-                view.setDividerAllowedBelow(false);
-                final TextView summaryView = (TextView) view.findViewById(android.R.id.summary);
-                summaryView.setText(getSummary());
-                sendAccessibilityEvent(summaryView);
-            }
-
-            private void sendAccessibilityEvent(View view) {
-                // Since the view is still not attached we create, populate,
-                // and send the event directly since we do not know when it
-                // will be attached and posting commands is not as clean.
-                AccessibilityManager accessibilityManager =
-                        AccessibilityManager.getInstance(getActivity());
-                if (accessibilityManager.isEnabled()) {
-                    AccessibilityEvent event = AccessibilityEvent.obtain();
-                    event.setEventType(AccessibilityEvent.TYPE_VIEW_FOCUSED);
-                    view.onInitializeAccessibilityEvent(event);
-                    view.dispatchPopulateAccessibilityEvent(event);
-                    accessibilityManager.sendAccessibilityEvent(event);
-                }
-            }
-        };
-        mSummaryPreference.setSelectable(false);
-        mSummaryPreference.setPersistent(false);
-        mSummaryPreference.setLayoutResource(R.layout.text_description_preference);
-        preferenceScreen.addPreference(mSummaryPreference);
     }
 
     @Override
@@ -94,6 +63,16 @@
         mToggleSwitch = mSwitchBar.getSwitch();
 
         onProcessArguments(getArguments());
+
+        // Show the "Settings" menu as if it were a preference screen
+        if (mSettingsTitle != null && mSettingsIntent != null) {
+            PreferenceScreen preferenceScreen = getPreferenceScreen();
+            Preference settingsPref = new Preference(preferenceScreen.getContext());
+            settingsPref.setTitle(mSettingsTitle);
+            settingsPref.setIconSpaceReserved(true);
+            settingsPref.setIntent(mSettingsIntent);
+            preferenceScreen.addPreference(settingsPref);
+        }
     }
 
     @Override
@@ -111,16 +90,6 @@
 
     protected abstract void onPreferenceToggled(String preferenceKey, boolean enabled);
 
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
-        if (mSettingsTitle != null && mSettingsIntent != null) {
-            MenuItem menuItem = menu.add(mSettingsTitle);
-            menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            menuItem.setIntent(mSettingsIntent);
-        }
-    }
-
     protected void onInstallSwitchBarToggleSwitch() {
         // Implement this to set a checked listener.
     }
@@ -145,11 +114,6 @@
     }
 
     protected void onProcessArguments(Bundle arguments) {
-        if (arguments == null) {
-            getPreferenceScreen().removePreference(mSummaryPreference);
-            return;
-        }
-
         // Key.
         mPreferenceKey = arguments.getString(AccessibilitySettings.EXTRA_PREFERENCE_KEY);
 
@@ -168,9 +132,7 @@
         if (arguments.containsKey(AccessibilitySettings.EXTRA_SUMMARY)) {
             final CharSequence summary = arguments.getCharSequence(
                     AccessibilitySettings.EXTRA_SUMMARY);
-            mSummaryPreference.setSummary(summary);
-        } else {
-            getPreferenceScreen().removePreference(mSummaryPreference);
+            mFooterPreferenceMixin.createFooterPreference().setTitle(summary);
         }
     }
 }
diff --git a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
index 293d2bf..c200d17 100644
--- a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
@@ -73,6 +73,11 @@
     }
 
     @Override
+    public int getHelpResource() {
+        return R.string.help_url_font_size;
+    }
+
+    @Override
     public int getMetricsCategory() {
         return MetricsEvent.ACCESSIBILITY_FONT_SIZE;
     }
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index 37a32d5..757d67d 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -144,7 +144,6 @@
         final PreferenceScreen preferenceScreen = getPreferenceManager().getPreferenceScreen();
         preferenceScreen.setOrderingAsAdded(false);
         mVideoPreference.setOrder(0);
-        mSummaryPreference.setOrder(1);
         mConfigWarningPreference.setOrder(2);
         preferenceScreen.addPreference(mVideoPreference);
         preferenceScreen.addPreference(mConfigWarningPreference);
diff --git a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
index 65959b4..dd34a0f 100644
--- a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
@@ -22,9 +22,8 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.Preference;
-
 import android.support.v7.preference.PreferenceScreen;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.Utils;
@@ -45,13 +44,12 @@
     public static final String KEY_ACCOUNT_TYPE = "account_type";
     public static final String KEY_ACCOUNT_LABEL = "account_label";
     public static final String KEY_ACCOUNT_TITLE_RES = "account_title_res";
-    public static final String KEY_ACCOUNT_HEADER = "account_header";
     public static final String KEY_USER_HANDLE = "user_handle";
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     Account mAccount;
     private String mAccountLabel;
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     String mAccountType;
     private AccountSyncPreferenceController mAccountSynController;
     private RemoveAccountPreferenceController mRemoveAccountController;
@@ -99,6 +97,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_account_detail;
+    }
+
+    @Override
     protected int getPreferenceScreenResId() {
         return R.xml.account_type_settings;
     }
@@ -110,6 +113,8 @@
         controllers.add(mAccountSynController);
         mRemoveAccountController = new RemoveAccountPreferenceController(context, this);
         controllers.add(mRemoveAccountController);
+        controllers.add(new AccountHeaderPreferenceController(
+                context, getLifecycle(), getActivity(), this, getArguments()));
         return controllers;
     }
 
@@ -127,8 +132,6 @@
 
     @VisibleForTesting
     void updateUi() {
-        final Preference headerPreference = findPreference(KEY_ACCOUNT_HEADER);
-        headerPreference.setTitle(mAccount.name);
         final Context context = getContext();
         UserHandle userHandle = null;
         Bundle args = getArguments();
@@ -136,14 +139,12 @@
             userHandle = args.getParcelable(KEY_USER_HANDLE);
         }
         final AuthenticatorHelper helper = new AuthenticatorHelper(context, userHandle, null);
-        headerPreference.setIcon(helper.getDrawableForType(context, mAccountType));
         final AccountTypePreferenceLoader accountTypePreferenceLoader =
-            new AccountTypePreferenceLoader(this, helper, userHandle);
-        PreferenceScreen prefs =
-            accountTypePreferenceLoader.addPreferencesForType(mAccountType, getPreferenceScreen());
+                new AccountTypePreferenceLoader(this, helper, userHandle);
+        PreferenceScreen prefs = accountTypePreferenceLoader.addPreferencesForType(
+                mAccountType, getPreferenceScreen());
         if (prefs != null) {
             accountTypePreferenceLoader.updatePreferenceIntents(prefs, mAccountType, mAccount);
         }
     }
-
 }
\ No newline at end of file
diff --git a/src/com/android/settings/accounts/AccountHeaderPreferenceController.java b/src/com/android/settings/accounts/AccountHeaderPreferenceController.java
new file mode 100644
index 0000000..d0ce58d
--- /dev/null
+++ b/src/com/android/settings/accounts/AccountHeaderPreferenceController.java
@@ -0,0 +1,91 @@
+/*
+ * 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.accounts;
+
+import android.accounts.Account;
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.widget.EntityHeaderController;
+import com.android.settingslib.accounts.AuthenticatorHelper;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import static com.android.settings.accounts.AccountDetailDashboardFragment.KEY_ACCOUNT;
+import static com.android.settings.accounts.AccountDetailDashboardFragment.KEY_USER_HANDLE;
+
+public class AccountHeaderPreferenceController extends PreferenceController {
+
+    private static final String KEY_ACCOUNT_HEADER = "account_header";
+
+    private final Activity mActivity;
+    private final PreferenceFragment mHost;
+    private final Account mAccount;
+    private final UserHandle mUserHandle;
+    private final Lifecycle mLifecycle;
+
+    public AccountHeaderPreferenceController(Context context, Lifecycle lifecycle,
+            Activity activity, PreferenceFragment host, Bundle args) {
+        super(context);
+        mActivity = activity;
+        mHost = host;
+        mLifecycle = lifecycle;
+        if (args != null && args.containsKey(KEY_ACCOUNT)) {
+            mAccount = args.getParcelable(KEY_ACCOUNT);
+        } else {
+            mAccount = null;
+        }
+
+        if (args != null && args.containsKey(KEY_USER_HANDLE)) {
+            mUserHandle = args.getParcelable(KEY_USER_HANDLE);
+        } else {
+            mUserHandle = null;
+        }
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mAccount != null && mUserHandle != null;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_ACCOUNT_HEADER;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final LayoutPreference headerPreference =
+                (LayoutPreference) screen.findPreference(KEY_ACCOUNT_HEADER);
+
+        final AuthenticatorHelper helper = new AuthenticatorHelper(mContext, mUserHandle, null);
+
+        EntityHeaderController
+                .newInstance(mActivity, mHost, headerPreference.findViewById(R.id.entity_header))
+                .setRecyclerView(mHost.getListView(), mLifecycle)
+                .setLabel(mAccount.name)
+                .setIcon(helper.getDrawableForType(mContext, mAccount.type))
+                .done(mActivity, true /* rebindButtons */);
+    }
+}
diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java
index 4820161..03a620b 100644
--- a/src/com/android/settings/accounts/AccountPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountPreferenceController.java
@@ -47,14 +47,14 @@
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.search2.SearchFeatureProviderImpl;
+import com.android.settings.search.SearchFeatureProviderImpl;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.accounts.AuthenticatorHelper;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/settings/accounts/AccountTypePreference.java b/src/com/android/settings/accounts/AccountTypePreference.java
index 4f92829..f66970d 100644
--- a/src/com/android/settings/accounts/AccountTypePreference.java
+++ b/src/com/android/settings/accounts/AccountTypePreference.java
@@ -72,6 +72,7 @@
             String titleResPackageName, int titleResId, CharSequence summary, String fragment,
             Bundle fragmentArguments, Drawable icon) {
         super(context);
+        setLayoutResource(R.layout.preference_small_icon);
         mTitle = account.name;
         mTitleResPackageName = titleResPackageName;
         mTitleResId = titleResId;
@@ -79,7 +80,6 @@
         mFragment = fragment;
         mFragmentArguments = fragmentArguments;
         mMetricsCategory = metricsCategory;
-        setWidgetLayoutResource(R.layout.account_type_preference);
 
         setKey(buildKey(account));
         setTitle(mTitle);
diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
index 345f9fc..cca15c9 100644
--- a/src/com/android/settings/accounts/AddAccountSettings.java
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.accounts;
 
+import static android.content.Intent.EXTRA_USER;
+
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;
 import android.accounts.AccountManagerFuture;
@@ -32,14 +34,12 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.Settings;
 import com.android.settings.Utils;
+import com.android.settings.password.ChooseLockSettingsHelper;
 
 import java.io.IOException;
-
-import static android.content.Intent.EXTRA_USER;
 /**
  * Entry point Activity for account setup. Works as follows
  *
diff --git a/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java
index 10e3610..a3dd94d 100644
--- a/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java
+++ b/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java
@@ -20,11 +20,11 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.users.UserCapabilities;
 import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class AddUserWhenLockedPreferenceController extends PreferenceController
         implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnPause, OnResume {
diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java
index fce88aa..fe6f7b4 100644
--- a/src/com/android/settings/accounts/ChooseAccountActivity.java
+++ b/src/com/android/settings/accounts/ChooseAccountActivity.java
@@ -44,10 +44,10 @@
 import com.android.settings.Utils;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.FooterPreference;
-import com.android.settings.widget.FooterPreferenceMixin;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.widget.FooterPreference;
+import com.android.settingslib.widget.FooterPreferenceMixin;
 
 import com.google.android.collect.Maps;
 
diff --git a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
index 1221947..0c53041 100644
--- a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
+++ b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
@@ -34,7 +34,7 @@
 public class EmergencyInfoPreferenceController extends PreferenceController {
 
     private static final String KEY_EMERGENCY_INFO = "emergency_info";
-    private static final String ACTION_EDIT_EMERGENCY_INFO = "android.settings.EDIT_EMERGENGY_INFO";
+    private static final String ACTION_EDIT_EMERGENCY_INFO = "android.settings.EDIT_EMERGENCY_INFO";
     private static final String PACKAGE_NAME_EMERGENCY = "com.android.emergency";
 
     public EmergencyInfoPreferenceController(Context context) {
diff --git a/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java b/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
index a5a92ee..792b77a 100644
--- a/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
+++ b/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
@@ -58,6 +58,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_user_and_account_dashboard;
+    }
+
+    @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
         final List<PreferenceController> controllers = new ArrayList<>();
         controllers.add(new EmergencyInfoPreferenceController(context));
diff --git a/src/com/android/settings/applications/AdvancedAppSettings.java b/src/com/android/settings/applications/AdvancedAppSettings.java
index cce8b7d..b623801 100644
--- a/src/com/android/settings/applications/AdvancedAppSettings.java
+++ b/src/com/android/settings/applications/AdvancedAppSettings.java
@@ -18,8 +18,8 @@
 import android.app.Activity;
 import android.content.Context;
 import android.provider.SearchIndexableResource;
-
 import android.text.TextUtils;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
@@ -57,6 +57,15 @@
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.APPLICATIONS_ADVANCED;
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context) {
         final List<PreferenceController> controllers = new ArrayList<>();
         controllers.add(new DefaultBrowserPreferenceController(context));
         controllers.add(new DefaultWorkBrowserPreferenceController(context));
@@ -68,11 +77,6 @@
         return controllers;
     }
 
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.APPLICATIONS_ADVANCED;
-    }
-
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 @Override
@@ -94,6 +98,11 @@
                             .getPreferenceKey());
                     return keys;
                 }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context);
+                }
             };
 
     static class SummaryProvider implements SummaryLoader.SummaryProvider {
@@ -118,10 +127,10 @@
                 return;
             }
             CharSequence summary = concatSummaryText(
-                mDefaultSmsPreferenceController.getDefaultAppLabel(),
-                mDefaultBrowserPreferenceController.getDefaultAppLabel());
+                    mDefaultSmsPreferenceController.getDefaultAppLabel(),
+                    mDefaultBrowserPreferenceController.getDefaultAppLabel());
             summary = concatSummaryText(summary,
-                mDefaultPhonePreferenceController.getDefaultAppLabel());
+                    mDefaultPhonePreferenceController.getDefaultAppLabel());
             if (!TextUtils.isEmpty(summary)) {
                 mSummaryLoader.setSummary(this, summary);
             }
@@ -139,11 +148,11 @@
     }
 
     public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY =
-        new SummaryLoader.SummaryProviderFactory() {
-            @Override
-            public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
-                    SummaryLoader summaryLoader) {
-                return new AdvancedAppSettings.SummaryProvider(activity, summaryLoader);
-            }
-        };
+            new SummaryLoader.SummaryProviderFactory() {
+                @Override
+                public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                        SummaryLoader summaryLoader) {
+                    return new AdvancedAppSettings.SummaryProvider(activity, summaryLoader);
+                }
+            };
 }
diff --git a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
index 63e8be7..df1430c 100644
--- a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
+++ b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
@@ -16,6 +16,9 @@
 
 package com.android.settings.applications;
 
+import android.app.Activity;
+import android.app.Application;
+import android.app.Fragment;
 import android.content.Context;
 import android.provider.SearchIndexableResource;
 
@@ -51,20 +54,35 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_apps_and_notifications;
+    }
+
+    @Override
     protected int getPreferenceScreenResId() {
         return R.xml.app_and_notification;
     }
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
-        return buildPreferenceControllers(context);
+        final Activity activity = getActivity();
+        final Application app;
+        if (activity != null) {
+            app = activity.getApplication();
+        } else {
+            app = null;
+        }
+        return buildPreferenceControllers(context, app, this);
     }
 
-    private static List<PreferenceController> buildPreferenceControllers(Context context) {
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            Application app, Fragment host) {
         final List<PreferenceController> controllers = new ArrayList<>();
         controllers.add(new EmergencyBroadcastPreferenceController(context,
                 "app_and_notif_cell_broadcast_settings"));
         controllers.add(new SpecialAppAccessPreferenceController(context));
+        controllers.add(new AppPermissionsPreferenceController(context));
+        controllers.add(new RecentAppsPreferenceController(context, app, host));
         return controllers;
     }
 
@@ -80,7 +98,7 @@
 
                 @Override
                 public List<PreferenceController> getPreferenceControllers(Context context) {
-                    return buildPreferenceControllers(context);
+                    return buildPreferenceControllers(context, null, null /* host */);
                 }
 
                 @Override
diff --git a/src/com/android/settings/applications/AppCounter.java b/src/com/android/settings/applications/AppCounter.java
index 8eff526..8c7aed7 100644
--- a/src/com/android/settings/applications/AppCounter.java
+++ b/src/com/android/settings/applications/AppCounter.java
@@ -14,7 +14,6 @@
 
 package com.android.settings.applications;
 
-import android.app.AppGlobals;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
diff --git a/src/com/android/settings/applications/AppHeaderController.java b/src/com/android/settings/applications/AppHeaderController.java
deleted file mode 100644
index 804d645..0000000
--- a/src/com/android/settings/applications/AppHeaderController.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * Copyright (C) 2016 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.annotation.IdRes;
-import android.annotation.UserIdInt;
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.ResolveInfo;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.UserHandle;
-import android.support.annotation.IntDef;
-import android.support.annotation.VisibleForTesting;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.android.settings.AppHeader;
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.applications.ApplicationsState;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-public class AppHeaderController {
-
-    @IntDef({ActionType.ACTION_NONE,
-            ActionType.ACTION_APP_INFO,
-            ActionType.ACTION_APP_PREFERENCE,
-            ActionType.ACTION_NOTIF_PREFERENCE})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface ActionType {
-        int ACTION_NONE = 0;
-        int ACTION_APP_INFO = 1;
-        int ACTION_APP_PREFERENCE = 2;
-        int ACTION_NOTIF_PREFERENCE = 3;
-    }
-
-    public static final String PREF_KEY_APP_HEADER = "pref_app_header";
-
-    private static final String TAG = "AppDetailFeature";
-
-    private final Context mContext;
-    private final Fragment mFragment;
-    private final int mMetricsCategory;
-    private final View mAppHeader;
-
-    private Drawable mIcon;
-    private CharSequence mLabel;
-    private CharSequence mSummary;
-    private String mPackageName;
-    private Intent mAppNotifPrefIntent;
-    @UserIdInt
-    private int mUid = UserHandle.USER_NULL;
-    @ActionType
-    private int mLeftAction;
-    @ActionType
-    private int mRightAction;
-
-    private boolean mIsInstantApp;
-
-    public AppHeaderController(Context context, Fragment fragment, View appHeader) {
-        mContext = context;
-        mFragment = fragment;
-        mMetricsCategory = FeatureFactory.getFactory(context).getMetricsFeatureProvider()
-                .getMetricsCategory(fragment);
-        if (appHeader != null) {
-            mAppHeader = appHeader;
-        } else {
-            mAppHeader = LayoutInflater.from(fragment.getContext())
-                    .inflate(R.layout.app_details, null /* root */);
-        }
-    }
-
-    public AppHeaderController setIcon(Drawable icon) {
-        if (icon != null) {
-            mIcon = icon.getConstantState().newDrawable(mContext.getResources());
-        }
-        return this;
-    }
-
-    public AppHeaderController setIcon(ApplicationsState.AppEntry appEntry) {
-        if (appEntry.icon != null) {
-            mIcon = appEntry.icon.getConstantState().newDrawable(mContext.getResources());
-        }
-        return this;
-    }
-
-    public AppHeaderController setLabel(CharSequence label) {
-        mLabel = label;
-        return this;
-    }
-
-    public AppHeaderController setLabel(ApplicationsState.AppEntry appEntry) {
-        mLabel = appEntry.label;
-        return this;
-    }
-
-    public AppHeaderController setSummary(CharSequence summary) {
-        mSummary = summary;
-        return this;
-    }
-
-    public AppHeaderController setSummary(PackageInfo packageInfo) {
-        if (packageInfo != null) {
-            mSummary = packageInfo.versionName;
-        }
-        return this;
-    }
-
-    public AppHeaderController setButtonActions(@ActionType int leftAction,
-            @ActionType int rightAction) {
-        mLeftAction = leftAction;
-        mRightAction = rightAction;
-        return this;
-    }
-
-    public AppHeaderController setPackageName(String packageName) {
-        mPackageName = packageName;
-        return this;
-    }
-
-    public AppHeaderController setUid(int uid) {
-        mUid = uid;
-        return this;
-    }
-
-    public AppHeaderController setAppNotifPrefIntent(Intent appNotifPrefIntent) {
-        mAppNotifPrefIntent = appNotifPrefIntent;
-        return this;
-    }
-
-    public AppHeaderController setIsInstantApp(boolean isInstantApp) {
-        this.mIsInstantApp = isInstantApp;
-        return this;
-    }
-
-    /**
-     * Done mutating appheader, rebinds everything and return a new {@link LayoutPreference}.
-     */
-    public LayoutPreference done(Activity activity, Context uiContext) {
-        final LayoutPreference pref = new LayoutPreference(uiContext, done(activity));
-        // Makes sure it's the first preference onscreen.
-        pref.setOrder(-1000);
-        pref.setKey(PREF_KEY_APP_HEADER);
-        return pref;
-    }
-
-    /**
-     * Done mutating appheader, rebinds everything (optionally skip rebinding buttons).
-     */
-    public View done(Activity activity, boolean rebindActions) {
-        styleActionBar(activity);
-        ImageView iconView = mAppHeader.findViewById(R.id.app_detail_icon);
-        if (iconView != null) {
-            iconView.setImageDrawable(mIcon);
-        }
-        setText(R.id.app_detail_title, mLabel);
-        setText(R.id.app_detail_summary, mSummary);
-        if (mIsInstantApp) {
-            setText(R.id.install_type,
-                    mAppHeader.getResources().getString(R.string.install_type_instant));
-        }
-
-        if (rebindActions) {
-            bindAppHeaderButtons();
-        }
-
-        return mAppHeader;
-    }
-
-    /**
-     * Only binds app header with button actions.
-     */
-    public AppHeaderController bindAppHeaderButtons() {
-        ImageButton leftButton = mAppHeader.findViewById(R.id.left_button);
-        ImageButton rightButton = mAppHeader.findViewById(R.id.right_button);
-
-        bindButton(leftButton, mLeftAction);
-        bindButton(rightButton, mRightAction);
-        return this;
-    }
-
-    public AppHeaderController styleActionBar(Activity activity) {
-        if (activity == null) {
-            Log.w(TAG, "No activity, cannot style actionbar.");
-            return this;
-        }
-        final ActionBar actionBar = activity.getActionBar();
-        if (actionBar == null) {
-            Log.w(TAG, "No actionbar, cannot style actionbar.");
-            return this;
-        }
-        actionBar.setBackgroundDrawable(
-                new ColorDrawable(Utils.getColorAttr(activity, android.R.attr.colorSecondary)));
-        actionBar.setElevation(0);
-
-        return this;
-    }
-
-    /**
-     * Done mutating appheader, rebinds everything.
-     */
-    @VisibleForTesting
-    View done(Activity activity) {
-        return done(activity, true /* rebindActions */);
-    }
-
-    private void bindButton(ImageButton button, @ActionType int action) {
-        if (button == null) {
-            return;
-        }
-        switch (action) {
-            case ActionType.ACTION_APP_INFO: {
-                if (mPackageName == null || mPackageName.equals(Utils.OS_PKG)
-                        || mUid == UserHandle.USER_NULL
-                        || !AppHeader.includeAppInfo(mFragment)) {
-                    button.setVisibility(View.GONE);
-                } else {
-                    button.setContentDescription(
-                            mContext.getString(R.string.application_info_label));
-                    button.setImageResource(com.android.settings.R.drawable.ic_info);
-                    button.setOnClickListener(v -> AppInfoBase.startAppInfoFragment(
-                            InstalledAppDetails.class, R.string.application_info_label,
-                            mPackageName, mUid, mFragment, 0 /* request */, mMetricsCategory));
-                    button.setVisibility(View.VISIBLE);
-                }
-                return;
-            }
-            case ActionType.ACTION_NOTIF_PREFERENCE: {
-                if (mAppNotifPrefIntent == null) {
-                    button.setVisibility(View.GONE);
-                } else {
-                    button.setOnClickListener(v -> mFragment.startActivity(mAppNotifPrefIntent));
-                    button.setVisibility(View.VISIBLE);
-                }
-                return;
-            }
-            case ActionType.ACTION_APP_PREFERENCE: {
-                final Intent intent = resolveIntent(
-                        new Intent(Intent.ACTION_APPLICATION_PREFERENCES).setPackage(mPackageName));
-                if (intent == null) {
-                    button.setVisibility(View.GONE);
-                    return;
-                }
-                button.setOnClickListener(v -> mFragment.startActivity(intent));
-                button.setVisibility(View.VISIBLE);
-                return;
-            }
-            case ActionType.ACTION_NONE: {
-                button.setVisibility(View.GONE);
-                return;
-            }
-        }
-    }
-
-    private Intent resolveIntent(Intent i) {
-        ResolveInfo result = mContext.getPackageManager().resolveActivity(i, 0);
-        if (result != null) {
-            return new Intent(i.getAction())
-                    .setClassName(result.activityInfo.packageName, result.activityInfo.name);
-        }
-        return null;
-    }
-
-    private void setText(@IdRes int id, CharSequence text) {
-        TextView textView = mAppHeader.findViewById(id);
-        if (textView != null) {
-            textView.setText(text);
-            textView.setVisibility(TextUtils.isEmpty(text) ? View.GONE : View.VISIBLE);
-        }
-    }
-}
diff --git a/src/com/android/settings/applications/AppInfoWithHeader.java b/src/com/android/settings/applications/AppInfoWithHeader.java
index 6b1ef67..95877e9 100644
--- a/src/com/android/settings/applications/AppInfoWithHeader.java
+++ b/src/com/android/settings/applications/AppInfoWithHeader.java
@@ -16,17 +16,17 @@
 
 package com.android.settings.applications;
 
-import static com.android.settings.applications.AppHeaderController.ActionType;
-
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
 import android.util.IconDrawableFactory;
 import android.util.Log;
 
-import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.applications.AppUtils;
 
+import static com.android.settings.widget.EntityHeaderController.ActionType;
+
 public abstract class AppInfoWithHeader extends AppInfoBase {
 
     private boolean mCreated;
@@ -41,9 +41,9 @@
         mCreated = true;
         if (mPackageInfo == null) return;
         final Activity activity = getActivity();
-        final Preference pref = FeatureFactory.getFactory(activity)
-                .getApplicationFeatureProvider(activity)
-                .newAppHeaderController(this, null /* appHeader */)
+        final Preference pref = EntityHeaderController
+                .newInstance(activity, this, null /* header */)
+                .setRecyclerView(getListView(), getLifecycle())
                 .setIcon(IconDrawableFactory.newInstance(activity)
                         .getBadgedIcon(mPackageInfo.applicationInfo))
                 .setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))
diff --git a/src/com/android/settings/applications/AppOpsDetails.java b/src/com/android/settings/applications/AppOpsDetails.java
index e6c040b..b488af6 100644
--- a/src/com/android/settings/applications/AppOpsDetails.java
+++ b/src/com/android/settings/applications/AppOpsDetails.java
@@ -28,6 +28,7 @@
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -43,6 +44,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
+import com.android.settings.widget.EntityHeaderController;
 
 import java.util.List;
 
@@ -64,7 +66,7 @@
         final View appSnippet = mRootView.findViewById(R.id.app_snippet);
         CharSequence label = mPm.getApplicationLabel(pkgInfo.applicationInfo);
         Drawable icon = mPm.getApplicationIcon(pkgInfo.applicationInfo);
-        InstalledAppDetails.setupAppSnippet(appSnippet, label, icon,
+        setupAppSnippet(appSnippet, label, icon,
                 pkgInfo != null ? pkgInfo.versionName : null);
     }
 
@@ -191,4 +193,30 @@
             setIntentAndFinish(true, true);
         }
     }
+
+    /**
+     * @deprecated app info pages should use {@link EntityHeaderController} to show the app header.
+     */
+    void setupAppSnippet(View appSnippet, CharSequence label, Drawable icon,
+            CharSequence versionName) {
+        LayoutInflater.from(appSnippet.getContext()).inflate(R.layout.widget_text_views,
+                appSnippet.findViewById(android.R.id.widget_frame));
+
+        ImageView iconView = appSnippet.findViewById(android.R.id.icon);
+        iconView.setImageDrawable(icon);
+        // Set application name.
+        TextView labelView = appSnippet.findViewById(android.R.id.title);
+        labelView.setText(label);
+        // Version number of application
+        TextView appVersion = appSnippet.findViewById(R.id.widget_text1);
+
+        if (!TextUtils.isEmpty(versionName)) {
+            appVersion.setSelected(true);
+            appVersion.setVisibility(View.VISIBLE);
+            appVersion.setText(appSnippet.getContext().getString(R.string.version_text,
+                    String.valueOf(versionName)));
+        } else {
+            appVersion.setVisibility(View.INVISIBLE);
+        }
+    }
 }
diff --git a/src/com/android/settings/applications/AppPermissionsPreferenceController.java b/src/com/android/settings/applications/AppPermissionsPreferenceController.java
new file mode 100644
index 0000000..57ec6d8
--- /dev/null
+++ b/src/com/android/settings/applications/AppPermissionsPreferenceController.java
@@ -0,0 +1,143 @@
+/*
+ * 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.applications;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.PermissionGroupInfo;
+import android.content.pm.PermissionInfo;
+import android.support.v7.preference.Preference;
+import android.text.TextUtils;
+import android.util.ArraySet;
+import android.util.Log;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+import java.util.List;
+import java.util.Set;
+
+public class AppPermissionsPreferenceController extends PreferenceController {
+
+    private static final String TAG = "AppPermissionPrefCtrl";
+    private static final String KEY_APP_PERMISSION_GROUPS = "manage_perms";
+    private static final String[] PERMISSION_GROUPS = new String[] {
+        "android.permission-group.LOCATION",
+        "android.permission-group.MICROPHONE",
+        "android.permission-group.CAMERA",
+        "android.permission-group.SMS",
+        "android.permission-group.CONTACTS",
+        "android.permission-group.PHONE"};
+
+    private static final int NUM_PERMISSION_TO_USE = 3;
+
+    private final PackageManager mPackageManager;
+
+    public AppPermissionsPreferenceController(Context context) {
+        super(context);
+        mPackageManager = context.getPackageManager();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_APP_PERMISSION_GROUPS;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final String summary = getSummary();
+        if (summary != null) {
+            preference.setSummary(summary);
+        }
+    }
+
+    /*
+       Summary text looks like: Apps using Permission1, Permission2, Permission3
+       The 3 permissions are the first three from the list which any app has granted:
+       Location, Microphone, Camera, Sms, Contacts, and Phone
+     */
+    private String getSummary() {
+        final Set<String> permissions = getAllPermissionsInGroups();
+        Set<String> grantedPermissionGroups = getGrantedPermissionGroups(permissions);
+        CharSequence summary = null;
+        int count = 0;
+        for (String group : PERMISSION_GROUPS) {
+            if (!grantedPermissionGroups.contains(group)) {
+                continue;
+            }
+            summary = concatSummaryText(summary, group);
+            if (++count >= NUM_PERMISSION_TO_USE) {
+                break;
+            }
+        }
+        return count > 0 ? mContext.getString(R.string.app_permissions_summary, summary) : null;
+    }
+
+    private Set<String> getGrantedPermissionGroups(Set<String> permissions) {
+        ArraySet<String> grantedPermissionGroups = new ArraySet<>();
+        List<PackageInfo> installedPackages =
+            mPackageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS);
+        for (PackageInfo installedPackage : installedPackages) {
+            if (installedPackage.permissions == null) {
+                continue;
+            }
+            for (PermissionInfo permissionInfo : installedPackage.permissions) {
+                if (permissions.contains(permissionInfo.name)
+                        && !grantedPermissionGroups.contains(permissionInfo.group)) {
+                    grantedPermissionGroups.add(permissionInfo.group);
+                }
+            }
+        }
+        return grantedPermissionGroups;
+    }
+
+    private CharSequence concatSummaryText(CharSequence currentSummary, String permission) {
+        final CharSequence label = getPermissionGroupLabel(permission);
+        if (TextUtils.isEmpty(currentSummary)) {
+            return label;
+        }
+        return mContext.getString(R.string.join_many_items_middle, currentSummary, label);
+    }
+
+    private CharSequence getPermissionGroupLabel(String group) {
+        try {
+            final PermissionGroupInfo groupInfo = mPackageManager.getPermissionGroupInfo(group, 0);
+            return groupInfo.loadLabel(mPackageManager);
+        } catch (NameNotFoundException e) {
+            Log.e(TAG, "Error getting permissions label.", e);
+        }
+        return group;
+    }
+
+    private Set<String> getAllPermissionsInGroups() {
+        ArraySet<String> result = new ArraySet<>();
+        for (String group : PERMISSION_GROUPS) {
+            try {
+                final List<PermissionInfo> permissions =
+                    mPackageManager.queryPermissionsByGroup(group, 0);
+                for (PermissionInfo permissionInfo : permissions) {
+                    result.add(permissionInfo.name);
+                }
+            } catch (NameNotFoundException e) {
+                Log.e(TAG, "Error getting permissions in group "+group, e);
+            }
+        }
+        return result;
+    }
+}
diff --git a/src/com/android/settings/applications/ApplicationFeatureProvider.java b/src/com/android/settings/applications/ApplicationFeatureProvider.java
index 27cac64..eae23d1 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProvider.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProvider.java
@@ -29,14 +29,8 @@
 public interface ApplicationFeatureProvider {
 
     /**
-     * Returns a new {@link AppHeaderController} instance to customize app header.
-     */
-    AppHeaderController newAppHeaderController(Fragment fragment, View appHeader);
-
-    /**
-     *
-     *  Returns a new {@link InstantAppButtonsController} instance for showing buttons
-     *  only relevant to instant apps.
+     * Returns a new {@link InstantAppButtonsController} instance for showing buttons
+     * only relevant to instant apps.
      */
     InstantAppButtonsController newInstantAppButtonsController(Fragment fragment,
             View view, InstantAppButtonsController.ShowDialogDelegate showDialogDelegate);
@@ -45,7 +39,7 @@
      * Calculates the total number of apps installed on the device via policy in the current user
      * and all its managed profiles.
      *
-     * @param async Whether to count asynchronously in a background thread
+     * @param async    Whether to count asynchronously in a background thread
      * @param callback The callback to invoke with the result
      */
     void calculateNumberOfPolicyInstalledApps(boolean async, NumberOfAppsCallback callback);
@@ -62,10 +56,10 @@
      * Asynchronously calculates the total number of apps installed in the current user and all its
      * managed profiles that have been granted one or more of the given permissions by the admin.
      *
-     * @param permissions Only consider apps that have been granted one or more of these permissions
-     *        by the admin, either at run-time or install-time
-     * @param async Whether to count asynchronously in a background thread
-     * @param callback The callback to invoke with the result
+     * @param permissions Only consider apps that have been granted one or more of these
+     *                    permissions by the admin, either at run-time or install-time
+     * @param async       Whether to count asynchronously in a background thread
+     * @param callback    The callback to invoke with the result
      */
     void calculateNumberOfAppsWithAdminGrantedPermissions(String[] permissions, boolean async,
             NumberOfAppsCallback callback);
@@ -74,9 +68,9 @@
      * Asynchronously builds the list of apps installed in the current user and all its
      * managed profiles that have been granted one or more of the given permissions by the admin.
      *
-     * @param permissions Only consider apps that have been granted one or more of these permissions
-     *        by the admin, either at run-time or install-time
-     * @param callback The callback to invoke with the result
+     * @param permissions Only consider apps that have been granted one or more of these
+     *                    permissions by the admin, either at run-time or install-time
+     * @param callback    The callback to invoke with the result
      */
     void listAppsWithAdminGrantedPermissions(String[] permissions, ListOfAppsCallback callback);
 
@@ -86,10 +80,9 @@
      * given intent (e.g. open browser), even if the user has other apps installed that would also
      * be able to handle the intent.
      *
-     * @param userId ID of the user for which to find persistent preferred activities
-     * @param intent The intents for which to find persistent preferred activities
-     *
-     * @return the persistent preferred activites for the given intents, ordered first by user id,
+     * @param userId  ID of the user for which to find persistent preferred activities
+     * @param intents The intents for which to find persistent preferred activities
+     * @return the persistent preferred activities for the given intents, ordered first by user id,
      * then by package name
      */
     List<UserAppInfo> findPersistentPreferredActivities(@UserIdInt int userId, Intent[] intents);
diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
index 685bd20..10b61c5 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
@@ -24,7 +24,6 @@
 import android.content.pm.ResolveInfo;
 import android.content.pm.UserInfo;
 import android.os.RemoteException;
-import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.ArraySet;
 import android.view.View;
@@ -54,11 +53,6 @@
     }
 
     @Override
-    public AppHeaderController newAppHeaderController(Fragment fragment, View appHeader) {
-        return new AppHeaderController(mContext, fragment, appHeader);
-    }
-
-    @Override
     public InstantAppButtonsController newInstantAppButtonsController(Fragment fragment,
             View view, InstantAppButtonsController.ShowDialogDelegate showDialogDelegate) {
         return new InstantAppButtonsController(mContext, fragment, view, showDialogDelegate);
diff --git a/src/com/android/settings/applications/ConvertToFbe.java b/src/com/android/settings/applications/ConvertToFbe.java
index be3c371..c5e6d77 100644
--- a/src/com/android/settings/applications/ConvertToFbe.java
+++ b/src/com/android/settings/applications/ConvertToFbe.java
@@ -24,16 +24,15 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 
-import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.password.ChooseLockSettingsHelper;
 
 /* Class to prompt for conversion of userdata to file based encryption
  */
-public class ConvertToFbe extends SettingsPreferenceFragment {
+public class ConvertToFbe extends InstrumentedFragment {
     static final String TAG = "ConvertToFBE";
     static final String CONVERT_FBE_EXTRA = "ConvertFBE";
     private static final int KEYGUARD_REQUEST = 55;
diff --git a/src/com/android/settings/applications/DrawOverlayDetails.java b/src/com/android/settings/applications/DrawOverlayDetails.java
index 72564bc..c6f3cc0 100644
--- a/src/com/android/settings/applications/DrawOverlayDetails.java
+++ b/src/com/android/settings/applications/DrawOverlayDetails.java
@@ -20,8 +20,6 @@
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.provider.Settings;
@@ -206,33 +204,6 @@
 
     public static CharSequence getSummary(Context context, OverlayState overlayState) {
         return context.getString(overlayState.isPermissible() ?
-            R.string.system_alert_window_on : R.string.system_alert_window_off);
-    }
-
-    public static CharSequence getSummary(Context context, String pkg) {
-        // first check if pkg is a system pkg
-        PackageManager packageManager = context.getPackageManager();
-        int uid = -1;
-        try {
-            ApplicationInfo appInfo = packageManager.getApplicationInfo(pkg, 0);
-            uid = appInfo.uid;
-            if ((appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
-                return context.getString(R.string.system_alert_window_on);
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            // pkg doesn't even exist?
-            Log.w(LOG_TAG, "Package " + pkg + " not found", e);
-            return context.getString(R.string.system_alert_window_off);
-        }
-
-        AppOpsManager appOpsManager = (AppOpsManager) context.getSystemService(Context
-                .APP_OPS_SERVICE);
-        if (uid == -1) {
-            return context.getString(R.string.system_alert_window_off);
-        }
-
-        int mode = appOpsManager.noteOpNoThrow(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, uid, pkg);
-        return context.getString((mode == AppOpsManager.MODE_ALLOWED) ?
-                R.string.system_alert_window_on : R.string.system_alert_window_off);
+            R.string.app_permission_summary_allowed : R.string.app_permission_summary_not_allowed);
     }
 }
diff --git a/src/com/android/settings/applications/ExternalSourcesDetails.java b/src/com/android/settings/applications/ExternalSourcesDetails.java
index fe51a87..36ce8f8 100644
--- a/src/com/android/settings/applications/ExternalSourcesDetails.java
+++ b/src/com/android/settings/applications/ExternalSourcesDetails.java
@@ -15,11 +15,6 @@
  */
 package com.android.settings.applications;
 
-import static android.app.Activity.RESULT_CANCELED;
-import static android.app.Activity.RESULT_OK;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
 import android.app.AlertDialog;
 import android.app.AppOpsManager;
 import android.content.Context;
@@ -29,12 +24,16 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.Settings;
 import com.android.settings.applications.AppStateInstallAppsBridge.InstallAppsState;
 import com.android.settingslib.RestrictedSwitchPreference;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
+import static android.app.Activity.RESULT_CANCELED;
+import static android.app.Activity.RESULT_OK;
+
 public class ExternalSourcesDetails extends AppInfoWithHeader
         implements OnPreferenceChangeListener {
 
@@ -90,15 +89,12 @@
                 return context.getString(R.string.disabled);
         }
 
-        final InstallAppsState appsState;
-        if (entry.extraInfo instanceof InstallAppsState) {
-            appsState = (InstallAppsState) entry.extraInfo;
-        } else {
-            appsState = new AppStateInstallAppsBridge(context, null, null)
-                    .createInstallAppsStateFor(entry.info.packageName, entry.info.uid);
-        }
-        return context.getString(appsState.canInstallApps() ? R.string.external_source_trusted
-                : R.string.external_source_untrusted);
+        final InstallAppsState appsState = new AppStateInstallAppsBridge(context, null, null)
+                .createInstallAppsStateFor(entry.info.packageName, entry.info.uid);
+
+        return context.getString(appsState.canInstallApps()
+                ? R.string.app_permission_summary_allowed
+                : R.string.app_permission_summary_not_allowed);
     }
 
     private void setCanInstallApps(boolean newState) {
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 3ee3c50..e66463d 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -37,7 +37,6 @@
 import android.content.pm.ResolveInfo;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
 import android.icu.text.ListFormatter;
 import android.net.INetworkStatsService;
 import android.net.INetworkStatsSession;
@@ -60,16 +59,12 @@
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.webkit.IWebViewUpdateService;
 import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.os.BatterySipper;
@@ -96,7 +91,7 @@
 import com.android.settings.notification.AppNotificationSettings;
 import com.android.settings.notification.NotificationBackend;
 import com.android.settings.notification.NotificationBackend.AppRow;
-import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.AppItem;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.applications.AppUtils;
@@ -381,7 +376,7 @@
         }
 
         setHasOptionsMenu(true);
-        addPreferencesFromResource(R.xml.installed_app_details_ia);
+        addPreferencesFromResource(R.xml.installed_app_details);
         addDynamicPrefs();
         if (Utils.isBandwidthControlEnabled()) {
             INetworkStatsService statsService = INetworkStatsService.Stub.asInterface(
@@ -447,14 +442,13 @@
         final Activity activity = getActivity();
         mHeader = (LayoutPreference) findPreference(KEY_HEADER);
         mActionButtons = (LayoutPreference) findPreference(KEY_ACTION_BUTTONS);
-        FeatureFactory.getFactory(activity)
-                .getApplicationFeatureProvider(activity)
-                .newAppHeaderController(this, mHeader.findViewById(R.id.app_snippet))
+        EntityHeaderController.newInstance(activity, this, mHeader.findViewById(R.id.entity_header))
+                .setRecyclerView(getListView(), getLifecycle())
                 .setPackageName(mPackageName)
-                .setButtonActions(AppHeaderController.ActionType.ACTION_APP_PREFERENCE,
-                        AppHeaderController.ActionType.ACTION_NONE)
+                .setButtonActions(EntityHeaderController.ActionType.ACTION_APP_PREFERENCE,
+                        EntityHeaderController.ActionType.ACTION_NONE)
                 .styleActionBar(activity)
-                .bindAppHeaderButtons();
+                .bindHeaderButtons();
         prepareUninstallAndStop();
 
         mNotificationPreference = findPreference(KEY_NOTIFICATION);
@@ -620,20 +614,18 @@
 
     // Utility method to set application label and icon.
     private void setAppLabelAndIcon(PackageInfo pkgInfo) {
-        final View appSnippet = mHeader.findViewById(R.id.app_snippet);
+        final View appSnippet = mHeader.findViewById(R.id.entity_header);
         mState.ensureIcon(mAppEntry);
         final Activity activity = getActivity();
         final boolean isInstantApp = AppUtils.isInstant(mPackageInfo.applicationInfo);
         final CharSequence summary =
                 isInstantApp ? null : getString(Utils.getInstallationStatus(mAppEntry.info));
-        FeatureFactory.getFactory(activity)
-            .getApplicationFeatureProvider(activity)
-            .newAppHeaderController(this, appSnippet)
-            .setLabel(mAppEntry)
-            .setIcon(mAppEntry)
-            .setSummary(summary)
-            .setIsInstantApp(isInstantApp)
-            .done(activity, false /* rebindActions */);
+        EntityHeaderController.newInstance(activity, this, appSnippet)
+                .setLabel(mAppEntry)
+                .setIcon(mAppEntry)
+                .setSummary(summary)
+                .setIsInstantApp(isInstantApp)
+                .done(activity, false /* rebindActions */);
         mVersionPreference.setSummary(getString(R.string.version_text, pkgInfo.versionName));
     }
 
@@ -1256,7 +1248,8 @@
         Preference pref = findPreference("default_home");
 
         if (pref != null) {
-            pref.setSummary(DefaultHomePreferenceController.isHomeDefault(mPackageName, context)
+            pref.setSummary(DefaultHomePreferenceController.isHomeDefault(mPackageName,
+                    new PackageManagerWrapperImpl(context.getPackageManager()))
                     ? R.string.yes : R.string.no);
         }
         pref = findPreference("default_browser");
@@ -1300,32 +1293,6 @@
         }
     }
 
-    /**
-     * @deprecated app info pages should use {@link AppHeaderController} to show the app header.
-     */
-    public static void setupAppSnippet(View appSnippet, CharSequence label, Drawable icon,
-            CharSequence versionName) {
-        LayoutInflater.from(appSnippet.getContext()).inflate(R.layout.widget_text_views,
-                (ViewGroup) appSnippet.findViewById(android.R.id.widget_frame));
-
-        ImageView iconView = (ImageView) appSnippet.findViewById(R.id.app_detail_icon);
-        iconView.setImageDrawable(icon);
-        // Set application name.
-        TextView labelView = (TextView) appSnippet.findViewById(R.id.app_detail_title);
-        labelView.setText(label);
-        // Version number of application
-        TextView appVersion = (TextView) appSnippet.findViewById(R.id.widget_text1);
-
-        if (!TextUtils.isEmpty(versionName)) {
-            appVersion.setSelected(true);
-            appVersion.setVisibility(View.VISIBLE);
-            appVersion.setText(appSnippet.getContext().getString(R.string.version_text,
-                    String.valueOf(versionName)));
-        } else {
-            appVersion.setVisibility(View.INVISIBLE);
-        }
-    }
-
     public static NetworkTemplate getTemplate(Context context) {
         if (DataUsageList.hasReadyMobileRadio(context)) {
             return NetworkTemplate.buildTemplateMobileWildcard();
diff --git a/src/com/android/settings/applications/LayoutPreference.java b/src/com/android/settings/applications/LayoutPreference.java
index b823f8e..6ae0772 100644
--- a/src/com/android/settings/applications/LayoutPreference.java
+++ b/src/com/android/settings/applications/LayoutPreference.java
@@ -88,7 +88,7 @@
         layout.addView(mRootView);
     }
 
-    public View findViewById(int id) {
+    public <T extends View> T findViewById(int id) {
         return mRootView.findViewById(id);
     }
 
diff --git a/src/com/android/settings/applications/LinearColorPreference.java b/src/com/android/settings/applications/LinearColorPreference.java
deleted file mode 100644
index e400f5e..0000000
--- a/src/com/android/settings/applications/LinearColorPreference.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2013 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.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-
-public class LinearColorPreference extends Preference {
-    float mRedRatio;
-    float mYellowRatio;
-    float mGreenRatio;
-    int mRedColor = 0xffaa5030;
-    int mYellowColor = 0xffaaaa30;
-    int mGreenColor = 0xff30aa50;
-    int mColoredRegions = LinearColorBar.REGION_ALL;
-    LinearColorBar.OnRegionTappedListener mOnRegionTappedListener;
-
-    public LinearColorPreference(Context context) {
-        super(context);
-        setLayoutResource(R.layout.preference_linearcolor);
-    }
-
-    public void setRatios(float red, float yellow, float green) {
-        mRedRatio = red;
-        mYellowRatio = yellow;
-        mGreenRatio = green;
-        notifyChanged();
-    }
-
-    public void setColors(int red, int yellow, int green) {
-        mRedColor = red;
-        mYellowColor = yellow;
-        mGreenColor = green;
-        notifyChanged();
-    }
-
-    public void setOnRegionTappedListener(LinearColorBar.OnRegionTappedListener listener) {
-        mOnRegionTappedListener = listener;
-        notifyChanged();
-    }
-
-    public void setColoredRegions(int regions) {
-        mColoredRegions = regions;
-        notifyChanged();
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder view) {
-        super.onBindViewHolder(view);
-
-        LinearColorBar colors = (LinearColorBar)view.findViewById(
-                R.id.linear_color_bar);
-        colors.setShowIndicator(false);
-        colors.setColors(mRedColor, mYellowColor, mGreenColor);
-        colors.setRatios(mRedRatio, mYellowRatio, mGreenRatio);
-        colors.setColoredRegions(mColoredRegions);
-        colors.setOnRegionTappedListener(mOnRegionTappedListener);
-    }
-}
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 76129b7..d6ae7b2 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -18,6 +18,7 @@
 
 import android.annotation.IdRes;
 import android.annotation.Nullable;
+import android.annotation.StringRes;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -148,7 +149,8 @@
     public static final int FILTER_APPS_COUNT = 13;  // This should always be the last entry
 
     // Mapping to string labels for the FILTER_APPS_* constants above.
-    public static final @IdRes int[] FILTER_LABELS = new int[FILTER_APPS_COUNT];
+    @IdRes
+    public static final int[] FILTER_LABELS = new int[FILTER_APPS_COUNT];
 
     // Mapping to filters for the FILTER_APPS_* constants above.
     public static final AppFilter[] FILTERS = new AppFilter[FILTER_APPS_COUNT];
@@ -261,8 +263,8 @@
 
     // List types that should show instant apps.
     public static final Set<Integer> LIST_TYPES_WITH_INSTANT = new ArraySet<>(Arrays.asList(
-                    LIST_TYPE_MAIN,
-                    LIST_TYPE_STORAGE));
+            LIST_TYPE_MAIN,
+            LIST_TYPE_STORAGE));
 
     private View mRootView;
 
@@ -338,7 +340,7 @@
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+            Bundle savedInstanceState) {
         // initialize the inflater
         mInflater = inflater;
 
@@ -425,7 +427,8 @@
     }
 
     @VisibleForTesting
-    static @Nullable AppFilter getCompositeFilter(int listType, int storageType, String volumeUuid) {
+    @Nullable
+    static AppFilter getCompositeFilter(int listType, int storageType, String volumeUuid) {
         AppFilter filter = new VolumeFilter(volumeUuid);
         if (listType == LIST_TYPE_STORAGE) {
             if (storageType == STORAGE_TYPE_MUSIC) {
@@ -506,10 +509,9 @@
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
+    public void onStart() {
+        super.onStart();
         updateView();
-        updateOptionsMenu();
         if (mApplications != null) {
             mApplications.resume(mSortOrder);
             mApplications.updateLoading();
@@ -527,16 +529,11 @@
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
+    public void onStop() {
+        super.onStop();
         if (mApplications != null) {
             mApplications.pause();
         }
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
         mResetAppsHelper.stop();
     }
 
@@ -572,8 +569,7 @@
     private void startApplicationDetailsActivity() {
         switch (mListType) {
             case LIST_TYPE_NOTIFICATION:
-                startAppInfoFragment(AppNotificationSettings.class,
-                        R.string.app_notifications_title);
+                startAppInfoFragment(AppNotificationSettings.class, R.string.notifications_title);
                 break;
             case LIST_TYPE_USAGE_ACCESS:
                 startAppInfoFragment(UsageAccessDetails.class, R.string.usage_access);
@@ -601,8 +597,8 @@
                 startAppInfoFragment(AppStorageSettings.class, R.string.storage_movies_tv);
                 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.
+            // 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.
             default:
                 startAppInfoFragment(InstalledAppDetails.class, R.string.application_info_label);
                 break;
@@ -616,8 +612,7 @@
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        HelpUtils.prepareHelpMenuItem(getActivity(), menu, mListType == LIST_TYPE_MAIN
-                ? R.string.help_uri_apps : R.string.help_uri_notifications, getClass().getName());
+        HelpUtils.prepareHelpMenuItem(getActivity(), menu, getHelpResource(), getClass().getName());
         mOptionsMenu = menu;
         inflater.inflate(R.menu.manage_apps, menu);
         updateOptionsMenu();
@@ -633,11 +628,21 @@
         mOptionsMenu = null;
     }
 
+    @StringRes
+    int getHelpResource() {
+        if (mListType == LIST_TYPE_MAIN) {
+            return R.string.help_uri_apps;
+        } else if (mListType == LIST_TYPE_USAGE_ACCESS) {
+            return R.string.help_url_usage_access;
+        } else {
+            return R.string.help_uri_notifications;
+        }
+    }
+
     void updateOptionsMenu() {
         if (mOptionsMenu == null) {
             return;
         }
-        final Context context = getActivity();
         mOptionsMenu.findItem(R.id.advanced).setVisible(false);
 
         mOptionsMenu.findItem(R.id.sort_order_alpha).setVisible(mListType == LIST_TYPE_STORAGE
@@ -649,6 +654,8 @@
                 && mListType != LIST_TYPE_HIGH_POWER);
         mOptionsMenu.findItem(R.id.hide_system).setVisible(mShowSystem
                 && mListType != LIST_TYPE_HIGH_POWER);
+
+        mOptionsMenu.findItem(R.id.reset_app_preferences).setVisible(mListType == LIST_TYPE_MAIN);
     }
 
     @Override
@@ -675,7 +682,8 @@
                 if (mListType == LIST_TYPE_NOTIFICATION) {
                     ((SettingsActivity) getActivity()).startPreferencePanel(this,
                             ConfigureNotificationSettings.class.getName(), null,
-                            R.string.configure_notification_settings, null, this, ADVANCED_SETTINGS);
+                            R.string.configure_notification_settings, null, this,
+                            ADVANCED_SETTINGS);
                 } else {
                     ((SettingsActivity) getActivity()).startPreferencePanel(this,
                             AdvancedAppSettings.class.getName(), null, R.string.configure_apps,
@@ -882,7 +890,7 @@
         };
 
         public ApplicationsAdapter(ApplicationsState state, ManageApplications manageApplications,
-                                   int filterMode) {
+                int filterMode) {
             mState = state;
             mFgHandler = new Handler();
             mBgHandler = new Handler(mState.getBackgroundLooper());
@@ -955,7 +963,8 @@
             // Record the current scroll position before pausing.
             mLastIndex = mManageApplications.mListView.getFirstVisiblePosition();
             View v = mManageApplications.mListView.getChildAt(0);
-            mLastTop = (v == null) ? 0 : (v.getTop() - mManageApplications.mListView.getPaddingTop());
+            mLastTop =
+                    (v == null) ? 0 : (v.getTop() - mManageApplications.mListView.getPaddingTop());
         }
 
         public void release() {
@@ -1042,8 +1051,7 @@
         }
 
         private ArrayList<ApplicationsState.AppEntry> removeDuplicateIgnoringUser(
-                ArrayList<ApplicationsState.AppEntry> entries)
-        {
+                ArrayList<ApplicationsState.AppEntry> entries) {
             int size = entries.size();
             // returnList will not have more entries than entries
             ArrayList<ApplicationsState.AppEntry> returnEntries = new
@@ -1102,7 +1110,7 @@
         }
 
         private void rebuildSections() {
-            if (mEntries!= null && mManageApplications.mListView.isFastScrollEnabled()) {
+            if (mEntries != null && mManageApplications.mListView.isFastScrollEnabled()) {
                 // Rebuild sections
                 if (mIndex == null) {
                     LocaleList locales = mContext.getResources().getConfiguration().getLocales();
@@ -1147,7 +1155,7 @@
         }
 
         ArrayList<ApplicationsState.AppEntry> applyPrefixFilter(CharSequence prefix,
-                                                                ArrayList<ApplicationsState.AppEntry> origEntries) {
+                ArrayList<ApplicationsState.AppEntry> origEntries) {
             if (prefix == null || prefix.length() == 0) {
                 return origEntries;
             } else {
@@ -1366,8 +1374,9 @@
                 case LIST_TYPE_USAGE_ACCESS:
                     if (holder.entry.extraInfo != null) {
                         holder.summary.setText((new UsageState((PermissionState) holder.entry
-                                .extraInfo)).isPermissible() ? R.string.switch_on_text :
-                                R.string.switch_off_text);
+                                .extraInfo)).isPermissible()
+                                ? R.string.app_permission_summary_allowed
+                                : R.string.app_permission_summary_not_allowed);
                     } else {
                         holder.summary.setText(null);
                     }
@@ -1468,7 +1477,7 @@
             = new SummaryLoader.SummaryProviderFactory() {
         @Override
         public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
-                                                                   SummaryLoader summaryLoader) {
+                SummaryLoader summaryLoader) {
             return new SummaryProvider(activity, summaryLoader);
         }
     };
diff --git a/src/com/android/settings/applications/NotificationApps.java b/src/com/android/settings/applications/NotificationApps.java
index c54363a..f290d43 100644
--- a/src/com/android/settings/applications/NotificationApps.java
+++ b/src/com/android/settings/applications/NotificationApps.java
@@ -17,7 +17,6 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.SummaryLoader;
@@ -29,23 +28,24 @@
  */
 public class NotificationApps extends ManageApplications {
 
-    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
+    public static class SummaryProvider implements SummaryLoader.SummaryProvider {
 
         private final Context mContext;
         private final SummaryLoader mLoader;
         private final NotificationBackend mNotificationBackend;
+        private final PackageManagerWrapper mPackageManager;
 
-        private SummaryProvider(Context context, SummaryLoader loader) {
+        public SummaryProvider(Context context, SummaryLoader loader) {
             mContext = context;
             mLoader = loader;
             mNotificationBackend = new NotificationBackend();
+            mPackageManager = new PackageManagerWrapperImpl(mContext.getPackageManager());
         }
 
         @Override
         public void setListening(boolean listening) {
             if (listening) {
-                new AppCounter(mContext,
-                        new PackageManagerWrapperImpl(mContext.getPackageManager())) {
+                new AppCounter(mContext, mPackageManager) {
                     @Override
                     protected void onCountComplete(int num) {
                         updateSummary(num);
diff --git a/src/com/android/settings/applications/PackageManagerWrapper.java b/src/com/android/settings/applications/PackageManagerWrapper.java
index ffa8e46..580b578 100644
--- a/src/com/android/settings/applications/PackageManagerWrapper.java
+++ b/src/com/android/settings/applications/PackageManagerWrapper.java
@@ -102,12 +102,15 @@
             ComponentName[] componentNames, ComponentName component);
 
     /**
+     * Calls {@code PackageManager.getPrimaryStorageCurrentVolume}
+     */
+    VolumeInfo getPrimaryStorageCurrentVolume();
+
+    /**
      * Calls {@code PackageManager.deletePackageAsUser}
      */
     void deletePackageAsUser(String packageName, IPackageDeleteObserver observer, int flags,
             int userId);
-    /**
-     * Calls {@code PackageManager.getPrimaryStorageCurrentVolume}
-     */
-    VolumeInfo getPrimaryStorageCurrentVolume();
+
+    int getPackageUidAsUser(String pkg, int userId) throws PackageManager.NameNotFoundException;
 }
diff --git a/src/com/android/settings/applications/PackageManagerWrapperImpl.java b/src/com/android/settings/applications/PackageManagerWrapperImpl.java
index 8349702..a47137c 100644
--- a/src/com/android/settings/applications/PackageManagerWrapperImpl.java
+++ b/src/com/android/settings/applications/PackageManagerWrapperImpl.java
@@ -94,13 +94,19 @@
     }
 
     @Override
+    public VolumeInfo getPrimaryStorageCurrentVolume() {
+        return mPm.getPrimaryStorageCurrentVolume();
+    }
+
+    @Override
     public void deletePackageAsUser(String packageName, IPackageDeleteObserver observer, int flags,
             int userId) {
         mPm.deletePackageAsUser(packageName, observer, flags, userId);
     }
 
     @Override
-    public VolumeInfo getPrimaryStorageCurrentVolume() {
-        return mPm.getPrimaryStorageCurrentVolume();
+    public int getPackageUidAsUser(String pkg, int userId)
+            throws PackageManager.NameNotFoundException {
+        return mPm.getPackageUidAsUser(pkg, userId);
     }
 }
diff --git a/src/com/android/settings/applications/PictureInPictureDetails.java b/src/com/android/settings/applications/PictureInPictureDetails.java
index 41f006a..a886a3d 100644
--- a/src/com/android/settings/applications/PictureInPictureDetails.java
+++ b/src/com/android/settings/applications/PictureInPictureDetails.java
@@ -15,10 +15,6 @@
  */
 package com.android.settings.applications;
 
-import static android.app.AppOpsManager.MODE_ALLOWED;
-import static android.app.AppOpsManager.MODE_ERRORED;
-import static android.app.AppOpsManager.OP_PICTURE_IN_PICTURE;
-
 import android.app.AlertDialog;
 import android.app.AppOpsManager;
 import android.content.Context;
@@ -34,6 +30,10 @@
 import com.android.settings.R;
 import com.android.settings.overlay.FeatureFactory;
 
+import static android.app.AppOpsManager.MODE_ALLOWED;
+import static android.app.AppOpsManager.MODE_ERRORED;
+import static android.app.AppOpsManager.OP_PICTURE_IN_PICTURE;
+
 public class PictureInPictureDetails extends AppInfoWithHeader
         implements OnPreferenceChangeListener {
 
@@ -124,7 +124,8 @@
     static int getPreferenceSummary(Context context, int uid, String packageName) {
         final boolean enabled = PictureInPictureDetails.getEnterPipStateForPackage(context, uid,
                 packageName);
-        return enabled ? R.string.picture_in_picture_on : R.string.picture_in_picture_off;
+        return enabled ? R.string.app_permission_summary_allowed
+                : R.string.app_permission_summary_not_allowed;
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java
index 6c0928c..b9c3826 100644
--- a/src/com/android/settings/applications/ProcessStatsDetail.java
+++ b/src/com/android/settings/applications/ProcessStatsDetail.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.applications;
 
-import static com.android.settings.applications.AppHeaderController.ActionType;
-
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
@@ -53,7 +51,7 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.SummaryPreference;
 import com.android.settings.applications.ProcStatsEntry.Service;
-import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.widget.EntityHeaderController;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -61,6 +59,8 @@
 import java.util.HashMap;
 import java.util.List;
 
+import static com.android.settings.widget.EntityHeaderController.ActionType;
+
 public class ProcessStatsDetail extends SettingsPreferenceFragment {
 
     private static final String TAG = "ProcessStatsDetail";
@@ -126,19 +126,19 @@
             return;
         }
         final Activity activity = getActivity();
-        final Preference pref = FeatureFactory.getFactory(activity)
-            .getApplicationFeatureProvider(activity)
-            .newAppHeaderController(this, null /* appHeader */)
-            .setIcon(mApp.mUiTargetApp != null
-                ? IconDrawableFactory.newInstance(activity).getBadgedIcon(mApp.mUiTargetApp)
-                : new ColorDrawable(0))
-            .setLabel(mApp.mUiLabel)
-            .setPackageName(mApp.mPackage)
-            .setUid(mApp.mUiTargetApp != null
-                ? mApp.mUiTargetApp.uid
-                : UserHandle.USER_NULL)
-            .setButtonActions(ActionType.ACTION_APP_INFO, ActionType.ACTION_NONE)
-            .done(activity, getPrefContext());
+        final Preference pref = EntityHeaderController
+                .newInstance(activity, this, null /* appHeader */)
+                .setRecyclerView(getListView(), getLifecycle())
+                .setIcon(mApp.mUiTargetApp != null
+                        ? IconDrawableFactory.newInstance(activity).getBadgedIcon(mApp.mUiTargetApp)
+                        : new ColorDrawable(0))
+                .setLabel(mApp.mUiLabel)
+                .setPackageName(mApp.mPackage)
+                .setUid(mApp.mUiTargetApp != null
+                        ? mApp.mUiTargetApp.uid
+                        : UserHandle.USER_NULL)
+                .setButtonActions(ActionType.ACTION_APP_INFO, ActionType.ACTION_NONE)
+                .done(activity, getPrefContext());
         getPreferenceScreen().addPreference(pref);
     }
 
diff --git a/src/com/android/settings/applications/ProcessStatsSummary.java b/src/com/android/settings/applications/ProcessStatsSummary.java
index 31ab0af..c00cd5f 100644
--- a/src/com/android/settings/applications/ProcessStatsSummary.java
+++ b/src/com/android/settings/applications/ProcessStatsSummary.java
@@ -109,7 +109,7 @@
             args.putBoolean(ARG_TRANSFER_STATS, true);
             args.putInt(ARG_DURATION_INDEX, mDurationIndex);
             mStatsManager.xferStats();
-            startFragment(this, ProcessStatsUi.class.getName(), R.string.app_list_memory_use, 0,
+            startFragment(this, ProcessStatsUi.class.getName(), R.string.memory_usage_apps, 0,
                     args);
             return true;
         }
diff --git a/src/com/android/settings/applications/RecentAppsPreferenceController.java b/src/com/android/settings/applications/RecentAppsPreferenceController.java
new file mode 100644
index 0000000..7a99508
--- /dev/null
+++ b/src/com/android/settings/applications/RecentAppsPreferenceController.java
@@ -0,0 +1,312 @@
+/*
+ * 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.applications;
+
+import android.app.Application;
+import android.app.Fragment;
+import android.app.usage.UsageStats;
+import android.app.usage.UsageStatsManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.UserHandle;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.text.format.DateUtils;
+import android.util.ArrayMap;
+import android.util.ArraySet;
+import android.util.IconDrawableFactory;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.applications.ApplicationsState;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
+        .SETTINGS_APP_NOTIF_CATEGORY;
+
+/**
+ * This controller displays a list of recently used apps and a "See all" button. If there is
+ * no recently used app, "See all" will be displayed as "App info".
+ */
+public class RecentAppsPreferenceController extends PreferenceController
+        implements Comparator<UsageStats> {
+
+    private static final String TAG = "RecentAppsCtrl";
+    private static final String KEY_PREF_CATEGORY = "recent_apps_category";
+    @VisibleForTesting
+    static final String KEY_SEE_ALL = "all_app_info";
+    private static final int SHOW_RECENT_APP_COUNT = 5;
+    private static final Set<String> SKIP_SYSTEM_PACKAGES = new ArraySet<>();
+
+    private final Fragment mHost;
+    private final PackageManager mPm;
+    private final UsageStatsManager mUsageStatsManager;
+    private final ApplicationsState mApplicationsState;
+    private final int mUserId;
+    private final IconDrawableFactory mIconDrawableFactory;
+
+    private Calendar mCal;
+    private List<UsageStats> mStats;
+
+    private PreferenceCategory mCategory;
+    private Preference mSeeAllPref;
+    private boolean mHasRecentApps;
+
+    static {
+        SKIP_SYSTEM_PACKAGES.addAll(Arrays.asList(
+                "android",
+                "com.android.phone",
+                "com.android.settings",
+                "com.android.systemui",
+                "com.android.providers.calendar",
+                "com.android.providers.media"
+        ));
+    }
+
+    public RecentAppsPreferenceController(Context context, Application app, Fragment host) {
+        this(context, app == null ? null : ApplicationsState.getInstance(app), host);
+    }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+    RecentAppsPreferenceController(Context context, ApplicationsState appState, Fragment host) {
+        super(context);
+        mIconDrawableFactory = IconDrawableFactory.newInstance(context);
+        mUserId = UserHandle.myUserId();
+        mPm = context.getPackageManager();
+        mHost = host;
+        mUsageStatsManager =
+                (UsageStatsManager) context.getSystemService(Context.USAGE_STATS_SERVICE);
+        mApplicationsState = appState;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_PREF_CATEGORY;
+    }
+
+    @Override
+    public void updateNonIndexableKeys(List<String> keys) {
+        super.updateNonIndexableKeys(keys);
+        // Don't index category name into search. It's not actionable.
+        keys.add(KEY_PREF_CATEGORY);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mCategory = (PreferenceCategory) screen.findPreference(getPreferenceKey());
+        mSeeAllPref = screen.findPreference(KEY_SEE_ALL);
+        super.displayPreference(screen);
+        refreshUi(mCategory.getContext());
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        refreshUi(mCategory.getContext());
+        // Show total number of installed apps as See all's summary.
+        new InstalledAppCounter(mContext, InstalledAppCounter.IGNORE_INSTALL_REASON,
+                new PackageManagerWrapperImpl(mContext.getPackageManager())) {
+            @Override
+            protected void onCountComplete(int num) {
+                if (mHasRecentApps) {
+                    mSeeAllPref.setTitle(mContext.getString(R.string.see_all_apps_title, num));
+                } else {
+                    mSeeAllPref.setSummary(mContext.getString(R.string.apps_summary, num));
+                }
+            }
+        }.execute();
+
+    }
+
+    @Override
+    public final int compare(UsageStats a, UsageStats b) {
+        // return by descending order
+        return Long.compare(b.getLastTimeUsed(), a.getLastTimeUsed());
+    }
+
+    @VisibleForTesting
+    void refreshUi(Context prefContext) {
+        reloadData();
+        final List<UsageStats> recentApps = getDisplayableRecentAppList();
+        if (recentApps != null && !recentApps.isEmpty()) {
+            mHasRecentApps = true;
+            displayRecentApps(prefContext, recentApps);
+        } else {
+            mHasRecentApps = false;
+            displayOnlyAppInfo();
+        }
+    }
+
+    @VisibleForTesting
+    void reloadData() {
+        mCal = Calendar.getInstance();
+        mCal.add(Calendar.DAY_OF_YEAR, -1);
+        mStats = mUsageStatsManager.queryUsageStats(
+                UsageStatsManager.INTERVAL_BEST, mCal.getTimeInMillis(),
+                System.currentTimeMillis());
+    }
+
+    private void displayOnlyAppInfo() {
+        mCategory.setTitle(null);
+        mSeeAllPref.setTitle(R.string.applications_settings);
+        mSeeAllPref.setIcon(null);
+        int prefCount = mCategory.getPreferenceCount();
+        for (int i = prefCount - 1; i >= 0; i--) {
+            final Preference pref = mCategory.getPreference(i);
+            if (!TextUtils.equals(pref.getKey(), KEY_SEE_ALL)) {
+                mCategory.removePreference(pref);
+            }
+        }
+    }
+
+    private void displayRecentApps(Context prefContext, List<UsageStats> recentApps) {
+        mCategory.setTitle(R.string.recent_app_category_title);
+        mSeeAllPref.setSummary(null);
+        mSeeAllPref.setIcon(R.drawable.ic_chevron_right_24dp);
+
+        // Rebind prefs/avoid adding new prefs if possible. Adding/removing prefs causes jank.
+        // Build a cached preference pool
+        final Map<String, Preference> appPreferences = new ArrayMap<>();
+        int prefCount = mCategory.getPreferenceCount();
+        for (int i = 0; i < prefCount; i++) {
+            final Preference pref = mCategory.getPreference(i);
+            final String key = pref.getKey();
+            if (!TextUtils.equals(key, KEY_SEE_ALL)) {
+                appPreferences.put(key, pref);
+            }
+        }
+        final int recentAppsCount = recentApps.size();
+        for (int i = 0; i < recentAppsCount; i++) {
+            final UsageStats stat = recentApps.get(i);
+            // Bind recent apps to existing prefs if possible, or create a new pref.
+            final String pkgName = stat.getPackageName();
+            final ApplicationsState.AppEntry appEntry =
+                    mApplicationsState.getEntry(pkgName, mUserId);
+            if (appEntry == null) {
+                continue;
+            }
+
+            boolean rebindPref = true;
+            Preference pref = appPreferences.remove(pkgName);
+            if (pref == null) {
+                pref = new Preference(prefContext);
+                rebindPref = false;
+            }
+            pref.setKey(pkgName);
+            pref.setTitle(appEntry.label);
+            pref.setIcon(mIconDrawableFactory.getBadgedIcon(appEntry.info));
+            pref.setSummary(DateUtils.getRelativeTimeSpanString(stat.getLastTimeUsed(),
+                    System.currentTimeMillis(),
+                    DateUtils.MINUTE_IN_MILLIS,
+                    DateUtils.FORMAT_ABBREV_RELATIVE));
+            pref.setOrder(i);
+            pref.setOnPreferenceClickListener(preference -> {
+                AppInfoBase.startAppInfoFragment(InstalledAppDetails.class,
+                        R.string.application_info_label, pkgName, appEntry.info.uid, mHost,
+                        1001 /*RequestCode*/, SETTINGS_APP_NOTIF_CATEGORY);
+                return true;
+            });
+            if (!rebindPref) {
+                mCategory.addPreference(pref);
+            }
+        }
+        // Remove unused prefs from pref cache pool
+        for (Preference unusedPrefs : appPreferences.values()) {
+            mCategory.removePreference(unusedPrefs);
+        }
+    }
+
+    private List<UsageStats> getDisplayableRecentAppList() {
+        final List<UsageStats> recentApps = new ArrayList<>();
+        final Map<String, UsageStats> map = new ArrayMap<>();
+        final int statCount = mStats.size();
+        for (int i = 0; i < statCount; i++) {
+            final UsageStats pkgStats = mStats.get(i);
+            if (!shouldIncludePkgInRecents(pkgStats)) {
+                continue;
+            }
+            final String pkgName = pkgStats.getPackageName();
+            final UsageStats existingStats = map.get(pkgName);
+            if (existingStats == null) {
+                map.put(pkgName, pkgStats);
+            } else {
+                existingStats.add(pkgStats);
+            }
+        }
+        final List<UsageStats> packageStats = new ArrayList<>();
+        packageStats.addAll(map.values());
+        Collections.sort(packageStats, this /* comparator */);
+        int count = 0;
+        for (UsageStats stat : packageStats) {
+            final ApplicationsState.AppEntry appEntry = mApplicationsState.getEntry(
+                    stat.getPackageName(), mUserId);
+            if (appEntry == null) {
+                continue;
+            }
+            recentApps.add(stat);
+            count++;
+            if (count >= SHOW_RECENT_APP_COUNT) {
+                break;
+            }
+        }
+        return recentApps;
+    }
+
+
+    /**
+     * Whether or not the app should be included in recent list.
+     */
+    private boolean shouldIncludePkgInRecents(UsageStats stat) {
+        final String pkgName = stat.getPackageName();
+        if (stat.getLastTimeUsed() < mCal.getTimeInMillis()) {
+            Log.d(TAG, "Invalid timestamp, skipping " + pkgName);
+            return false;
+        }
+
+        if (SKIP_SYSTEM_PACKAGES.contains(pkgName)) {
+            Log.d(TAG, "System package, skipping " + pkgName);
+            return false;
+        }
+        final Intent launchIntent = new Intent().addCategory(Intent.CATEGORY_LAUNCHER)
+                .setPackage(pkgName);
+
+        if (mPm.resolveActivity(launchIntent, 0) == null) {
+            // Not visible on launcher -> likely not a user visible app, skip
+            Log.d(TAG, "Not a user visible app, skipping " + pkgName);
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/src/com/android/settings/applications/ResetAppPrefPreferenceController.java b/src/com/android/settings/applications/ResetAppPrefPreferenceController.java
index 41352bb..6c99a2e 100644
--- a/src/com/android/settings/applications/ResetAppPrefPreferenceController.java
+++ b/src/com/android/settings/applications/ResetAppPrefPreferenceController.java
@@ -22,10 +22,10 @@
 import android.text.TextUtils;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnCreate;
-import com.android.settings.core.lifecycle.events.OnSaveInstanceState;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnCreate;
+import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
 
 public class ResetAppPrefPreferenceController extends PreferenceController
         implements LifecycleObserver, OnCreate, OnSaveInstanceState {
diff --git a/src/com/android/settings/applications/SpecialAccessSettings.java b/src/com/android/settings/applications/SpecialAccessSettings.java
index 31f461c..069db76 100644
--- a/src/com/android/settings/applications/SpecialAccessSettings.java
+++ b/src/com/android/settings/applications/SpecialAccessSettings.java
@@ -14,20 +14,54 @@
 
 package com.android.settings.applications;
 
-import android.os.Bundle;
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
 
-public class SpecialAccessSettings extends SettingsPreferenceFragment {
+import java.util.ArrayList;
+import java.util.List;
+
+public class SpecialAccessSettings extends DashboardFragment {
+
+    private static final String TAG = "SpecialAccessSettings";
 
     @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        addPreferencesFromResource(R.xml.special_access);
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.special_access;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return null;
     }
 
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.SPECIAL_ACCESS;
     }
+
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+                        boolean enabled) {
+                    final ArrayList<SearchIndexableResource> result = new ArrayList<>();
+
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.special_access;
+                    result.add(sir);
+                    return result;
+                }
+            };
 }
diff --git a/src/com/android/settings/applications/WriteSettingsDetails.java b/src/com/android/settings/applications/WriteSettingsDetails.java
index aea05b3..50e6948 100644
--- a/src/com/android/settings/applications/WriteSettingsDetails.java
+++ b/src/com/android/settings/applications/WriteSettingsDetails.java
@@ -20,8 +20,6 @@
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.provider.Settings;
@@ -38,8 +36,6 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
-import java.util.List;
-
 public class WriteSettingsDetails extends AppInfoWithHeader implements OnPreferenceChangeListener,
         OnPreferenceClickListener {
 
@@ -182,47 +178,8 @@
     }
 
     public static CharSequence getSummary(Context context, WriteSettingsState writeSettingsState) {
-        return context.getString(writeSettingsState.isPermissible() ? R.string.write_settings_on :
-                R.string.write_settings_off);
-    }
-
-    public static CharSequence getSummary(Context context, String pkg) {
-        // first check if pkg is a system pkg
-        boolean isSystem = false;
-        PackageManager packageManager = context.getPackageManager();
-        try {
-            ApplicationInfo appInfo = packageManager.getApplicationInfo(pkg, 0);
-            if ((appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
-                isSystem = true;
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            // pkg doesn't even exist?
-            Log.w(LOG_TAG, "Package " + pkg + " not found", e);
-            return context.getString(R.string.write_settings_off);
-        }
-
-        AppOpsManager appOpsManager = (AppOpsManager) context.getSystemService(Context
-                .APP_OPS_SERVICE);
-        List<AppOpsManager.PackageOps> packageOps = appOpsManager.getPackagesForOps(
-                APP_OPS_OP_CODE);
-        if (packageOps == null) {
-            return context.getString(R.string.write_settings_off);
-        }
-
-        int uid = isSystem ? 0 : -1;
-        for (AppOpsManager.PackageOps packageOp : packageOps) {
-            if (pkg.equals(packageOp.getPackageName())) {
-                uid = packageOp.getUid();
-                break;
-            }
-        }
-
-        if (uid == -1) {
-            return context.getString(R.string.write_settings_off);
-        }
-
-        int mode = appOpsManager.noteOpNoThrow(AppOpsManager.OP_WRITE_SETTINGS, uid, pkg);
-        return context.getString((mode == AppOpsManager.MODE_ALLOWED) ?
-                R.string.write_settings_on : R.string.write_settings_off);
+        return context.getString(writeSettingsState.isPermissible()
+                ? R.string.app_permission_summary_allowed
+                : R.string.app_permission_summary_not_allowed);
     }
 }
diff --git a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java
index 05bc8d6..4a8e9c2 100644
--- a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java
+++ b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java
@@ -26,10 +26,10 @@
 
 import com.android.internal.app.AssistUtils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java
index e44e70f..faee23d 100644
--- a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java
+++ b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java
@@ -28,10 +28,10 @@
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.app.AssistUtils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java
index 21dfe19..fb7be629b 100644
--- a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java
+++ b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java
@@ -26,10 +26,10 @@
 
 import com.android.internal.app.AssistUtils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
index 032fb13..3443a44 100644
--- a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
+++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
@@ -27,10 +27,10 @@
 import com.android.internal.app.AssistUtils;
 import com.android.settings.applications.defaultapps.DefaultAppInfo;
 import com.android.settings.applications.defaultapps.DefaultAppPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.List;
 
diff --git a/src/com/android/settings/applications/assist/ManageAssist.java b/src/com/android/settings/applications/assist/ManageAssist.java
index aa71c9a..3b8edf3 100644
--- a/src/com/android/settings/applications/assist/ManageAssist.java
+++ b/src/com/android/settings/applications/assist/ManageAssist.java
@@ -22,11 +22,11 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.gestures.AssistGesturePreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -102,6 +102,5 @@
                     keys.add(KEY_ASSIST);
                     return keys;
                 }
-
             };
 }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
index a08711c..d3617ef 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
@@ -23,11 +23,11 @@
 import android.app.Fragment;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.Pair;
 
-import com.android.internal.logging.nano.MetricsProto;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.applications.PackageManagerWrapperImpl;
@@ -63,6 +63,16 @@
     }
 
     @Override
+    protected void onRadioButtonConfirmed(String selectedKey) {
+        mMetricsFeatureProvider.action(getContext(),
+                MetricsEvent.ACTION_SETTINGS_UPDATE_DEFAULT_APP,
+                selectedKey,
+                Pair.create(MetricsEvent.FIELD_CONTEXT, getMetricsCategory()));
+
+        super.onRadioButtonConfirmed(selectedKey);
+    }
+
+    @Override
     public void bindPreferenceExtra(RadioButtonPreference pref,
             String key, CandidateInfo info, String defaultKey, String systemDefaultKey) {
         if (!(info instanceof DefaultAppInfo)) {
@@ -97,7 +107,7 @@
 
         @Override
         public int getMetricsCategory() {
-            return MetricsProto.MetricsEvent.DEFAULT_APP_PICKER_CONFIRMATION_DIALOG;
+            return MetricsEvent.DEFAULT_APP_PICKER_CONFIRMATION_DIALOG;
         }
 
         /**
diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
index 5c0f9a3..219ce0f 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
@@ -18,16 +18,20 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ComponentInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
+import android.util.Log;
 
 import java.util.List;
 
 public class DefaultBrowserPreferenceController extends DefaultAppPreferenceController {
 
+    private static final String TAG = "BrowserPrefCtrl";
+
     static final Intent BROWSE_PROBE = new Intent()
             .setAction(Intent.ACTION_VIEW)
             .addCategory(Intent.CATEGORY_BROWSABLE)
@@ -60,9 +64,10 @@
     @Override
     protected DefaultAppInfo getDefaultAppInfo() {
         try {
+            final String packageName = mPackageManager.getDefaultBrowserPackageNameAsUser(mUserId);
+            Log.d(TAG, "Get default browser package: " + packageName);
             return new DefaultAppInfo(mPackageManager,
-                    mPackageManager.getPackageManager().getApplicationInfo(
-                            mPackageManager.getDefaultBrowserPackageNameAsUser(mUserId), 0));
+                    mPackageManager.getPackageManager().getApplicationInfo(packageName, 0));
         } catch (PackageManager.NameNotFoundException e) {
             return null;
         }
@@ -90,7 +95,12 @@
         // Resolve that intent and check that the handleAllWebDataURI boolean is set
         final List<ResolveInfo> list = getCandidates();
         if (list != null && list.size() == 1) {
-            return list.get(0).loadLabel(mPackageManager.getPackageManager()).toString();
+            final ResolveInfo info = list.get(0);
+            final String label = info.loadLabel(mPackageManager.getPackageManager()).toString();
+            final ComponentInfo cn = info.getComponentInfo();
+            final String packageName = cn == null ? null : cn.packageName;
+            Log.d(TAG, "Getting label for the only browser app: " + packageName + label);
+            return label;
         }
         return null;
     }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
index 2e93876..a89766f 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
@@ -26,6 +26,8 @@
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 
+import com.android.settings.applications.PackageManagerWrapper;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -106,11 +108,10 @@
         return false;
     }
 
-    public static boolean isHomeDefault(String pkg, Context context) {
-        ArrayList<ResolveInfo> homeActivities = new ArrayList<>();
-        PackageManager pm = context.getPackageManager();
+    public static boolean isHomeDefault(String pkg, PackageManagerWrapper pm) {
+        final ArrayList<ResolveInfo> homeActivities = new ArrayList<>();
         ComponentName def = pm.getHomeActivities(homeActivities);
 
-        return def != null && def.getPackageName().equals(pkg);
+        return def == null || def.getPackageName().equals(pkg);
     }
 }
diff --git a/src/com/android/settings/backup/BackupSettingsActivity.java b/src/com/android/settings/backup/BackupSettingsActivity.java
index f8bab3d..7ffc6cd 100644
--- a/src/com/android/settings/backup/BackupSettingsActivity.java
+++ b/src/com/android/settings/backup/BackupSettingsActivity.java
@@ -94,14 +94,12 @@
 
                     // Add the activity title
                     SearchIndexableRaw data = new SearchIndexableRaw(context);
-                    data.title = context.getResources().getString(R.string.privacy_settings_title);
-                    data.screenTitle = context.getResources().getString(
-                            R.string.privacy_settings_title);
-                    data.keywords = context.getResources().getString(
-                            R.string.keywords_backup);
+                    data.title = context.getString(R.string.privacy_settings_title);
+                    data.screenTitle = context.getString(R.string.settings_label);
+                    data.keywords = context.getString(R.string.keywords_backup);
                     data.intentTargetPackage = context.getPackageName();
                     data.intentTargetClass = BackupSettingsActivity.class.getName();
-                    data.intentAction = "android.intent.action.MAIN";
+                    data.intentAction = Intent.ACTION_MAIN;
                     data.key = BACKUP_SEARCH_INDEX_KEY;
                     result.add(data);
 
@@ -110,7 +108,7 @@
 
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
-                    final List<String> keys = new ArrayList<String>();
+                    final List<String> keys = super.getNonIndexableKeys(context);
 
                     // For non-primary user, no backup is available, so don't show it in search
                     // TODO: http://b/22388012
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
new file mode 100644
index 0000000..41cd28d
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.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.bluetooth;
+
+import android.content.Context;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.widget.Button;
+
+import com.android.settings.R;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+/**
+ * This class adds two buttons: one to connect/disconnect from a device (depending on the current
+ * connected state), and one to "forget" (ie unpair) the device.
+ */
+public class BluetoothDetailsButtonsController extends BluetoothDetailsController {
+    private static final String KEY_ACTION_BUTTONS = "action_buttons";
+    private boolean mIsConnected;
+
+    private LayoutPreference mActionButtons;
+
+    public BluetoothDetailsButtonsController(Context context, PreferenceFragment fragment,
+            CachedBluetoothDevice device, Lifecycle lifecycle) {
+        super(context, fragment, device, lifecycle);
+        mIsConnected = device.isConnected();
+    }
+
+    @Override
+    protected void init(PreferenceScreen screen) {
+        mActionButtons = (LayoutPreference) screen.findPreference(getPreferenceKey());
+        Button rightButton = (Button) mActionButtons.findViewById(R.id.right_button);
+        rightButton.setText(R.string.forget);
+        rightButton.setOnClickListener((view) -> {
+            mCachedDevice.unpair();
+            mFragment.getActivity().finish();
+        });
+    }
+
+    @Override
+    protected void refresh() {
+        Button leftButton = (Button) mActionButtons.findViewById(R.id.left_button);
+        leftButton.setEnabled(!mCachedDevice.isBusy());
+        boolean notInitialized = TextUtils.isEmpty(leftButton.getText());
+
+        boolean previouslyConnected = mIsConnected;
+        mIsConnected = mCachedDevice.isConnected();
+        if (mIsConnected) {
+            if (notInitialized || !previouslyConnected) {
+                leftButton.setText(R.string.bluetooth_device_context_disconnect);
+                leftButton.setOnClickListener((view) -> {
+                    mCachedDevice.disconnect();
+                });
+            }
+        } else {
+            if (notInitialized || previouslyConnected) {
+                leftButton.setText(R.string.bluetooth_device_context_connect);
+                leftButton.setOnClickListener((view) -> {
+                    mCachedDevice.connect(true);
+                });
+            }
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_ACTION_BUTTONS;
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsController.java
new file mode 100644
index 0000000..73e9f31
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsController.java
@@ -0,0 +1,89 @@
+/*
+ * 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.bluetooth;
+
+import android.content.Context;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+
+/**
+ * This class provides common lifecycle and bluetooth device event registration for Bluetooth device
+ * details controllers.
+ */
+public abstract class BluetoothDetailsController extends PreferenceController
+        implements CachedBluetoothDevice.Callback, LifecycleObserver, OnPause, OnResume {
+
+    protected final Context mContext;
+    protected final PreferenceFragment mFragment;
+    protected final CachedBluetoothDevice mCachedDevice;
+
+    public BluetoothDetailsController(Context context, PreferenceFragment fragment,
+            CachedBluetoothDevice device, Lifecycle lifecycle) {
+        super(context);
+        mContext = context;
+        mFragment = fragment;
+        mCachedDevice = device;
+        lifecycle.addObserver(this);
+    }
+
+    @Override
+    public void onPause() {
+        mCachedDevice.unregisterCallback(this);
+    }
+
+    @Override
+    public void onResume() {
+        mCachedDevice.registerCallback(this);
+        refresh();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void onDeviceAttributesChanged() {
+        refresh();
+    }
+
+    @Override
+    public final void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        init(screen);
+    }
+
+    /**
+     * This is a method to do one-time initialization when the screen is first created, such as
+     * adding preferences.
+     * @param screen the screen where this controller's preferences should be added
+     */
+    protected abstract void init(PreferenceScreen screen);
+
+    /**
+     * This method is called when something about the bluetooth device has changed, and this object
+     * should update the preferences it manages based on the new state.
+     */
+    protected abstract void refresh();
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
new file mode 100644
index 0000000..de503b2
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
@@ -0,0 +1,71 @@
+/*
+ * 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.bluetooth;
+
+
+import android.content.Context;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.PreferenceScreen;
+import android.util.Pair;
+
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.widget.EntityHeaderController;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+/**
+ * This class adds a header with device name and status (connected/disconnected, etc.).
+ */
+public class BluetoothDetailsHeaderController extends BluetoothDetailsController {
+
+    private EntityHeaderController mHeaderController;
+
+    public BluetoothDetailsHeaderController(Context context, PreferenceFragment fragment,
+            CachedBluetoothDevice device, Lifecycle lifecycle) {
+        super(context, fragment, device, lifecycle);
+    }
+
+    @Override
+    protected void init(PreferenceScreen screen) {
+        mHeaderController = EntityHeaderController.newInstance(mFragment.getActivity(), mFragment,
+                null);
+        LayoutPreference pref = mHeaderController.done(mFragment.getActivity(), mContext);
+        screen.addPreference(pref);
+    }
+
+    protected void setHeaderProperties() {
+        Pair<Integer, String> pair = Utils.getBtClassDrawableWithDescription
+                (mContext.getResources(), mCachedDevice);
+        int summaryResourceId = mCachedDevice.getConnectionSummary();
+        mHeaderController.setLabel(mCachedDevice.getName());
+        mHeaderController.setIcon(mContext.getDrawable(pair.first));
+        mHeaderController.setIconContentDescription(pair.second);
+        mHeaderController.setSummary(
+                summaryResourceId > 0 ? mContext.getString(summaryResourceId) : null);
+    }
+
+    @Override
+    protected void refresh() {
+        setHeaderProperties();
+        mHeaderController.done(mFragment.getActivity(), false);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return EntityHeaderController.PREF_KEY_APP_HEADER;
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
new file mode 100644
index 0000000..c5cb74b
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
@@ -0,0 +1,58 @@
+/*
+ * 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.bluetooth;
+
+import android.content.Context;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.FooterPreference;
+import com.android.settingslib.widget.FooterPreferenceMixin;
+
+/**
+ * This class adds the device MAC address to a footer.
+ */
+public class BluetoothDetailsMacAddressController extends BluetoothDetailsController {
+    FooterPreferenceMixin mFooterPreferenceMixin;
+    FooterPreference mFooterPreference;
+
+    public BluetoothDetailsMacAddressController(Context context,
+            PreferenceFragment fragment,
+            CachedBluetoothDevice device,
+            Lifecycle lifecycle) {
+        super(context, fragment, device, lifecycle);
+        mFooterPreferenceMixin = new FooterPreferenceMixin(fragment, lifecycle);
+    }
+
+    @Override
+    protected void init(PreferenceScreen screen) {
+        mFooterPreference = mFooterPreferenceMixin.createFooterPreference();
+        mFooterPreference.setTitle(mContext.getString(
+                    R.string.bluetooth_device_mac_address, mCachedDevice.getDevice().getAddress()));
+    }
+
+    @Override
+    protected void refresh() {}
+
+    @Override
+    public String getPreferenceKey() {
+        return mFooterPreference.getKey();
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
new file mode 100644
index 0000000..b0ed056
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
@@ -0,0 +1,269 @@
+/*
+ * 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.bluetooth;
+
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
+import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settingslib.bluetooth.A2dpProfile;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.bluetooth.LocalBluetoothProfile;
+import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
+import com.android.settingslib.bluetooth.MapProfile;
+import com.android.settingslib.bluetooth.PanProfile;
+import com.android.settingslib.bluetooth.PbapServerProfile;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.List;
+
+/**
+ * This class adds switches for toggling the individual profiles that a Bluetooth device
+ * supports, such as "Phone audio", "Media audio", "Contact sharing", etc.
+ */
+public class BluetoothDetailsProfilesController extends BluetoothDetailsController
+        implements Preference.OnPreferenceClickListener {
+    private static final String KEY_PROFILES_GROUP = "bluetooth_profiles";
+
+    @VisibleForTesting
+    static final String HIGH_QUALITY_AUDIO_PREF_TAG = "A2dpProfileHighQualityAudio";
+
+    private LocalBluetoothManager mManager;
+    private LocalBluetoothProfileManager mProfileManager;
+    private CachedBluetoothDevice mCachedDevice;
+    private PreferenceCategory mProfilesContainer;
+
+    public BluetoothDetailsProfilesController(Context context, PreferenceFragment fragment,
+            LocalBluetoothManager manager, CachedBluetoothDevice device, Lifecycle lifecycle) {
+        super(context, fragment, device, lifecycle);
+        mManager = manager;
+        mProfileManager = mManager.getProfileManager();
+        mCachedDevice = device;
+        lifecycle.addObserver(this);
+    }
+
+    @Override
+    protected void init(PreferenceScreen screen) {
+        mProfilesContainer = (PreferenceCategory)screen.findPreference(getPreferenceKey());
+        // Call refresh here even though it will get called later in onResume, to avoid the
+        // list of switches appearing to "pop" into the page.
+        refresh();
+    }
+
+    /**
+     * Creates a switch preference for the particular profile.
+     *
+     * @param context The context to use when creating the SwitchPreference
+     * @param profile The profile for which the preference controls.
+     * @return A preference that allows the user to choose whether this profile
+     * will be connected to.
+     */
+    private SwitchPreference createProfilePreference(Context context,
+            LocalBluetoothProfile profile) {
+        SwitchPreference pref = new SwitchPreference(context);
+        pref.setKey(profile.toString());
+        pref.setTitle(profile.getNameResource(mCachedDevice.getDevice()));
+        pref.setOnPreferenceClickListener(this);
+        return pref;
+    }
+
+    /**
+     * Refreshes the state for an existing SwitchPreference for a profile.
+     */
+    private void refreshProfilePreference(SwitchPreference profilePref,
+            LocalBluetoothProfile profile) {
+        BluetoothDevice device = mCachedDevice.getDevice();
+        profilePref.setEnabled(!mCachedDevice.isBusy());
+        if (profile instanceof MapProfile) {
+            profilePref.setChecked(mCachedDevice.getMessagePermissionChoice()
+                    == CachedBluetoothDevice.ACCESS_ALLOWED);
+        } else if (profile instanceof PbapServerProfile) {
+            profilePref.setChecked(mCachedDevice.getPhonebookPermissionChoice()
+                    == CachedBluetoothDevice.ACCESS_ALLOWED);
+        } else if (profile instanceof PanProfile) {
+            profilePref.setChecked(profile.getConnectionStatus(device) ==
+                    BluetoothProfile.STATE_CONNECTED);
+        } else {
+            profilePref.setChecked(profile.isPreferred(device));
+        }
+
+        if (profile instanceof A2dpProfile) {
+            A2dpProfile a2dp = (A2dpProfile) profile;
+            SwitchPreference highQualityPref = (SwitchPreference) mProfilesContainer.findPreference(
+                    HIGH_QUALITY_AUDIO_PREF_TAG);
+            if (highQualityPref != null) {
+                if (a2dp.isPreferred(device) && a2dp.supportsHighQualityAudio(device)) {
+                    highQualityPref.setVisible(true);
+                    highQualityPref.setTitle(a2dp.getHighQualityAudioOptionLabel(device));
+                    highQualityPref.setChecked(a2dp.isHighQualityAudioEnabled(device));
+                    highQualityPref.setEnabled(!mCachedDevice.isBusy());
+                } else {
+                    highQualityPref.setVisible(false);
+                }
+            }
+        }
+    }
+
+    /**
+     * Helper method to enable a profile for a device.
+     */
+    private void enableProfile(LocalBluetoothProfile profile, BluetoothDevice device,
+            SwitchPreference profilePref) {
+        if (profile instanceof PbapServerProfile) {
+            mCachedDevice.setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);
+            // We don't need to do the additional steps below for this profile.
+            return;
+        }
+        if (profile instanceof MapProfile) {
+            mCachedDevice.setMessagePermissionChoice(BluetoothDevice.ACCESS_ALLOWED);
+        }
+        profile.setPreferred(device, true);
+        mCachedDevice.connectProfile(profile);
+    }
+
+    /**
+     * Helper method to disable a profile for a device
+     */
+    private void disableProfile(LocalBluetoothProfile profile, BluetoothDevice device,
+            SwitchPreference profilePref) {
+        if (profile instanceof PbapServerProfile) {
+            mCachedDevice.setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);
+            // We don't need to do the additional steps below for this profile.
+            return;
+        }
+        mCachedDevice.disconnect(profile);
+        profile.setPreferred(device, false);
+        if (profile instanceof MapProfile) {
+            mCachedDevice.setMessagePermissionChoice(BluetoothDevice.ACCESS_REJECTED);
+        }
+    }
+
+    /**
+     * When the pref for a bluetooth profile is clicked on, we want to toggle the enabled/disabled
+     * state for that profile.
+     */
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        LocalBluetoothProfile profile = mProfileManager.getProfileByName(preference.getKey());
+        if (profile == null) {
+            // It might be the PbapServerProfile, which is not stored by name.
+            PbapServerProfile psp = mManager.getProfileManager().getPbapProfile();
+            if (TextUtils.equals(preference.getKey(), psp.toString())) {
+                profile = psp;
+            } else {
+                return false;
+            }
+        }
+        SwitchPreference profilePref = (SwitchPreference) preference;
+        BluetoothDevice device = mCachedDevice.getDevice();
+        if (profilePref.isChecked()) {
+            enableProfile(profile, device, profilePref);
+        } else {
+            disableProfile(profile, device, profilePref);
+        }
+        refreshProfilePreference(profilePref, profile);
+        return true;
+    }
+
+
+    /**
+     * Helper to get the list of connectable and special profiles.
+     */
+    private List<LocalBluetoothProfile> getProfiles() {
+        List<LocalBluetoothProfile> result = mCachedDevice.getConnectableProfiles();
+
+        final int pbapPermission = mCachedDevice.getPhonebookPermissionChoice();
+        // Only provide PBAP cabability if the client device has requested PBAP.
+        if (pbapPermission != CachedBluetoothDevice.ACCESS_UNKNOWN) {
+            final PbapServerProfile psp = mManager.getProfileManager().getPbapProfile();
+            result.add(psp);
+        }
+
+        final MapProfile mapProfile = mManager.getProfileManager().getMapProfile();
+        final int mapPermission = mCachedDevice.getMessagePermissionChoice();
+        if (mapPermission != CachedBluetoothDevice.ACCESS_UNKNOWN) {
+            result.add(mapProfile);
+        }
+
+        return result;
+    }
+
+    /**
+     * This is a helper method to be called after adding a Preference for a profile. If that
+     * profile happened to be A2dp and the device supports high quality audio, it will add a
+     * separate preference for controlling whether to actually use high quality audio.
+     *
+     * @param profile the profile just added
+     */
+    private void maybeAddHighQualityAudioPref(LocalBluetoothProfile profile) {
+        if (!(profile instanceof A2dpProfile)) {
+            return;
+        }
+        BluetoothDevice device = mCachedDevice.getDevice();
+        A2dpProfile a2dp = (A2dpProfile) profile;
+        if (a2dp.supportsHighQualityAudio(device)) {
+            SwitchPreference highQualityAudioPref = new SwitchPreference(
+                    mProfilesContainer.getContext());
+            highQualityAudioPref.setKey(HIGH_QUALITY_AUDIO_PREF_TAG);
+            highQualityAudioPref.setVisible(false);
+            highQualityAudioPref.setOnPreferenceClickListener(clickedPref -> {
+                boolean enable = ((SwitchPreference) clickedPref).isChecked();
+                a2dp.setHighQualityAudioEnabled(mCachedDevice.getDevice(), enable);
+                return true;
+            });
+            mProfilesContainer.addPreference(highQualityAudioPref);
+        }
+    }
+
+    /**
+     * Refreshes the state of the switches for all profiles, possibly adding or removing switches as
+     * needed.
+     */
+    @Override
+    protected void refresh() {
+        for (LocalBluetoothProfile profile : getProfiles()) {
+            SwitchPreference pref = (SwitchPreference) mProfilesContainer.findPreference(
+                    profile.toString());
+            if (pref == null) {
+                pref = createProfilePreference(mProfilesContainer.getContext(), profile);
+                mProfilesContainer.addPreference(pref);
+                maybeAddHighQualityAudioPref(profile);
+            }
+            refreshProfilePreference(pref, profile);
+        }
+        for (LocalBluetoothProfile removedProfile : mCachedDevice.getRemovedProfiles()) {
+            SwitchPreference pref = (SwitchPreference) mProfilesContainer.findPreference(
+                    removedProfile.toString());
+            if (pref != null) {
+                mProfilesContainer.removePreference(pref);
+            }
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_PROFILES_GROUP;
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
new file mode 100644
index 0000000..c81e1ee
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
@@ -0,0 +1,85 @@
+/*
+ * 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.bluetooth;
+
+import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
+
+import android.bluetooth.BluetoothDevice;
+import android.content.Context;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.dashboard.RestrictedDashboardFragment;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment {
+    public static final String KEY_DEVICE_ADDRESS = "device_address";
+    private static final String TAG = "BTDeviceDetailsFrg";
+
+    private String mDeviceAddress;
+
+    public BluetoothDeviceDetailsFragment() {
+        super(DISALLOW_CONFIG_BLUETOOTH);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        mDeviceAddress = getArguments().getString(KEY_DEVICE_ADDRESS);
+        super.onAttach(context);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.BLUETOOTH_DEVICE_DETAILS;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.bluetooth_device_details_fragment;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        ArrayList<PreferenceController> controllers = new ArrayList<>();
+        LocalBluetoothManager manager = Utils.getLocalBtManager(context);
+        BluetoothDevice remoteDevice = manager.getBluetoothAdapter().getRemoteDevice(
+                mDeviceAddress);
+        CachedBluetoothDevice device = manager.getCachedDeviceManager().findDevice(remoteDevice);
+        if (device != null) {
+            Lifecycle lifecycle = getLifecycle();
+            controllers.add(new BluetoothDetailsHeaderController(context, this, device, lifecycle));
+            controllers.add(new BluetoothDetailsButtonsController(context, this, device,
+                    lifecycle));
+            controllers.add(new BluetoothDetailsProfilesController(context, this, manager, device,
+                    lifecycle));
+            controllers.add(new BluetoothDetailsMacAddressController(context, this, device,
+                    lifecycle));
+        }
+        return controllers;
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
new file mode 100644
index 0000000..baab3fc
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
@@ -0,0 +1,174 @@
+/*
+ * 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.bluetooth;
+
+import android.app.Fragment;
+import android.bluetooth.BluetoothAdapter;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
+import android.util.Log;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+/**
+ * Controller that shows and updates the bluetooth device name
+ */
+public class BluetoothDeviceNamePreferenceController extends PreferenceController implements
+        LifecycleObserver, OnStart, OnStop {
+    private static final String TAG = "BluetoothNamePrefCtrl";
+
+    public static final String KEY_DEVICE_NAME = "device_name";
+    private int mAccentColor;
+    private Fragment mFragment;
+    private LocalBluetoothManager mLocalManager;
+    private LocalBluetoothAdapter mLocalAdapter;
+    private Preference mPreference;
+
+    public BluetoothDeviceNamePreferenceController(Context context, Fragment fragment,
+            Lifecycle lifecycle) {
+        this(context, fragment, (LocalBluetoothAdapter) null);
+
+        mLocalManager = Utils.getLocalBtManager(context);
+        if (mLocalManager == null) {
+            Log.e(TAG, "Bluetooth is not supported on this device");
+            return;
+        }
+        mLocalAdapter = mLocalManager.getBluetoothAdapter();
+        lifecycle.addObserver(this);
+    }
+
+    @VisibleForTesting
+    BluetoothDeviceNamePreferenceController(Context context, Fragment fragment,
+            LocalBluetoothAdapter localAdapter) {
+        super(context);
+        mAccentColor = com.android.settingslib.Utils.getColorAccent(context);
+        mFragment = fragment;
+        mLocalAdapter = localAdapter;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mPreference = screen.findPreference(KEY_DEVICE_NAME);
+    }
+
+    @Override
+    public void onStart() {
+        mContext.registerReceiver(mReceiver,
+                new IntentFilter(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED));
+    }
+
+    @Override
+    public void onStop() {
+        mContext.unregisterReceiver(mReceiver);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mLocalAdapter != null;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_DEVICE_NAME;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateDeviceName(preference, mLocalAdapter.getName());
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (KEY_DEVICE_NAME.equals(preference.getKey())) {
+            new BluetoothNameDialogFragment().show(mFragment.getFragmentManager(), "rename device");
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Create preference to show bluetooth device name
+     *
+     * @param screen to add the preference in
+     * @param order to decide position of the preference
+     * @return bluetooth preference that created in this method
+     */
+    public Preference createBluetoothDeviceNamePreference(PreferenceScreen screen, int order) {
+        mPreference = new Preference(screen.getContext());
+        mPreference.setOrder(order);
+        mPreference.setKey(KEY_DEVICE_NAME);
+        screen.addPreference(mPreference);
+
+        return mPreference;
+    }
+
+    /**
+     * Update device summary with {@code deviceName}, where {@code deviceName} has accent color
+     *
+     * @param preference to set the summary for
+     * @param deviceName bluetooth device name to show in the summary
+     */
+    public void updateDeviceName(final Preference preference, final String deviceName) {
+        if (deviceName == null) {
+            // TODO: show error message in preference subtitle
+            return;
+        }
+        final Spannable spannableName = new SpannableString(deviceName);
+        spannableName.setSpan(new ForegroundColorSpan(mAccentColor), 0,
+                spannableName.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        final CharSequence summary = TextUtils.expandTemplate(
+                mContext.getText(R.string.bluetooth_device_name_summary), spannableName);
+
+        preference.setSummary(summary);
+    }
+
+    /**
+     * Receiver that listens to {@link BluetoothAdapter#ACTION_LOCAL_NAME_CHANGED} and updates the
+     * device name if possible
+     */
+    @VisibleForTesting
+    final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            final String action = intent.getAction();
+
+            if (TextUtils.equals(action, BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED)) {
+                if (mPreference != null && mLocalAdapter != null && mLocalAdapter.isEnabled()) {
+                    updateDeviceName(mPreference, mLocalAdapter.getName());
+                }
+            }
+        }
+    };
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index 7be6dd7..8281d76 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -17,7 +17,6 @@
 package com.android.settings.bluetooth;
 
 import android.app.AlertDialog;
-import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -27,7 +26,6 @@
 import android.support.v7.preference.PreferenceViewHolder;
 import android.text.Html;
 import android.text.TextUtils;
-import android.util.Log;
 import android.util.Pair;
 import android.util.TypedValue;
 import android.widget.ImageView;
@@ -38,10 +36,6 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.widget.GearPreference;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.HidProfile;
-import com.android.settingslib.bluetooth.LocalBluetoothProfile;
-
-import java.util.List;
 
 import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
 
@@ -63,18 +57,11 @@
     private String contentDescription = null;
 
     /* Talk-back descriptions for various BT icons */
-    Resources r = getContext().getResources();
-    public final String COMPUTER = r.getString(R.string.bluetooth_talkback_computer);
-    public final String INPUT_PERIPHERAL = r.getString(
-            R.string.bluetooth_talkback_input_peripheral);
-    public final String HEADSET = r.getString(R.string.bluetooth_talkback_headset);
-    public final String PHONE = r.getString(R.string.bluetooth_talkback_phone);
-    public final String IMAGING = r.getString(R.string.bluetooth_talkback_imaging);
-    public final String HEADPHONE = r.getString(R.string.bluetooth_talkback_headphone);
-    public final String BLUETOOTH = r.getString(R.string.bluetooth_talkback_bluetooth);
+    Resources mResources;
 
     public BluetoothDevicePreference(Context context, CachedBluetoothDevice cachedDevice) {
         super(context, null);
+        mResources = getContext().getResources();
         mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
 
         if (sDimAlpha == Integer.MIN_VALUE) {
@@ -139,7 +126,8 @@
         }
 
 
-        Pair<Integer, String> pair = getBtClassDrawableWithDescription();
+        Pair<Integer, String> pair = Utils.getBtClassDrawableWithDescription(mResources,
+                mCachedDevice);
         if (pair.first != 0) {
             setIcon(pair.first);
             contentDescription = pair.second;
@@ -246,45 +234,4 @@
         }
     }
 
-    private Pair<Integer, String> getBtClassDrawableWithDescription() {
-        BluetoothClass btClass = mCachedDevice.getBtClass();
-        if (btClass != null) {
-            switch (btClass.getMajorDeviceClass()) {
-                case BluetoothClass.Device.Major.COMPUTER:
-                    return new Pair<Integer, String>(R.drawable.ic_bt_laptop, COMPUTER);
-
-                case BluetoothClass.Device.Major.PHONE:
-                    return new Pair<Integer, String>(R.drawable.ic_bt_cellphone, PHONE);
-
-                case BluetoothClass.Device.Major.PERIPHERAL:
-                    return new Pair<Integer, String>(HidProfile.getHidClassDrawable(btClass),
-                            INPUT_PERIPHERAL);
-
-                case BluetoothClass.Device.Major.IMAGING:
-                    return new Pair<Integer, String>(R.drawable.ic_bt_imaging, IMAGING);
-
-                default:
-                    // unrecognized device class; continue
-            }
-        } else {
-            Log.w(TAG, "mBtClass is null");
-        }
-
-        List<LocalBluetoothProfile> profiles = mCachedDevice.getProfiles();
-        for (LocalBluetoothProfile profile : profiles) {
-            int resId = profile.getDrawableResource(btClass);
-            if (resId != 0) {
-                return new Pair<Integer, String>(resId, null);
-            }
-        }
-        if (btClass != null) {
-            if (btClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) {
-                return new Pair<Integer, String>(R.drawable.ic_bt_headset_hfp, HEADSET);
-            }
-            if (btClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) {
-                return new Pair<Integer, String>(R.drawable.ic_bt_headphones_a2dp, HEADPHONE);
-            }
-        }
-        return new Pair<Integer, String>(R.drawable.ic_settings_bluetooth, BLUETOOTH);
-    }
 }
diff --git a/src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java b/src/com/android/settings/bluetooth/BluetoothFeatureProvider.java
similarity index 60%
copy from src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java
copy to src/com/android/settings/bluetooth/BluetoothFeatureProvider.java
index b34b407..a6ae31c 100644
--- a/src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java
+++ b/src/com/android/settings/bluetooth/BluetoothFeatureProvider.java
@@ -14,10 +14,19 @@
  * limitations under the License.
  */
 
-package com.android.settings.core.lifecycle.events;
+package com.android.settings.bluetooth;
 
-import android.view.MenuItem;
+/**
+ * Feature provider for bluetooth feature
+ */
+public interface BluetoothFeatureProvider {
+    /**
+     * @return whether additional pairing page is enabled
+     */
+    boolean isPairingPageEnabled();
 
-public interface OnOptionsItemSelected {
-    boolean onOptionsItemSelected(MenuItem menuItem);
+    /**
+     * @return whether device details should be shown as a separate page (true) or a dialog (false)
+     */
+    boolean isDeviceDetailPageEnabled();
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothFeatureProviderImpl.java b/src/com/android/settings/bluetooth/BluetoothFeatureProviderImpl.java
new file mode 100644
index 0000000..8d9e1c4
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothFeatureProviderImpl.java
@@ -0,0 +1,17 @@
+package com.android.settings.bluetooth;
+
+/**
+ * Impl for bluetooth feature provider
+ */
+public class BluetoothFeatureProviderImpl implements BluetoothFeatureProvider {
+
+    @Override
+    public boolean isPairingPageEnabled() {
+        return false;
+    }
+
+    @Override
+    public boolean isDeviceDetailPageEnabled() {
+        return false;
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java
index 508d6c9..6d474ee 100644
--- a/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java
@@ -15,22 +15,27 @@
  */
 package com.android.settings.bluetooth;
 
+import android.app.Fragment;
 import android.content.Context;
+import android.os.UserHandle;
+import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
-import com.android.settings.core.lifecycle.events.OnStart;
-import com.android.settings.core.lifecycle.events.OnStop;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.widget.MasterSwitchController;
 import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
+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.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
 
 public class BluetoothMasterSwitchPreferenceController extends PreferenceController
         implements OnSummaryChangeListener,
@@ -43,19 +48,27 @@
     private BluetoothEnabler mBluetoothEnabler;
     private BluetoothSummaryUpdater mSummaryUpdater;
     private RestrictionUtils mRestrictionUtils;
+    private Fragment mFragment;
+    private SettingsActivity mActivity;
+    private BluetoothFeatureProvider mBluetoothFeatureProvider;
 
     public BluetoothMasterSwitchPreferenceController(Context context,
-            LocalBluetoothManager bluetoothManager) {
-        this(context, bluetoothManager, new RestrictionUtils());
+            LocalBluetoothManager bluetoothManager, Fragment fragment, SettingsActivity activity) {
+        this(context, bluetoothManager, new RestrictionUtils(), fragment, activity);
     }
 
     @VisibleForTesting
     public BluetoothMasterSwitchPreferenceController(Context context,
-            LocalBluetoothManager bluetoothManager, RestrictionUtils restrictionUtils) {
+            LocalBluetoothManager bluetoothManager, RestrictionUtils restrictionUtils,
+            Fragment fragment, SettingsActivity activity) {
         super(context);
         mBluetoothManager = bluetoothManager;
         mSummaryUpdater = new BluetoothSummaryUpdater(mContext, this, mBluetoothManager);
         mRestrictionUtils = restrictionUtils;
+        mFragment = fragment;
+        mActivity = activity;
+        mBluetoothFeatureProvider = FeatureFactory.getFactory(
+                mContext).getBluetoothFeatureProvider(mContext);
     }
 
     @Override
@@ -63,10 +76,23 @@
         super.displayPreference(screen);
         mBtPreference = (MasterSwitchPreference) screen.findPreference(KEY_TOGGLE_BLUETOOTH);
         mBluetoothEnabler = new BluetoothEnabler(mContext,
-            new MasterSwitchController(mBtPreference),
-            FeatureFactory.getFactory(mContext).getMetricsFeatureProvider(), mBluetoothManager,
-            MetricsEvent.ACTION_SETTINGS_MASTER_SWITCH_BLUETOOTH_TOGGLE,
-            mRestrictionUtils);
+                new MasterSwitchController(mBtPreference),
+                FeatureFactory.getFactory(mContext).getMetricsFeatureProvider(), mBluetoothManager,
+                MetricsEvent.ACTION_SETTINGS_MASTER_SWITCH_BLUETOOTH_TOGGLE,
+                mRestrictionUtils);
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (KEY_TOGGLE_BLUETOOTH.equals(preference.getKey())) {
+            final String fragmentClass = mBluetoothFeatureProvider.isPairingPageEnabled() ?
+                    BluetoothSettings.class.getName() :
+                    BluetoothSettingsObsolete.class.getName();
+            mActivity.startPreferencePanelAsUser(mFragment, fragmentClass, null, R.string.bluetooth,
+                    null, new UserHandle(UserHandle.myUserId()));
+            return true;
+        }
+        return super.handlePreferenceTreeClick(preference);
     }
 
     @Override
@@ -79,6 +105,7 @@
         return KEY_TOGGLE_BLUETOOTH;
     }
 
+    @Override
     public void onResume() {
         mSummaryUpdater.register(true);
     }
diff --git a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
index 5a3bc36..484d4b3 100644
--- a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
@@ -58,7 +58,7 @@
 
     // accessed from inner class (not private to avoid thunks)
     static final String TAG = "BluetoothNameDialogFragment";
-    final LocalBluetoothAdapter mLocalAdapter;
+    LocalBluetoothAdapter mLocalAdapter;
     EditText mDeviceNameView;
 
     // This flag is set when the name is updated by code, to distinguish from user changes
@@ -85,17 +85,20 @@
         }
     };
 
-    public BluetoothNameDialogFragment() {
-        LocalBluetoothManager localManager = Utils.getLocalBtManager(getActivity());
-        mLocalAdapter = localManager.getBluetoothAdapter();
-    }
-
     @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.DIALOG_BLUETOOTH_RENAME;
     }
 
     @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        LocalBluetoothManager localManager = Utils.getLocalBtManager(getActivity());
+        mLocalAdapter = localManager.getBluetoothAdapter();
+    }
+
+    @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         String deviceName = mLocalAdapter.getName();
         if (savedInstanceState != null) {
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
new file mode 100644
index 0000000..987fd3b
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
@@ -0,0 +1,203 @@
+/*
+ * 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.bluetooth;
+
+import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.search.Indexable;
+import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.widget.FooterPreference;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * BluetoothPairingDetail is a page to scan bluetooth devices and pair them.
+ */
+public class BluetoothPairingDetail extends DeviceListPreferenceFragment implements
+        Indexable {
+    private static final String TAG = "BluetoothPairingDetail";
+
+    @VisibleForTesting
+    static final String KEY_AVAIL_DEVICES = "available_devices";
+    @VisibleForTesting
+    static final String KEY_FOOTER_PREF = "footer_preference";
+
+    @VisibleForTesting
+    BluetoothDeviceNamePreferenceController mDeviceNamePrefController;
+    @VisibleForTesting
+    BluetoothProgressCategory mAvailableDevicesCategory;
+    @VisibleForTesting
+    FooterPreference mFooterPreference;
+
+    private boolean mInitialScanStarted;
+
+    public BluetoothPairingDetail() {
+        super(DISALLOW_CONFIG_BLUETOOTH);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        mInitialScanStarted = false;
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        if (mLocalAdapter != null) {
+            updateContent(mLocalAdapter.getBluetoothState());
+            mAvailableDevicesCategory.setProgress(mLocalAdapter.isDiscovering());
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+
+        // Make the device only visible to connected devices.
+        mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
+        disableScanning();
+    }
+
+    @Override
+    void initPreferencesFromPreferenceScreen() {
+        mAvailableDevicesCategory = (BluetoothProgressCategory) findPreference(KEY_AVAIL_DEVICES);
+        mFooterPreference = (FooterPreference) findPreference(KEY_FOOTER_PREF);
+        mFooterPreference.setSelectable(false);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        //TODO(b/38383542): add bluetooth pairing category
+        return MetricsEvent.BLUETOOTH;
+    }
+
+    @Override
+    void enableScanning() {
+        // Clear all device states before first scan
+        if (!mInitialScanStarted) {
+            if (mAvailableDevicesCategory != null) {
+                removeAllDevices();
+            }
+            mLocalManager.getCachedDeviceManager().clearNonBondedDevices();
+            mInitialScanStarted = true;
+        }
+        super.enableScanning();
+    }
+
+    @Override
+    void onDevicePreferenceClick(BluetoothDevicePreference btPreference) {
+        disableScanning();
+        super.onDevicePreferenceClick(btPreference);
+    }
+
+    @Override
+    public void onScanningStateChanged(boolean started) {
+        super.onScanningStateChanged(started);
+        started |= mScanEnabled;
+        mAvailableDevicesCategory.setProgress(started);
+    }
+
+    @VisibleForTesting
+    void updateContent(int bluetoothState) {
+        switch (bluetoothState) {
+            case BluetoothAdapter.STATE_ON:
+                mDevicePreferenceMap.clear();
+                mLocalAdapter.setBluetoothEnabled(true);
+
+                addDeviceCategory(mAvailableDevicesCategory,
+                        R.string.bluetooth_preference_found_devices,
+                        BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER, mInitialScanStarted);
+                updateFooterPreference(mFooterPreference);
+                // mLocalAdapter.setScanMode is internally synchronized so it is okay for multiple
+                // threads to execute.
+                mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
+                enableScanning();
+                break;
+
+            case BluetoothAdapter.STATE_OFF:
+                finish();
+                break;
+        }
+    }
+
+    @Override
+    public void onBluetoothStateChanged(int bluetoothState) {
+        super.onBluetoothStateChanged(bluetoothState);
+        updateContent(bluetoothState);
+    }
+
+    @Override
+    public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
+        if (bondState == BluetoothDevice.BOND_BONDED) {
+            // If one device is connected(bonded), then close this fragment.
+            finish();
+            return;
+        }
+        if (mSelectedDevice != null && cachedDevice != null) {
+            BluetoothDevice device = cachedDevice.getDevice();
+            if (device != null && mSelectedDevice.equals(device)
+                    && bondState == BluetoothDevice.BOND_NONE) {
+                // If currently selected device failed to bond, restart scanning
+                enableScanning();
+            }
+        }
+    }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_bluetooth;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.bluetooth_pairing_detail;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        List<PreferenceController> controllers = new ArrayList<>();
+        mDeviceNamePrefController = new BluetoothDeviceNamePreferenceController(context,
+                this, getLifecycle());
+        controllers.add(mDeviceNamePrefController);
+
+        return controllers;
+    }
+
+    @Override
+    public String getDeviceListKey() {
+        return KEY_AVAIL_DEVICES;
+    }
+
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java
new file mode 100644
index 0000000..ab99aad
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java
@@ -0,0 +1,84 @@
+/*
+ * 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.bluetooth;
+
+import android.content.Context;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.Preference;
+import android.os.UserHandle;
+
+import com.android.settings.SettingsActivity;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.R;
+
+
+/**
+ * Controller that shows and updates the bluetooth device name
+ */
+public class BluetoothPairingPreferenceController extends PreferenceController {
+    private static final String TAG = "BluetoothPairingPrefCtrl";
+
+    public static final String KEY_PAIRING = "pref_bt_pairing";
+    private PreferenceFragment mFragment;
+    private SettingsActivity mActivity;
+    private Preference mPreference;
+
+    public BluetoothPairingPreferenceController(Context context, PreferenceFragment fragment,
+            SettingsActivity activity) {
+        super(context);
+        mFragment = fragment;
+        mActivity = activity;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_PAIRING;
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (KEY_PAIRING.equals(preference.getKey())) {
+            mActivity.startPreferencePanelAsUser(mFragment, BluetoothPairingDetail.class.getName(),
+                    null, R.string.bluetooth_pairing_page_title, null,
+                    new UserHandle(UserHandle.myUserId()));
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Create pairing preference to jump to pairing page
+     *
+     * @return bluetooth preference that created in this method
+     */
+    public Preference createBluetoothPairingPreference(int order) {
+        mPreference = new Preference(mFragment.getPreferenceScreen().getContext());
+        mPreference.setKey(KEY_PAIRING);
+        mPreference.setIcon(R.drawable.ic_add);
+        mPreference.setOrder(order);
+        mPreference.setTitle(R.string.bluetooth_pairing_pref_title);
+
+        return mPreference;
+    }
+
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 317a350..f8648ef 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -17,21 +17,21 @@
 package com.android.settings.bluetooth;
 
 import android.app.Activity;
+import android.app.Fragment;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
-import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.os.SystemProperties;
 import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceScreen;
-import android.text.BidiFormatter;
 import android.text.Spannable;
 import android.text.style.TextAppearanceSpan;
 import android.util.Log;
@@ -45,23 +45,25 @@
 import com.android.settings.LinkifyUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
+import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.location.ScanningSettings;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.widget.FooterPreference;
 import com.android.settings.widget.GearPreference;
 import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
 import com.android.settings.widget.SwitchBar;
 import com.android.settings.widget.SwitchBarController;
 import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.widget.FooterPreference;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 
 import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
@@ -69,13 +71,12 @@
 /**
  * BluetoothSettings is the Settings screen for Bluetooth configuration and
  * connection management.
+ *
  */
-public final class BluetoothSettings extends DeviceListPreferenceFragment implements Indexable {
+public class BluetoothSettings extends DeviceListPreferenceFragment implements Indexable {
     private static final String TAG = "BluetoothSettings";
 
-    private static final int MENU_ID_SCAN = Menu.FIRST;
-    private static final int MENU_ID_RENAME_DEVICE = Menu.FIRST + 1;
-    private static final int MENU_ID_SHOW_RECEIVED = Menu.FIRST + 2;
+    private static final int MENU_ID_SHOW_RECEIVED = Menu.FIRST + 1;
 
     /* Private intent to show the list of received files */
     private static final String BTOPP_ACTION_OPEN_RECEIVED_FILES =
@@ -83,56 +84,31 @@
     private static final String BTOPP_PACKAGE =
             "com.android.bluetooth";
 
-    private static final String KEY_PAIRED_DEVICES = "paired_devices";
+    private static final int PAIRED_DEVICE_ORDER = 1;
+    private static final int PAIRING_PREF_ORDER = 2;
 
-    private static View mSettingsDialogView = null;
+    @VisibleForTesting
+    static final String KEY_PAIRED_DEVICES = "paired_devices";
+    @VisibleForTesting
+    static final String KEY_FOOTER_PREF = "footer_preference";
 
+    @VisibleForTesting
+    PreferenceGroup mPairedDevicesCategory;
+    @VisibleForTesting
+    FooterPreference mFooterPreference;
+    private Preference mPairingPreference;
     private BluetoothEnabler mBluetoothEnabler;
 
-    private PreferenceGroup mPairedDevicesCategory;
-    private PreferenceGroup mAvailableDevicesCategory;
-    private boolean mAvailableDevicesCategoryIsPresent;
-
-    private boolean mInitialScanStarted;
-    private boolean mInitiateDiscoverable;
-
     private SwitchBar mSwitchBar;
 
     private final IntentFilter mIntentFilter;
+    private BluetoothDeviceNamePreferenceController mDeviceNamePrefController;
+    @VisibleForTesting
+    BluetoothPairingPreferenceController mPairingPrefController;
 
     // For Search
-    private static final String DATA_KEY_REFERENCE = "main_toggle_bluetooth";
-
-    // accessed from inner class (not private to avoid thunks)
-    FooterPreference mMyDevicePreference;
-
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            final String action = intent.getAction();
-            final int state =
-                    intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR);
-
-            if (action.equals(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED)) {
-                updateDeviceName(context);
-            }
-
-            if (state == BluetoothAdapter.STATE_ON) {
-                mInitiateDiscoverable = true;
-            }
-        }
-
-        private void updateDeviceName(Context context) {
-            if (mLocalAdapter.isEnabled() && mMyDevicePreference != null) {
-                final Resources res = context.getResources();
-                final Locale locale = res.getConfiguration().getLocales().get(0);
-                final BidiFormatter bidiFormatter = BidiFormatter.getInstance(locale);
-                mMyDevicePreference.setTitle(res.getString(
-                        R.string.bluetooth_is_visible_message,
-                        bidiFormatter.unicodeWrap(mLocalAdapter.getName())));
-            }
-        }
-    };
+    @VisibleForTesting
+    static final String DATA_KEY_REFERENCE = "main_toggle_bluetooth";
 
     public BluetoothSettings() {
         super(DISALLOW_CONFIG_BLUETOOTH);
@@ -147,15 +123,13 @@
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        mInitialScanStarted = false;
-        mInitiateDiscoverable = true;
 
         final SettingsActivity activity = (SettingsActivity) getActivity();
         mSwitchBar = activity.getSwitchBar();
 
         mBluetoothEnabler = new BluetoothEnabler(activity, new SwitchBarController(mSwitchBar),
-            mMetricsFeatureProvider, Utils.getLocalBtManager(activity),
-            MetricsEvent.ACTION_BLUETOOTH_TOGGLE);
+                mMetricsFeatureProvider, Utils.getLocalBtManager(activity),
+                MetricsEvent.ACTION_BLUETOOTH_TOGGLE);
         mBluetoothEnabler.setupSwitchController();
     }
 
@@ -167,23 +141,11 @@
     }
 
     @Override
-    void addPreferencesForActivity() {
-        addPreferencesFromResource(R.xml.bluetooth_settings);
-        final Context prefContext = getPrefContext();
-        mPairedDevicesCategory = new PreferenceCategory(prefContext);
-        mPairedDevicesCategory.setKey(KEY_PAIRED_DEVICES);
-        mPairedDevicesCategory.setOrder(1);
-        getPreferenceScreen().addPreference(mPairedDevicesCategory);
-
-        mAvailableDevicesCategory = new BluetoothProgressCategory(prefContext);
-        mAvailableDevicesCategory.setSelectable(false);
-        mAvailableDevicesCategory.setOrder(2);
-        getPreferenceScreen().addPreference(mAvailableDevicesCategory);
-
-        mMyDevicePreference = mFooterPreferenceMixin.createFooterPreference();
-        mMyDevicePreference.setSelectable(false);
-
-        setHasOptionsMenu(true);
+    void initPreferencesFromPreferenceScreen() {
+        mPairingPreference = mPairingPrefController.createBluetoothPairingPreference(
+                PAIRING_PREF_ORDER);
+        mFooterPreference = (FooterPreference) findPreference(KEY_FOOTER_PREF);
+        mPairedDevicesCategory = (PreferenceGroup) findPreference(KEY_PAIRED_DEVICES);
     }
 
     @Override
@@ -194,19 +156,14 @@
             mBluetoothEnabler.resume(getActivity());
         }
         super.onStart();
-
-        mInitiateDiscoverable = true;
-
         if (isUiRestricted()) {
-            setDeviceListGroup(getPreferenceScreen());
+            getPreferenceScreen().removeAll();
             if (!isUiRestrictedByOnlyAdmin()) {
                 getEmptyTextView().setText(R.string.bluetooth_empty_list_user_restricted);
             }
-            removeAllDevices();
             return;
         }
 
-        getActivity().registerReceiver(mReceiver, mIntentFilter);
         if (mLocalAdapter != null) {
             updateContent(mLocalAdapter.getBluetoothState());
         }
@@ -225,8 +182,6 @@
         if (isUiRestricted()) {
             return;
         }
-
-        getActivity().unregisterReceiver(mReceiver);
     }
 
     @Override
@@ -235,16 +190,6 @@
         // If the user is not allowed to configure bluetooth, do not show the menu.
         if (isUiRestricted()) return;
 
-        boolean bluetoothIsEnabled = mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON;
-        boolean isDiscovering = mLocalAdapter.isDiscovering();
-        int textId = isDiscovering ? R.string.bluetooth_searching_for_devices :
-                R.string.bluetooth_search_for_devices;
-        menu.add(Menu.NONE, MENU_ID_SCAN, 0, textId)
-                .setEnabled(bluetoothIsEnabled && !isDiscovering)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-        menu.add(Menu.NONE, MENU_ID_RENAME_DEVICE, 0, R.string.bluetooth_rename_device)
-                .setEnabled(bluetoothIsEnabled)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
         menu.add(Menu.NONE, MENU_ID_SHOW_RECEIVED, 0, R.string.bluetooth_show_received_files)
                 .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
         super.onCreateOptionsMenu(menu, inflater);
@@ -253,21 +198,6 @@
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case MENU_ID_SCAN:
-                if (mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON) {
-                    mMetricsFeatureProvider.action(getActivity(),
-                            MetricsEvent.ACTION_BLUETOOTH_SCAN);
-                    startScanning();
-                }
-                return true;
-
-            case MENU_ID_RENAME_DEVICE:
-                mMetricsFeatureProvider.action(getActivity(),
-                        MetricsEvent.ACTION_BLUETOOTH_RENAME);
-                new BluetoothNameDialogFragment().show(
-                        getFragmentManager(), "rename device");
-                return true;
-
             case MENU_ID_SHOW_RECEIVED:
                 mMetricsFeatureProvider.action(getActivity(),
                         MetricsEvent.ACTION_BLUETOOTH_FILES);
@@ -279,108 +209,37 @@
         return super.onOptionsItemSelected(item);
     }
 
-    private void startScanning() {
-        if (isUiRestricted()) {
-            return;
-        }
-
-        if (!mAvailableDevicesCategoryIsPresent) {
-            getPreferenceScreen().addPreference(mAvailableDevicesCategory);
-            mAvailableDevicesCategoryIsPresent = true;
-        }
-
-        if (mAvailableDevicesCategory != null) {
-            setDeviceListGroup(mAvailableDevicesCategory);
-            removeAllDevices();
-        }
-
-        mLocalManager.getCachedDeviceManager().clearNonBondedDevices();
-        mAvailableDevicesCategory.removeAll();
-        mInitialScanStarted = true;
-        mLocalAdapter.startScanning(true);
-    }
-
     @Override
-    void onDevicePreferenceClick(BluetoothDevicePreference btPreference) {
-        mLocalAdapter.stopScanning();
-        super.onDevicePreferenceClick(btPreference);
-    }
-
-    private void addDeviceCategory(PreferenceGroup preferenceGroup, int titleId,
-            BluetoothDeviceFilter.Filter filter, boolean addCachedDevices) {
-        cacheRemoveAllPrefs(preferenceGroup);
-        preferenceGroup.setTitle(titleId);
-        setFilter(filter);
-        setDeviceListGroup(preferenceGroup);
-        if (addCachedDevices) {
-            addCachedDevices();
-        }
-        preferenceGroup.setEnabled(true);
-        removeCachedPrefs(preferenceGroup);
+    public String getDeviceListKey() {
+        return KEY_PAIRED_DEVICES;
     }
 
     private void updateContent(int bluetoothState) {
-        final PreferenceScreen preferenceScreen = getPreferenceScreen();
         int messageId = 0;
 
         switch (bluetoothState) {
             case BluetoothAdapter.STATE_ON:
+                displayEmptyMessage(false);
                 mDevicePreferenceMap.clear();
 
                 if (isUiRestricted()) {
                     messageId = R.string.bluetooth_empty_list_user_restricted;
                     break;
                 }
-                getPreferenceScreen().removeAll();
-                getPreferenceScreen().addPreference(mPairedDevicesCategory);
-                getPreferenceScreen().addPreference(mAvailableDevicesCategory);
-                getPreferenceScreen().addPreference(mMyDevicePreference);
 
-                // Paired devices category
                 addDeviceCategory(mPairedDevicesCategory,
                         R.string.bluetooth_preference_paired_devices,
                         BluetoothDeviceFilter.BONDED_DEVICE_FILTER, true);
-                int numberOfPairedDevices = mPairedDevicesCategory.getPreferenceCount();
-
-                if (isUiRestricted() || numberOfPairedDevices <= 0) {
-                    if (preferenceScreen.findPreference(KEY_PAIRED_DEVICES) != null) {
-                        preferenceScreen.removePreference(mPairedDevicesCategory);
-                    }
-                } else {
-                    if (preferenceScreen.findPreference(KEY_PAIRED_DEVICES) == null) {
-                        preferenceScreen.addPreference(mPairedDevicesCategory);
-                    }
-                }
-
-                // Available devices category
-                addDeviceCategory(mAvailableDevicesCategory,
-                        R.string.bluetooth_preference_found_devices,
-                        BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER, mInitialScanStarted);
-
-                if (!mInitialScanStarted) {
-                    startScanning();
-                }
-
-                final Resources res = getResources();
-                final Locale locale = res.getConfiguration().getLocales().get(0);
-                final BidiFormatter bidiFormatter = BidiFormatter.getInstance(locale);
-                mMyDevicePreference.setTitle(res.getString(
-                        R.string.bluetooth_is_visible_message,
-                        bidiFormatter.unicodeWrap(mLocalAdapter.getName())));
+                mPairedDevicesCategory.addPreference(mPairingPreference);
+                updateFooterPreference(mFooterPreference);
 
                 getActivity().invalidateOptionsMenu();
-
-                // mLocalAdapter.setScanMode is internally synchronized so it is okay for multiple
-                // threads to execute.
-                if (mInitiateDiscoverable) {
-                    // Make the device visible to other devices.
-                    mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
-                    mInitiateDiscoverable = false;
-                }
+                mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
                 return; // not break
 
             case BluetoothAdapter.STATE_TURNING_OFF:
                 messageId = R.string.bluetooth_turning_off;
+                mLocalAdapter.stopScanning();
                 break;
 
             case BluetoothAdapter.STATE_OFF:
@@ -392,12 +251,10 @@
 
             case BluetoothAdapter.STATE_TURNING_ON:
                 messageId = R.string.bluetooth_turning_on;
-                mInitialScanStarted = false;
                 break;
         }
 
-        setDeviceListGroup(preferenceScreen);
-        removeAllDevices();
+        displayEmptyMessage(true);
         if (messageId != 0) {
             getEmptyTextView().setText(messageId);
         }
@@ -436,18 +293,21 @@
                 }
             });
         }
-        getPreferenceScreen().removeAll();
         setTextSpan(emptyView.getText(), briefText);
     }
 
+    @VisibleForTesting
+    void displayEmptyMessage(boolean display) {
+        final Activity activity = getActivity();
+        activity.findViewById(android.R.id.list_container).setVisibility(
+                display ? View.INVISIBLE : View.VISIBLE);
+        activity.findViewById(android.R.id.empty).setVisibility(
+                display ? View.VISIBLE : View.GONE);
+    }
+
     @Override
     public void onBluetoothStateChanged(int bluetoothState) {
         super.onBluetoothStateChanged(bluetoothState);
-        // If BT is turned off/on staying in the same BT Settings screen
-        // discoverability to be set again
-        if (BluetoothAdapter.STATE_ON == bluetoothState) {
-            mInitiateDiscoverable = true;
-        }
         updateContent(bluetoothState);
     }
 
@@ -455,15 +315,14 @@
     public void onScanningStateChanged(boolean started) {
         super.onScanningStateChanged(started);
         // Update options' enabled state
-        if (getActivity() != null) {
-            getActivity().invalidateOptionsMenu();
+        final Activity activity = getActivity();
+        if (activity != null) {
+            activity.invalidateOptionsMenu();
         }
     }
 
     @Override
     public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
-        setDeviceListGroup(getPreferenceScreen());
-        removeAllDevices();
         updateContent(mLocalAdapter.getBluetoothState());
     }
 
@@ -472,11 +331,16 @@
         if (text instanceof Spannable) {
             Spannable boldSpan = (Spannable) text;
             boldSpan.setSpan(
-                new TextAppearanceSpan(getActivity(), android.R.style.TextAppearance_Medium), 0,
-                briefText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                    new TextAppearanceSpan(getActivity(), android.R.style.TextAppearance_Medium), 0,
+                    briefText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
     }
 
+    @VisibleForTesting
+    void setLocalBluetoothAdapter(LocalBluetoothAdapter localAdapter) {
+        mLocalAdapter = localAdapter;
+    }
+
     private final GearPreference.OnGearClickListener mDeviceProfilesListener = pref -> {
         // User clicked on advanced options icon for a device in the list
         if (!(pref instanceof BluetoothDevicePreference)) {
@@ -490,12 +354,28 @@
             return;
         }
         final Bundle args = new Bundle();
-        args.putString(DeviceProfilesSettings.ARG_DEVICE_ADDRESS,
-                device.getDevice().getAddress());
-        final DeviceProfilesSettings profileSettings = new DeviceProfilesSettings();
-        profileSettings.setArguments(args);
-        profileSettings.show(getFragmentManager(),
-                DeviceProfilesSettings.class.getSimpleName());
+        Context context = getActivity();
+        boolean useDetailPage = FeatureFactory.getFactory(context).getBluetoothFeatureProvider(
+                context).isDeviceDetailPageEnabled();
+        if (!useDetailPage) {
+            // Old version - uses a dialog.
+            args.putString(DeviceProfilesSettings.ARG_DEVICE_ADDRESS,
+                    device.getDevice().getAddress());
+            final DeviceProfilesSettings profileSettings = new DeviceProfilesSettings();
+            profileSettings.setArguments(args);
+            profileSettings.show(getFragmentManager(),
+                    DeviceProfilesSettings.class.getSimpleName());
+        } else {
+            // New version - uses a separate screen.
+            args.putString(BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS,
+                    device.getDevice().getAddress());
+            BluetoothDeviceDetailsFragment fragment = new BluetoothDeviceDetailsFragment();
+            final SettingsActivity activity =
+                    (SettingsActivity) BluetoothSettings.this.getActivity();
+            activity.startPreferencePanel(this,
+                    BluetoothDeviceDetailsFragment.class.getName(), args,
+                    R.string.device_details_title, null, null, 0);
+        }
     };
 
     /**
@@ -505,6 +385,7 @@
      */
     @Override
     void initDevicePreference(BluetoothDevicePreference preference) {
+        preference.setOrder(PAIRED_DEVICE_ORDER);
         CachedBluetoothDevice cachedDevice = preference.getCachedDevice();
         if (cachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) {
             // Only paired device have an associated advanced settings screen
@@ -517,6 +398,29 @@
         return R.string.help_url_bluetooth;
     }
 
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.bluetooth_settings;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        List<PreferenceController> controllers = new ArrayList<>();
+        mDeviceNamePrefController = new BluetoothDeviceNamePreferenceController(context,
+                this, getLifecycle());
+        mPairingPrefController = new BluetoothPairingPreferenceController(context, this,
+                (SettingsActivity) getActivity());
+        controllers.add(mDeviceNamePrefController);
+        controllers.add(mPairingPrefController);
+
+        return controllers;
+    }
+
     @VisibleForTesting
     static class SummaryProvider implements SummaryLoader.SummaryProvider, OnSummaryChangeListener {
 
@@ -575,23 +479,18 @@
                     data.key = DATA_KEY_REFERENCE;
                     result.add(data);
 
-                    // Add cached paired BT devices
-                    LocalBluetoothManager lbtm = Utils.getLocalBtManager(context);
-                    // LocalBluetoothManager.getInstance can return null if the device does not
-                    // support bluetooth (e.g. the emulator).
-                    if (lbtm != null) {
-                        Set<BluetoothDevice> bondedDevices =
-                                lbtm.getBluetoothAdapter().getBondedDevices();
-
-                        for (BluetoothDevice device : bondedDevices) {
-                            data = new SearchIndexableRaw(context);
-                            data.title = device.getName();
-                            data.screenTitle = res.getString(R.string.bluetooth_settings);
-                            data.enabled = enabled;
-                            result.add(data);
-                        }
-                    }
+                    // Removed paired bluetooth device indexing. See BluetoothSettingsObsolete.java.
                     return result;
                 }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    List<String> keys = super.getNonIndexableKeys(context);
+                    if (!FeatureFactory.getFactory(context).getBluetoothFeatureProvider(
+                            context).isPairingPageEnabled()) {
+                        keys.add(DATA_KEY_REFERENCE);
+                    }
+                    return keys;
+                }
             };
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothSettingsObsolete.java b/src/com/android/settings/bluetooth/BluetoothSettingsObsolete.java
new file mode 100644
index 0000000..207d313
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothSettingsObsolete.java
@@ -0,0 +1,625 @@
+/*
+ * 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.bluetooth;
+
+import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
+
+import android.app.Activity;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceGroup;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.BidiFormatter;
+import android.text.Spannable;
+import android.text.style.TextAppearanceSpan;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.TextView;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.LinkifyUtils;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.location.ScanningSettings;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.widget.GearPreference;
+import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
+import com.android.settings.widget.SwitchBar;
+import com.android.settings.widget.SwitchBarController;
+import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.widget.FooterPreference;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * BluetoothSettingsObsolete is the Settings screen for Bluetooth configuration and
+ * connection management.
+ *
+ * This fragment stores old implementation of {@link BluetoothSettings} and is
+ * deprecated, please use {@link BluetoothSettings} instead.
+ */
+@Deprecated
+public class BluetoothSettingsObsolete extends DeviceListPreferenceObsoleteFragment
+        implements Indexable {
+    private static final String TAG = "BluetoothSettingsObsolete";
+
+    private static final int MENU_ID_SCAN = Menu.FIRST;
+    private static final int MENU_ID_SHOW_RECEIVED = Menu.FIRST + 1;
+
+    /* Private intent to show the list of received files */
+    private static final String BTOPP_ACTION_OPEN_RECEIVED_FILES =
+            "android.btopp.intent.action.OPEN_RECEIVED_FILES";
+    private static final String BTOPP_PACKAGE =
+            "com.android.bluetooth";
+
+    private static final String KEY_PAIRED_DEVICES = "paired_devices";
+
+    private static View mSettingsDialogView = null;
+
+    private BluetoothEnabler mBluetoothEnabler;
+
+    private PreferenceGroup mPairedDevicesCategory;
+    private PreferenceGroup mAvailableDevicesCategory;
+    private Preference mDeviceNamePreference;
+    private boolean mAvailableDevicesCategoryIsPresent;
+
+    private boolean mInitialScanStarted;
+    private boolean mInitiateDiscoverable;
+
+    private SwitchBar mSwitchBar;
+
+    private final IntentFilter mIntentFilter;
+    private BluetoothDeviceNamePreferenceController mDeviceNamePrefController;
+
+    // For Search
+    @VisibleForTesting
+    static final String DATA_KEY_REFERENCE = "main_toggle_bluetooth_obsolete";
+
+    // accessed from inner class (not private to avoid thunks)
+    FooterPreference mMyDevicePreference;
+
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            final String action = intent.getAction();
+            final int state =
+                    intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR);
+
+            if (state == BluetoothAdapter.STATE_ON) {
+                mInitiateDiscoverable = true;
+            }
+        }
+    };
+
+    public BluetoothSettingsObsolete() {
+        super(DISALLOW_CONFIG_BLUETOOTH);
+        mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.BLUETOOTH;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        mInitialScanStarted = false;
+        mInitiateDiscoverable = true;
+
+        final SettingsActivity activity = (SettingsActivity) getActivity();
+        mSwitchBar = activity.getSwitchBar();
+
+        mBluetoothEnabler = new BluetoothEnabler(activity, new SwitchBarController(mSwitchBar),
+                mMetricsFeatureProvider, Utils.getLocalBtManager(activity),
+                MetricsEvent.ACTION_BLUETOOTH_TOGGLE);
+        mBluetoothEnabler.setupSwitchController();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+
+        mBluetoothEnabler.teardownSwitchController();
+    }
+
+    @Override
+    void addPreferencesForActivity() {
+        final Context prefContext = getPrefContext();
+
+        mDeviceNamePreference = mDeviceNamePrefController.createBluetoothDeviceNamePreference(
+                getPreferenceScreen(), 1 /* order */);
+
+        mPairedDevicesCategory = new PreferenceCategory(prefContext);
+        mPairedDevicesCategory.setKey(KEY_PAIRED_DEVICES);
+        mPairedDevicesCategory.setOrder(2);
+        getPreferenceScreen().addPreference(mPairedDevicesCategory);
+
+        mAvailableDevicesCategory = new BluetoothProgressCategory(prefContext);
+        mAvailableDevicesCategory.setSelectable(false);
+        mAvailableDevicesCategory.setOrder(3);
+        getPreferenceScreen().addPreference(mAvailableDevicesCategory);
+
+        mMyDevicePreference = mFooterPreferenceMixin.createFooterPreference();
+        mMyDevicePreference.setSelectable(false);
+
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onStart() {
+        // resume BluetoothEnabler before calling super.onStart() so we don't get
+        // any onDeviceAdded() callbacks before setting up view in updateContent()
+        if (mBluetoothEnabler != null) {
+            mBluetoothEnabler.resume(getActivity());
+        }
+        super.onStart();
+
+        mInitiateDiscoverable = true;
+
+        if (isUiRestricted()) {
+            setDeviceListGroup(getPreferenceScreen());
+            if (!isUiRestrictedByOnlyAdmin()) {
+                getEmptyTextView().setText(R.string.bluetooth_empty_list_user_restricted);
+            }
+            removeAllDevices();
+            return;
+        }
+
+        getActivity().registerReceiver(mReceiver, mIntentFilter);
+        if (mLocalAdapter != null) {
+            updateContent(mLocalAdapter.getBluetoothState());
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (mBluetoothEnabler != null) {
+            mBluetoothEnabler.pause();
+        }
+
+        // Make the device only visible to connected devices.
+        mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
+
+        if (isUiRestricted()) {
+            return;
+        }
+
+        getActivity().unregisterReceiver(mReceiver);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (mLocalAdapter == null) return;
+        // If the user is not allowed to configure bluetooth, do not show the menu.
+        if (isUiRestricted()) return;
+
+        boolean bluetoothIsEnabled = mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON;
+        boolean isDiscovering = mLocalAdapter.isDiscovering();
+        int textId = isDiscovering ? R.string.bluetooth_searching_for_devices :
+                R.string.bluetooth_search_for_devices;
+        menu.add(Menu.NONE, MENU_ID_SCAN, 0, textId)
+                .setEnabled(bluetoothIsEnabled && !isDiscovering)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+        menu.add(Menu.NONE, MENU_ID_SHOW_RECEIVED, 0, R.string.bluetooth_show_received_files)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case MENU_ID_SCAN:
+                if (mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON) {
+                    mMetricsFeatureProvider.action(getActivity(),
+                            MetricsEvent.ACTION_BLUETOOTH_SCAN);
+                    startScanning();
+                }
+                return true;
+
+            case MENU_ID_SHOW_RECEIVED:
+                mMetricsFeatureProvider.action(getActivity(),
+                        MetricsEvent.ACTION_BLUETOOTH_FILES);
+                Intent intent = new Intent(BTOPP_ACTION_OPEN_RECEIVED_FILES);
+                intent.setPackage(BTOPP_PACKAGE);
+                getActivity().sendBroadcast(intent);
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void startScanning() {
+        if (isUiRestricted()) {
+            return;
+        }
+
+        if (!mAvailableDevicesCategoryIsPresent) {
+            getPreferenceScreen().addPreference(mAvailableDevicesCategory);
+            mAvailableDevicesCategoryIsPresent = true;
+        }
+
+        if (mAvailableDevicesCategory != null) {
+            setDeviceListGroup(mAvailableDevicesCategory);
+            removeAllDevices();
+        }
+
+        mLocalManager.getCachedDeviceManager().clearNonBondedDevices();
+        mAvailableDevicesCategory.removeAll();
+        mInitialScanStarted = true;
+        mLocalAdapter.startScanning(true);
+    }
+
+    @Override
+    void onDevicePreferenceClick(BluetoothDevicePreference btPreference) {
+        mLocalAdapter.stopScanning();
+        super.onDevicePreferenceClick(btPreference);
+    }
+
+    private void addDeviceCategory(PreferenceGroup preferenceGroup, int titleId,
+            BluetoothDeviceFilter.Filter filter, boolean addCachedDevices) {
+        cacheRemoveAllPrefs(preferenceGroup);
+        preferenceGroup.setTitle(titleId);
+        setFilter(filter);
+        setDeviceListGroup(preferenceGroup);
+        if (addCachedDevices) {
+            addCachedDevices();
+        }
+        preferenceGroup.setEnabled(true);
+        removeCachedPrefs(preferenceGroup);
+    }
+
+    private void updateContent(int bluetoothState) {
+        final PreferenceScreen preferenceScreen = getPreferenceScreen();
+        int messageId = 0;
+
+        switch (bluetoothState) {
+            case BluetoothAdapter.STATE_ON:
+                mDevicePreferenceMap.clear();
+
+                if (isUiRestricted()) {
+                    messageId = R.string.bluetooth_empty_list_user_restricted;
+                    break;
+                }
+                getPreferenceScreen().removeAll();
+                getPreferenceScreen().addPreference(mDeviceNamePreference);
+                getPreferenceScreen().addPreference(mPairedDevicesCategory);
+                getPreferenceScreen().addPreference(mAvailableDevicesCategory);
+                getPreferenceScreen().addPreference(mMyDevicePreference);
+
+                // Paired devices category
+                addDeviceCategory(mPairedDevicesCategory,
+                        R.string.bluetooth_preference_paired_devices,
+                        BluetoothDeviceFilter.BONDED_DEVICE_FILTER, true);
+                int numberOfPairedDevices = mPairedDevicesCategory.getPreferenceCount();
+
+                if (isUiRestricted() || numberOfPairedDevices <= 0) {
+                    if (preferenceScreen.findPreference(KEY_PAIRED_DEVICES) != null) {
+                        preferenceScreen.removePreference(mPairedDevicesCategory);
+                    }
+                } else {
+                    if (preferenceScreen.findPreference(KEY_PAIRED_DEVICES) == null) {
+                        preferenceScreen.addPreference(mPairedDevicesCategory);
+                    }
+                }
+
+                // Available devices category
+                addDeviceCategory(mAvailableDevicesCategory,
+                        R.string.bluetooth_preference_found_devices,
+                        BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER, mInitialScanStarted);
+
+                if (!mInitialScanStarted) {
+                    startScanning();
+                }
+
+                updateMyDevicePreference(mMyDevicePreference);
+                getActivity().invalidateOptionsMenu();
+
+                // mLocalAdapter.setScanMode is internally synchronized so it is okay for multiple
+                // threads to execute.
+                if (mInitiateDiscoverable) {
+                    // Make the device visible to other devices.
+                    mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
+                    mInitiateDiscoverable = false;
+                }
+                return; // not break
+
+            case BluetoothAdapter.STATE_TURNING_OFF:
+                messageId = R.string.bluetooth_turning_off;
+                break;
+
+            case BluetoothAdapter.STATE_OFF:
+                setOffMessage();
+                if (isUiRestricted()) {
+                    messageId = R.string.bluetooth_empty_list_user_restricted;
+                }
+                break;
+
+            case BluetoothAdapter.STATE_TURNING_ON:
+                messageId = R.string.bluetooth_turning_on;
+                mInitialScanStarted = false;
+                break;
+        }
+
+        setDeviceListGroup(preferenceScreen);
+        removeAllDevices();
+        if (messageId != 0) {
+            getEmptyTextView().setText(messageId);
+        }
+        if (!isUiRestricted()) {
+            getActivity().invalidateOptionsMenu();
+        }
+    }
+
+    private void setOffMessage() {
+        final TextView emptyView = getEmptyTextView();
+        if (emptyView == null) {
+            return;
+        }
+        final CharSequence briefText = getText(R.string.bluetooth_empty_list_bluetooth_off);
+
+        final ContentResolver resolver = getActivity().getContentResolver();
+        final boolean bleScanningMode = Settings.Global.getInt(
+                resolver, Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1;
+
+        if (!bleScanningMode) {
+            // Show only the brief text if the scanning mode has been turned off.
+            emptyView.setText(briefText, TextView.BufferType.SPANNABLE);
+        } else {
+            final StringBuilder contentBuilder = new StringBuilder();
+            contentBuilder.append(briefText);
+            contentBuilder.append("\n\n");
+            contentBuilder.append(getText(R.string.ble_scan_notify_text));
+            LinkifyUtils.linkify(emptyView, contentBuilder, new LinkifyUtils.OnClickListener() {
+                @Override
+                public void onClick() {
+                    final SettingsActivity activity =
+                            (SettingsActivity) BluetoothSettingsObsolete.this.getActivity();
+                    activity.startPreferencePanel(BluetoothSettingsObsolete.this,
+                            ScanningSettings.class.getName(), null,
+                            R.string.location_scanning_screen_title, null, null, 0);
+                }
+            });
+        }
+        getPreferenceScreen().removeAll();
+        setTextSpan(emptyView.getText(), briefText);
+    }
+
+    @Override
+    public void onBluetoothStateChanged(int bluetoothState) {
+        super.onBluetoothStateChanged(bluetoothState);
+        // If BT is turned off/on staying in the same BT Settings screen
+        // discoverability to be set again
+        if (BluetoothAdapter.STATE_ON == bluetoothState) {
+            mInitiateDiscoverable = true;
+        }
+        updateContent(bluetoothState);
+    }
+
+    @Override
+    public void onScanningStateChanged(boolean started) {
+        super.onScanningStateChanged(started);
+        // Update options' enabled state
+        if (getActivity() != null) {
+            getActivity().invalidateOptionsMenu();
+        }
+    }
+
+    @Override
+    public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
+        setDeviceListGroup(getPreferenceScreen());
+        removeAllDevices();
+        updateContent(mLocalAdapter.getBluetoothState());
+    }
+
+    @VisibleForTesting
+    void setTextSpan(CharSequence text, CharSequence briefText) {
+        if (text instanceof Spannable) {
+            Spannable boldSpan = (Spannable) text;
+            boldSpan.setSpan(
+                    new TextAppearanceSpan(getActivity(), android.R.style.TextAppearance_Medium), 0,
+                    briefText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+    }
+
+    @VisibleForTesting
+    void updateMyDevicePreference(Preference myDevicePreference) {
+        final BidiFormatter bidiFormatter = BidiFormatter.getInstance();
+
+        myDevicePreference.setTitle(getString(
+                R.string.bluetooth_footer_mac_message,
+                bidiFormatter.unicodeWrap(mLocalAdapter.getAddress())));
+    }
+
+    @VisibleForTesting
+    void setLocalBluetoothAdapter(LocalBluetoothAdapter localAdapter) {
+        mLocalAdapter = localAdapter;
+    }
+
+    private final GearPreference.OnGearClickListener mDeviceProfilesListener = pref -> {
+        // User clicked on advanced options icon for a device in the list
+        if (!(pref instanceof BluetoothDevicePreference)) {
+            Log.w(TAG, "onClick() called for other View: " + pref);
+            return;
+        }
+        final CachedBluetoothDevice device =
+                ((BluetoothDevicePreference) pref).getBluetoothDevice();
+        if (device == null) {
+            Log.w(TAG, "No BT device attached with this pref: " + pref);
+            return;
+        }
+        final Bundle args = new Bundle();
+        args.putString(DeviceProfilesSettings.ARG_DEVICE_ADDRESS,
+                device.getDevice().getAddress());
+        final DeviceProfilesSettings profileSettings = new DeviceProfilesSettings();
+        profileSettings.setArguments(args);
+        profileSettings.show(getFragmentManager(),
+                DeviceProfilesSettings.class.getSimpleName());
+    };
+
+    /**
+     * Add a listener, which enables the advanced settings icon.
+     *
+     * @param preference the newly added preference
+     */
+    @Override
+    void initDevicePreference(BluetoothDevicePreference preference) {
+        CachedBluetoothDevice cachedDevice = preference.getCachedDevice();
+        if (cachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) {
+            // Only paired device have an associated advanced settings screen
+            preference.setOnGearClickListener(mDeviceProfilesListener);
+        }
+    }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_bluetooth;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.bluetooth_settings_obsolete;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        List<PreferenceController> controllers = new ArrayList<>();
+        mDeviceNamePrefController = new BluetoothDeviceNamePreferenceController(context,
+                this, getLifecycle());
+        controllers.add(mDeviceNamePrefController);
+
+        return controllers;
+    }
+
+    @VisibleForTesting
+    static class SummaryProvider implements SummaryLoader.SummaryProvider, OnSummaryChangeListener {
+
+        private final LocalBluetoothManager mBluetoothManager;
+        private final Context mContext;
+        private final SummaryLoader mSummaryLoader;
+
+        @VisibleForTesting
+        BluetoothSummaryUpdater mSummaryUpdater;
+
+        public SummaryProvider(Context context, SummaryLoader summaryLoader,
+                LocalBluetoothManager bluetoothManager) {
+            mBluetoothManager = bluetoothManager;
+            mContext = context;
+            mSummaryLoader = summaryLoader;
+            mSummaryUpdater = new BluetoothSummaryUpdater(mContext, this, mBluetoothManager);
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            mSummaryUpdater.register(listening);
+        }
+
+        @Override
+        public void onSummaryChanged(String summary) {
+            if (mSummaryLoader != null) {
+                mSummaryLoader.setSummary(this, summary);
+            }
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                SummaryLoader summaryLoader) {
+
+            return new SummaryProvider(activity, summaryLoader, Utils.getLocalBtManager(activity));
+        }
+    };
+
+    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableRaw> getRawDataToIndex(Context context,
+                        boolean enabled) {
+
+                    final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
+
+                    final Resources res = context.getResources();
+
+                    // Add fragment title
+                    SearchIndexableRaw data = new SearchIndexableRaw(context);
+                    data.title = res.getString(R.string.bluetooth_settings);
+                    data.screenTitle = res.getString(R.string.bluetooth_settings);
+                    data.key = DATA_KEY_REFERENCE;
+                    result.add(data);
+
+                    // Add cached paired BT devices
+                    LocalBluetoothManager lbtm = Utils.getLocalBtManager(context);
+                    // LocalBluetoothManager.getInstance can return null if the device does not
+                    // support bluetooth (e.g. the emulator).
+                    if (lbtm != null) {
+                        Set<BluetoothDevice> bondedDevices =
+                                lbtm.getBluetoothAdapter().getBondedDevices();
+
+                        for (BluetoothDevice device : bondedDevices) {
+                            data = new SearchIndexableRaw(context);
+                            data.title = device.getName();
+                            data.screenTitle = res.getString(R.string.bluetooth_settings);
+                            data.enabled = enabled;
+                            result.add(data);
+                        }
+                    }
+                    return result;
+                }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    List<String> keys = super.getNonIndexableKeys(context);
+                    if (FeatureFactory.getFactory(context).getBluetoothFeatureProvider(
+                            context).isPairingPageEnabled()) {
+                        keys.add(DATA_KEY_REFERENCE);
+                    }
+                    return keys;
+                }
+
+            };
+}
diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
index c132163..ca06e3c 100644
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -19,12 +19,15 @@
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceGroup;
+import android.text.BidiFormatter;
 import android.util.Log;
 
-import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.dashboard.RestrictedDashboardFragment;
+import com.android.settings.R;
 import com.android.settingslib.bluetooth.BluetoothCallback;
 import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -41,22 +44,26 @@
  * @see BluetoothSettings
  * @see DevicePickerFragment
  */
+// TODO: Refactor this fragment
 public abstract class DeviceListPreferenceFragment extends
-        RestrictedSettingsFragment implements BluetoothCallback {
+        RestrictedDashboardFragment implements BluetoothCallback {
 
     private static final String TAG = "DeviceListPreferenceFragment";
 
-    private static final String KEY_BT_DEVICE_LIST = "bt_device_list";
     private static final String KEY_BT_SCAN = "bt_scan";
 
     private BluetoothDeviceFilter.Filter mFilter;
 
+    @VisibleForTesting
+    boolean mScanEnabled;
+
     BluetoothDevice mSelectedDevice;
 
     LocalBluetoothAdapter mLocalAdapter;
     LocalBluetoothManager mLocalManager;
 
-    private PreferenceGroup mDeviceListGroup;
+    @VisibleForTesting
+    PreferenceGroup mDeviceListGroup;
 
     final WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference> mDevicePreferenceMap =
             new WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference>();
@@ -85,17 +92,13 @@
         }
         mLocalAdapter = mLocalManager.getBluetoothAdapter();
 
-        addPreferencesForActivity();
+        initPreferencesFromPreferenceScreen();
 
-        mDeviceListGroup = (PreferenceCategory) findPreference(KEY_BT_DEVICE_LIST);
+        mDeviceListGroup = (PreferenceCategory) findPreference(getDeviceListKey());
     }
 
-    void setDeviceListGroup(PreferenceGroup preferenceGroup) {
-        mDeviceListGroup = preferenceGroup;
-    }
-
-    /** Add preferences from the subclass. */
-    abstract void addPreferencesForActivity();
+    /** find and update preference that already existed in preference screen */
+    abstract void initPreferencesFromPreferenceScreen();
 
     @Override
     public void onStart() {
@@ -104,8 +107,6 @@
 
         mLocalManager.setForegroundActivity(getActivity());
         mLocalManager.getEventManager().registerCallback(this);
-
-        updateProgressUi(mLocalAdapter.isDiscovering());
     }
 
     @Override
@@ -121,7 +122,6 @@
     }
 
     void removeAllDevices() {
-        mLocalAdapter.stopScanning();
         mDevicePreferenceMap.clear();
         mDeviceListGroup.removeAll();
     }
@@ -156,6 +156,7 @@
         btPreference.onClicked();
     }
 
+    @Override
     public void onDeviceAdded(CachedBluetoothDevice cachedDevice) {
         if (mDevicePreferenceMap.get(cachedDevice) != null) {
             return;
@@ -201,6 +202,16 @@
         // Does nothing by default
     }
 
+    @VisibleForTesting
+    void updateFooterPreference(Preference myDevicePreference) {
+        final BidiFormatter bidiFormatter = BidiFormatter.getInstance();
+
+        myDevicePreference.setTitle(getString(
+                R.string.bluetooth_footer_mac_message,
+                bidiFormatter.unicodeWrap(mLocalAdapter.getAddress())));
+    }
+
+    @Override
     public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) {
         BluetoothDevicePreference preference = mDevicePreferenceMap.remove(cachedDevice);
         if (preference != null) {
@@ -208,21 +219,56 @@
         }
     }
 
+    @VisibleForTesting
+    void enableScanning() {
+        // LocalBluetoothAdapter already handles repeated scan requests
+        mLocalAdapter.startScanning(true);
+        mScanEnabled = true;
+    }
+
+    @VisibleForTesting
+    void disableScanning() {
+        mLocalAdapter.stopScanning();
+        mScanEnabled = false;
+    }
+
+    @Override
     public void onScanningStateChanged(boolean started) {
-        updateProgressUi(started);
-    }
-
-    private void updateProgressUi(boolean start) {
-        if (mDeviceListGroup instanceof BluetoothProgressCategory) {
-            ((BluetoothProgressCategory) mDeviceListGroup).setProgress(start);
+        if (!started && mScanEnabled) {
+            mLocalAdapter.startScanning(true);
         }
     }
 
-    public void onBluetoothStateChanged(int bluetoothState) {
-        if (bluetoothState == BluetoothAdapter.STATE_OFF) {
-            updateProgressUi(false);
+    @Override
+    public void onBluetoothStateChanged(int bluetoothState) {}
+
+    /**
+     * Add bluetooth device preferences to {@code preferenceGroup} which satisfy the {@code filter}
+     *
+     * This method will also (1) set the title for {@code preferenceGroup} and (2) change the
+     * default preferenceGroup and filter
+     * @param preferenceGroup
+     * @param titleId
+     * @param filter
+     * @param addCachedDevices
+     */
+    public void addDeviceCategory(PreferenceGroup preferenceGroup, int titleId,
+            BluetoothDeviceFilter.Filter filter, boolean addCachedDevices) {
+        cacheRemoveAllPrefs(preferenceGroup);
+        preferenceGroup.setTitle(titleId);
+        mDeviceListGroup = preferenceGroup;
+        setFilter(filter);
+        if (addCachedDevices) {
+            addCachedDevices();
         }
+        preferenceGroup.setEnabled(true);
+        removeCachedPrefs(preferenceGroup);
     }
 
     public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) { }
+
+    /**
+     * Return the key of the {@link PreferenceGroup} that contains the bluetooth devices
+     */
+    public abstract String getDeviceListKey();
 }
diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceObsoleteFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceObsoleteFragment.java
new file mode 100644
index 0000000..84d8558
--- /dev/null
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceObsoleteFragment.java
@@ -0,0 +1,232 @@
+/*
+ * 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.bluetooth;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.os.Bundle;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceGroup;
+import android.util.Log;
+
+import com.android.settings.dashboard.RestrictedDashboardFragment;
+import com.android.settingslib.bluetooth.BluetoothCallback;
+import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+
+import java.util.Collection;
+import java.util.WeakHashMap;
+
+/**
+ * Parent class for settings fragments that contain a list of Bluetooth
+ * devices.
+ *
+ * This fragment stores old implementation of {@link DeviceListPreferenceFragment} and is
+ * deprecated, please use {@link DeviceListPreferenceFragment} instead.
+ *
+ * @see BluetoothSettingsObsolete
+ * @see DevicePickerFragment
+ */
+@Deprecated
+public abstract class DeviceListPreferenceObsoleteFragment extends
+        RestrictedDashboardFragment implements BluetoothCallback {
+
+    private static final String TAG = "DeviceListPreferenceFragment";
+
+    private static final String KEY_BT_DEVICE_LIST = "bt_device_list";
+    private static final String KEY_BT_SCAN = "bt_scan";
+
+    private BluetoothDeviceFilter.Filter mFilter;
+
+    BluetoothDevice mSelectedDevice;
+
+    LocalBluetoothAdapter mLocalAdapter;
+    LocalBluetoothManager mLocalManager;
+
+    private PreferenceGroup mDeviceListGroup;
+
+    final WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference> mDevicePreferenceMap =
+            new WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference>();
+
+    DeviceListPreferenceObsoleteFragment(String restrictedKey) {
+        super(restrictedKey);
+        mFilter = BluetoothDeviceFilter.ALL_FILTER;
+    }
+
+    final void setFilter(BluetoothDeviceFilter.Filter filter) {
+        mFilter = filter;
+    }
+
+    final void setFilter(int filterType) {
+        mFilter = BluetoothDeviceFilter.getFilter(filterType);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mLocalManager = Utils.getLocalBtManager(getActivity());
+        if (mLocalManager == null) {
+            Log.e(TAG, "Bluetooth is not supported on this device");
+            return;
+        }
+        mLocalAdapter = mLocalManager.getBluetoothAdapter();
+
+        addPreferencesForActivity();
+
+        mDeviceListGroup = (PreferenceCategory) findPreference(KEY_BT_DEVICE_LIST);
+    }
+
+    void setDeviceListGroup(PreferenceGroup preferenceGroup) {
+        mDeviceListGroup = preferenceGroup;
+    }
+
+    /** Add preferences from the subclass. */
+    abstract void addPreferencesForActivity();
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        if (mLocalManager == null || isUiRestricted()) return;
+
+        mLocalManager.setForegroundActivity(getActivity());
+        mLocalManager.getEventManager().registerCallback(this);
+
+        updateProgressUi(mLocalAdapter.isDiscovering());
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (mLocalManager == null || isUiRestricted()) {
+            return;
+        }
+
+        removeAllDevices();
+        mLocalManager.setForegroundActivity(null);
+        mLocalManager.getEventManager().unregisterCallback(this);
+    }
+
+    void removeAllDevices() {
+        mLocalAdapter.stopScanning();
+        mDevicePreferenceMap.clear();
+        mDeviceListGroup.removeAll();
+    }
+
+    void addCachedDevices() {
+        Collection<CachedBluetoothDevice> cachedDevices =
+                mLocalManager.getCachedDeviceManager().getCachedDevicesCopy();
+        for (CachedBluetoothDevice cachedDevice : cachedDevices) {
+            onDeviceAdded(cachedDevice);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        if (KEY_BT_SCAN.equals(preference.getKey())) {
+            mLocalAdapter.startScanning(true);
+            return true;
+        }
+
+        if (preference instanceof BluetoothDevicePreference) {
+            BluetoothDevicePreference btPreference = (BluetoothDevicePreference) preference;
+            CachedBluetoothDevice device = btPreference.getCachedDevice();
+            mSelectedDevice = device.getDevice();
+            onDevicePreferenceClick(btPreference);
+            return true;
+        }
+
+        return super.onPreferenceTreeClick(preference);
+    }
+
+    void onDevicePreferenceClick(BluetoothDevicePreference btPreference) {
+        btPreference.onClicked();
+    }
+
+    public void onDeviceAdded(CachedBluetoothDevice cachedDevice) {
+        if (mDevicePreferenceMap.get(cachedDevice) != null) {
+            return;
+        }
+
+        // Prevent updates while the list shows one of the state messages
+        if (mLocalAdapter.getBluetoothState() != BluetoothAdapter.STATE_ON) return;
+
+        if (mFilter.matches(cachedDevice.getDevice())) {
+            createDevicePreference(cachedDevice);
+        }
+    }
+
+    void createDevicePreference(CachedBluetoothDevice cachedDevice) {
+        if (mDeviceListGroup == null) {
+            Log.w(TAG, "Trying to create a device preference before the list group/category "
+                    + "exists!");
+            return;
+        }
+
+        String key = cachedDevice.getDevice().getAddress();
+        BluetoothDevicePreference preference = (BluetoothDevicePreference) getCachedPreference(key);
+
+        if (preference == null) {
+            preference = new BluetoothDevicePreference(getPrefContext(), cachedDevice);
+            preference.setKey(key);
+            mDeviceListGroup.addPreference(preference);
+        } else {
+            // Tell the preference it is being re-used in case there is new info in the
+            // cached device.
+            preference.rebind();
+        }
+
+        initDevicePreference(preference);
+        mDevicePreferenceMap.put(cachedDevice, preference);
+    }
+
+    /**
+     * Overridden in {@link BluetoothSettings} to add a listener.
+     * @param preference the newly added preference
+     */
+    void initDevicePreference(BluetoothDevicePreference preference) {
+        // Does nothing by default
+    }
+
+    public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) {
+        BluetoothDevicePreference preference = mDevicePreferenceMap.remove(cachedDevice);
+        if (preference != null) {
+            mDeviceListGroup.removePreference(preference);
+        }
+    }
+
+    public void onScanningStateChanged(boolean started) {
+        updateProgressUi(started);
+    }
+
+    private void updateProgressUi(boolean start) {
+        if (mDeviceListGroup instanceof BluetoothProgressCategory) {
+            ((BluetoothProgressCategory) mDeviceListGroup).setProgress(start);
+        }
+    }
+
+    public void onBluetoothStateChanged(int bluetoothState) {
+        if (bluetoothState == BluetoothAdapter.STATE_OFF) {
+            updateProgressUi(false);
+        }
+    }
+
+    public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) { }
+}
diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 490a3ad..60470c5 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -25,20 +25,23 @@
 import android.os.UserManager;
 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.core.PreferenceController;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 
 import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
 
+import java.util.List;
+
 /**
  * BluetoothSettings is the Settings screen for Bluetooth configuration and
  * connection management.
  */
 public final class DevicePickerFragment extends DeviceListPreferenceFragment {
-    private static final int MENU_ID_REFRESH = Menu.FIRST;
+    private static final String KEY_BT_DEVICE_LIST = "bt_device_list";
+    private static final String TAG = "DevicePickerFragment";
 
     public DevicePickerFragment() {
         super(null /* Not tied to any user restrictions. */);
@@ -47,12 +50,10 @@
     private boolean mNeedAuth;
     private String mLaunchPackage;
     private String mLaunchClass;
-    private boolean mStartScanOnStart;
+    private boolean mScanAllowed;
 
     @Override
-    void addPreferencesForActivity() {
-        addPreferencesFromResource(R.xml.device_picker);
-
+    void initPreferencesFromPreferenceScreen() {
         Intent intent = getActivity().getIntent();
         mNeedAuth = intent.getBooleanExtra(BluetoothDevicePicker.EXTRA_NEED_AUTH, false);
         setFilter(intent.getIntExtra(BluetoothDevicePicker.EXTRA_FILTER_TYPE,
@@ -63,23 +64,10 @@
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        menu.add(Menu.NONE, MENU_ID_REFRESH, 0, R.string.bluetooth_search_for_devices)
-                .setEnabled(true)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
         super.onCreateOptionsMenu(menu, inflater);
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case MENU_ID_REFRESH:
-                mLocalAdapter.startScanning(true);
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
     public int getMetricsCategory() {
         return MetricsEvent.BLUETOOTH_DEVICE_PICKER;
     }
@@ -89,8 +77,7 @@
         super.onCreate(savedInstanceState);
         getActivity().setTitle(getString(R.string.device_picker));
         UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
-        mStartScanOnStart = !um.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)
-                && (savedInstanceState == null);  // don't start scan after rotation
+        mScanAllowed = !um.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH);
         setHasOptionsMenu(true);
     }
 
@@ -98,15 +85,33 @@
     public void onStart() {
         super.onStart();
         addCachedDevices();
-        if (mStartScanOnStart) {
-            mLocalAdapter.startScanning(true);
-            mStartScanOnStart = false;
+        mSelectedDevice = null;
+        if (mScanAllowed) {
+            enableScanning();
+        }
+    }
+
+    @Override
+    public void onStop() {
+        // Try disable scanning no matter what, no effect if enableScanning has not been called
+        disableScanning();
+        super.onStop();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        /* Check if any device was selected, if no device selected
+         * send  ACTION_DEVICE_SELECTED with a null device, otherwise
+         * don't do anything */
+        if (mSelectedDevice == null) {
+            sendDevicePickedIntent(null);
         }
     }
 
     @Override
     void onDevicePreferenceClick(BluetoothDevicePreference btPreference) {
-        mLocalAdapter.stopScanning();
+        disableScanning();
         LocalBluetoothPreferences.persistSelectedDeviceInPicker(
                 getActivity(), mSelectedDevice.getAddress());
         if ((btPreference.getCachedDevice().getBondState() ==
@@ -120,12 +125,15 @@
 
     public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice,
             int bondState) {
+        BluetoothDevice device = cachedDevice.getDevice();
+        if (!device.equals(mSelectedDevice)) {
+            return;
+        }
         if (bondState == BluetoothDevice.BOND_BONDED) {
-            BluetoothDevice device = cachedDevice.getDevice();
-            if (device.equals(mSelectedDevice)) {
-                sendDevicePickedIntent(device);
-                finish();
-            }
+            sendDevicePickedIntent(device);
+            finish();
+        } else if (bondState == BluetoothDevice.BOND_NONE) {
+            enableScanning();
         }
     }
 
@@ -134,10 +142,30 @@
         super.onBluetoothStateChanged(bluetoothState);
 
         if (bluetoothState == BluetoothAdapter.STATE_ON) {
-            mLocalAdapter.startScanning(false);
+            enableScanning();
         }
     }
 
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.device_picker;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return null;
+    }
+
+    @Override
+    public String getDeviceListKey() {
+        return KEY_BT_DEVICE_LIST;
+    }
+
     private void sendDevicePickedIntent(BluetoothDevice device) {
         Intent intent = new Intent(BluetoothDevicePicker.ACTION_DEVICE_SELECTED);
         intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java
index eb194f4..b370c11 100755
--- a/src/com/android/settings/bluetooth/Utils.java
+++ b/src/com/android/settings/bluetooth/Utils.java
@@ -17,20 +17,28 @@
 package com.android.settings.bluetooth;
 
 import android.app.AlertDialog;
+import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.res.Resources;
 import android.support.annotation.VisibleForTesting;
+import android.util.Pair;
 import android.widget.Toast;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.HidProfile;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.LocalBluetoothManager.BluetoothManagerCallback;
+import com.android.settingslib.bluetooth.LocalBluetoothProfile;
 import com.android.settingslib.bluetooth.Utils.ErrorListener;
 
+import java.util.List;
+
 /**
  * Utils is a helper class that contains constants for various
  * Android resource IDs, debug logging flags, and static methods
@@ -141,4 +149,52 @@
             com.android.settingslib.bluetooth.Utils.setErrorListener(mErrorListener);
         }
     };
+
+    static Pair<Integer, String> getBtClassDrawableWithDescription(Resources r,
+            CachedBluetoothDevice cachedDevice) {
+        BluetoothClass btClass = cachedDevice.getBtClass();
+        if (btClass != null) {
+            switch (btClass.getMajorDeviceClass()) {
+                case BluetoothClass.Device.Major.COMPUTER:
+                    return new Pair<Integer, String>(R.drawable.ic_bt_laptop,
+                           r.getString(R.string.bluetooth_talkback_computer));
+
+                case BluetoothClass.Device.Major.PHONE:
+                    return new Pair<Integer, String>(R.drawable.ic_bt_cellphone,
+                            r.getString(R.string.bluetooth_talkback_phone));
+
+                case BluetoothClass.Device.Major.PERIPHERAL:
+                    return new Pair<Integer, String>(HidProfile.getHidClassDrawable(btClass),
+                            r.getString(
+                                    R.string.bluetooth_talkback_input_peripheral));
+
+                case BluetoothClass.Device.Major.IMAGING:
+                    return new Pair<Integer, String>(R.drawable.ic_bt_imaging,
+                            r.getString(R.string.bluetooth_talkback_imaging));
+
+                default:
+                    // unrecognized device class; continue
+            }
+        }
+
+        List<LocalBluetoothProfile> profiles = cachedDevice.getProfiles();
+        for (LocalBluetoothProfile profile : profiles) {
+            int resId = profile.getDrawableResource(btClass);
+            if (resId != 0) {
+                return new Pair<Integer, String>(resId, null);
+            }
+        }
+        if (btClass != null) {
+            if (btClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) {
+                return new Pair<Integer, String>(R.drawable.ic_bt_headset_hfp,
+                        r.getString(R.string.bluetooth_talkback_headset));
+            }
+            if (btClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) {
+                return new Pair<Integer, String>(R.drawable.ic_bt_headphones_a2dp,
+                        r.getString(R.string.bluetooth_talkback_headphone));
+            }
+        }
+        return new Pair<Integer, String>(R.drawable.ic_settings_bluetooth,
+                r.getString(R.string.bluetooth_talkback_bluetooth));
+    }
 }
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index 6a1c06c..52028b3 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
@@ -15,21 +15,25 @@
  */
 package com.android.settings.connecteddevice;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.provider.SearchIndexableResource;
+import android.support.annotation.VisibleForTesting;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
+import com.android.settings.SettingsActivity;
 import com.android.settings.bluetooth.BluetoothMasterSwitchPreferenceController;
 import com.android.settings.bluetooth.Utils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.deviceinfo.UsbBackend;
 import com.android.settings.nfc.NfcPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -51,6 +55,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_connected_devices;
+    }
+
+    @Override
     protected int getPreferenceScreenResId() {
         return R.xml.connected_devices;
     }
@@ -67,13 +76,51 @@
         lifecycle.addObserver(mUsbPrefController);
         controllers.add(mUsbPrefController);
         final BluetoothMasterSwitchPreferenceController bluetoothPreferenceController =
-            new BluetoothMasterSwitchPreferenceController(
-                context, Utils.getLocalBtManager(context));
+                new BluetoothMasterSwitchPreferenceController(
+                        context, Utils.getLocalBtManager(context), this,
+                        (SettingsActivity) getActivity());
         lifecycle.addObserver(bluetoothPreferenceController);
         controllers.add(bluetoothPreferenceController);
         return controllers;
     }
 
+    @VisibleForTesting
+    static class SummaryProvider implements SummaryLoader.SummaryProvider {
+
+        private final Context mContext;
+        private final SummaryLoader mSummaryLoader;
+        private final NfcPreferenceController mNfcPreferenceController;
+
+        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
+            mContext = context;
+            mSummaryLoader = summaryLoader;
+            mNfcPreferenceController = new NfcPreferenceController(context);
+        }
+
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                if (mNfcPreferenceController.isAvailable()) {
+                    mSummaryLoader.setSummary(this,
+                            mContext.getString(R.string.connected_devices_dashboard_summary));
+                } else {
+                    mSummaryLoader.setSummary(this, mContext.getString(
+                            R.string.connected_devices_dashboard_no_nfc_summary));
+                }
+            }
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
+
     /**
      * For Search.
      */
@@ -89,9 +136,8 @@
 
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> keys = super.getNonIndexableKeys(context);
                     PackageManager pm = context.getPackageManager();
-                    final List<String> keys = new ArrayList<String>();
-
                     if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
                         keys.add(NfcPreferenceController.KEY_TOGGLE_NFC);
                         keys.add(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
diff --git a/src/com/android/settings/connecteddevice/UsbModePreferenceController.java b/src/com/android/settings/connecteddevice/UsbModePreferenceController.java
index a98f068..9c9ed12 100644
--- a/src/com/android/settings/connecteddevice/UsbModePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/UsbModePreferenceController.java
@@ -26,10 +26,10 @@
 
 import com.android.settings.core.PreferenceController;
 import com.android.settings.R;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.deviceinfo.UsbBackend;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class UsbModePreferenceController extends PreferenceController
         implements LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java b/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java
index 8d98b50..df6ccd3 100644
--- a/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java
+++ b/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java
@@ -20,9 +20,9 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public abstract class DynamicAvailabilityPreferenceController extends PreferenceController
         implements LifecycleObserver, OnResume {
diff --git a/src/com/android/settings/core/InstrumentedActivity.java b/src/com/android/settings/core/InstrumentedActivity.java
index 891af5d..9b24756 100644
--- a/src/com/android/settings/core/InstrumentedActivity.java
+++ b/src/com/android/settings/core/InstrumentedActivity.java
@@ -18,7 +18,7 @@
 
 import com.android.settings.core.instrumentation.Instrumentable;
 import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
-import com.android.settings.core.lifecycle.ObservableActivity;
+import com.android.settingslib.core.lifecycle.ObservableActivity;
 
 /**
  * Instrumented activity that logs visibility state.
diff --git a/src/com/android/settings/core/InstrumentedFragment.java b/src/com/android/settings/core/InstrumentedFragment.java
index 303d4d8..188dbde 100644
--- a/src/com/android/settings/core/InstrumentedFragment.java
+++ b/src/com/android/settings/core/InstrumentedFragment.java
@@ -21,9 +21,9 @@
 import com.android.settings.core.instrumentation.Instrumentable;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
-import com.android.settings.core.lifecycle.ObservableFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.survey.SurveyMixin;
+import com.android.settingslib.core.lifecycle.ObservableFragment;
 
 public abstract class InstrumentedFragment extends ObservableFragment implements Instrumentable {
 
@@ -49,4 +49,4 @@
         mVisibilityLoggerMixin.setSourceMetricsCategory(getActivity());
         super.onResume();
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
index 746c10d..bfb69e7 100644
--- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java
+++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
@@ -22,9 +22,9 @@
 import com.android.settings.core.instrumentation.Instrumentable;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
-import com.android.settings.core.lifecycle.ObservablePreferenceFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.survey.SurveyMixin;
+import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;
 
 /**
  * Instrumented fragment that logs visibility state.
diff --git a/src/com/android/settings/core/PreferenceController.java b/src/com/android/settings/core/PreferenceController.java
index 002240d..2b3a7ab 100644
--- a/src/com/android/settings/core/PreferenceController.java
+++ b/src/com/android/settings/core/PreferenceController.java
@@ -18,7 +18,7 @@
 import android.content.Context;
 
 import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.search2.ResultPayload;
+import com.android.settings.search.ResultPayload;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.List;
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index edf2b75..f9aa887 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -18,14 +18,11 @@
 
 import com.android.settings.ApnEditor;
 import com.android.settings.ApnSettings;
-import com.android.settings.ChooseLockPassword;
-import com.android.settings.ChooseLockPattern;
 import com.android.settings.CryptKeeperSettings;
 import com.android.settings.DateTimeSettings;
 import com.android.settings.DeviceAdminSettings;
 import com.android.settings.DeviceInfoSettings;
 import com.android.settings.DisplaySettings;
-import com.android.settings.DreamSettings;
 import com.android.settings.IccLockSettings;
 import com.android.settings.MasterClear;
 import com.android.settings.PrivacySettings;
@@ -60,6 +57,7 @@
 import com.android.settings.applications.VrListenerSettings;
 import com.android.settings.applications.WriteSettingsDetails;
 import com.android.settings.applications.assist.ManageAssist;
+import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment;
 import com.android.settings.bluetooth.BluetoothSettings;
 import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
 import com.android.settings.dashboard.SupportFragment;
@@ -75,11 +73,13 @@
 import com.android.settings.deviceinfo.StorageDashboardFragment;
 import com.android.settings.deviceinfo.StorageSettings;
 import com.android.settings.display.NightDisplaySettings;
+import com.android.settings.dream.DreamSettings;
 import com.android.settings.enterprise.EnterprisePrivacySettings;
 import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;
 import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.gestures.AssistGestureSettings;
+import com.android.settings.gestures.CameraLiftTriggerSettings;
 import com.android.settings.gestures.DoubleTapPowerSettings;
 import com.android.settings.gestures.DoubleTapScreenSettings;
 import com.android.settings.gestures.DoubleTwistGestureSettings;
@@ -108,10 +108,13 @@
 import com.android.settings.notification.ZenModeScheduleRuleSettings;
 import com.android.settings.notification.ZenModeSettings;
 import com.android.settings.notification.ZenModeVisualInterruptionSettings;
+import com.android.settings.password.ChooseLockPassword;
+import com.android.settings.password.ChooseLockPattern;
 import com.android.settings.print.PrintJobSettingsFragment;
 import com.android.settings.print.PrintSettingsFragment;
 import com.android.settings.security.LockscreenDashboardFragment;
 import com.android.settings.sim.SimSettings;
+import com.android.settings.support.SupportDashboardActivity;
 import com.android.settings.system.ResetDashboardFragment;
 import com.android.settings.system.SystemDashboardFragment;
 import com.android.settings.tts.TextToSpeechSettings;
@@ -177,6 +180,7 @@
             AccountSyncSettings.class.getName(),
             AssistGestureSettings.class.getName(),
             SwipeToNotificationSettings.class.getName(),
+            CameraLiftTriggerSettings.class.getName(),
             DoubleTapPowerSettings.class.getName(),
             DoubleTapScreenSettings.class.getName(),
             PickupGestureSettings.class.getName(),
@@ -244,6 +248,7 @@
             EnterprisePrivacySettings.class.getName(),
             WebViewAppPicker.class.getName(),
             LockscreenDashboardFragment.class.getName(),
+            BluetoothDeviceDetailsFragment.class.getName(),
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {
@@ -260,7 +265,7 @@
             Settings.SecuritySettingsActivity.class.getName(),
             Settings.AccessibilitySettingsActivity.class.getName(),
             Settings.SystemDashboardActivity.class.getName(),
-            Settings.SupportDashboardActivity.class.getName(),
+            SupportDashboardActivity.class.getName(),
             // Home page > Network & Internet
             Settings.WifiSettingsActivity.class.getName(),
             Settings.DataUsageSummaryActivity.class.getName(),
diff --git a/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java b/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java
index dd3c1cc..5a9ab56 100644
--- a/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java
+++ b/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java
@@ -18,8 +18,8 @@
 import android.content.Context;
 
 import com.android.settings.DialogCreatable;
-import com.android.settings.core.lifecycle.ObservableDialogFragment;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.ObservableDialogFragment;
 
 public abstract class InstrumentedDialogFragment extends ObservableDialogFragment
         implements Instrumentable {
diff --git a/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java b/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java
index d1c7c7a..b57ff6a 100644
--- a/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java
+++ b/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java
@@ -20,7 +20,9 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.AsyncTask;
+import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
+import android.util.Log;
 import android.util.Pair;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -32,6 +34,8 @@
 
 public class SharedPreferencesLogger implements SharedPreferences {
 
+    private static final String LOG_TAG = "SharedPreferencesLogger";
+
     private final String mTag;
     private final Context mContext;
     private final MetricsFeatureProvider mMetricsFeature;
@@ -99,11 +103,11 @@
             OnSharedPreferenceChangeListener listener) {
     }
 
-    private void logValue(String key, String value) {
+    private void logValue(String key, Object value) {
         logValue(key, value, false /* forceLog */);
     }
 
-    private void logValue(String key, String value, boolean forceLog) {
+    private void logValue(String key, Object value, boolean forceLog) {
         final String prefKey = mTag + "/" + key;
         if (!forceLog && !mPreferenceKeySet.contains(prefKey)) {
             // Pref key doesn't exist in set, this is initial display so we skip metrics but
@@ -114,18 +118,39 @@
         // TODO: Remove count logging to save some resource.
         mMetricsFeature.count(mContext, prefKey + "|" + value, 1);
 
-        // Pref key exists in set, log it's change in metrics.
-        mMetricsFeature.action(mContext, MetricsEvent.ACTION_SETTINGS_PREFERENCE_CHANGE,
-                Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME, prefKey),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_VALUE, value));
+        final Pair<Integer, Object> valueData;
+        if (value instanceof Long) {
+            valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE,
+                    value);
+        } else if (value instanceof Integer) {
+            valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE,
+                    ((Integer) value).longValue());
+        } else if (value instanceof Boolean) {
+            valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE,
+                    (Boolean) value ? 1L : 0L);
+        } else if (value instanceof Float) {
+            valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_FLOAT_VALUE,
+                    value);
+        } else if (value instanceof String){
+            valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_VALUE,
+                    value);
+        } else {
+            Log.w(LOG_TAG, "Tried to log unloggable object"  + value);
+            valueData = null;
+        }
+        if (valueData != null) {
+            // Pref key exists in set, log it's change in metrics.
+            mMetricsFeature.action(mContext, MetricsEvent.ACTION_SETTINGS_PREFERENCE_CHANGE,
+                    Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME, prefKey),
+                    valueData);
+        }
     }
 
-    private void logPackageName(String key, String value) {
+    @VisibleForTesting
+    void logPackageName(String key, String value) {
         final String prefKey = mTag + "/" + key;
-        mMetricsFeature.action(mContext, MetricsEvent.ACTION_SETTINGS_PREFERENCE_CHANGE,
+        mMetricsFeature.action(mContext, MetricsEvent.ACTION_SETTINGS_PREFERENCE_CHANGE, value,
                 Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME, prefKey));
-        mMetricsFeature.action(mContext, MetricsEvent.ACTION_GENERIC_PACKAGE,
-                prefKey + "|" + value);
     }
 
     private void safeLogValue(String key, String value) {
@@ -173,25 +198,25 @@
 
         @Override
         public Editor putInt(String key, int value) {
-            logValue(key, String.valueOf(value));
+            logValue(key, value);
             return this;
         }
 
         @Override
         public Editor putLong(String key, long value) {
-            logValue(key, String.valueOf(value));
+            logValue(key, value);
             return this;
         }
 
         @Override
         public Editor putFloat(String key, float value) {
-            logValue(key, String.valueOf(value));
+            logValue(key, value);
             return this;
         }
 
         @Override
         public Editor putBoolean(String key, boolean value) {
-            logValue(key, String.valueOf(value));
+            logValue(key, value);
             return this;
         }
 
diff --git a/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java b/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java
index fcd32d1..8de35ad 100644
--- a/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java
+++ b/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java
@@ -22,11 +22,11 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.SettingsActivity;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnAttach;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnAttach;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import static com.android.settings.core.instrumentation.Instrumentable.METRICS_CATEGORY_UNKNOWN;
 
diff --git a/src/com/android/settings/core/lifecycle/Lifecycle.java b/src/com/android/settings/core/lifecycle/Lifecycle.java
deleted file mode 100644
index ef23688..0000000
--- a/src/com/android/settings/core/lifecycle/Lifecycle.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (C) 2016 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.core.lifecycle;
-
-import android.annotation.UiThread;
-import android.content.Context;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.preference.PreferenceScreen;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-import com.android.settings.core.lifecycle.events.OnAttach;
-import com.android.settings.core.lifecycle.events.OnCreate;
-import com.android.settings.core.lifecycle.events.OnCreateOptionsMenu;
-import com.android.settings.core.lifecycle.events.OnDestroy;
-import com.android.settings.core.lifecycle.events.OnOptionsItemSelected;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnPrepareOptionsMenu;
-import com.android.settings.core.lifecycle.events.OnResume;
-import com.android.settings.core.lifecycle.events.OnSaveInstanceState;
-import com.android.settings.core.lifecycle.events.OnStart;
-import com.android.settings.core.lifecycle.events.OnStop;
-import com.android.settings.core.lifecycle.events.SetPreferenceScreen;
-import com.android.settings.utils.ThreadUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Dispatcher for lifecycle events.
- */
-public class Lifecycle {
-
-    protected final List<LifecycleObserver> mObservers = new ArrayList<>();
-
-    /**
-     * Registers a new observer of lifecycle events.
-     */
-    @UiThread
-    public <T extends LifecycleObserver> T addObserver(T observer) {
-        ThreadUtils.ensureMainThread();
-        mObservers.add(observer);
-        return observer;
-    }
-
-    public void onAttach(Context context) {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnAttach) {
-                ((OnAttach) observer).onAttach(context);
-            }
-        }
-    }
-
-    public void onCreate(Bundle savedInstanceState) {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnCreate) {
-                ((OnCreate) observer).onCreate(savedInstanceState);
-            }
-        }
-    }
-
-    public void onStart() {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnStart) {
-                ((OnStart) observer).onStart();
-            }
-        }
-    }
-
-    public void setPreferenceScreen(PreferenceScreen preferenceScreen) {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof SetPreferenceScreen) {
-                ((SetPreferenceScreen) observer).setPreferenceScreen(preferenceScreen);
-            }
-        }
-    }
-
-    public void onResume() {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnResume) {
-                ((OnResume) observer).onResume();
-            }
-        }
-    }
-
-    public void onPause() {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnPause) {
-                ((OnPause) observer).onPause();
-            }
-        }
-    }
-
-    public void onSaveInstanceState(Bundle outState) {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnSaveInstanceState) {
-                ((OnSaveInstanceState) observer).onSaveInstanceState(outState);
-            }
-        }
-    }
-
-    public void onStop() {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnStop) {
-                ((OnStop) observer).onStop();
-            }
-        }
-    }
-
-    public void onDestroy() {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnDestroy) {
-                ((OnDestroy) observer).onDestroy();
-            }
-        }
-    }
-
-    public void onCreateOptionsMenu(final Menu menu, final @Nullable MenuInflater inflater) {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnCreateOptionsMenu) {
-                ((OnCreateOptionsMenu) observer).onCreateOptionsMenu(menu, inflater);
-            }
-        }
-    }
-
-    public void onPrepareOptionsMenu(final Menu menu) {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnPrepareOptionsMenu) {
-                ((OnPrepareOptionsMenu) observer).onPrepareOptionsMenu(menu);
-            }
-        }
-    }
-
-    public boolean onOptionsItemSelected(final MenuItem menuItem) {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnOptionsItemSelected) {
-                if (((OnOptionsItemSelected) observer).onOptionsItemSelected(menuItem)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-}
diff --git a/src/com/android/settings/core/lifecycle/LifecycleObserver.java b/src/com/android/settings/core/lifecycle/LifecycleObserver.java
deleted file mode 100644
index 1f88e85..0000000
--- a/src/com/android/settings/core/lifecycle/LifecycleObserver.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2016 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.core.lifecycle;
-
-/**
- * Observer of lifecycle events.
- */
-public interface LifecycleObserver {
-}
diff --git a/src/com/android/settings/core/lifecycle/ObservableActivity.java b/src/com/android/settings/core/lifecycle/ObservableActivity.java
deleted file mode 100644
index 006c9ae..0000000
--- a/src/com/android/settings/core/lifecycle/ObservableActivity.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2016 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.core.lifecycle;
-
-import android.annotation.Nullable;
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.PersistableBundle;
-import android.view.Menu;
-import android.view.MenuItem;
-
-/**
- * {@link Activity} that has hooks to observe activity lifecycle events.
- */
-public class ObservableActivity extends Activity {
-
-    private final Lifecycle mLifecycle = new Lifecycle();
-
-    protected Lifecycle getLifecycle() {
-        return mLifecycle;
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        mLifecycle.onAttach(this);
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState,
-            @Nullable PersistableBundle persistentState) {
-        mLifecycle.onAttach(this);
-        super.onCreate(savedInstanceState, persistentState);
-    }
-
-    @Override
-    protected void onStart() {
-        mLifecycle.onStart();
-        super.onStart();
-    }
-
-    @Override
-    protected void onResume() {
-        mLifecycle.onResume();
-        super.onResume();
-    }
-
-    @Override
-    protected void onPause() {
-        mLifecycle.onPause();
-        super.onPause();
-    }
-
-    @Override
-    protected void onStop() {
-        mLifecycle.onStop();
-        super.onStop();
-    }
-
-    @Override
-    protected void onDestroy() {
-        mLifecycle.onDestroy();
-        super.onDestroy();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(final Menu menu) {
-        if (super.onCreateOptionsMenu(menu)) {
-            mLifecycle.onCreateOptionsMenu(menu, null);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(final Menu menu) {
-        if (super.onPrepareOptionsMenu(menu)) {
-            mLifecycle.onPrepareOptionsMenu(menu);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(final MenuItem menuItem) {
-        boolean lifecycleHandled = mLifecycle.onOptionsItemSelected(menuItem);
-        if (!lifecycleHandled) {
-            return super.onOptionsItemSelected(menuItem);
-        }
-        return lifecycleHandled;
-    }
-}
diff --git a/src/com/android/settings/core/lifecycle/ObservableDialogFragment.java b/src/com/android/settings/core/lifecycle/ObservableDialogFragment.java
deleted file mode 100644
index c3265dd..0000000
--- a/src/com/android/settings/core/lifecycle/ObservableDialogFragment.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2016 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.core.lifecycle;
-
-import android.app.DialogFragment;
-import android.content.Context;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-/**
- * {@link DialogFragment} that has hooks to observe fragment lifecycle events.
- */
-public class ObservableDialogFragment extends DialogFragment {
-
-    protected final Lifecycle mLifecycle = new Lifecycle();
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        mLifecycle.onAttach(context);
-    }
-
-    @Override
-    public void onStart() {
-        mLifecycle.onStart();
-        super.onStart();
-    }
-
-    @Override
-    public void onResume() {
-        mLifecycle.onResume();
-        super.onResume();
-    }
-
-    @Override
-    public void onPause() {
-        mLifecycle.onPause();
-        super.onPause();
-    }
-
-    @Override
-    public void onStop() {
-        mLifecycle.onStop();
-        super.onStop();
-    }
-
-    @Override
-    public void onDestroy() {
-        mLifecycle.onDestroy();
-        super.onDestroy();
-    }
-
-    @Override
-    public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
-        mLifecycle.onCreateOptionsMenu(menu, inflater);
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @Override
-    public void onPrepareOptionsMenu(final Menu menu) {
-        mLifecycle.onPrepareOptionsMenu(menu);
-        super.onPrepareOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(final MenuItem menuItem) {
-        boolean lifecycleHandled = mLifecycle.onOptionsItemSelected(menuItem);
-        if (!lifecycleHandled) {
-            return super.onOptionsItemSelected(menuItem);
-        }
-        return lifecycleHandled;
-    }
-}
diff --git a/src/com/android/settings/core/lifecycle/ObservableFragment.java b/src/com/android/settings/core/lifecycle/ObservableFragment.java
deleted file mode 100644
index 8dae7ea..0000000
--- a/src/com/android/settings/core/lifecycle/ObservableFragment.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2016 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.core.lifecycle;
-
-import android.annotation.CallSuper;
-import android.app.Fragment;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-public class ObservableFragment extends Fragment {
-
-    private final Lifecycle mLifecycle = new Lifecycle();
-
-    protected Lifecycle getLifecycle() {
-        return mLifecycle;
-    }
-
-    @CallSuper
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        mLifecycle.onAttach(context);
-    }
-
-    @CallSuper
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        mLifecycle.onCreate(savedInstanceState);
-        super.onCreate(savedInstanceState);
-    }
-
-    @CallSuper
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        mLifecycle.onSaveInstanceState(outState);
-    }
-
-    @CallSuper
-    @Override
-    public void onStart() {
-        mLifecycle.onStart();
-        super.onStart();
-    }
-
-    @CallSuper
-    @Override
-    public void onStop() {
-        mLifecycle.onStop();
-        super.onStop();
-    }
-
-    @CallSuper
-    @Override
-    public void onResume() {
-        mLifecycle.onResume();
-        super.onResume();
-    }
-
-    @CallSuper
-    @Override
-    public void onPause() {
-        mLifecycle.onPause();
-        super.onPause();
-    }
-
-    @CallSuper
-    @Override
-    public void onDestroy() {
-        mLifecycle.onDestroy();
-        super.onDestroy();
-    }
-
-    @CallSuper
-    @Override
-    public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
-        mLifecycle.onCreateOptionsMenu(menu, inflater);
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @CallSuper
-    @Override
-    public void onPrepareOptionsMenu(final Menu menu) {
-        mLifecycle.onPrepareOptionsMenu(menu);
-        super.onPrepareOptionsMenu(menu);
-    }
-
-    @CallSuper
-    @Override
-    public boolean onOptionsItemSelected(final MenuItem menuItem) {
-        boolean lifecycleHandled = mLifecycle.onOptionsItemSelected(menuItem);
-        if (!lifecycleHandled) {
-            return super.onOptionsItemSelected(menuItem);
-        }
-        return lifecycleHandled;
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/core/lifecycle/ObservablePreferenceFragment.java b/src/com/android/settings/core/lifecycle/ObservablePreferenceFragment.java
deleted file mode 100644
index 94a0be1..0000000
--- a/src/com/android/settings/core/lifecycle/ObservablePreferenceFragment.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2016 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.core.lifecycle;
-
-
-import android.annotation.CallSuper;
-import android.content.Context;
-import android.os.Bundle;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.PreferenceScreen;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-/**
- * {@link PreferenceFragment} that has hooks to observe fragment lifecycle events.
- */
-public abstract class ObservablePreferenceFragment extends PreferenceFragment {
-
-    private final Lifecycle mLifecycle = new Lifecycle();
-
-    protected Lifecycle getLifecycle() {
-        return mLifecycle;
-    }
-
-    @CallSuper
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        mLifecycle.onAttach(context);
-    }
-
-    @CallSuper
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        mLifecycle.onCreate(savedInstanceState);
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public void setPreferenceScreen(PreferenceScreen preferenceScreen) {
-        mLifecycle.setPreferenceScreen(preferenceScreen);
-        super.setPreferenceScreen(preferenceScreen);
-    }
-
-    @CallSuper
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        mLifecycle.onSaveInstanceState(outState);
-    }
-
-    @CallSuper
-    @Override
-    public void onStart() {
-        mLifecycle.onStart();
-        super.onStart();
-    }
-
-    @CallSuper
-    @Override
-    public void onStop() {
-        mLifecycle.onStop();
-        super.onStop();
-    }
-
-    @CallSuper
-    @Override
-    public void onResume() {
-        mLifecycle.onResume();
-        super.onResume();
-    }
-
-    @CallSuper
-    @Override
-    public void onPause() {
-        mLifecycle.onPause();
-        super.onPause();
-    }
-
-    @CallSuper
-    @Override
-    public void onDestroy() {
-        mLifecycle.onDestroy();
-        super.onDestroy();
-    }
-
-    @CallSuper
-    @Override
-    public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
-        mLifecycle.onCreateOptionsMenu(menu, inflater);
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @CallSuper
-    @Override
-    public void onPrepareOptionsMenu(final Menu menu) {
-        mLifecycle.onPrepareOptionsMenu(menu);
-        super.onPrepareOptionsMenu(menu);
-    }
-
-    @CallSuper
-    @Override
-    public boolean onOptionsItemSelected(final MenuItem menuItem) {
-        boolean lifecycleHandled = mLifecycle.onOptionsItemSelected(menuItem);
-        if (!lifecycleHandled) {
-            return super.onOptionsItemSelected(menuItem);
-        }
-        return lifecycleHandled;
-    }
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnAttach.java b/src/com/android/settings/core/lifecycle/events/OnAttach.java
deleted file mode 100644
index 74fbe2f..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnAttach.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2016 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.core.lifecycle.events;
-
-import android.content.Context;
-
-public interface OnAttach {
-    void onAttach(Context context);
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnCreate.java b/src/com/android/settings/core/lifecycle/events/OnCreate.java
deleted file mode 100644
index 9c97cf5..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnCreate.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2016 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.core.lifecycle.events;
-
-
-import android.os.Bundle;
-
-public interface OnCreate {
-    void onCreate(Bundle savedInstanceState);
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnCreateOptionsMenu.java b/src/com/android/settings/core/lifecycle/events/OnCreateOptionsMenu.java
deleted file mode 100644
index 4c794ba..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnCreateOptionsMenu.java
+++ /dev/null
@@ -1,24 +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.core.lifecycle.events;
-
-import android.view.Menu;
-import android.view.MenuInflater;
-
-public interface OnCreateOptionsMenu {
-    void onCreateOptionsMenu(Menu menu, MenuInflater inflater);
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnDestroy.java b/src/com/android/settings/core/lifecycle/events/OnDestroy.java
deleted file mode 100644
index 5499de8..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnDestroy.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2016 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.core.lifecycle.events;
-
-public interface OnDestroy {
-    void onDestroy();
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnPause.java b/src/com/android/settings/core/lifecycle/events/OnPause.java
deleted file mode 100644
index 155af00..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnPause.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2016 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.core.lifecycle.events;
-
-public interface OnPause {
-    void onPause();
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnPrepareOptionsMenu.java b/src/com/android/settings/core/lifecycle/events/OnPrepareOptionsMenu.java
deleted file mode 100644
index d642807..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnPrepareOptionsMenu.java
+++ /dev/null
@@ -1,24 +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.core.lifecycle.events;
-
-import android.view.Menu;
-import android.view.MenuInflater;
-
-public interface OnPrepareOptionsMenu {
-    void onPrepareOptionsMenu(Menu menu);
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnResume.java b/src/com/android/settings/core/lifecycle/events/OnResume.java
deleted file mode 100644
index 30ce42b..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnResume.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2016 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.core.lifecycle.events;
-
-public interface OnResume {
-    void onResume();
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnSaveInstanceState.java b/src/com/android/settings/core/lifecycle/events/OnSaveInstanceState.java
deleted file mode 100644
index fab4041..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnSaveInstanceState.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2016 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.core.lifecycle.events;
-
-import android.os.Bundle;
-
-
-public interface OnSaveInstanceState {
-    void onSaveInstanceState(Bundle outState);
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnStart.java b/src/com/android/settings/core/lifecycle/events/OnStart.java
deleted file mode 100644
index 3b4e6cc..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnStart.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2016 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.core.lifecycle.events;
-
-public interface OnStart {
-
-    void onStart();
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnStop.java b/src/com/android/settings/core/lifecycle/events/OnStop.java
deleted file mode 100644
index 8c19b87..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnStop.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2016 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.core.lifecycle.events;
-
-public interface OnStop {
-
-    void onStop();
-}
diff --git a/src/com/android/settings/core/lifecycle/events/SetPreferenceScreen.java b/src/com/android/settings/core/lifecycle/events/SetPreferenceScreen.java
deleted file mode 100644
index d206ed3..0000000
--- a/src/com/android/settings/core/lifecycle/events/SetPreferenceScreen.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2016 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.core.lifecycle.events;
-
-import android.support.v7.preference.PreferenceScreen;
-
-public interface SetPreferenceScreen {
-
-    void setPreferenceScreen(PreferenceScreen preferenceScreen);
-}
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index e3e95be..3a768cc 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -15,14 +15,18 @@
  */
 package com.android.settings.dashboard;
 
+import android.annotation.AttrRes;
+import android.annotation.ColorInt;
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.TypedArray;
+import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
 import android.os.Bundle;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.util.DiffUtil;
+import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.ArrayMap;
@@ -31,30 +35,40 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.R.id;
 import com.android.settings.SettingsActivity;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.dashboard.DashboardData.SuggestionConditionHeaderData;
 import com.android.settings.dashboard.conditional.Condition;
+import com.android.settings.dashboard.conditional.ConditionAdapter;
 import com.android.settings.dashboard.conditional.ConditionAdapterUtils;
+import com.android.settings.dashboard.conditional.FocusRecyclerView;
+import com.android.settings.dashboard.suggestions.SuggestionAdapter;
 import com.android.settings.dashboard.suggestions.SuggestionDismissController;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.Utils;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
 
+import com.android.settingslib.suggestions.SuggestionParser;
 import java.util.ArrayList;
 import java.util.List;
 
 public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.DashboardItemHolder>
-        implements SummaryLoader.SummaryConsumer, SuggestionDismissController.Callback {
+        implements SummaryLoader.SummaryConsumer {
     public static final String TAG = "DashboardAdapter";
     private static final String STATE_SUGGESTION_LIST = "suggestion_list";
     private static final String STATE_CATEGORY_LIST = "category_list";
     private static final String STATE_SUGGESTION_MODE = "suggestion_mode";
     private static final String STATE_SUGGESTIONS_SHOWN_LOGGED = "suggestions_shown_logged";
+    private static final int DONT_SET_BACKGROUND_ATTR = -1;
+    private static final String STATE_SUGGESTION_CONDITION_MODE = "suggestion_condition_mode";
 
     private final IconCache mCache;
     private final Context mContext;
@@ -63,6 +77,12 @@
     private final SuggestionFeatureProvider mSuggestionFeatureProvider;
     private final ArrayList<String> mSuggestionsShownLogged;
     private boolean mFirstFrameDrawn;
+    private boolean mCombineSuggestionAndCondition;
+    private RecyclerView mRecyclerView;
+    private SuggestionParser mSuggestionParser;
+    private SuggestionAdapter mSuggestionAdapter;
+    private SuggestionDismissController mSuggestionDismissHandler;
+    private SuggestionDismissController.Callback mCallback;
 
     @VisibleForTesting
     DashboardData mDashboardData;
@@ -79,43 +99,65 @@
 
         @Override
         public void onClick(View v) {
-            Condition expandedCondition = mDashboardData.getExpandedCondition();
-
-            //TODO: get rid of setTag/getTag
-            if (v.getTag() == expandedCondition) {
+            if (mCombineSuggestionAndCondition) {
+                Condition condition = (Condition) v.getTag();
+                //TODO: get rid of setTag/getTag
                 mMetricsFeatureProvider.action(mContext,
+                    MetricsEvent.ACTION_SETTINGS_CONDITION_CLICK,
+                    condition.getMetricsConstant());
+                condition.onPrimaryClick();
+            } else {
+                Condition expandedCondition = mDashboardData.getExpandedCondition();
+
+                //TODO: get rid of setTag/getTag
+                if (v.getTag() == expandedCondition) {
+                    mMetricsFeatureProvider.action(mContext,
                         MetricsEvent.ACTION_SETTINGS_CONDITION_CLICK,
                         expandedCondition.getMetricsConstant());
-                expandedCondition.onPrimaryClick();
-            } else {
-                expandedCondition = (Condition) v.getTag();
-                mMetricsFeatureProvider.action(mContext,
+                    expandedCondition.onPrimaryClick();
+                } else {
+                    expandedCondition = (Condition) v.getTag();
+                    mMetricsFeatureProvider.action(mContext,
                         MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND,
                         expandedCondition.getMetricsConstant());
 
-                updateExpandedCondition(expandedCondition);
+                    updateExpandedCondition(expandedCondition);
+                }
             }
         }
     };
 
+    @Deprecated
     public DashboardAdapter(Context context, Bundle savedInstanceState,
-            List<Condition> conditions) {
+        List<Condition> conditions) {
+        this(context, savedInstanceState, conditions, null, null);
+    }
+
+    public DashboardAdapter(Context context, Bundle savedInstanceState,
+            List<Condition> conditions, SuggestionParser suggestionParser,
+            SuggestionDismissController.Callback callback) {
         List<Tile> suggestions = null;
         List<DashboardCategory> categories = null;
         int suggestionMode = DashboardData.SUGGESTION_MODE_DEFAULT;
+        int suggestionConditionMode = DashboardData.HEADER_MODE_DEFAULT;
 
         mContext = context;
         final FeatureFactory factory = FeatureFactory.getFactory(context);
         mMetricsFeatureProvider = factory.getMetricsFeatureProvider();
         mDashboardFeatureProvider = factory.getDashboardFeatureProvider(context);
         mSuggestionFeatureProvider = factory.getSuggestionFeatureProvider(context);
+        mCombineSuggestionAndCondition = mDashboardFeatureProvider.combineSuggestionAndCondition();
         mCache = new IconCache(context);
+        mSuggestionParser = suggestionParser;
+        mCallback = callback;
 
         setHasStableIds(true);
 
         if (savedInstanceState != null) {
             suggestions = savedInstanceState.getParcelableArrayList(STATE_SUGGESTION_LIST);
             categories = savedInstanceState.getParcelableArrayList(STATE_CATEGORY_LIST);
+            suggestionConditionMode = savedInstanceState.getInt(
+                STATE_SUGGESTION_CONDITION_MODE, suggestionConditionMode);
             suggestionMode = savedInstanceState.getInt(
                     STATE_SUGGESTION_MODE, DashboardData.SUGGESTION_MODE_DEFAULT);
             mSuggestionsShownLogged = savedInstanceState.getStringArrayList(
@@ -129,6 +171,8 @@
                 .setSuggestions(suggestions)
                 .setCategories(categories)
                 .setSuggestionMode(suggestionMode)
+                .setCombineSuggestionAndCondition(mCombineSuggestionAndCondition)
+                .setSuggestionConditionMode(suggestionConditionMode)
                 .build();
     }
 
@@ -138,20 +182,22 @@
 
     public void setCategoriesAndSuggestions(List<DashboardCategory> categories,
             List<Tile> suggestions) {
-        // TODO: Better place for tinting?
-        final TypedArray a = mContext.obtainStyledAttributes(new int[]{
-                android.R.attr.colorControlNormal});
-        int tintColor = a.getColor(0, mContext.getColor(android.R.color.white));
-        a.recycle();
-        for (int i = 0; i < categories.size(); i++) {
-            for (int j = 0; j < categories.get(i).tiles.size(); j++) {
-                final Tile tile = categories.get(i).tiles.get(j);
+        if (mDashboardFeatureProvider.shouldTintIcon()) {
+            // TODO: Better place for tinting?
+            final TypedArray a = mContext.obtainStyledAttributes(new int[]{
+                    android.R.attr.colorControlNormal});
+            final int tintColor = a.getColor(0, mContext.getColor(R.color.fallback_tintColor));
+            a.recycle();
+            for (int i = 0; i < categories.size(); i++) {
+                for (int j = 0; j < categories.get(i).tiles.size(); j++) {
+                    final Tile tile = categories.get(i).tiles.get(j);
 
-                if (!mContext.getPackageName().equals(
-                        tile.intent.getComponent().getPackageName())) {
-                    // If this drawable is coming from outside Settings, tint it to match the
-                    // color.
-                    tile.icon.setTint(tintColor);
+                    if (!mContext.getPackageName().equals(
+                            tile.intent.getComponent().getPackageName())) {
+                        // If this drawable is coming from outside Settings, tint it to match the
+                        // color.
+                        tile.icon.setTint(tintColor);
+                    }
                 }
             }
         }
@@ -163,14 +209,24 @@
                 .build();
         notifyDashboardDataChanged(prevData);
         List<Tile> shownSuggestions = null;
-        switch (mDashboardData.getSuggestionMode()) {
-            case DashboardData.SUGGESTION_MODE_DEFAULT:
+        if (mCombineSuggestionAndCondition) {
+            final int mode = mDashboardData.getSuggestionConditionMode();
+            if (mode == DashboardData.HEADER_MODE_DEFAULT) {
                 shownSuggestions = suggestions.subList(0,
-                        Math.min(suggestions.size(), DashboardData.DEFAULT_SUGGESTION_COUNT));
-                break;
-            case DashboardData.SUGGESTION_MODE_EXPANDED:
+                    Math.min(suggestions.size(), DashboardData.DEFAULT_SUGGESTION_COUNT));
+            } else if (mode != DashboardData.HEADER_MODE_COLLAPSED) {
                 shownSuggestions = suggestions;
-                break;
+            }
+        } else {
+            switch (mDashboardData.getSuggestionMode()) {
+                case DashboardData.SUGGESTION_MODE_DEFAULT:
+                    shownSuggestions = suggestions.subList(0,
+                        Math.min(suggestions.size(), DashboardData.DEFAULT_SUGGESTION_COUNT));
+                    break;
+                case DashboardData.SUGGESTION_MODE_EXPANDED:
+                    shownSuggestions = suggestions;
+                    break;
+            }
         }
         if (shownSuggestions != null) {
             for (Tile suggestion : shownSuggestions) {
@@ -195,10 +251,16 @@
     public void setConditions(List<Condition> conditions) {
         final DashboardData prevData = mDashboardData;
         Log.d(TAG, "adapter setConditions called");
-        mDashboardData = new DashboardData.Builder(prevData)
+        if (mCombineSuggestionAndCondition) {
+            mDashboardData = new DashboardData.Builder(prevData)
+                .setConditions(conditions)
+                .build();
+        } else {
+            mDashboardData = new DashboardData.Builder(prevData)
                 .setConditions(conditions)
                 .setExpandedCondition(null)
                 .build();
+        }
         notifyDashboardDataChanged(prevData);
     }
 
@@ -214,14 +276,23 @@
 
     @Override
     public DashboardItemHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        return new DashboardItemHolder(LayoutInflater.from(parent.getContext()).inflate(
-                viewType, parent, false));
+        final View view = LayoutInflater.from(parent.getContext()).inflate(viewType, parent, false);
+        if (viewType == R.layout.suggestion_condition_header) {
+            return new SuggestionAndConditionHeaderHolder(view);
+        }
+        if (viewType == R.layout.suggestion_condition_container) {
+            return new SuggestionAndConditionContainerHolder(view);
+        }
+        return new DashboardItemHolder(view);
     }
 
     @Override
     public void onBindViewHolder(DashboardItemHolder holder, int position) {
         final int type = mDashboardData.getItemTypeByPosition(position);
         switch (type) {
+            case R.layout.dashboard_header_spacer:
+                onBindHeaderSpacer(holder, position);
+                break;
             case R.layout.dashboard_category:
                 onBindCategory(holder,
                         (DashboardCategory) mDashboardData.getItemEntityByPosition(position));
@@ -237,6 +308,7 @@
                         mDashboardData.getItemEntityByPosition(position));
                 break;
             case R.layout.suggestion_tile:
+            case R.layout.suggestion_tile_card:
                 final Tile suggestion = (Tile) mDashboardData.getItemEntityByPosition(position);
                 final String suggestionId = mSuggestionFeatureProvider.getSuggestionIdentifier(
                         mContext, suggestion);
@@ -247,7 +319,16 @@
                     mSuggestionsShownLogged.add(suggestionId);
                 }
                 onBindTile(holder, suggestion);
-                holder.itemView.setOnClickListener(v -> {
+                View clickHandler = holder.itemView;
+                // If a view with @android:id/primary is defined, use that as the click handler
+                // instead.
+                final View primaryAction = holder.itemView.findViewById(android.R.id.primary);
+                if (primaryAction != null) {
+                    clickHandler = primaryAction;
+                    // set the item view to disabled to remove any touch effects
+                    holder.itemView.setEnabled(false);
+                }
+                clickHandler.setOnClickListener(v -> {
                     mMetricsFeatureProvider.action(mContext,
                             MetricsEvent.ACTION_SETTINGS_SUGGESTION, suggestionId);
                     ((SettingsActivity) mContext).startSuggestion(suggestion.intent);
@@ -260,6 +341,43 @@
                         (Condition) mDashboardData.getItemEntityByPosition(position),
                         holder, isExpanded, mConditionClickListener, v -> onExpandClick(v));
                 break;
+            case R.layout.suggestion_condition_container:
+                onBindConditionAndSuggestion(
+                    (SuggestionAndConditionContainerHolder) holder, position);
+                break;
+            case R.layout.suggestion_condition_header:
+                /* There are 2 different headers for the suggestions/conditions section. To minimize
+                   visual animation when expanding and collapsing the suggestions/conditions, we are
+                   using the same layout to represent the 2 headers:
+                   1. Suggestion header - when there is any suggestion shown, the suggestion header
+                      will be the first item on the section. It only has the text "Suggestion", and
+                      do nothing when clicked. This header will not be shown when the section is
+                      collapsed, in which case, the SuggestionCondition header will be
+                      shown instead to show the summary info.
+                   2. SuggestionCondition header - the header that shows the summary info for the
+                      suggestion/condition that is currently hidden. It has the expand button to
+                      expand the section. */
+                if (mDashboardData.getDisplayableSuggestionCount() > 0 && position == 1
+                        && mDashboardData.getSuggestionConditionMode()
+                            != DashboardData.HEADER_MODE_COLLAPSED) {
+                    onBindSuggestionHeader((SuggestionAndConditionHeaderHolder) holder);
+                } else {
+                    onBindSuggestionConditionHeader((SuggestionAndConditionHeaderHolder) holder,
+                        (SuggestionConditionHeaderData)
+                            mDashboardData.getItemEntityByPosition(position));
+                }
+                break;
+            case R.layout.suggestion_condition_footer:
+                holder.itemView.setOnClickListener(v -> {
+                    mMetricsFeatureProvider.action(mContext,
+                            MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND, false);
+                    DashboardData prevData = mDashboardData;
+                    mDashboardData = new DashboardData.Builder(prevData).setSuggestionConditionMode(
+                        DashboardData.HEADER_MODE_COLLAPSED).build();
+                    notifyDashboardDataChanged(prevData);
+                    mRecyclerView.scrollToPosition(1);
+                });
+                break;
         }
     }
 
@@ -278,6 +396,14 @@
         return mDashboardData.size();
     }
 
+    @Override
+    public void onAttachedToRecyclerView(RecyclerView recyclerView) {
+        super.onAttachedToRecyclerView(recyclerView);
+        // save the view so that we can scroll it when expanding/collapsing the suggestion and
+        // conditions.
+        mRecyclerView = recyclerView;
+    }
+
     public void onPause() {
         if (mDashboardData.getSuggestions() == null) {
             return;
@@ -293,6 +419,9 @@
         mSuggestionsShownLogged.clear();
     }
 
+    // condition card is always expanded in new suggestion/condition UI.
+    // TODO: Remove when completely move to new suggestion/condition UI
+    @Deprecated
     public void onExpandClick(View v) {
         Condition expandedCondition = mDashboardData.getExpandedCondition();
         if (v.getTag() == expandedCondition) {
@@ -313,6 +442,13 @@
         return mDashboardData.getItemEntityById(itemId);
     }
 
+    public Tile getSuggestion(int position) {
+        if (mCombineSuggestionAndCondition) {
+            return mSuggestionAdapter.getSuggestion(position);
+        }
+        return (Tile) getItem(getItemId(position));
+    }
+
     private void notifyDashboardDataChanged(DashboardData prevData) {
         if (mFirstFrameDrawn && prevData != null) {
             final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(new DashboardData
@@ -332,24 +468,31 @@
         notifyDashboardDataChanged(prevData);
     }
 
-    @Override
-    public Tile getSuggestionForPosition(int position) {
-        return (Tile) mDashboardData.getItemEntityByPosition(position);
-    }
+    private void onBindHeaderSpacer(DashboardItemHolder holder, int position) {
+        if (mDashboardData.size() > (position + 1)) {
+            // The spacer that goes underneath the search bar needs to match the
+            // background of the first real view. That view is either a condition,
+            // a suggestion, or the dashboard item.
+            //
+            // If it's a dashboard item, set null background so it uses the parent's
+            // background like the other views. Otherwise, match the colors.
+            int nextType = mDashboardData.getItemTypeByPosition(position + 1);
+            int colorAttr = nextType == R.layout.suggestion_header
+                    ? android.R.attr.colorSecondary
+                    : nextType == R.layout.condition_card
+                            ? android.R.attr.colorAccent
+                            : DONT_SET_BACKGROUND_ATTR;
 
-    @Override
-    public void onSuggestionDismissed(Tile suggestion) {
-        final List<Tile> suggestions = mDashboardData.getSuggestions();
-        if (suggestions == null) {
-            return;
+            if (colorAttr != DONT_SET_BACKGROUND_ATTR) {
+                TypedArray array = holder.itemView.getContext()
+                        .obtainStyledAttributes(new int[]{colorAttr});
+                @ColorInt int color = array.getColor(0, 0);
+                array.recycle();
+                holder.itemView.setBackgroundColor(color);
+            } else {
+                holder.itemView.setBackground(null);
+            }
         }
-        suggestions.remove(suggestion);
-
-        final DashboardData prevData = mDashboardData;
-        mDashboardData = new DashboardData.Builder(prevData)
-                .setSuggestions(suggestions)
-                .build();
-        notifyDashboardDataChanged(prevData);
     }
 
     @VisibleForTesting
@@ -381,17 +524,7 @@
             final int suggestionMode;
             if (moreSuggestions) {
                 suggestionMode = DashboardData.SUGGESTION_MODE_EXPANDED;
-
-                for (Tile suggestion : mDashboardData.getSuggestions()) {
-                    final String suggestionId = mSuggestionFeatureProvider.getSuggestionIdentifier(
-                            mContext, suggestion);
-                    if (!mSuggestionsShownLogged.contains(suggestionId)) {
-                        mMetricsFeatureProvider.action(
-                                mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                                suggestionId);
-                        mSuggestionsShownLogged.add(suggestionId);
-                    }
-                }
+                logSuggestions();
             } else {
                 suggestionMode = DashboardData.SUGGESTION_MODE_COLLAPSED;
             }
@@ -404,14 +537,144 @@
         });
     }
 
-    private void onBindTile(DashboardItemHolder holder, Tile tile) {
-        holder.icon.setImageDrawable(mCache.getIcon(tile.icon));
-        holder.title.setText(tile.title);
-        if (!TextUtils.isEmpty(tile.summary)) {
-            holder.summary.setText(tile.summary);
-            holder.summary.setVisibility(View.VISIBLE);
+    private void logSuggestions() {
+        for (Tile suggestion : mDashboardData.getSuggestions()) {
+            final String suggestionId = mSuggestionFeatureProvider.getSuggestionIdentifier(
+                mContext, suggestion);
+            if (!mSuggestionsShownLogged.contains(suggestionId)) {
+                mMetricsFeatureProvider.action(
+                    mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                    suggestionId);
+                mSuggestionsShownLogged.add(suggestionId);
+            }
+        }
+    }
+
+    private void onBindSuggestionHeader(final SuggestionAndConditionHeaderHolder holder) {
+        holder.title.setText(R.string.suggestions_title);
+        holder.title.setTextColor(Color.BLACK);
+        holder.icon.setVisibility(View.INVISIBLE);
+        holder.icons.removeAllViews();
+        holder.icons.setVisibility(View.INVISIBLE);
+        holder.summary.setVisibility(View.INVISIBLE);
+        holder.expandIndicator.setVisibility(View.INVISIBLE);
+        holder.itemView.setOnClickListener(null);
+    }
+
+    private void onBindSuggestionConditionHeader(final SuggestionAndConditionHeaderHolder holder,
+            SuggestionConditionHeaderData data) {
+        final int curMode = mDashboardData.getSuggestionConditionMode();
+        final int nextMode = data.hiddenSuggestionCount > 0 && data.conditionCount > 0
+            && curMode != DashboardData.HEADER_MODE_SUGGESTION_EXPANDED
+            ? DashboardData.HEADER_MODE_SUGGESTION_EXPANDED
+            : DashboardData.HEADER_MODE_FULLY_EXPANDED;
+        final boolean moreSuggestions = data.hiddenSuggestionCount > 0;
+        final boolean hasConditions = data.conditionCount > 0;
+        if (data.conditionCount > 0) {
+            holder.icon.setImageIcon(data.conditionIcons.get(0));
+            holder.icon.setVisibility(View.VISIBLE);
+            if (data.conditionCount == 1) {
+                holder.title.setText(data.title);
+                holder.title.setTextColor(Utils.getColorAccent(mContext));
+                holder.icons.setVisibility(View.INVISIBLE);
+            } else {
+                holder.title.setText(null);
+                updateConditionIcons(data.conditionIcons, holder.icons);
+                holder.icons.setVisibility(View.VISIBLE);
+            }
         } else {
-            holder.summary.setVisibility(View.GONE);
+            holder.icon.setVisibility(View.INVISIBLE);
+            holder.icons.setVisibility(View.INVISIBLE);
+        }
+
+        if (data.hiddenSuggestionCount > 0) {
+            holder.summary.setTextColor(Color.BLACK);
+            if (curMode == DashboardData.HEADER_MODE_COLLAPSED) {
+                if (data.conditionCount > 0) {
+                    holder.summary.setText(mContext.getResources().getQuantityString(
+                        R.plurals.suggestions_collapsed_summary,
+                        data.hiddenSuggestionCount, data.hiddenSuggestionCount));
+                } else {
+                    holder.title.setText(mContext.getResources().getQuantityString(
+                        R.plurals.suggestions_collapsed_title,
+                        data.hiddenSuggestionCount, data.hiddenSuggestionCount));
+                    holder.title.setTextColor(Color.BLACK);
+                    holder.summary.setText(null);
+                }
+            } else if (curMode == DashboardData.HEADER_MODE_DEFAULT) {
+                if (data.conditionCount > 0) {
+                    holder.summary.setText(mContext.getString(
+                        R.string.suggestions_summary, data.hiddenSuggestionCount));
+                } else {
+                    holder.title.setText(mContext.getString(
+                        R.string.suggestions_more_title, data.hiddenSuggestionCount));
+                    holder.title.setTextColor(Color.BLACK);
+                    holder.summary.setText(null);
+                }
+            }
+        } else if (data.conditionCount > 1) {
+            holder.summary.setTextColor(Utils.getColorAccent(mContext));
+            holder.summary.setText(
+                mContext.getString(R.string.condition_summary, data.conditionCount));
+        } else {
+            holder.summary.setText(null);
+        }
+        holder.summary.setVisibility(View.VISIBLE);
+        holder.expandIndicator.setVisibility(View.VISIBLE);
+
+        holder.itemView.setOnClickListener(v -> {
+            if (moreSuggestions ) {
+                logSuggestions();
+            } else if (hasConditions) {
+                mMetricsFeatureProvider.action(mContext,
+                    MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND, true);
+            }
+            DashboardData prevData = mDashboardData;
+            final boolean wasCollapsed = curMode == DashboardData.HEADER_MODE_COLLAPSED;
+            mDashboardData = new DashboardData.Builder(prevData)
+                .setSuggestionConditionMode(nextMode).build();
+            notifyDashboardDataChanged(prevData);
+            if (wasCollapsed) {
+                mRecyclerView.scrollToPosition(1);
+            }
+        });
+    }
+
+    private void onBindConditionAndSuggestion(final SuggestionAndConditionContainerHolder holder,
+            int position) {
+        RecyclerView.Adapter<DashboardItemHolder> adapter;
+        // If there is suggestions to show, it will be at position 2 (position 0 = header spacer,
+        // position 1 is suggestion header.
+        if (position == 2 && mDashboardData.getSuggestions() != null) {
+            mSuggestionAdapter = new SuggestionAdapter(mContext, (List<Tile>)
+                mDashboardData.getItemEntityByPosition(position), mSuggestionsShownLogged);
+            adapter = mSuggestionAdapter;
+            mSuggestionDismissHandler = new SuggestionDismissController(mContext,
+                holder.data, mSuggestionParser, mCallback);
+        } else {
+            ConditionAdapterUtils.addDismiss(holder.data);
+            adapter = new ConditionAdapter(mContext,
+                (List<Condition>) mDashboardData.getItemEntityByPosition(position),
+                    mDashboardData.getSuggestionConditionMode());
+        }
+        holder.data.setLayoutManager(new LinearLayoutManager(mContext));
+        holder.data.setAdapter(adapter);
+    }
+
+    private void onBindTile(DashboardItemHolder holder, Tile tile) {
+        if (tile.remoteViews != null) {
+            final ViewGroup itemView = (ViewGroup) holder.itemView;
+            itemView.removeAllViews();
+            itemView.addView(tile.remoteViews.apply(itemView.getContext(), itemView));
+        } else {
+            holder.icon.setImageDrawable(mCache.getIcon(tile.icon));
+            holder.title.setText(tile.title);
+            if (!TextUtils.isEmpty(tile.summary)) {
+                holder.summary.setText(tile.summary);
+                holder.summary.setVisibility(View.VISIBLE);
+            } else {
+                holder.summary.setVisibility(View.GONE);
+            }
         }
     }
 
@@ -430,9 +693,27 @@
         }
         outState.putInt(STATE_SUGGESTION_MODE, mDashboardData.getSuggestionMode());
         outState.putStringArrayList(STATE_SUGGESTIONS_SHOWN_LOGGED, mSuggestionsShownLogged);
+        outState.putInt(STATE_SUGGESTION_CONDITION_MODE,
+            mDashboardData.getSuggestionConditionMode());
     }
 
-    private static class IconCache {
+    private void updateConditionIcons(List<Icon> icons, ViewGroup parent) {
+        if (icons == null || icons.size() < 2) {
+            parent.setVisibility(View.INVISIBLE);
+            return;
+        }
+        final LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+        parent.removeAllViews();
+        for (int i = 1, size = icons.size(); i < size; i++) {
+            ImageView icon = (ImageView) inflater.inflate(
+                R.layout.condition_header_icon, parent, false);
+            icon.setImageIcon(icons.get(i));
+            parent.addView(icon);
+        }
+        parent.setVisibility(View.VISIBLE);
+    }
+
+    public static class IconCache {
         private final Context mContext;
         private final ArrayMap<Icon, Drawable> mMap = new ArrayMap<>();
 
@@ -462,4 +743,25 @@
             summary = itemView.findViewById(android.R.id.summary);
         }
     }
+
+    public static class SuggestionAndConditionHeaderHolder extends DashboardItemHolder {
+        public final LinearLayout icons;
+        public final ImageView expandIndicator;
+
+        public SuggestionAndConditionHeaderHolder(View itemView) {
+            super(itemView);
+            icons = itemView.findViewById(id.additional_icons);
+            expandIndicator = itemView.findViewById(id.expand_indicator);
+        }
+    }
+
+    public static class SuggestionAndConditionContainerHolder extends DashboardItemHolder {
+        public final RecyclerView data;
+
+        public SuggestionAndConditionContainerHolder(View itemView) {
+            super(itemView);
+            data = itemView.findViewById(id.data);
+        }
+    }
+
 }
diff --git a/src/com/android/settings/dashboard/DashboardData.java b/src/com/android/settings/dashboard/DashboardData.java
index 4e8c7a0..64e8af2 100644
--- a/src/com/android/settings/dashboard/DashboardData.java
+++ b/src/com/android/settings/dashboard/DashboardData.java
@@ -16,7 +16,9 @@
 package com.android.settings.dashboard;
 
 import android.annotation.IntDef;
+import android.graphics.drawable.Icon;
 import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
 import android.support.v7.util.DiffUtil;
 import android.text.TextUtils;
 
@@ -38,24 +40,43 @@
  * ItemsData has inner class Item, which represents the Item in data list.
  */
 public class DashboardData {
+    @Deprecated
     public static final int SUGGESTION_MODE_DEFAULT = 0;
+    @Deprecated
     public static final int SUGGESTION_MODE_COLLAPSED = 1;
+    @Deprecated
     public static final int SUGGESTION_MODE_EXPANDED = 2;
+
+    public static final int HEADER_MODE_DEFAULT = 0;
+    public static final int HEADER_MODE_SUGGESTION_EXPANDED = 1;
+    public static final int HEADER_MODE_FULLY_EXPANDED = 2;
+    public static final int HEADER_MODE_COLLAPSED = 3;
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({HEADER_MODE_DEFAULT, HEADER_MODE_SUGGESTION_EXPANDED, HEADER_MODE_FULLY_EXPANDED,
+        HEADER_MODE_COLLAPSED})
+    public @interface HeaderMode{}
+
     public static final int POSITION_NOT_FOUND = -1;
     public static final int DEFAULT_SUGGESTION_COUNT = 2;
 
     // id namespace for different type of items.
-    private static final int NS_SPACER = 0;
+    private static final int NS_HEADER_SPACER = 0;
+    private static final int NS_SPACER = 1000;
     private static final int NS_ITEMS = 2000;
     private static final int NS_CONDITION = 3000;
+    private static final int NS_SUGGESTION_CONDITION = 4000;
 
     private final List<Item> mItems;
     private final List<DashboardCategory> mCategories;
     private final List<Condition> mConditions;
     private final List<Tile> mSuggestions;
+    @Deprecated
     private final int mSuggestionMode;
+    @Deprecated
     private final Condition mExpandedCondition;
+    private final @HeaderMode int mSuggestionConditionMode;
     private int mId;
+    private boolean mCombineSuggestionAndCondition;
 
     private DashboardData(Builder builder) {
         mCategories = builder.mCategories;
@@ -63,6 +84,8 @@
         mSuggestions = builder.mSuggestions;
         mSuggestionMode = builder.mSuggestionMode;
         mExpandedCondition = builder.mExpandedCondition;
+        mSuggestionConditionMode = builder.mSuggestionConditionMode;
+        mCombineSuggestionAndCondition = builder.mCombineSuggestionAndCondition;
 
         mItems = new ArrayList<>();
         mId = 0;
@@ -115,6 +138,11 @@
         return mSuggestionMode;
     }
 
+    public int getSuggestionConditionMode() {
+        return mSuggestionConditionMode;
+    }
+
+    @Deprecated
     public Condition getExpandedCondition() {
         return mExpandedCondition;
     }
@@ -176,14 +204,31 @@
      * @return the count of suggestions to display
      */
     public int getDisplayableSuggestionCount() {
-        final int suggestionSize = mSuggestions.size();
-        return mSuggestionMode == SUGGESTION_MODE_DEFAULT
-                ? Math.min(DEFAULT_SUGGESTION_COUNT, suggestionSize)
-                : mSuggestionMode == SUGGESTION_MODE_EXPANDED
-                        ? suggestionSize : 0;
+        final int suggestionSize = sizeOf(mSuggestions);
+        if (mCombineSuggestionAndCondition) {
+            if (mSuggestionConditionMode == HEADER_MODE_COLLAPSED) {
+                return 0;
+            }
+            if (mSuggestionConditionMode == HEADER_MODE_DEFAULT) {
+                return Math.min(DEFAULT_SUGGESTION_COUNT, suggestionSize);
+            }
+            return suggestionSize;
+        }
+        if (mSuggestionMode == SUGGESTION_MODE_DEFAULT) {
+            return Math.min(DEFAULT_SUGGESTION_COUNT, suggestionSize);
+        }
+        if (mSuggestionMode == SUGGESTION_MODE_EXPANDED) {
+            return suggestionSize;
+        }
+        return 0;
     }
 
     public boolean hasMoreSuggestions() {
+        if (mCombineSuggestionAndCondition) {
+            return mSuggestionConditionMode == HEADER_MODE_COLLAPSED && mSuggestions.size() > 0
+                || mSuggestionConditionMode == HEADER_MODE_DEFAULT
+                    && mSuggestions.size() > DEFAULT_SUGGESTION_COUNT;
+        }
         return mSuggestionMode == SUGGESTION_MODE_COLLAPSED
                 || (mSuggestionMode == SUGGESTION_MODE_DEFAULT
                 && mSuggestions.size() > DEFAULT_SUGGESTION_COUNT);
@@ -207,7 +252,11 @@
      */
     private void countItem(Object object, int type, boolean add, int nameSpace) {
         if (add) {
-            mItems.add(new Item(object, type, mId + nameSpace, object == mExpandedCondition));
+            if (mCombineSuggestionAndCondition) {
+                mItems.add(new Item(object, type, mId + nameSpace));
+            } else {
+                mItems.add(new Item(object, type, mId + nameSpace, object == mExpandedCondition));
+            }
         }
         mId++;
     }
@@ -218,7 +267,13 @@
      */
     private void countSuggestion(Tile tile, boolean add) {
         if (add) {
-            mItems.add(new Item(tile, R.layout.suggestion_tile, Objects.hash(tile.title), false));
+            mItems.add(new Item(
+                    tile,
+                    tile.remoteViews != null
+                            ? R.layout.suggestion_tile_card
+                            : R.layout.suggestion_tile,
+                    Objects.hash(tile.title),
+                    false));
         }
         mId++;
     }
@@ -228,26 +283,78 @@
      * and mIsShowingAll, mSuggestionMode flag.
      */
     private void buildItemsData() {
-        boolean hasConditions = false;
-        for (int i = 0; mConditions != null && i < mConditions.size(); i++) {
-            boolean shouldShow = mConditions.get(i).shouldShow();
-            hasConditions |= shouldShow;
-            countItem(mConditions.get(i), R.layout.condition_card, shouldShow, NS_CONDITION);
-        }
-
+        // add the view that goes under the search bar
+        countItem(null, R.layout.dashboard_header_spacer, true, NS_HEADER_SPACER);
         resetCount();
-        final boolean hasSuggestions = mSuggestions != null && mSuggestions.size() != 0;
-        countItem(null, R.layout.dashboard_spacer, hasConditions && hasSuggestions, NS_SPACER);
-        countItem(buildSuggestionHeaderData(), R.layout.suggestion_header, hasSuggestions,
+        final boolean hasSuggestions = sizeOf(mSuggestions) > 0;
+        if (!mCombineSuggestionAndCondition) {
+            boolean hasConditions = false;
+            for (int i = 0; mConditions != null && i < mConditions.size(); i++) {
+                boolean shouldShow = mConditions.get(i).shouldShow();
+                hasConditions |= shouldShow;
+                countItem(mConditions.get(i), R.layout.condition_card, shouldShow, NS_CONDITION);
+            }
+
+            resetCount();
+            countItem(null, R.layout.dashboard_spacer, hasConditions && hasSuggestions, NS_SPACER);
+            countItem(buildSuggestionHeaderData(), R.layout.suggestion_header, hasSuggestions,
                 NS_SPACER);
 
-        resetCount();
-        if (mSuggestions != null) {
-            int maxSuggestions = getDisplayableSuggestionCount();
-            for (int i = 0; i < mSuggestions.size(); i++) {
-                countSuggestion(mSuggestions.get(i), i < maxSuggestions);
+            resetCount();
+            if (mSuggestions != null) {
+                int maxSuggestions = getDisplayableSuggestionCount();
+                for (int i = 0; i < mSuggestions.size(); i++) {
+                    countSuggestion(mSuggestions.get(i), i < maxSuggestions);
+                }
             }
+        } else {
+            final List<Condition> conditions = getConditionsToShow(mConditions);
+            final boolean hasConditions = sizeOf(conditions) > 0;
+
+            final List<Tile> suggestions = getSuggestionsToShow(mSuggestions);
+            final int hiddenSuggestion =
+                hasSuggestions ? sizeOf(mSuggestions) - sizeOf(suggestions) : 0;
+
+            resetCount();
+            /* Top suggestion/condition header. This will be present when there is any suggestion or
+             * condition to show, except in the case that there is only conditions to show and the
+             * mode is fully expanded. */
+            countItem(new SuggestionConditionHeaderData(conditions, hiddenSuggestion),
+                R.layout.suggestion_condition_header, hasSuggestions
+                    || hasConditions && mSuggestionConditionMode != HEADER_MODE_FULLY_EXPANDED,
+                NS_SUGGESTION_CONDITION);
+
+            /* Suggestion container. This is the card view that contains the list of suggestions.
+             * This will be added whenever the suggestion list is not empty */
+            countItem(suggestions, R.layout.suggestion_condition_container, sizeOf(suggestions) > 0,
+                NS_SUGGESTION_CONDITION);
+
+            /* Second suggestion/condition header. This will be added when there is at least one
+             * suggestion or condition that is not currently displayed, and the user can expand the
+              * section to view more items. */
+            countItem(new SuggestionConditionHeaderData(conditions, hiddenSuggestion),
+                R.layout.suggestion_condition_header,
+                mSuggestionConditionMode != HEADER_MODE_COLLAPSED
+                    && mSuggestionConditionMode != HEADER_MODE_FULLY_EXPANDED
+                    && (hiddenSuggestion > 0
+                        || hasConditions && hasSuggestions),
+                NS_SUGGESTION_CONDITION);
+
+            /* Condition container. This is the card view that contains the list of conditions.
+             * This will be added whenever the condition list is not empty */
+            countItem(conditions, R.layout.suggestion_condition_container,
+                hasConditions && mSuggestionConditionMode == HEADER_MODE_FULLY_EXPANDED,
+                NS_SUGGESTION_CONDITION);
+
+            /* Suggestion/condition footer. This will be present when the section is fully expanded
+             * or when there is no conditions and no hidden suggestions */
+            countItem(null, R.layout.suggestion_condition_footer,
+                (hasConditions || hasSuggestions) &&
+                    mSuggestionConditionMode == HEADER_MODE_FULLY_EXPANDED
+                || hasSuggestions && !hasConditions && hiddenSuggestion == 0,
+                NS_SUGGESTION_CONDITION);
         }
+
         resetCount();
         for (int i = 0; mCategories != null && i < mCategories.size(); i++) {
             DashboardCategory category = mCategories.get(i);
@@ -260,6 +367,10 @@
         }
     }
 
+    private static int sizeOf(List<?> list) {
+        return list == null ? 0 : list.size();
+    }
+
     private SuggestionHeaderData buildSuggestionHeaderData() {
         SuggestionHeaderData data;
         if (mSuggestions == null) {
@@ -275,19 +386,49 @@
         return data;
     }
 
+    private List<Condition> getConditionsToShow(List<Condition> conditions) {
+        if (conditions == null) {
+            return null;
+        }
+        List<Condition> result = new ArrayList<Condition>();
+        final int size = conditions == null ? 0 : conditions.size();
+        for (int i = 0; i < size; i++) {
+            final Condition condition = conditions.get(i);
+            if (condition.shouldShow()) {
+                result.add(condition);
+            }
+        }
+        return result;
+    }
+
+    private List<Tile> getSuggestionsToShow(List<Tile> suggestions) {
+        if (suggestions == null || mSuggestionConditionMode == HEADER_MODE_COLLAPSED) {
+            return null;
+        }
+        if (mSuggestionConditionMode != HEADER_MODE_DEFAULT
+                || suggestions.size() <= DEFAULT_SUGGESTION_COUNT) {
+            return suggestions;
+        }
+        return suggestions.subList(0, DEFAULT_SUGGESTION_COUNT);
+    }
+
     /**
      * Builder used to build the ItemsData
      * <p>
-     * {@link #mExpandedCondition} and {@link #mSuggestionMode} have default value
-     * while others are not.
+     * {@link #mExpandedCondition}, {@link #mSuggestionConditionMode} and {@link #mSuggestionMode}
+     * have default value while others are not.
      */
     public static class Builder {
+        @Deprecated
         private int mSuggestionMode = SUGGESTION_MODE_DEFAULT;
+        @Deprecated
         private Condition mExpandedCondition = null;
+        private @HeaderMode int mSuggestionConditionMode = HEADER_MODE_DEFAULT;
 
         private List<DashboardCategory> mCategories;
         private List<Condition> mConditions;
         private List<Tile> mSuggestions;
+        private boolean mCombineSuggestionAndCondition;
 
         public Builder() {
         }
@@ -298,6 +439,8 @@
             mSuggestions = dashboardData.mSuggestions;
             mSuggestionMode = dashboardData.mSuggestionMode;
             mExpandedCondition = dashboardData.mExpandedCondition;
+            mSuggestionConditionMode = dashboardData.mSuggestionConditionMode;
+            mCombineSuggestionAndCondition = dashboardData.mCombineSuggestionAndCondition;
         }
 
         public Builder setCategories(List<DashboardCategory> categories) {
@@ -320,11 +463,22 @@
             return this;
         }
 
+        @Deprecated
         public Builder setExpandedCondition(Condition expandedCondition) {
             this.mExpandedCondition = expandedCondition;
             return this;
         }
 
+        public Builder setSuggestionConditionMode(@HeaderMode int mode) {
+            this.mSuggestionConditionMode = mode;
+            return this;
+        }
+
+        public Builder setCombineSuggestionAndCondition(boolean combine) {
+            this.mCombineSuggestionAndCondition = combine;
+            return this;
+        }
+
         public DashboardData build() {
             return new DashboardData(this);
         }
@@ -363,6 +517,8 @@
             return mOldItems.get(oldItemPosition).equals(mNewItems.get(newItemPosition));
         }
 
+        // not needed in combined UI
+        @Deprecated
         @Nullable
         @Override
         public Object getChangePayload(int oldItemPosition, int newItemPosition) {
@@ -380,13 +536,24 @@
         // valid types in field type
         private static final int TYPE_DASHBOARD_CATEGORY = R.layout.dashboard_category;
         private static final int TYPE_DASHBOARD_TILE = R.layout.dashboard_tile;
+        @Deprecated
         private static final int TYPE_SUGGESTION_HEADER = R.layout.suggestion_header;
+        @Deprecated
         private static final int TYPE_SUGGESTION_TILE = R.layout.suggestion_tile;
+        private static final int TYPE_SUGGESTION_CONDITION_CONTAINER =
+            R.layout.suggestion_condition_container;
+        private static final int TYPE_SUGGESTION_CONDITION_HEADER =
+            R.layout.suggestion_condition_header;
+        @Deprecated
         private static final int TYPE_CONDITION_CARD = R.layout.condition_card;
+        private static final int TYPE_SUGGESTION_CONDITION_FOOTER =
+                R.layout.suggestion_condition_footer;
         private static final int TYPE_DASHBOARD_SPACER = R.layout.dashboard_spacer;
 
         @IntDef({TYPE_DASHBOARD_CATEGORY, TYPE_DASHBOARD_TILE, TYPE_SUGGESTION_HEADER,
-                TYPE_SUGGESTION_TILE, TYPE_CONDITION_CARD, TYPE_DASHBOARD_SPACER})
+                TYPE_SUGGESTION_TILE, TYPE_SUGGESTION_CONDITION_CONTAINER,
+                TYPE_SUGGESTION_CONDITION_HEADER, TYPE_CONDITION_CARD,
+                TYPE_SUGGESTION_CONDITION_FOOTER, TYPE_DASHBOARD_SPACER})
         @Retention(RetentionPolicy.SOURCE)
         public @interface ItemTypes{}
 
@@ -412,8 +579,10 @@
          * To store whether the condition is expanded, useless when {@link #type} is not
          * {@link #TYPE_CONDITION_CARD}
          */
+        @Deprecated
         public final boolean conditionExpanded;
 
+        @Deprecated
         public Item(Object entity, @ItemTypes int type, int id, boolean conditionExpanded) {
             this.entity = entity;
             this.type = type;
@@ -421,6 +590,10 @@
             this.conditionExpanded = conditionExpanded;
         }
 
+        public Item(Object entity, @ItemTypes int type, int id) {
+            this(entity, type, id, false);
+        }
+
         /**
          * Override it to make comparision in the {@link ItemsDataDiffCallback}
          * @param obj object to compared with
@@ -506,4 +679,27 @@
         }
     }
 
+    /**
+     * This class contains the data needed to build the suggestion/condition header. The data can
+     * also be used to check the diff in DiffUtil.Callback
+     */
+    public static class SuggestionConditionHeaderData {
+        public final List<Icon> conditionIcons;
+        public final CharSequence title;
+        public final int conditionCount;
+        public final int hiddenSuggestionCount;
+
+        public SuggestionConditionHeaderData(List<Condition> conditions,
+                int hiddenSuggestionCount) {
+            conditionCount = sizeOf(conditions);
+            this.hiddenSuggestionCount = hiddenSuggestionCount;
+            title = conditionCount > 0 ? conditions.get(0).getTitle() : null;
+            conditionIcons = new ArrayList<Icon>();
+            for (int i = 0; conditions != null && i < conditions.size(); i++) {
+                final Condition condition = conditions.get(i);
+                conditionIcons.add(condition.getIcon());
+            }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProvider.java b/src/com/android/settings/dashboard/DashboardFeatureProvider.java
index 1c55bbb..939a5d6 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProvider.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProvider.java
@@ -56,6 +56,11 @@
     List<DashboardCategory> getAllCategories();
 
     /**
+     * Whether or not we should tint icons in setting pages.
+     */
+    boolean shouldTintIcon();
+
+    /**
      * Returns an unique string key for the tile.
      */
     String getDashboardKeyForTile(Tile tile);
@@ -90,4 +95,9 @@
      */
     void openTileIntent(Activity activity, Tile tile);
 
+    /**
+     * Whether or not we should use new UI that combines the settings suggestions and conditions.
+     */
+    boolean combineSuggestionAndCondition();
+
 }
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 342888e..dcae322 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -98,6 +98,11 @@
     }
 
     @Override
+    public boolean shouldTintIcon() {
+        return mContext.getResources().getBoolean(R.bool.config_tintSettingIcon);
+    }
+
+    @Override
     public String getDashboardKeyForTile(Tile tile) {
         if (tile == null || tile.intent == null) {
             return null;
@@ -201,6 +206,11 @@
         launchIntentOrSelectProfile(activity, tile, intent, MetricsEvent.DASHBOARD_SUMMARY);
     }
 
+    @Override
+    public boolean combineSuggestionAndCondition() {
+        return false;
+    }
+
     private void launchIntentOrSelectProfile(Activity activity, Tile tile, Intent intent,
             int sourceMetricCategory) {
         if (!isIntentResolvable(intent)) {
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 67eae1e..9c0bfd8 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -34,29 +34,32 @@
 import com.android.settings.dashboard.conditional.Condition;
 import com.android.settings.dashboard.conditional.ConditionAdapterUtils;
 import com.android.settings.dashboard.conditional.ConditionManager;
+import com.android.settings.dashboard.conditional.ConditionManager.ConditionListener;
 import com.android.settings.dashboard.conditional.FocusRecyclerView;
+import com.android.settings.dashboard.conditional.FocusRecyclerView.FocusListener;
 import com.android.settings.dashboard.suggestions.SuggestionDismissController;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.dashboard.suggestions.SuggestionsChecks;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.SuggestionParser;
 import com.android.settingslib.drawer.CategoryKey;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.SettingsDrawerActivity;
+import com.android.settingslib.drawer.SettingsDrawerActivity.CategoryListener;
 import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.suggestions.SuggestionList;
+import com.android.settingslib.suggestions.SuggestionParser;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class DashboardSummary extends InstrumentedFragment
-        implements SettingsDrawerActivity.CategoryListener, ConditionManager.ConditionListener,
-        FocusRecyclerView.FocusListener {
+        implements CategoryListener, ConditionListener,
+        FocusListener, SuggestionDismissController.Callback {
     public static final boolean DEBUG = false;
     private static final boolean DEBUG_TIMING = false;
     private static final int MAX_WAIT_MILLIS = 700;
     private static final String TAG = "DashboardSummary";
 
-    private static final String SUGGESTIONS = "suggestions";
 
     private static final String EXTRA_SCROLL_POSITION = "scroll_position";
 
@@ -94,7 +97,7 @@
         mConditionManager = ConditionManager.get(activity, false);
         getLifecycle().addObserver(mConditionManager);
         mSuggestionParser = new SuggestionParser(activity,
-                activity.getSharedPreferences(SUGGESTIONS, 0), R.xml.suggestion_ordering);
+                mSuggestionFeatureProvider.getSharedPrefs(activity), R.xml.suggestion_ordering);
         mSuggestionsChecks = new SuggestionsChecks(getContext());
         if (DEBUG_TIMING) {
             Log.d(TAG, "onCreate took " + (System.currentTimeMillis() - startTime)
@@ -192,13 +195,16 @@
         mDashboard.addItemDecoration(new DashboardDecorator(getContext()));
         mDashboard.setListener(this);
         Log.d(TAG, "adapter created");
-        mAdapter = new DashboardAdapter(getContext(), bundle, mConditionManager.getConditions());
+        mAdapter = new DashboardAdapter(getContext(), bundle, mConditionManager.getConditions(),
+            mSuggestionParser, this /* SuggestionDismissController.Callback */);
         mDashboard.setAdapter(mAdapter);
-        mSuggestionDismissHandler = new SuggestionDismissController(
-                getContext(), mDashboard, mSuggestionParser, mAdapter);
+        if (!mDashboardFeatureProvider.combineSuggestionAndCondition()) {
+            mSuggestionDismissHandler = new SuggestionDismissController(
+                getContext(), mDashboard, mSuggestionParser, this);
+            ConditionAdapterUtils.addDismiss(mDashboard);
+        }
         mDashboard.setItemAnimator(new DashboardItemAnimator());
         mSummaryLoader.setSummaryConsumer(mAdapter);
-        ConditionAdapterUtils.addDismiss(mDashboard);
         if (DEBUG_TIMING) {
             Log.d(TAG, "onViewCreated took "
                     + (System.currentTimeMillis() - startTime) + " ms");
@@ -236,13 +242,27 @@
         }
     }
 
+    @Override
+    public Tile getSuggestionForPosition(int position) {
+        return mAdapter.getSuggestion(position);
+    }
+
+    @Override
+    public void onSuggestionDismissed(Tile suggestion) {
+        // Refresh the UI to pick up suggestions that can now be shown because, say, a higher
+        // priority suggestion has been dismissed, or an exclusive suggestion category is emptied.
+        rebuildUI();
+    }
+
     private class SuggestionLoader extends AsyncTask<Void, Void, List<Tile>> {
         @Override
         protected List<Tile> doInBackground(Void... params) {
             final Context context = getContext();
             boolean isSmartSuggestionEnabled =
                     mSuggestionFeatureProvider.isSmartSuggestionEnabled(context);
-            List<Tile> suggestions = mSuggestionParser.getSuggestions(isSmartSuggestionEnabled);
+            final SuggestionList sl = mSuggestionParser.getSuggestions(isSmartSuggestionEnabled);
+            final List<Tile> suggestions = sl.getSuggestions();
+
             if (isSmartSuggestionEnabled) {
                 List<String> suggestionIds = new ArrayList<>(suggestions.size());
                 for (Tile suggestion : suggestions) {
@@ -255,11 +275,12 @@
             for (int i = 0; i < suggestions.size(); i++) {
                 Tile suggestion = suggestions.get(i);
                 if (mSuggestionsChecks.isSuggestionComplete(suggestion)) {
-                    mSuggestionFeatureProvider.dismissSuggestion(
-                            context, mSuggestionParser, suggestion);
                     suggestions.remove(i--);
                 }
             }
+            if (sl.isExclusiveSuggestionCategory()) {
+                mSuggestionFeatureProvider.filterExclusiveSuggestions(suggestions);
+            }
             return suggestions;
         }
 
diff --git a/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java b/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java
index 0cc3d15..92055be 100644
--- a/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java
+++ b/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java
@@ -30,10 +30,10 @@
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.Instrumentable;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnCreate;
-import com.android.settings.core.lifecycle.events.OnSaveInstanceState;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnCreate;
+import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/settings/dashboard/RestrictedDashboardFragment.java b/src/com/android/settings/dashboard/RestrictedDashboardFragment.java
new file mode 100644
index 0000000..c2176d7
--- /dev/null
+++ b/src/com/android/settings/dashboard/RestrictedDashboardFragment.java
@@ -0,0 +1,261 @@
+/*
+ * 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.dashboard;
+
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.RestrictionsManager;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.view.View;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.ShowAdminSupportDetailsDialog;
+import com.android.settingslib.RestrictedLockUtils;
+
+/**
+ * Base class for settings screens that should be pin protected when in restricted mode or
+ * that will display an admin support message in case an admin has disabled the options.
+ * The constructor for this class will take the restriction key that this screen should be
+ * locked by.  If {@link RestrictionsManager.hasRestrictionsProvider()} and
+ * {@link UserManager.hasUserRestriction()}, then the user will have to enter the restrictions
+ * pin before seeing the Settings screen.
+ *
+ * {@link RestrictionsManager.hasRestrictionsProvider()} returns true, pass in
+ * {@link RESTRICT_IF_OVERRIDABLE} to the constructor instead of a restrictions key.
+ *
+ * This fragment is a replacement of {@link RestrictedSettingsFragment} but extends
+ * from {@link DashboardFragment}, so we could also use
+ * {@link com.android.settings.core.PreferenceController} in this fragment.
+ */
+public abstract class RestrictedDashboardFragment extends DashboardFragment {
+
+    protected static final String RESTRICT_IF_OVERRIDABLE = "restrict_if_overridable";
+
+    // No RestrictedSettingsFragment screens should use this number in startActivityForResult.
+    private static final int REQUEST_PIN_CHALLENGE = 12309;
+
+    private static final String KEY_CHALLENGE_SUCCEEDED = "chsc";
+    private static final String KEY_CHALLENGE_REQUESTED = "chrq";
+
+    // If the restriction PIN is entered correctly.
+    private boolean mChallengeSucceeded;
+    private boolean mChallengeRequested;
+
+    private UserManager mUserManager;
+    private RestrictionsManager mRestrictionsManager;
+
+    private final String mRestrictionKey;
+    private View mAdminSupportDetails;
+    private EnforcedAdmin mEnforcedAdmin;
+    private TextView mEmptyTextView;
+
+    private boolean mOnlyAvailableForAdmins = false;
+    private boolean mIsAdminUser;
+
+    // Receiver to clear pin status when the screen is turned off.
+    private BroadcastReceiver mScreenOffReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (!mChallengeRequested) {
+                mChallengeSucceeded = false;
+                mChallengeRequested = false;
+            }
+        }
+    };
+
+    /**
+     * @param restrictionKey The restriction key to check before pin protecting
+     *            this settings page. Pass in {@link RESTRICT_IF_OVERRIDABLE} if it should
+     *            be protected whenever a restrictions provider is set. Pass in
+     *            null if it should never be protected.
+     */
+    public RestrictedDashboardFragment(String restrictionKey) {
+        mRestrictionKey = restrictionKey;
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mRestrictionsManager = (RestrictionsManager) getSystemService(Context.RESTRICTIONS_SERVICE);
+        mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);
+        mIsAdminUser = mUserManager.isAdminUser();
+
+        if (icicle != null) {
+            mChallengeSucceeded = icicle.getBoolean(KEY_CHALLENGE_SUCCEEDED, false);
+            mChallengeRequested = icicle.getBoolean(KEY_CHALLENGE_REQUESTED, false);
+        }
+
+        IntentFilter offFilter = new IntentFilter(Intent.ACTION_SCREEN_OFF);
+        offFilter.addAction(Intent.ACTION_USER_PRESENT);
+        getActivity().registerReceiver(mScreenOffReceiver, offFilter);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        mAdminSupportDetails = initAdminSupportDetailsView();
+        mEmptyTextView = initEmptyTextView();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        if (getActivity().isChangingConfigurations()) {
+            outState.putBoolean(KEY_CHALLENGE_REQUESTED, mChallengeRequested);
+            outState.putBoolean(KEY_CHALLENGE_SUCCEEDED, mChallengeSucceeded);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (shouldBeProviderProtected(mRestrictionKey)) {
+            ensurePin();
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        getActivity().unregisterReceiver(mScreenOffReceiver);
+        super.onDestroy();
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_PIN_CHALLENGE) {
+            if (resultCode == Activity.RESULT_OK) {
+                mChallengeSucceeded = true;
+                mChallengeRequested = false;
+            } else {
+                mChallengeSucceeded = false;
+            }
+            return;
+        }
+
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    private void ensurePin() {
+        if (!mChallengeSucceeded && !mChallengeRequested
+                && mRestrictionsManager.hasRestrictionsProvider()) {
+            Intent intent = mRestrictionsManager.createLocalApprovalIntent();
+            if (intent != null) {
+                mChallengeRequested = true;
+                mChallengeSucceeded = false;
+                PersistableBundle request = new PersistableBundle();
+                request.putString(RestrictionsManager.REQUEST_KEY_MESSAGE,
+                        getResources().getString(R.string.restr_pin_enter_admin_pin));
+                intent.putExtra(RestrictionsManager.EXTRA_REQUEST_BUNDLE, request);
+                startActivityForResult(intent, REQUEST_PIN_CHALLENGE);
+            }
+        }
+    }
+
+    /**
+     * Returns true if this activity is restricted, but no restrictions provider has been set.
+     * Used to determine if the settings UI should disable UI.
+     */
+    protected boolean isRestrictedAndNotProviderProtected() {
+        if (mRestrictionKey == null || RESTRICT_IF_OVERRIDABLE.equals(mRestrictionKey)) {
+            return false;
+        }
+        return mUserManager.hasUserRestriction(mRestrictionKey)
+                && !mRestrictionsManager.hasRestrictionsProvider();
+    }
+
+    protected boolean hasChallengeSucceeded() {
+        return (mChallengeRequested && mChallengeSucceeded) || !mChallengeRequested;
+    }
+
+    /**
+     * Returns true if this restrictions key is locked down.
+     */
+    protected boolean shouldBeProviderProtected(String restrictionKey) {
+        if (restrictionKey == null) {
+            return false;
+        }
+        boolean restricted = RESTRICT_IF_OVERRIDABLE.equals(restrictionKey)
+                || mUserManager.hasUserRestriction(mRestrictionKey);
+        return restricted && mRestrictionsManager.hasRestrictionsProvider();
+    }
+
+    private View initAdminSupportDetailsView() {
+        return getActivity().findViewById(R.id.admin_support_details);
+    }
+
+    protected TextView initEmptyTextView() {
+        TextView emptyView = (TextView) getActivity().findViewById(android.R.id.empty);
+        return emptyView;
+    }
+
+    public EnforcedAdmin getRestrictionEnforcedAdmin() {
+        mEnforcedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(getActivity(),
+                mRestrictionKey, UserHandle.myUserId());
+        if (mEnforcedAdmin != null && mEnforcedAdmin.userId == UserHandle.USER_NULL) {
+            mEnforcedAdmin.userId = UserHandle.myUserId();
+        }
+        return mEnforcedAdmin;
+    }
+
+    public TextView getEmptyTextView() {
+        return mEmptyTextView;
+    }
+
+    @Override
+    protected void onDataSetChanged() {
+        highlightPreferenceIfNeeded();
+        if (mAdminSupportDetails != null && isUiRestrictedByOnlyAdmin()) {
+            final EnforcedAdmin admin = getRestrictionEnforcedAdmin();
+            ShowAdminSupportDetailsDialog.setAdminSupportDetails(getActivity(),
+                    mAdminSupportDetails, admin, false);
+            setEmptyView(mAdminSupportDetails);
+        } else if (mEmptyTextView != null) {
+            setEmptyView(mEmptyTextView);
+        }
+        super.onDataSetChanged();
+    }
+
+    public void setIfOnlyAvailableForAdmins(boolean onlyForAdmins) {
+        mOnlyAvailableForAdmins = onlyForAdmins;
+    }
+
+    /**
+     * Returns whether restricted or actionable UI elements should be removed or disabled.
+     */
+    protected boolean isUiRestricted() {
+        return isRestrictedAndNotProviderProtected() || !hasChallengeSucceeded()
+                || (!mIsAdminUser && mOnlyAvailableForAdmins);
+    }
+
+    protected boolean isUiRestrictedByOnlyAdmin() {
+        return isUiRestricted() && !mUserManager.hasBaseUserRestriction(mRestrictionKey,
+                UserHandle.of(UserHandle.myUserId())) && (mIsAdminUser || !mOnlyAvailableForAdmins);
+    }
+}
diff --git a/src/com/android/settings/dashboard/conditional/CellularDataCondition.java b/src/com/android/settings/dashboard/conditional/CellularDataCondition.java
index 523bfc4..6842422 100644
--- a/src/com/android/settings/dashboard/conditional/CellularDataCondition.java
+++ b/src/com/android/settings/dashboard/conditional/CellularDataCondition.java
@@ -105,8 +105,11 @@
         public void onReceive(Context context, Intent intent) {
             if (TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED.equals(
                     intent.getAction())) {
-                ConditionManager.get(context).getCondition(CellularDataCondition.class)
-                        .refreshState();
+                CellularDataCondition condition = ConditionManager.get(context).getCondition(
+                        CellularDataCondition.class);
+                if (condition != null) {
+                    condition.refreshState();
+                }
             }
         }
     }
diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapter.java b/src/com/android/settings/dashboard/conditional/ConditionAdapter.java
new file mode 100644
index 0000000..5827d14
--- /dev/null
+++ b/src/com/android/settings/dashboard/conditional/ConditionAdapter.java
@@ -0,0 +1,103 @@
+/*
+ * 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.dashboard.conditional;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.dashboard.DashboardAdapter.DashboardItemHolder;
+import com.android.settings.dashboard.DashboardData;
+import com.android.settings.dashboard.DashboardData.HeaderMode;
+import com.android.settings.overlay.FeatureFactory;
+import java.util.List;
+import java.util.Objects;
+
+public class ConditionAdapter extends RecyclerView.Adapter<DashboardItemHolder> {
+    public static final String TAG = "ConditionAdapter";
+
+    private final Context mContext;
+    private final MetricsFeatureProvider mMetricsFeatureProvider;
+    private List<Condition> mConditions;
+    private @HeaderMode int mMode;
+
+    private View.OnClickListener mConditionClickListener = new View.OnClickListener() {
+
+        @Override
+        public void onClick(View v) {
+            //TODO: get rid of setTag/getTag
+            Condition condition = (Condition) v.getTag();
+            mMetricsFeatureProvider.action(mContext,
+                MetricsEvent.ACTION_SETTINGS_CONDITION_CLICK,
+                condition.getMetricsConstant());
+            condition.onPrimaryClick();
+        }
+    };
+
+    public ConditionAdapter(Context context, List<Condition> conditions, @HeaderMode int mode) {
+        mContext = context;
+        mConditions = conditions;
+        mMode = mode;
+        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+
+        setHasStableIds(true);
+    }
+
+    public Object getItem(long itemId) {
+        for (Condition condition : mConditions) {
+            if (Objects.hash(condition.getTitle()) == itemId) {
+                return condition;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public DashboardItemHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new DashboardItemHolder(LayoutInflater.from(parent.getContext()).inflate(
+                viewType, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(DashboardItemHolder holder, int position) {
+        // TODO: merge methods from ConditionAdapterUtils into this class
+        ConditionAdapterUtils.bindViews(mConditions.get(position), holder,
+            position == mConditions.size() - 1, mConditionClickListener);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return Objects.hash(mConditions.get(position).getTitle());
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return R.layout.condition_tile_new_ui;
+    }
+
+    @Override
+    public int getItemCount() {
+        if (mMode == DashboardData.HEADER_MODE_FULLY_EXPANDED) {
+            return mConditions.size();
+        }
+        return 0;
+    }
+
+}
diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java b/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java
index aebbf93..0e25723 100644
--- a/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java
+++ b/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java
@@ -44,22 +44,28 @@
             @Override
             public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
                 return viewHolder.getItemViewType() == R.layout.condition_card
+                    || viewHolder.getItemViewType() == R.layout.condition_tile_new_ui
                         ? super.getSwipeDirs(recyclerView, viewHolder) : 0;
             }
 
             @Override
             public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
-                DashboardAdapter adapter = (DashboardAdapter) recyclerView.getAdapter();
-                Object item = adapter.getItem(viewHolder.getItemId());
-                if (item instanceof Condition) {
-                    ((Condition) item).silence();
+                Object item;
+                if (viewHolder.getItemViewType() == R.layout.condition_card) {
+                    DashboardAdapter adapter = (DashboardAdapter) recyclerView.getAdapter();
+                    item = adapter.getItem(viewHolder.getItemId());
+                } else {
+                    ConditionAdapter adapter = (ConditionAdapter) recyclerView.getAdapter();
+                    item = adapter.getItem(viewHolder.getItemId());
                 }
+                ((Condition) item).silence();
             }
         };
         ItemTouchHelper itemTouchHelper = new ItemTouchHelper(callback);
         itemTouchHelper.attachToRecyclerView(recyclerView);
     }
 
+    @Deprecated
     public static void bindViews(final Condition condition,
             DashboardAdapter.DashboardItemHolder view, boolean isExpanded,
             View.OnClickListener onClickListener, View.OnClickListener onExpandListener) {
@@ -121,6 +127,49 @@
         }
     }
 
+    public static void bindViews(final Condition condition,
+            DashboardAdapter.DashboardItemHolder view, boolean isLastItem,
+            View.OnClickListener onClickListener) {
+        if (condition instanceof AirplaneModeCondition) {
+            Log.d(TAG, "Airplane mode condition has been bound with "
+                + "isActive=" + condition.isActive() + ". Airplane mode is currently " +
+                WirelessUtils.isAirplaneModeOn(condition.mManager.getContext()));
+        }
+        View card = view.itemView.findViewById(R.id.content);
+        card.setTag(condition);
+        card.setOnClickListener(onClickListener);
+        view.icon.setImageIcon(condition.getIcon());
+        view.title.setText(condition.getTitle());
+
+        CharSequence[] actions = condition.getActions();
+        final boolean hasButtons = actions.length > 0;
+        setViewVisibility(view.itemView, R.id.buttonBar, hasButtons);
+
+        view.summary.setText(condition.getSummary());
+        for (int i = 0; i < 2; i++) {
+            Button button = (Button) view.itemView.findViewById(i == 0
+                ? R.id.first_action : R.id.second_action);
+            if (actions.length > i) {
+                button.setVisibility(View.VISIBLE);
+                button.setText(actions[i]);
+                final int index = i;
+                button.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Context context = v.getContext();
+                        FeatureFactory.getFactory(context).getMetricsFeatureProvider()
+                            .action(context, MetricsEvent.ACTION_SETTINGS_CONDITION_BUTTON,
+                                condition.getMetricsConstant());
+                        condition.onActionClick(index);
+                    }
+                });
+            } else {
+                button.setVisibility(View.GONE);
+            }
+        }
+        setViewVisibility(view.itemView, R.id.divider, !isLastItem);
+    }
+
     private static void setViewVisibility(View containerView, int viewId, boolean visible) {
         View view = containerView.findViewById(viewId);
         if (view != null) {
diff --git a/src/com/android/settings/dashboard/conditional/ConditionManager.java b/src/com/android/settings/dashboard/conditional/ConditionManager.java
index c67fb32..a60019a 100644
--- a/src/com/android/settings/dashboard/conditional/ConditionManager.java
+++ b/src/com/android/settings/dashboard/conditional/ConditionManager.java
@@ -21,9 +21,9 @@
 import android.util.Log;
 import android.util.Xml;
 
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlSerializer;
@@ -96,8 +96,12 @@
                     Condition condition = createCondition(Class.forName(clz));
                     PersistableBundle bundle = PersistableBundle.restoreFromXml(parser);
                     if (DEBUG) Log.d(TAG, "Reading " + clz + " -- " + bundle);
-                    condition.restoreState(bundle);
-                    conditions.add(condition);
+                    if (condition != null) {
+                        condition.restoreState(bundle);
+                        conditions.add(condition);
+                    } else {
+                        Log.e(TAG, "failed to add condition: " + clz);
+                    }
                     while (parser.getDepth() > depth) {
                         parser.next();
                     }
@@ -155,7 +159,10 @@
     private void addIfMissing(Class<? extends Condition> clz, ArrayList<Condition> conditions) {
         if (getCondition(clz, conditions) == null) {
             if (DEBUG) Log.d(TAG, "Adding missing " + clz.getName());
-            conditions.add(createCondition(clz));
+            Condition condition = createCondition(clz);
+            if (condition != null) {
+                conditions.add(condition);
+            }
         }
     }
 
@@ -177,7 +184,8 @@
         } else if (NightDisplayCondition.class == clz) {
             return new NightDisplayCondition(this);
         }
-        throw new RuntimeException("Unexpected Condition " + clz);
+        Log.e(TAG, "unknown condition class: " + clz.getSimpleName());
+        return null;
     }
 
     Context getContext() {
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
new file mode 100644
index 0000000..3335950
--- /dev/null
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
@@ -0,0 +1,135 @@
+/*
+ * 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.dashboard.suggestions;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.R.layout;
+import com.android.settings.SettingsActivity;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.dashboard.DashboardAdapter.DashboardItemHolder;
+import com.android.settings.dashboard.DashboardAdapter.IconCache;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.drawer.Tile;
+import java.util.List;
+import java.util.Objects;
+
+public class SuggestionAdapter extends RecyclerView.Adapter<DashboardItemHolder> {
+    public static final String TAG = "SuggestionAdapter";
+
+    private final Context mContext;
+    private final MetricsFeatureProvider mMetricsFeatureProvider;
+    private final SuggestionFeatureProvider mSuggestionFeatureProvider;
+    private List<Tile> mSuggestions;
+    private final IconCache mCache;
+    private final List<String> mSuggestionsShownLogged;
+
+    public SuggestionAdapter(Context context, List<Tile> suggestions,
+            List<String> suggestionsShownLogged) {
+        mContext = context;
+        mSuggestions = suggestions;
+        mSuggestionsShownLogged = suggestionsShownLogged;
+        mCache = new IconCache(context);
+        final FeatureFactory factory = FeatureFactory.getFactory(context);
+        mMetricsFeatureProvider = factory.getMetricsFeatureProvider();
+        mSuggestionFeatureProvider = factory.getSuggestionFeatureProvider(context);
+
+        setHasStableIds(true);
+    }
+
+    @Override
+    public DashboardItemHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new DashboardItemHolder(LayoutInflater.from(parent.getContext()).inflate(
+                viewType, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(DashboardItemHolder holder, int position) {
+        final Tile suggestion = (Tile) mSuggestions.get(position);
+        final String suggestionId = mSuggestionFeatureProvider.getSuggestionIdentifier(
+            mContext, suggestion);
+        // This is for cases when a suggestion is dismissed and the next one comes to view
+        if (!mSuggestionsShownLogged.contains(suggestionId)) {
+            mMetricsFeatureProvider.action(
+                mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, suggestionId);
+            mSuggestionsShownLogged.add(suggestionId);
+        }
+        if (suggestion.remoteViews != null) {
+            final ViewGroup itemView = (ViewGroup) holder.itemView;
+            itemView.removeAllViews();
+            itemView.addView(suggestion.remoteViews.apply(itemView.getContext(), itemView));
+        } else {
+            holder.icon.setImageDrawable(mCache.getIcon(suggestion.icon));
+            holder.title.setText(suggestion.title);
+            if (!TextUtils.isEmpty(suggestion.summary)) {
+                holder.summary.setText(suggestion.summary);
+                holder.summary.setVisibility(View.VISIBLE);
+            } else {
+                holder.summary.setVisibility(View.GONE);
+            }
+        }
+        final View divider = holder.itemView.findViewById(R.id.divider);
+        if (divider != null) {
+            divider.setVisibility(position < mSuggestions.size() - 1 ? View.VISIBLE : View.GONE);
+        }
+        View clickHandler = holder.itemView;
+        // If a view with @android:id/primary is defined, use that as the click handler
+        // instead.
+        final View primaryAction = holder.itemView.findViewById(android.R.id.primary);
+        if (primaryAction != null) {
+            clickHandler = primaryAction;
+            // set the item view to disabled to remove any touch effects
+            holder.itemView.setEnabled(false);
+        }
+        clickHandler.setOnClickListener(v -> {
+            mMetricsFeatureProvider.action(mContext,
+                MetricsEvent.ACTION_SETTINGS_SUGGESTION, suggestionId);
+            ((SettingsActivity) mContext).startSuggestion(suggestion.intent);
+        });
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return Objects.hash(mSuggestions.get(position).title);
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return layout.suggestion_tile_new_ui;
+    }
+
+    @Override
+    public int getItemCount() {
+        return mSuggestions.size();
+    }
+
+    public Tile getSuggestion(int position) {
+        final long itemId = getItemId(position);
+        for (Tile tile: mSuggestions) {
+            if (Objects.hash(tile.title) == itemId) {
+                return tile;
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java b/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
index 708aadb..f0a65f6 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
@@ -22,8 +22,8 @@
 
 import com.android.settings.R;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.SuggestionParser;
 import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.suggestions.SuggestionParser;
 
 public class SuggestionDismissController extends ItemTouchHelper.SimpleCallback {
 
@@ -65,7 +65,10 @@
 
     @Override
     public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
-        if (viewHolder.getItemViewType() == R.layout.suggestion_tile) {
+        final int layoutId = viewHolder.getItemViewType();
+        if (layoutId == R.layout.suggestion_tile
+                || layoutId == R.layout.suggestion_tile_new_ui
+                || layoutId == R.layout.suggestion_tile_card) {
             // Only return swipe direction for suggestion tiles. All other types are not swipeable.
             return super.getSwipeDirs(recyclerView, viewHolder);
         }
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
index 14f5e9c..5dc8892 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
@@ -16,10 +16,13 @@
 
 package com.android.settings.dashboard.suggestions;
 
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.SharedPreferences;
+import android.support.annotation.NonNull;
 
-import com.android.settingslib.SuggestionParser;
 import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.suggestions.SuggestionParser;
 
 import java.util.List;
 
@@ -31,11 +34,13 @@
      */
     boolean isSmartSuggestionEnabled(Context context);
 
-    /** Return true if className is the name of a class of one of your newly added suggestion. */
-    boolean isPresent(String className);
-
     /** Return true if the suggestion has already been completed and does not need to be shown */
-    boolean isSuggestionCompleted(Context context);
+    boolean isSuggestionCompleted(Context context, @NonNull ComponentName suggestion);
+
+    /**
+     * Returns the {@link SharedPreferences} that holds metadata for suggestions.
+     */
+    SharedPreferences getSharedPrefs(Context context);
 
     /**
      * Ranks the list of suggestions in place.
@@ -46,6 +51,11 @@
     void rankSuggestions(final List<Tile> suggestions, List<String> suggestionIds);
 
     /**
+     * Only keep top few suggestions from exclusive suggestions.
+     */
+    void filterExclusiveSuggestions(List<Tile> suggestions);
+
+    /**
      * Dismisses a suggestion.
      */
     void dismissSuggestion(Context context, SuggestionParser parser, Tile suggestion);
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index 779a8aa..638f85f 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -16,19 +16,29 @@
 
 package com.android.settings.dashboard.suggestions;
 
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.support.annotation.NonNull;
+import android.util.Log;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.SuggestionParser;
+import com.android.settings.support.NewDeviceIntroSuggestionActivity;
 import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.suggestions.SuggestionParser;
 
 import java.util.List;
 
 public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider {
 
+    private static final String TAG = "SuggestionFeature";
+    private static final int EXCLUSIVE_SUGGESTION_MAX_COUNT = 3;
+
+    private static final String SHARED_PREF_FILENAME = "suggestions";
+
     private final SuggestionRanker mSuggestionRanker;
     private final MetricsFeatureProvider mMetricsFeatureProvider;
 
@@ -38,16 +48,19 @@
     }
 
     @Override
-    public boolean isPresent(String className) {
+    public boolean isSuggestionCompleted(Context context, @NonNull ComponentName component) {
+        final String className = component.getClassName();
+        if (className.equals(NewDeviceIntroSuggestionActivity.class.getName())) {
+            return NewDeviceIntroSuggestionActivity.isSuggestionComplete(context);
+        }
         return false;
     }
 
     @Override
-    public boolean isSuggestionCompleted(Context context) {
-        return false;
+    public SharedPreferences getSharedPrefs(Context context) {
+        return context.getSharedPreferences(SHARED_PREF_FILENAME, Context.MODE_PRIVATE);
     }
 
-
     public SuggestionFeatureProviderImpl(Context context) {
         final Context appContext = context.getApplicationContext();
         mSuggestionRanker = new SuggestionRanker(
@@ -62,6 +75,17 @@
     }
 
     @Override
+    public void filterExclusiveSuggestions(List<Tile> suggestions) {
+        if (suggestions == null) {
+            return;
+        }
+        for (int i = suggestions.size() - 1; i >= EXCLUSIVE_SUGGESTION_MAX_COUNT; i--) {
+            Log.d(TAG, "Removing exclusive suggestion");
+            suggestions.remove(i);
+        }
+    }
+
+    @Override
     public void dismissSuggestion(Context context, SuggestionParser parser, Tile suggestion) {
         if (parser == null || suggestion == null || context == null) {
             return;
@@ -78,12 +102,12 @@
                 suggestion.intent.getComponent(),
                 PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
                 PackageManager.DONT_KILL_APP);
-        parser.markCategoryDone(suggestion.category);
     }
 
     @Override
     public String getSuggestionIdentifier(Context context, Tile suggestion) {
-        if (suggestion.intent == null || suggestion.intent.getComponent() == null) {
+        if (suggestion.intent == null || suggestion.intent.getComponent() == null
+                || context == null) {
             return "unknown_suggestion";
         }
         String packageName = suggestion.intent.getComponent().getPackageName();
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java b/src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java
index bdd5c60..5c4edc6 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java
@@ -21,11 +21,14 @@
 import android.app.NotificationManager;
 import android.app.WallpaperManager;
 import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.hardware.fingerprint.FingerprintManager;
+import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
 
 import com.android.ims.ImsManager;
+import com.android.settings.Settings.CameraLiftTriggerSuggestionActivity;
 import com.android.settings.Settings.FingerprintEnrollSuggestionActivity;
 import com.android.settings.Settings.FingerprintSuggestionActivity;
 import com.android.settings.Settings.ScreenLockSuggestionActivity;
@@ -54,7 +57,8 @@
     }
 
     public boolean isSuggestionComplete(Tile suggestion) {
-        String className = suggestion.intent.getComponent().getClassName();
+        ComponentName component = suggestion.intent.getComponent();
+        String className = component.getClassName();
         if (className.equals(ZenModeAutomationSuggestionActivity.class.getName())) {
             return hasEnabledZenAutoRules();
         } else if (className.equals(WallpaperSuggestionActivity.class.getName())) {
@@ -71,15 +75,14 @@
                 return true;
             }
             return manager.hasEnrolledFingerprints();
+        } else if (className.equals(CameraLiftTriggerSuggestionActivity.class.getName())) {
+            return isCameraLiftTriggerEnabled();
         }
 
-        SuggestionFeatureProvider provider =
+        final SuggestionFeatureProvider provider =
                 FeatureFactory.getFactory(mContext).getSuggestionFeatureProvider(mContext);
-        if (provider != null && provider.isPresent(className)) {
-            return provider.isSuggestionCompleted(mContext);
-        }
 
-        return false;
+        return provider.isSuggestionCompleted(mContext, component);
     }
 
     private boolean isDeviceSecured() {
@@ -124,4 +127,10 @@
                 mContext.getUserId());
         return (dpmFlags & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) == 0;
     }
+
+    private boolean isCameraLiftTriggerEnabled() {
+        final int triggerEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED, 0);
+        return triggerEnabled == 1;
+    }
 }
diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index 69343c3..d9643f2 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -14,8 +14,6 @@
 
 package com.android.settings.datausage;
 
-import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
-
 import android.app.Activity;
 import android.app.LoaderManager;
 import android.content.Context;
@@ -23,7 +21,6 @@
 import android.content.Loader;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.UserInfo;
 import android.graphics.drawable.Drawable;
 import android.net.INetworkStatsSession;
 import android.net.NetworkPolicy;
@@ -33,27 +30,30 @@
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.UserHandle;
-import android.os.UserManager;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.text.format.Formatter;
 import android.util.ArraySet;
 import android.util.IconDrawableFactory;
+import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.applications.AppHeaderController;
 import com.android.settings.applications.AppInfoBase;
-import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.applications.PackageManagerWrapper;
+import com.android.settings.applications.PackageManagerWrapperImpl;
+import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.AppItem;
-import com.android.settingslib.Utils;
 import com.android.settingslib.net.ChartData;
 import com.android.settingslib.net.ChartDataLoader;
+import com.android.settingslib.net.UidDetail;
 import com.android.settingslib.net.UidDetailProvider;
 
+import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
+
 public class AppDataUsage extends DataUsageBase implements Preference.OnPreferenceChangeListener,
         DataSaverBackend.Listener {
 
@@ -74,6 +74,7 @@
     private static final int LOADER_CHART_DATA = 2;
     private static final int LOADER_APP_PREF = 3;
 
+    private PackageManagerWrapper mPackageManagerWrapper;
     private final ArraySet<String> mPackages = new ArraySet<>();
     private Preference mTotalUsage;
     private Preference mForegroundUsage;
@@ -102,6 +103,7 @@
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        mPackageManagerWrapper = new PackageManagerWrapperImpl(getPackageManager());
         final Bundle args = getArguments();
 
         try {
@@ -145,11 +147,11 @@
 
         if (mAppItem.key > 0) {
             if (mPackages.size() != 0) {
-                PackageManager pm = getPackageManager();
                 try {
-                    ApplicationInfo info = pm.getApplicationInfo(mPackages.valueAt(0), 0);
+                    ApplicationInfo info = mPackageManagerWrapper.getApplicationInfoAsUser(
+                            mPackages.valueAt(0), 0, UserHandle.getUserId(mAppItem.key));
                     mIcon = IconDrawableFactory.newInstance(getActivity()).getBadgedIcon(info);
-                    mLabel = info.loadLabel(pm);
+                    mLabel = info.loadLabel(mPackageManagerWrapper.getPackageManager());
                     mPackageName = info.packageName;
                 } catch (PackageManager.NameNotFoundException e) {
                 }
@@ -190,22 +192,12 @@
                 removePreference(KEY_APP_LIST);
             }
         } else {
-            if (mAppItem.key == TrafficStats.UID_REMOVED) {
-                mLabel = getContext().getString(R.string.data_usage_uninstalled_apps_users);
-            } else if (mAppItem.key == TrafficStats.UID_TETHERING) {
-                mLabel = getContext().getString(R.string.tether_settings_title_all);
-            } else {
-                final int userId = UidDetailProvider.getUserIdForKey(mAppItem.key);
-                final UserManager um = UserManager.get(getActivity());
-                final UserInfo info = um.getUserInfo(userId);
-                if (info != null) {
-                    mIcon = Utils.getUserIcon(getActivity(), um, info);
-                    mLabel = Utils.getUserLabel(getActivity(), info);
-                } else {
-                    mLabel = getContext().getString(R.string.data_usage_uninstalled_apps_users);
-                }
-                mPackageName = getActivity().getPackageName();
-            }
+            final Context context = getActivity();
+            UidDetail uidDetail = new UidDetailProvider(context).getUidDetail(mAppItem.key, true);
+            mIcon = uidDetail.icon;
+            mLabel = uidDetail.label;
+            mPackageName = context.getPackageName();
+
             removePreference(KEY_UNRESTRICTED_DATA);
             removePreference(KEY_APP_SETTINGS);
             removePreference(KEY_RESTRICT_BACKGROUND);
@@ -330,22 +322,30 @@
 
         String pkg = mPackages.size() != 0 ? mPackages.valueAt(0) : null;
         int uid = 0;
-        try {
-            uid = pkg != null ? getPackageManager().getPackageUid(pkg, 0) : 0;
-        } catch (PackageManager.NameNotFoundException e) {
+        if (pkg != null) {
+            try {
+                uid = mPackageManagerWrapper.getPackageUidAsUser(pkg,
+                        UserHandle.getUserId(mAppItem.key));
+            } catch (PackageManager.NameNotFoundException e) {
+                Log.w(TAG, "Skipping UID because cannot find package " + pkg);
+            }
         }
 
+        final boolean showInfoButton = mAppItem.key > 0;
+
         final Activity activity = getActivity();
-        final Preference pref = FeatureFactory.getFactory(activity)
-            .getApplicationFeatureProvider(activity)
-            .newAppHeaderController(this, null /* appHeader */)
-            .setIcon(mIcon)
-            .setLabel(mLabel)
-            .setPackageName(pkg)
-            .setUid(uid)
-            .setButtonActions(AppHeaderController.ActionType.ACTION_APP_INFO,
-                AppHeaderController.ActionType.ACTION_NONE)
-            .done(activity, getPrefContext());
+        final Preference pref = EntityHeaderController
+                .newInstance(activity, this, null /* header */)
+                .setRecyclerView(getListView(), getLifecycle())
+                .setUid(uid)
+                .setButtonActions(showInfoButton
+                                ? EntityHeaderController.ActionType.ACTION_APP_INFO
+                                : EntityHeaderController.ActionType.ACTION_NONE,
+                        EntityHeaderController.ActionType.ACTION_NONE)
+                .setIcon(mIcon)
+                .setLabel(mLabel)
+                .setPackageName(pkg)
+                .done(activity, getPrefContext());
         getPreferenceScreen().addPreference(pref);
     }
 
diff --git a/src/com/android/settings/datausage/AppDataUsagePreference.java b/src/com/android/settings/datausage/AppDataUsagePreference.java
index 04e2b6d..6770e9e 100644
--- a/src/com/android/settings/datausage/AppDataUsagePreference.java
+++ b/src/com/android/settings/datausage/AppDataUsagePreference.java
@@ -90,8 +90,7 @@
             if (cachedDetail != null) {
                 bindView(cachedDetail, target);
             } else {
-                new UidDetailTask(provider, item, target).executeOnExecutor(
-                        AsyncTask.THREAD_POOL_EXECUTOR);
+                new UidDetailTask(provider, item, target).execute();
             }
         }
 
diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index dda984b..1025ad7 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -101,7 +101,7 @@
 
     private void updatePrefs() {
         NetworkPolicy policy = services.mPolicyEditor.getPolicy(mNetworkTemplate);
-        mBillingCycle.setSummary(getString(R.string.billing_cycle_summary, policy != null ?
+        mBillingCycle.setSummary(getString(R.string.billing_cycle_fragment_summary, policy != null ?
                 policy.cycleDay : 1));
         if (policy != null && policy.warningBytes != WARNING_DISABLED) {
             mDataWarning.setSummary(Formatter.formatFileSize(getContext(), policy.warningBytes));
diff --git a/src/com/android/settings/datausage/ChartDataUsagePreference.java b/src/com/android/settings/datausage/ChartDataUsagePreference.java
index f72d465..3c3a231 100644
--- a/src/com/android/settings/datausage/ChartDataUsagePreference.java
+++ b/src/com/android/settings/datausage/ChartDataUsagePreference.java
@@ -15,7 +15,6 @@
 package com.android.settings.datausage;
 
 import android.content.Context;
-import android.content.res.TypedArray;
 import android.net.NetworkPolicy;
 import android.net.NetworkStatsHistory;
 import android.net.TrafficStats;
@@ -29,7 +28,7 @@
 import android.util.SparseIntArray;
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settingslib.graph.UsageView;
+import com.android.settings.graph.UsageView;
 
 public class ChartDataUsagePreference extends Preference {
 
@@ -63,7 +62,7 @@
 
         int top = getTop();
         chart.clearPaths();
-        chart.configureGraph(toInt(mEnd - mStart), top, false, false);
+        chart.configureGraph(toInt(mEnd - mStart), top);
         calcPoints(chart);
         chart.setBottomLabels(new CharSequence[] {
                 Utils.formatDateRange(getContext(), mStart, mStart),
diff --git a/src/com/android/settings/datausage/DataUsageMeteredSettings.java b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
index ce2bc8d..c2a18e9 100644
--- a/src/com/android/settings/datausage/DataUsageMeteredSettings.java
+++ b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
@@ -226,7 +226,7 @@
 
             @Override
             public List<String> getNonIndexableKeys(Context context) {
-                final ArrayList<String> result = new ArrayList<String>();
+                final List<String> result = super.getNonIndexableKeys(context);
                 if (!SHOW_MOBILE_CATEGORY || !hasReadyMobileRadio(context)) {
                     result.add("mobile");
                 }
diff --git a/src/com/android/settings/datetime/TimeChangeListenerMixin.java b/src/com/android/settings/datetime/TimeChangeListenerMixin.java
index f3729ae..f93ee0c 100644
--- a/src/com/android/settings/datetime/TimeChangeListenerMixin.java
+++ b/src/com/android/settings/datetime/TimeChangeListenerMixin.java
@@ -21,9 +21,9 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class TimeChangeListenerMixin extends BroadcastReceiver
         implements LifecycleObserver, OnPause, OnResume {
diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
index a2fe07d..f7b62b1 100644
--- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
+++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
@@ -33,6 +33,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
 import com.android.settings.widget.SwitchBar;
 
 /**
@@ -74,9 +75,11 @@
         mDaysToRetain.setOnPreferenceChangeListener(this);
 
         ContentResolver cr = getContentResolver();
-        int photosDaysToRetain = Settings.Secure.getInt(cr,
-                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
-                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN_DEFAULT);
+        int photosDaysToRetain =
+                Settings.Secure.getInt(
+                        cr,
+                        Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
+                        Utils.getDefaultStorageManagerDaysToRetain(getResources()));
         String[] stringValues =
                 getResources().getStringArray(R.array.automatic_storage_management_days_values);
         mDaysToRetain.setValue(stringValues[daysValueToIndex(photosDaysToRetain, stringValues)]);
@@ -164,4 +167,5 @@
         }
         return indices.length - 1;
     }
+
 }
diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
index 74a6091..a96e0e3 100644
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -58,7 +58,7 @@
 import android.os.storage.IStorageManager;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
-import android.service.persistentdata.PersistentDataBlockManager;
+import android.service.oemlock.OemLockManager;
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.ListPreference;
@@ -82,13 +82,13 @@
 
 import com.android.internal.app.LocalePicker;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.RestrictedSettingsFragment;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.webview.WebViewAppPreferenceController;
@@ -193,7 +193,7 @@
     private static final String WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY = "wifi_allow_scan_with_traffic";
     private static final String USB_CONFIGURATION_KEY = "select_usb_configuration";
     private static final String MOBILE_DATA_ALWAYS_ON = "mobile_data_always_on";
-    private static final String KEY_COLOR_MODE = "color_mode";
+    private static final String KEY_COLOR_MODE = "picture_color_mode";
     private static final String FORCE_RESIZABLE_KEY = "force_resizable_activities";
     private static final String COLOR_TEMPERATURE_KEY = "color_temperature";
 
@@ -237,7 +237,6 @@
     private static final int RESULT_DEBUG_APP = 1000;
     private static final int RESULT_MOCK_LOCATION_APP = 1001;
 
-    private static final String PERSISTENT_DATA_BLOCK_PROP = "ro.frp.pst";
     private static final String FLASH_LOCKED_PROP = "ro.boot.flash.locked";
 
     private static final String SHORTCUT_MANAGER_RESET_KEY = "reset_shortcut_manager_throttling";
@@ -251,7 +250,7 @@
     private IWebViewUpdateService mWebViewUpdateService;
     private UserManager mUm;
     private WifiManager mWifiManager;
-    private PersistentDataBlockManager mOemUnlockManager;
+    private OemLockManager mOemLockManager;
     private TelephonyManager mTelephonyManager;
 
     private SwitchBar mSwitchBar;
@@ -336,12 +335,11 @@
 
     private SwitchPreference mColorTemperaturePreference;
 
-    private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>();
+    private final ArrayList<Preference> mAllPrefs = new ArrayList<>();
 
-    private final ArrayList<SwitchPreference> mResetSwitchPrefs
-            = new ArrayList<SwitchPreference>();
+    private final ArrayList<SwitchPreference> mResetSwitchPrefs = new ArrayList<>();
 
-    private final HashSet<Preference> mDisabledPrefs = new HashSet<Preference>();
+    private final HashSet<Preference> mDisabledPrefs = new HashSet<>();
     // To track whether a confirmation dialog was clicked.
     private boolean mDialogClicked;
     private Dialog mEnableDialog;
@@ -383,8 +381,7 @@
         mBackupManager = IBackupManager.Stub.asInterface(
                 ServiceManager.getService(Context.BACKUP_SERVICE));
         mWebViewUpdateService = WebViewFactory.getUpdateService();
-        mOemUnlockManager = (PersistentDataBlockManager) getActivity()
-                .getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
+        mOemLockManager = (OemLockManager) getSystemService(Context.OEM_LOCK_SERVICE);
         mTelephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
 
         mUm = (UserManager) getSystemService(Context.USER_SERVICE);
@@ -402,7 +399,7 @@
             // Block access to developer options if the user is not the owner, if user policy
             // restricts it, or if the device has not been provisioned
             mUnavailable = true;
-            addPreferencesFromResource(R.xml.empty_settings);
+            addPreferencesFromResource(R.xml.placeholder_prefs);
             return;
         }
 
@@ -432,7 +429,7 @@
         mKeepScreenOn = (RestrictedSwitchPreference) findAndInitSwitchPref(KEEP_SCREEN_ON);
         mBtHciSnoopLog = findAndInitSwitchPref(BT_HCI_SNOOP_LOG);
         mEnableOemUnlock = (RestrictedSwitchPreference) findAndInitSwitchPref(ENABLE_OEM_UNLOCK);
-        if (!showEnableOemUnlockPreference()) {
+        if (!showEnableOemUnlockPreference(getActivity())) {
             removePreference(mEnableOemUnlock);
             mEnableOemUnlock = null;
         }
@@ -558,7 +555,8 @@
 
         mColorModePreference = (ColorModePreference) findPreference(KEY_COLOR_MODE);
         mColorModePreference.updateCurrentAndSupported();
-        if (mColorModePreference.getColorModeCount() < 2) {
+        if (mColorModePreference.getColorModeCount() < 2 ||
+                getContext().getDisplay().isWideColorGamut()) {
             removePreference(KEY_COLOR_MODE);
             mColorModePreference = null;
         }
@@ -1014,18 +1012,17 @@
                 mOtaDisableAutomaticUpdate.isChecked() ? 0 : 1);
     }
 
-    private static boolean showEnableOemUnlockPreference() {
-        return !SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP).equals("");
+    private static boolean showEnableOemUnlockPreference(Context context) {
+        return context.getSystemService(Context.OEM_LOCK_SERVICE) != null;
     }
 
     private boolean enableOemUnlockPreference() {
-        return !isBootloaderUnlocked() && OemUnlockUtils.isOemUnlockAllowed(mUm);
+        return !isBootloaderUnlocked() && mOemLockManager.canUserAllowOemUnlock();
     }
 
     private void updateOemUnlockOptions() {
         if (mEnableOemUnlock != null) {
-            updateSwitchPreference(mEnableOemUnlock,
-                    OemUnlockUtils.isOemUnlockEnabled(getActivity()));
+            updateSwitchPreference(mEnableOemUnlock, mOemLockManager.isOemUnlockAllowed());
             updateOemUnlockSettingDescription();
             // Showing mEnableOemUnlock preference as device has persistent data block.
             mEnableOemUnlock.setDisabledByAdmin(null);
@@ -1461,7 +1458,7 @@
     private void updateBluetoothEnableInbandRingingOptions() {
         if (mBluetoothEnableInbandRinging != null) {
             updateSwitchPreference(mBluetoothEnableInbandRinging,
-                SystemProperties.getBoolean(BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY, false));
+                SystemProperties.getBoolean(BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY, true));
         }
     }
 
@@ -2296,7 +2293,7 @@
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 if (which == DialogInterface.BUTTON_POSITIVE) {
-                    OemUnlockUtils.setOemUnlockEnabled(getActivity(), true);
+                    mOemLockManager.setOemUnlockAllowedByUser(true);
                 }
             }
         };
@@ -2367,7 +2364,7 @@
                 if (mEnableOemUnlock.isChecked()) {
                     confirmEnableOemUnlock();
                 } else {
-                    OemUnlockUtils.setOemUnlockEnabled(getActivity(), false);
+                    mOemLockManager.setOemUnlockAllowedByUser(false);
                 }
             }
         } else {
@@ -2440,7 +2437,7 @@
                     confirmEnableOemUnlock();
                 }
             } else {
-                OemUnlockUtils.setOemUnlockEnabled(getActivity(), false);
+                mOemLockManager.setOemUnlockAllowedByUser(false);
             }
         } else if (preference == mMockLocationAppPref) {
             Intent intent = new Intent(getActivity(), AppPicker.class);
@@ -2751,7 +2748,8 @@
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
 
-                private boolean isShowingDeveloperOptions(Context context) {
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
                     return context.getSharedPreferences(DevelopmentSettings.PREF_FILE,
                             Context.MODE_PRIVATE).getBoolean(
                             DevelopmentSettings.PREF_SHOW,
@@ -2762,10 +2760,6 @@
                 public List<SearchIndexableResource> getXmlResourcesToIndex(
                         Context context, boolean enabled) {
 
-                    if (!isShowingDeveloperOptions(context)) {
-                        return null;
-                    }
-
                     final SearchIndexableResource sir = new SearchIndexableResource(context);
                     sir.xmlResId = R.xml.development_prefs;
                     return Arrays.asList(sir);
@@ -2773,12 +2767,9 @@
 
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
-                    if (!isShowingDeveloperOptions(context)) {
-                        return null;
-                    }
+                    final List<String> keys = super.getNonIndexableKeys(context);
 
-                    final List<String> keys = new ArrayList<String>();
-                    if (!showEnableOemUnlockPreference()) {
+                    if (!showEnableOemUnlockPreference(context)) {
                         keys.add(ENABLE_OEM_UNLOCK);
                     }
                     return keys;
@@ -2806,11 +2797,10 @@
                 oemUnlockSummary = R.string.oem_unlock_enable_disabled_summary_bootloader_unlocked;
             } else if (isSimLockedDevice()) {
                 oemUnlockSummary = R.string.oem_unlock_enable_disabled_summary_sim_locked_device;
-            } else if (!OemUnlockUtils.isOemUnlockAllowed(mUm)) {
-                // If the device isn't SIM-locked but OEM unlock is disabled by the system via the
-                // user restriction, this means either some other carrier restriction is in place or
-                // the device hasn't been able to confirm which restrictions (SIM-lock or otherwise)
-                // apply.
+            } else if (!mOemLockManager.canUserAllowOemUnlock()) {
+                // If the device isn't SIM-locked but OEM unlock is disallowed by some party, this
+                // means either some other carrier restriction is in place or the device hasn't been
+                // able to confirm which restrictions (SIM-lock or otherwise) apply.
                 oemUnlockSummary =
                         R.string.oem_unlock_enable_disabled_summary_connectivity_or_locked;
             }
@@ -2833,12 +2823,7 @@
      * Returns {@code true} if the bootloader has been unlocked. Otherwise, returns {code false}.
      */
     private boolean isBootloaderUnlocked() {
-        int flashLockState = PersistentDataBlockManager.FLASH_LOCK_UNKNOWN;
-        if (mOemUnlockManager != null) {
-            flashLockState = mOemUnlockManager.getFlashLockState();
-        }
-
-        return flashLockState == PersistentDataBlockManager.FLASH_LOCK_UNLOCKED;
+        return mOemLockManager.isDeviceOemUnlocked();
     }
 
 
diff --git a/src/com/android/settings/development/DevelopmentSettingsDisabledActivity.java b/src/com/android/settings/development/DevelopmentSettingsDisabledActivity.java
index 31f7a20..9ea24da 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDisabledActivity.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDisabledActivity.java
@@ -18,11 +18,15 @@
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.widget.Toast;
+
+import com.android.settings.R;
 
 public class DevelopmentSettingsDisabledActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Toast.makeText(this, R.string.dev_settings_disabled_warning, Toast.LENGTH_SHORT).show();
         finish();
     }
 }
diff --git a/src/com/android/settings/development/DevelopmentSettingsEnabler.java b/src/com/android/settings/development/DevelopmentSettingsEnabler.java
index e97997e..7132631 100644
--- a/src/com/android/settings/development/DevelopmentSettingsEnabler.java
+++ b/src/com/android/settings/development/DevelopmentSettingsEnabler.java
@@ -20,9 +20,9 @@
 import android.content.SharedPreferences;
 import android.provider.Settings;
 
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class DevelopmentSettingsEnabler implements LifecycleObserver, OnResume {
 
diff --git a/src/com/android/settings/development/OemUnlockUtils.java b/src/com/android/settings/development/OemUnlockUtils.java
deleted file mode 100644
index cee3679..0000000
--- a/src/com/android/settings/development/OemUnlockUtils.java
+++ /dev/null
@@ -1,61 +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.development;
-
-import android.content.Context;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.service.persistentdata.PersistentDataBlockManager;
-import android.util.Log;
-
-public class OemUnlockUtils {
-    private static final String TAG = "OemUnlockUtils";
-
-    /**
-     * Returns whether or not this device is able to be OEM unlocked.
-     */
-    static boolean isOemUnlockEnabled(Context context) {
-        PersistentDataBlockManager manager = (PersistentDataBlockManager)
-                context.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
-        return manager.getOemUnlockEnabled();
-    }
-
-    /**
-     * Allows enabling or disabling OEM unlock on this device. OEM unlocked
-     * devices allow users to flash other OSes to them.
-     */
-    static void setOemUnlockEnabled(Context context, boolean enabled) {
-        try {
-            PersistentDataBlockManager manager = (PersistentDataBlockManager)
-                    context.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
-            manager.setOemUnlockEnabled(enabled);
-        } catch (SecurityException e) {
-            Log.e(TAG, "Fail to set oem unlock.", e);
-        }
-    }
-
-    /**
-     * Returns {@code true} if OEM unlock is disallowed by user restriction
-     * {@link UserManager#DISALLOW_FACTORY_RESET} or {@link UserManager#DISALLOW_OEM_UNLOCK}.
-     * Otherwise, returns {@code false}.
-     */
-    static boolean isOemUnlockAllowed(UserManager um) {
-        final UserHandle userHandle = UserHandle.of(UserHandle.myUserId());
-        return !(um.hasBaseUserRestriction(UserManager.DISALLOW_OEM_UNLOCK, userHandle)
-                || um.hasBaseUserRestriction(UserManager.DISALLOW_FACTORY_RESET, userHandle));
-    }
-}
diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
index bee1351..9232838 100644
--- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
@@ -30,18 +30,18 @@
 import android.widget.Toast;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.development.DevelopmentSettings;
 import com.android.settings.development.DevelopmentSettingsEnabler;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class BuildNumberPreferenceController extends PreferenceController
         implements LifecycleObserver, OnResume {
diff --git a/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java b/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java
index e8792f2..1b56301 100644
--- a/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java
@@ -27,10 +27,10 @@
 import android.util.Log;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 
 public class FirmwareVersionPreferenceController extends PreferenceController
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java b/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java
index 4724c3d..88b9487 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java
@@ -25,11 +25,11 @@
 
 import com.android.settings.R;
 import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnCreateOptionsMenu;
-import com.android.settings.core.lifecycle.events.OnOptionsItemSelected;
-import com.android.settings.core.lifecycle.events.OnPrepareOptionsMenu;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu;
+import com.android.settingslib.core.lifecycle.events.OnOptionsItemSelected;
+import com.android.settingslib.core.lifecycle.events.OnPrepareOptionsMenu;
 
 import java.util.Objects;
 
diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
index 13b3d0b..b5a7b3b 100644
--- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
@@ -113,6 +113,11 @@
         getLoaderManager().initLoader(VOLUME_SIZE_JOB_ID, Bundle.EMPTY, new VolumeSizeCallbacks());
     }
 
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_storage_dashboard;
+    }
+
     private void onReceivedSizes() {
         if (mStorageInfo == null || mAppsResult == null) {
             return;
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index ce9ea9b..0107555 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -549,77 +549,87 @@
         }
     };
 
-    /**
-     * Enable indexing of searchable data
-     */
+    /** Enable indexing of searchable data */
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-        new BaseSearchIndexProvider() {
-            @Override
-            public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
-                final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableRaw> getRawDataToIndex(
+                        Context context, boolean enabled) {
+                    final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
 
-                SearchIndexableRaw data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.storage_settings);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
+                    SearchIndexableRaw data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.storage_settings);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
 
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.internal_storage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.internal_storage);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
 
-                data = new SearchIndexableRaw(context);
-                final StorageManager storage = context.getSystemService(StorageManager.class);
-                final List<VolumeInfo> vols = storage.getVolumes();
-                for (VolumeInfo vol : vols) {
-                    if (isInteresting(vol)) {
-                        data.title = storage.getBestVolumeDescription(vol);
-                        data.screenTitle = context.getString(R.string.storage_settings);
-                        result.add(data);
+                    data = new SearchIndexableRaw(context);
+                    final StorageManager storage = context.getSystemService(StorageManager.class);
+                    final List<VolumeInfo> vols = storage.getVolumes();
+                    for (VolumeInfo vol : vols) {
+                        if (isInteresting(vol)) {
+                            data.title = storage.getBestVolumeDescription(vol);
+                            data.screenTitle = context.getString(R.string.storage_settings);
+                            result.add(data);
+                        }
                     }
+
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.memory_size);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
+
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.memory_available);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
+
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.memory_apps_usage);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
+
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.memory_dcim_usage);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
+
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.memory_music_usage);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
+
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.memory_downloads_usage);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
+
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.memory_media_cache_usage);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
+
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.memory_media_misc_usage);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
+
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.storage_menu_free);
+                    data.screenTitle = context.getString(R.string.storage_menu_free);
+                    // We need to define all three in order for this to trigger properly.
+                    data.intentAction = StorageManager.ACTION_MANAGE_STORAGE;
+                    data.intentTargetPackage =
+                            context.getString(R.string.config_deletion_helper_package);
+                    data.intentTargetClass =
+                            context.getString(R.string.config_deletion_helper_class);
+                    result.add(data);
+
+                    return result;
                 }
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_size);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_available);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_apps_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_dcim_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_music_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_downloads_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_media_cache_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_media_misc_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                return result;
-            }
-        };
+            };
 }
diff --git a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
index a8ca5b9..acd34f0 100644
--- a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
@@ -26,12 +26,12 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.deletionhelper.ActivationWarningFragment;
 import com.android.settings.widget.MasterSwitchController;
 import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settings.widget.SwitchWidgetController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class AutomaticStorageManagementSwitchPreferenceController extends PreferenceController
         implements LifecycleObserver, OnResume, SwitchWidgetController.OnSwitchChangeListener {
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
new file mode 100644
index 0000000..bed04d3
--- /dev/null
+++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
@@ -0,0 +1,65 @@
+/*
+ * 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.display;
+
+import static android.provider.Settings.Secure.DOZE_ALWAYS_ON;
+
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.core.PreferenceController;
+
+public class AmbientDisplayAlwaysOnPreferenceController extends PreferenceController
+        implements Preference.OnPreferenceChangeListener {
+
+    private static final String KEY_ALWAYS_ON = "ambient_display_always_on";
+    private static final int MY_USER = UserHandle.myUserId();
+
+    private final AmbientDisplayConfiguration mConfig;
+
+    public AmbientDisplayAlwaysOnPreferenceController(Context context,
+            AmbientDisplayConfiguration config) {
+        super(context);
+        mConfig = config;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_ALWAYS_ON;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        ((SwitchPreference) preference).setChecked(mConfig.alwaysOnEnabled(MY_USER));
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        int enabled = (boolean) newValue ? 1 : 0;
+        Settings.Secure.putInt(mContext.getContentResolver(), DOZE_ALWAYS_ON, enabled);
+        return true;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mConfig.alwaysOnAvailable();
+    }
+}
diff --git a/src/com/android/settings/display/DozePreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
similarity index 63%
rename from src/com/android/settings/display/DozePreferenceController.java
rename to src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
index ad72053..9e15afb 100644
--- a/src/com/android/settings/display/DozePreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
@@ -14,40 +14,44 @@
 package com.android.settings.display;
 
 import android.content.Context;
-import android.os.Build;
-import android.os.SystemProperties;
+import android.os.UserHandle;
 import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.text.TextUtils;
 
+import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.overlay.FeatureFactory;
 
 import static android.provider.Settings.Secure.DOZE_ENABLED;
 import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY;
 
-public class DozePreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener {
+public class AmbientDisplayNotificationsPreferenceController extends PreferenceController
+        implements Preference.OnPreferenceChangeListener {
 
-    private static final String KEY_DOZE = "doze";
+    @VisibleForTesting
+    static final String KEY_AMBIENT_DISPLAY_NOTIFICATIONS = "ambient_display_notification";
+    private static final int MY_USER = UserHandle.myUserId();
 
     private final MetricsFeatureProvider mMetricsFeatureProvider;
+    private final AmbientDisplayConfiguration mConfig;
 
-    public DozePreferenceController(Context context) {
+    public AmbientDisplayNotificationsPreferenceController(Context context,
+            AmbientDisplayConfiguration config, MetricsFeatureProvider metricsFeatureProvider) {
         super(context);
-        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+        mMetricsFeatureProvider = metricsFeatureProvider;
+        mConfig = config;
     }
 
     @Override
     public String getPreferenceKey() {
-        return KEY_DOZE;
+        return KEY_AMBIENT_DISPLAY_NOTIFICATIONS;
     }
 
     @Override
     public boolean handlePreferenceTreeClick(Preference preference) {
-        if (KEY_DOZE.equals(preference.getKey())) {
+        if (KEY_AMBIENT_DISPLAY_NOTIFICATIONS.equals(preference.getKey())) {
             mMetricsFeatureProvider.action(mContext, ACTION_AMBIENT_DISPLAY);
         }
         return false;
@@ -55,8 +59,7 @@
 
     @Override
     public void updateState(Preference preference) {
-        int value = Settings.Secure.getInt(mContext.getContentResolver(), DOZE_ENABLED, 1);
-        ((SwitchPreference) preference).setChecked(value != 0);
+        ((SwitchPreference) preference).setChecked(mConfig.pulseOnNotificationEnabled(MY_USER));
     }
 
     @Override
@@ -68,11 +71,6 @@
 
     @Override
     public boolean isAvailable() {
-        String name = Build.IS_DEBUGGABLE ? SystemProperties.get("debug.doze.component") : null;
-        if (TextUtils.isEmpty(name)) {
-            name = mContext.getResources().getString(
-                    com.android.internal.R.string.config_dozeComponent);
-        }
-        return !TextUtils.isEmpty(name);
+        return mConfig.pulseOnNotificationAvailable();
     }
 }
diff --git a/src/com/android/settings/display/AmbientDisplayPreferenceController.java b/src/com/android/settings/display/AmbientDisplayPreferenceController.java
new file mode 100644
index 0000000..f3e3046
--- /dev/null
+++ b/src/com/android/settings/display/AmbientDisplayPreferenceController.java
@@ -0,0 +1,64 @@
+/*
+ * 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.display;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.support.v7.preference.Preference;
+
+import com.android.internal.app.NightDisplayController;
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+
+public class AmbientDisplayPreferenceController extends PreferenceController {
+
+    private static final int MY_USER_ID = UserHandle.myUserId();
+
+    private final AmbientDisplayConfiguration mConfig;
+    private final String mKey;
+
+    public AmbientDisplayPreferenceController(Context context, AmbientDisplayConfiguration config,
+            String key) {
+        super(context);
+        mConfig = config;
+        mKey = key;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mConfig.available();
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        if (mConfig.alwaysOnEnabled(MY_USER_ID)) {
+            preference.setSummary(R.string.ambient_display_screen_summary_always_on);
+        } else if (mConfig.pulseOnNotificationEnabled(MY_USER_ID)) {
+            preference.setSummary(R.string.ambient_display_screen_summary_notifications);
+        } else if (mConfig.enabled(MY_USER_ID)) {
+            preference.setSummary(R.string.switch_on_text);
+        } else {
+            preference.setSummary(R.string.switch_off_text);
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return mKey;
+    }
+}
diff --git a/src/com/android/settings/display/AmbientDisplaySettings.java b/src/com/android/settings/display/AmbientDisplaySettings.java
new file mode 100644
index 0000000..011cccb
--- /dev/null
+++ b/src/com/android/settings/display/AmbientDisplaySettings.java
@@ -0,0 +1,107 @@
+/*
+ * 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.display;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.provider.SearchIndexableResource;
+
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.gestures.DoubleTapScreenPreferenceController;
+import com.android.settings.gestures.PickupGesturePreferenceController;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Settings screen for Ambient display.
+ */
+public class AmbientDisplaySettings extends DashboardFragment {
+
+    private static final String TAG = "AmbientDisplaySettings";
+    private static final int MY_USER_ID = UserHandle.myUserId();
+
+    private static final String KEY_AMBIENT_DISPLAY_ALWAYS_ON = "ambient_display_always_on";
+    private static final String KEY_AMBIENT_DISPLAY_DOUBLE_TAP = "ambient_display_double_tap";
+    private static final String KEY_AMBIENT_DISPLAY_PICK_UP = "ambient_display_pick_up";
+    private static final String KEY_AMBIENT_DISPLAY_NOTIFICATION = "ambient_display_notification";
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle, AmbientDisplayConfiguration config,
+            MetricsFeatureProvider metricsFeatureProvider) {
+        final List<PreferenceController> controllers = new ArrayList<>();
+        controllers.add(new AmbientDisplayNotificationsPreferenceController(context, config,
+                metricsFeatureProvider));
+        controllers.add(new AmbientDisplayAlwaysOnPreferenceController(context, config));
+        controllers.add(new DoubleTapScreenPreferenceController(context, lifecycle, config,
+                MY_USER_ID, KEY_AMBIENT_DISPLAY_DOUBLE_TAP));
+        controllers.add(new PickupGesturePreferenceController(context, lifecycle, config,
+                MY_USER_ID, KEY_AMBIENT_DISPLAY_PICK_UP));
+        return controllers;
+    }
+
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.ambient_display_settings;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle(),
+                new AmbientDisplayConfiguration(context), mMetricsFeatureProvider);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.AMBIENT_DISPLAY_SETTINGS;
+    }
+
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+                        boolean enabled) {
+                    final ArrayList<SearchIndexableResource> result = new ArrayList<>();
+
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.ambient_display_settings;
+                    result.add(sir);
+                    return result;
+                }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context, null,
+                            new AmbientDisplayConfiguration(context), null);
+                }
+            };
+}
diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
index 6f9a302..f731264 100644
--- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java
+++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
@@ -14,16 +14,16 @@
 package com.android.settings.display;
 
 import android.content.Context;
+import android.content.Intent;
 import android.provider.Settings;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 
-import android.util.ArrayMap;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
-
-import java.util.Map;
+import com.android.settings.search.DatabaseIndexingUtils;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
+import com.android.settings.R;
 
 import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
 import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
@@ -68,11 +68,12 @@
 
     @Override
     public ResultPayload getResultPayload() {
-        final Map<Integer, Boolean> valueMap = new ArrayMap<>();
-        valueMap.put(SCREEN_BRIGHTNESS_MODE_AUTOMATIC, true);
-        valueMap.put(SCREEN_BRIGHTNESS_MODE_MANUAL, false);
+        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
+                getClass().getName(), mAutoBrightnessKey,
+                mContext.getString(R.string.display_settings));
 
         return new InlineSwitchPayload(SCREEN_BRIGHTNESS_MODE,
-                ResultPayload.SettingsSource.SYSTEM, valueMap);
+                ResultPayload.SettingsSource.SYSTEM, SCREEN_BRIGHTNESS_MODE_AUTOMATIC, intent,
+                isAvailable());
     }
 }
diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java
index fd79e51..a39cde5 100644
--- a/src/com/android/settings/display/AutoRotatePreferenceController.java
+++ b/src/com/android/settings/display/AutoRotatePreferenceController.java
@@ -14,26 +14,33 @@
 package com.android.settings.display;
 
 import android.content.Context;
-import android.content.res.Configuration;
-import android.support.v7.preference.DropDownPreference;
 import android.support.v7.preference.Preference;
+import android.support.v7.preference.TwoStatePreference;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.view.RotationPolicy;
-import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class AutoRotatePreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener {
+        Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
 
     private static final String KEY_AUTO_ROTATE = "auto_rotate";
     private final MetricsFeatureProvider mMetricsFeatureProvider;
+    private TwoStatePreference mPreference;
+    private RotationPolicy.RotationPolicyListener mRotationPolicyListener;
 
-    public AutoRotatePreferenceController(Context context) {
+    public AutoRotatePreferenceController(Context context, Lifecycle lifecycle) {
         super(context);
         mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
     }
 
     @Override
@@ -43,29 +50,8 @@
 
     @Override
     public void updateState(Preference preference) {
-        final DropDownPreference rotatePreference = (DropDownPreference) preference;
-        final int rotateLockedResourceId;
-        preference.setSummary("%s");
-        // The following block sets the string used when rotation is locked.
-        // If the device locks specifically to portrait or landscape (rather than current
-        // rotation), then we use a different string to include this information.
-        if (allowAllRotations()) {
-            rotateLockedResourceId = R.string.display_auto_rotate_stay_in_current;
-        } else {
-            if (RotationPolicy.getRotationLockOrientation(mContext)
-                    == Configuration.ORIENTATION_PORTRAIT) {
-                rotateLockedResourceId = R.string.display_auto_rotate_stay_in_portrait;
-            } else {
-                rotateLockedResourceId = R.string.display_auto_rotate_stay_in_landscape;
-            }
-        }
-        rotatePreference.setEntries(new CharSequence[]{
-                mContext.getString(R.string.display_auto_rotate_rotate),
-                mContext.getString(rotateLockedResourceId),
-        });
-        rotatePreference.setEntryValues(new CharSequence[]{"0", "1"});
-        rotatePreference.setValueIndex(RotationPolicy.isRotationLocked(mContext) ?
-                1 : 0);
+        mPreference = (TwoStatePreference) preference;
+        updatePreference();
     }
 
     @Override
@@ -73,17 +59,40 @@
         return RotationPolicy.isRotationLockToggleVisible(mContext);
     }
 
-    private boolean allowAllRotations() {
-        return mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_allowAllRotations);
-    }
-
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final boolean locked = Integer.parseInt((String) newValue) != 0;
+        final boolean locked = !(boolean) newValue;
         mMetricsFeatureProvider.action(mContext, MetricsProto.MetricsEvent.ACTION_ROTATION_LOCK,
                 locked);
         RotationPolicy.setRotationLock(mContext, locked);
         return true;
     }
+
+    @Override
+    public void onResume() {
+        if (mRotationPolicyListener == null) {
+            mRotationPolicyListener = new RotationPolicy.RotationPolicyListener() {
+                @Override
+                public void onChange() {
+                    updatePreference();
+                }
+            };
+        }
+        RotationPolicy.registerRotationPolicyListener(mContext,
+                mRotationPolicyListener);
+    }
+
+    @Override
+    public void onPause() {
+        if (mRotationPolicyListener != null) {
+            RotationPolicy.unregisterRotationPolicyListener(mContext, mRotationPolicyListener);
+        }
+    }
+
+    private void updatePreference() {
+        if (mPreference == null) {
+            return;
+        }
+        mPreference.setChecked(!RotationPolicy.isRotationLocked(mContext));
+    }
 }
diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
new file mode 100644
index 0000000..3436d2d
--- /dev/null
+++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
@@ -0,0 +1,166 @@
+/*
+ * 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.display;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.PowerManager;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.provider.Settings;
+import android.provider.Settings.System;
+import android.service.vr.IVrManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.util.Log;
+
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+
+import java.text.NumberFormat;
+
+public class BrightnessLevelPreferenceController extends PreferenceController implements
+        LifecycleObserver, OnResume, OnPause {
+
+    private static final String TAG = "BrightnessPrefCtrl";
+    private static final String KEY_BRIGHTNESS = "brightness";
+    private static final Uri BRIGHTNESS_MODE_URI;
+    private static final Uri BRIGHTNESS_URI;
+    private static final Uri BRIGHTNESS_FOR_VR_URI;
+    private static final Uri BRIGHTNESS_ADJ_URI;
+
+    private final int mMinBrightness;
+    private final int mMaxBrightness;
+    private final int mMinVrBrightness;
+    private final int mMaxVrBrightness;
+    private final ContentResolver mContentResolver;
+
+    private Preference mPreference;
+
+    static {
+        BRIGHTNESS_MODE_URI = System.getUriFor(System.SCREEN_BRIGHTNESS_MODE);
+        BRIGHTNESS_URI = System.getUriFor(System.SCREEN_BRIGHTNESS);
+        BRIGHTNESS_FOR_VR_URI = System.getUriFor(System.SCREEN_BRIGHTNESS_FOR_VR);
+        BRIGHTNESS_ADJ_URI = System.getUriFor(System.SCREEN_AUTO_BRIGHTNESS_ADJ);
+    }
+
+    private ContentObserver mBrightnessObserver =
+        new ContentObserver(new Handler(Looper.getMainLooper())) {
+            @Override
+            public void onChange(boolean selfChange) {
+                updatedSummary(mPreference);
+            }
+        };
+
+    public BrightnessLevelPreferenceController(Context context, Lifecycle lifecycle) {
+        this(context, lifecycle, new PowerManagerWrapper(
+                (PowerManager) context.getSystemService(Context.POWER_SERVICE)));
+    }
+
+    @VisibleForTesting
+    public BrightnessLevelPreferenceController(Context context, Lifecycle lifecycle,
+            PowerManagerWrapper powerManagerWrapper) {
+        super(context);
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+        mMinBrightness = powerManagerWrapper.getMinimumScreenBrightnessSetting();
+        mMaxBrightness = powerManagerWrapper.getMaximumScreenBrightnessSetting();
+        mMinVrBrightness = powerManagerWrapper.getMinimumScreenBrightnessForVrSetting();
+        mMaxVrBrightness = powerManagerWrapper.getMaximumScreenBrightnessForVrSetting();
+        mContentResolver = mContext.getContentResolver();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_BRIGHTNESS;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(KEY_BRIGHTNESS);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updatedSummary(preference);
+    }
+
+    @Override
+    public void onResume() {
+        mContentResolver.registerContentObserver(BRIGHTNESS_MODE_URI, false, mBrightnessObserver);
+        mContentResolver.registerContentObserver(BRIGHTNESS_URI, false, mBrightnessObserver);
+        mContentResolver.registerContentObserver(BRIGHTNESS_FOR_VR_URI, false, mBrightnessObserver);
+        mContentResolver.registerContentObserver(BRIGHTNESS_ADJ_URI, false, mBrightnessObserver);
+    }
+
+    @Override
+    public void onPause() {
+        mContentResolver.unregisterContentObserver(mBrightnessObserver);
+    }
+
+    private void updatedSummary(Preference preference) {
+        if (preference != null) {
+            preference.setSummary(NumberFormat.getPercentInstance().format(getCurrentBrightness()));
+        }
+    }
+
+    private double getCurrentBrightness() {
+        if (isInVrMode()) {
+            final double value = System.getInt(mContentResolver, System.SCREEN_BRIGHTNESS_FOR_VR,
+                    mMaxBrightness);
+            return getPercentage(value, mMinVrBrightness, mMaxVrBrightness);
+        }
+        final int brightnessMode = Settings.System.getInt(mContentResolver,
+                System.SCREEN_BRIGHTNESS_MODE, System.SCREEN_BRIGHTNESS_MODE_MANUAL);
+        if (brightnessMode == System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
+            final float value = Settings.System.getFloat(mContentResolver,
+                    System.SCREEN_AUTO_BRIGHTNESS_ADJ, 0);
+            // auto brightness is between -1 and 1
+            return ((value + 1)) / 2;
+        }
+        final double value = Settings.System.getInt(mContentResolver, System.SCREEN_BRIGHTNESS,
+                mMinBrightness);
+        return getPercentage(value, mMinBrightness, mMaxBrightness);
+    }
+
+    private double getPercentage(double value, int min, int max) {
+        return (value - min) / (max - min);
+    }
+
+    @VisibleForTesting
+    boolean isInVrMode() {
+        try {
+            return IVrManager.Stub.asInterface(ServiceManager.getService(Context.VR_SERVICE))
+                    .getVrModeState();
+        } catch (RemoteException e) {
+            Log.e(TAG, "Failed to check vr mode!", e);
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/settings/display/ColorModePreferenceController.java b/src/com/android/settings/display/ColorModePreferenceController.java
new file mode 100644
index 0000000..9574016
--- /dev/null
+++ b/src/com/android/settings/display/ColorModePreferenceController.java
@@ -0,0 +1,118 @@
+/*
+ * 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.display;
+
+import android.content.Context;
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemProperties;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.TwoStatePreference;
+import android.util.Log;
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.core.PreferenceController;
+
+public class ColorModePreferenceController extends PreferenceController implements
+        Preference.OnPreferenceChangeListener {
+    private static final String TAG = "ColorModePreference";
+
+    private static final String KEY_COLOR_MODE = "color_mode";
+
+    @VisibleForTesting
+    static final float COLOR_SATURATION_DEFAULT = 1.0f;
+    @VisibleForTesting
+    static final float COLOR_SATURATION_VIVID = 1.1f;
+
+    private static final int SURFACE_FLINGER_TRANSACTION_SATURATION = 1022;
+    @VisibleForTesting
+    static final String PERSISTENT_PROPERTY_SATURATION = "persist.sys.sf.color_saturation";
+
+    private final IBinder mSurfaceFlinger;
+    private final ConfigurationWrapper mConfigWrapper;
+
+    public ColorModePreferenceController(Context context) {
+        super(context);
+        mSurfaceFlinger = ServiceManager.getService("SurfaceFlinger");
+        mConfigWrapper = new ConfigurationWrapper(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_COLOR_MODE;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        TwoStatePreference colorMode = (TwoStatePreference) preference;
+        colorMode.setChecked(getSaturationValue() > 1.0f);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mConfigWrapper.isScreenWideColorGamut();
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        float saturation = (boolean) newValue
+                ? COLOR_SATURATION_VIVID : COLOR_SATURATION_DEFAULT;
+
+        SystemProperties.set(PERSISTENT_PROPERTY_SATURATION, Float.toString(saturation));
+        applySaturation(saturation);
+
+        return true;
+    }
+
+    /**
+     * Propagates the provided saturation to the SurfaceFlinger.
+     */
+    private void applySaturation(float saturation) {
+        if (mSurfaceFlinger != null) {
+            final Parcel data = Parcel.obtain();
+            data.writeInterfaceToken("android.ui.ISurfaceComposer");
+            data.writeFloat(saturation);
+            try {
+                mSurfaceFlinger.transact(SURFACE_FLINGER_TRANSACTION_SATURATION, data, null, 0);
+            } catch (RemoteException ex) {
+                Log.e(TAG, "Failed to set saturation", ex);
+            } finally {
+                data.recycle();
+            }
+        }
+    }
+
+    private static float getSaturationValue() {
+        try {
+            return Float.parseFloat(SystemProperties.get(
+                    PERSISTENT_PROPERTY_SATURATION, Float.toString(COLOR_SATURATION_DEFAULT)));
+        } catch (NumberFormatException e) {
+            return COLOR_SATURATION_DEFAULT;
+        }
+    }
+
+    @VisibleForTesting
+    static class ConfigurationWrapper {
+        private final Context mContext;
+
+        ConfigurationWrapper(Context context) {
+            mContext = context;
+        }
+
+        boolean isScreenWideColorGamut() {
+            return mContext.getResources().getConfiguration().isScreenWideColorGamut();
+        }
+    }
+}
diff --git a/src/com/android/settings/display/DensityPreference.java b/src/com/android/settings/display/DensityPreference.java
index 0c5c187..fdd3fae 100644
--- a/src/com/android/settings/display/DensityPreference.java
+++ b/src/com/android/settings/display/DensityPreference.java
@@ -16,6 +16,7 @@
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.text.BidiFormatter;
 import android.text.InputType;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
@@ -23,10 +24,13 @@
 import android.view.Display;
 import android.view.View;
 import android.widget.EditText;
+
 import com.android.settings.CustomEditTextPreference;
 import com.android.settings.R;
 import com.android.settingslib.display.DisplayDensityUtils;
 
+import java.text.NumberFormat;
+
 public class DensityPreference extends CustomEditTextPreference {
     private static final String TAG = "DensityPreference";
 
@@ -37,8 +41,9 @@
     @Override
     public void onAttached() {
         super.onAttached();
-
-        setSummary(getContext().getString(R.string.developer_density_summary, getCurrentSwDp()));
+        final CharSequence dpValue = BidiFormatter.getInstance()
+                .unicodeWrap(NumberFormat.getInstance().format(getCurrentSwDp()));
+        setSummary(getContext().getString(R.string.density_pixel_summary,dpValue));
     }
 
     private int getCurrentSwDp() {
diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java
index 1da16fe..23ddf07 100644
--- a/src/com/android/settings/display/NightDisplaySettings.java
+++ b/src/com/android/settings/display/NightDisplaySettings.java
@@ -28,7 +28,7 @@
 import com.android.internal.app.NightDisplayController;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SeekBarPreference;
+import com.android.settings.widget.SeekBarPreference;
 import com.android.settings.SettingsPreferenceFragment;
 
 import java.text.DateFormat;
@@ -74,6 +74,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_night_display;
+    }
+
+    @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         super.onCreatePreferences(savedInstanceState, rootKey);
 
diff --git a/src/com/android/settings/display/PowerManagerWrapper.java b/src/com/android/settings/display/PowerManagerWrapper.java
new file mode 100644
index 0000000..afa2f33
--- /dev/null
+++ b/src/com/android/settings/display/PowerManagerWrapper.java
@@ -0,0 +1,49 @@
+/*
+ * 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.display;
+
+import android.os.PowerManager;
+
+/**
+ * This class replicates a subset of the android.os.PowerManager. The class exists so that we can
+ * use a thin wrapper around the PowerManager in production code and a mock in tests. We cannot
+ * directly mock or shadow the PowerManager, because some of the methods we rely on are newer than
+ * the API version supported by Robolectric or are hidden.
+ */
+public class PowerManagerWrapper {
+    private final PowerManager mPowerManager;
+
+    public PowerManagerWrapper(PowerManager powerManager) {
+        mPowerManager = powerManager;
+    }
+
+    public int getMinimumScreenBrightnessSetting() {
+        return mPowerManager.getMinimumScreenBrightnessSetting();
+    }
+
+    public int getMaximumScreenBrightnessSetting() {
+        return mPowerManager.getMaximumScreenBrightnessSetting();
+    }
+
+    public int getMinimumScreenBrightnessForVrSetting() {
+        return mPowerManager.getMinimumScreenBrightnessForVrSetting();
+    }
+
+    public int getMaximumScreenBrightnessForVrSetting() {
+        return mPowerManager.getMaximumScreenBrightnessForVrSetting();
+    }
+}
diff --git a/src/com/android/settings/display/ScreenSaverPreferenceController.java b/src/com/android/settings/display/ScreenSaverPreferenceController.java
index fab9062..7a10802 100644
--- a/src/com/android/settings/display/ScreenSaverPreferenceController.java
+++ b/src/com/android/settings/display/ScreenSaverPreferenceController.java
@@ -16,8 +16,8 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.DreamSettings;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.dream.DreamSettings;
 
 public class ScreenSaverPreferenceController extends PreferenceController {
 
diff --git a/src/com/android/settings/display/ScreenZoomSettings.java b/src/com/android/settings/display/ScreenZoomSettings.java
index 7538cd3..ec3999b 100644
--- a/src/com/android/settings/display/ScreenZoomSettings.java
+++ b/src/com/android/settings/display/ScreenZoomSettings.java
@@ -94,6 +94,11 @@
     }
 
     @Override
+    public int getHelpResource() {
+        return R.string.help_url_display_size;
+    }
+
+    @Override
     public int getMetricsCategory() {
         return MetricsEvent.DISPLAY_SCREEN_ZOOM;
     }
diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java
index 99a19f8..c38ed28 100644
--- a/src/com/android/settings/display/ThemePreferenceController.java
+++ b/src/com/android/settings/display/ThemePreferenceController.java
@@ -90,11 +90,20 @@
         pref.setEntries(labels);
         pref.setEntryValues(pkgs);
         String theme = getCurrentTheme();
-        if (TextUtils.isEmpty(theme)) {
-            theme = mContext.getString(R.string.default_theme);
-            pref.setSummary(theme);
+        CharSequence themeLabel = null;
+
+        for (int i = 0; i < pkgs.length; i++) {
+            if (TextUtils.equals(pkgs[i], theme)) {
+                themeLabel = labels[i];
+                break;
+            }
         }
-        pref.setSummary(theme);
+
+        if (TextUtils.isEmpty(themeLabel)) {
+            themeLabel = mContext.getString(R.string.default_theme);
+        }
+
+        pref.setSummary(themeLabel);
         pref.setValue(theme);
     }
 
@@ -127,7 +136,7 @@
                     UserHandle.myUserId());
             for (int i = 0, size = infos.size(); i < size; i++) {
                 if (infos.get(i).isEnabled() &&
-                         isChangeableOverlay(infos.get(i).packageName)) {
+                        isChangeableOverlay(infos.get(i).packageName)) {
                     return infos.get(i).packageName;
                 }
             }
diff --git a/src/com/android/settings/dream/CurrentDreamPicker.java b/src/com/android/settings/dream/CurrentDreamPicker.java
new file mode 100644
index 0000000..da9bf9e
--- /dev/null
+++ b/src/com/android/settings/dream/CurrentDreamPicker.java
@@ -0,0 +1,117 @@
+/*
+ * 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.dream;
+
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.widget.RadioButtonPickerFragment;
+import com.android.settingslib.dream.DreamBackend;
+import com.android.settingslib.dream.DreamBackend.DreamInfo;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public final class CurrentDreamPicker extends RadioButtonPickerFragment {
+
+    private DreamBackend mBackend;
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+
+        mBackend = DreamBackend.getInstance(context);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DREAM;
+    }
+
+    @Override
+    protected boolean setDefaultKey(String key) {
+        Map<String, ComponentName> componentNameMap = getDreamComponentsMap();
+        if (componentNameMap.get(key) != null) {
+            mBackend.setActiveDream(componentNameMap.get(key));
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    protected String getDefaultKey() {
+        return mBackend.getActiveDream().flattenToString();
+    }
+
+    @Override
+    protected List<? extends CandidateInfo> getCandidates() {
+        final List<DreamCandidateInfo> candidates;
+        candidates = mBackend.getDreamInfos().stream()
+                .map(DreamCandidateInfo::new)
+                .collect(Collectors.toList());
+
+        return candidates;
+    }
+
+    @Override
+    protected void onSelectionPerformed(boolean success) {
+        super.onSelectionPerformed(success);
+
+        getActivity().finish();
+    }
+
+    private Map<String, ComponentName> getDreamComponentsMap() {
+        Map<String, ComponentName> comps = new HashMap<>();
+        mBackend.getDreamInfos()
+                .forEach((info) ->
+                        comps.put(info.componentName.flattenToString(), info.componentName));
+
+        return comps;
+    }
+
+    private static final class DreamCandidateInfo extends CandidateInfo {
+        private final CharSequence name;
+        private final Drawable icon;
+        private final String key;
+
+        DreamCandidateInfo(DreamInfo info) {
+            super(true);
+
+            name = info.caption;
+            icon = info.icon;
+            key = info.componentName.flattenToString();
+        }
+
+        @Override
+        public CharSequence loadLabel() {
+            return name;
+        }
+
+        @Override
+        public Drawable loadIcon() {
+            return icon;
+        }
+
+        @Override
+        public String getKey() {
+            return key;
+        }
+    }
+}
diff --git a/src/com/android/settings/dream/CurrentDreamPreferenceController.java b/src/com/android/settings/dream/CurrentDreamPreferenceController.java
new file mode 100644
index 0000000..5b448f8
--- /dev/null
+++ b/src/com/android/settings/dream/CurrentDreamPreferenceController.java
@@ -0,0 +1,79 @@
+/*
+ * 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.dream;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.widget.GearPreference;
+import com.android.settingslib.dream.DreamBackend;
+import com.android.settingslib.dream.DreamBackend.DreamInfo;
+import java.util.Optional;
+
+public class CurrentDreamPreferenceController extends PreferenceController {
+    private final DreamBackend mBackend;
+    private final static String TAG = "CurrentDreamPreferenceController";
+    private final static String CURRENT_SCREENSAVER = "current_screensaver";
+
+    public CurrentDreamPreferenceController(Context context) {
+        super(context);
+        mBackend = DreamBackend.getInstance(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mBackend.getDreamInfos().size() > 0;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return CURRENT_SCREENSAVER;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        preference.setSummary(mBackend.getActiveDreamName());
+        setGearClickListenerForPreference(preference);
+    }
+
+    private void setGearClickListenerForPreference(Preference preference) {
+        if (!(preference instanceof GearPreference)) return;
+
+        GearPreference gearPreference = (GearPreference)preference;
+        Optional<DreamInfo> info = getActiveDreamInfo();
+        if (!info.isPresent() || info.get().settingsComponentName == null) {
+            gearPreference.setOnGearClickListener(null);
+            return;
+        }
+        gearPreference.setOnGearClickListener(gearPref -> launchScreenSaverSettings());
+    }
+
+    private void launchScreenSaverSettings() {
+        Optional<DreamInfo> info = getActiveDreamInfo();
+        if (!info.isPresent()) return;
+        mBackend.launchSettings(info.get());
+    }
+
+    private Optional<DreamInfo> getActiveDreamInfo() {
+        return mBackend.getDreamInfos()
+                .stream()
+                .filter((info) -> info.isActive)
+                .findFirst();
+    }
+}
diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java
new file mode 100644
index 0000000..8c10d45
--- /dev/null
+++ b/src/com/android/settings/dream/DreamSettings.java
@@ -0,0 +1,154 @@
+/*
+ * 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.dream;
+
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.dream.DreamBackend;
+import com.android.settingslib.dream.DreamBackend.WhenToDream;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static com.android.settingslib.dream.DreamBackend.EITHER;
+import static com.android.settingslib.dream.DreamBackend.NEVER;
+import static com.android.settingslib.dream.DreamBackend.WHILE_CHARGING;
+import static com.android.settingslib.dream.DreamBackend.WHILE_DOCKED;
+
+public class DreamSettings extends DashboardFragment {
+
+    private static final String TAG = "DreamSettings";
+    static final String WHILE_CHARGING_ONLY = "while_charging_only";
+    static final String WHILE_DOCKED_ONLY = "while_docked_only";
+    static final String EITHER_CHARGING_OR_DOCKED = "either_charging_or_docked";
+    static final String NEVER_DREAM = "never";
+
+    @WhenToDream
+    static int getSettingFromPrefKey(String key) {
+        switch (key) {
+            case WHILE_CHARGING_ONLY:
+                return WHILE_CHARGING;
+            case WHILE_DOCKED_ONLY:
+                return WHILE_DOCKED;
+            case EITHER_CHARGING_OR_DOCKED:
+                return EITHER;
+            case NEVER_DREAM:
+            default:
+                return NEVER;
+        }
+    }
+
+    static String getKeyFromSetting(@WhenToDream int dreamSetting) {
+        switch (dreamSetting) {
+            case WHILE_CHARGING:
+                return WHILE_CHARGING_ONLY;
+            case WHILE_DOCKED:
+                return WHILE_DOCKED_ONLY;
+            case EITHER:
+                return EITHER_CHARGING_OR_DOCKED;
+            case NEVER:
+            default:
+                return NEVER_DREAM;
+        }
+    }
+
+    static int getDreamSettingDescriptionResId(@WhenToDream int dreamSetting) {
+        switch (dreamSetting) {
+            case WHILE_CHARGING:
+                return R.string.screensaver_settings_summary_sleep;
+            case WHILE_DOCKED:
+                return R.string.screensaver_settings_summary_dock;
+            case EITHER:
+                return R.string.screensaver_settings_summary_either_long;
+            case NEVER:
+            default:
+                return R.string.screensaver_settings_summary_never;
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.DREAM;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.dream_fragment_overview;
+    }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_screen_saver;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context);
+    }
+
+    public static CharSequence getSummaryTextWithDreamName(Context context) {
+        DreamBackend backend = DreamBackend.getInstance(context);
+        return getSummaryTextFromBackend(backend, context);
+    }
+
+    @VisibleForTesting
+    static CharSequence getSummaryTextFromBackend(DreamBackend backend, Context context) {
+        if (!backend.isEnabled()) {
+            return context.getString(R.string.screensaver_settings_summary_off);
+        } else {
+            return backend.getActiveDreamName();
+        }
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context) {
+        List<PreferenceController> controllers = new ArrayList<>();
+        controllers.add(new CurrentDreamPreferenceController(context));
+        controllers.add(new WhenToDreamPreferenceController(context));
+        controllers.add(new StartNowPreferenceController(context));
+        return controllers;
+    }
+
+    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER
+            = new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.dream_fragment_overview;
+                    return Arrays.asList(sir);
+                }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context);
+                }
+            };
+}
+
diff --git a/src/com/android/settings/dream/StartNowPreferenceController.java b/src/com/android/settings/dream/StartNowPreferenceController.java
new file mode 100644
index 0000000..994b70b
--- /dev/null
+++ b/src/com/android/settings/dream/StartNowPreferenceController.java
@@ -0,0 +1,66 @@
+/*
+ * 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.dream;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.widget.Button;
+import com.android.settings.R;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.dream.DreamBackend;
+
+public class StartNowPreferenceController extends PreferenceController {
+    private static final String TAG = "StartNowPreferenceController";
+    private static final String PREF_KEY = "dream_start_now_button_container";
+    private final DreamBackend mBackend;
+
+    public StartNowPreferenceController(Context context) {
+        super(context);
+
+        mBackend = DreamBackend.getInstance(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return PREF_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        LayoutPreference pref = (LayoutPreference) screen.findPreference(getPreferenceKey());
+        Button startButton = (Button)pref.findViewById(R.id.dream_start_now_button);
+        startButton.setOnClickListener(v -> mBackend.startDreaming());
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        Button startButton = (Button)((LayoutPreference)preference)
+                .findViewById(R.id.dream_start_now_button);
+        startButton.setEnabled(mBackend.getWhenToDreamSetting() != DreamBackend.NEVER);
+    }
+}
diff --git a/src/com/android/settings/dream/WhenToDreamPicker.java b/src/com/android/settings/dream/WhenToDreamPicker.java
new file mode 100644
index 0000000..a55064d
--- /dev/null
+++ b/src/com/android/settings/dream/WhenToDreamPicker.java
@@ -0,0 +1,115 @@
+/*
+ * 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.dream;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.widget.RadioButtonPickerFragment;
+import com.android.settingslib.dream.DreamBackend;
+import java.util.ArrayList;
+import java.util.List;
+
+public class WhenToDreamPicker extends RadioButtonPickerFragment {
+
+    private static final String TAG = "WhenToDreamPicker";
+    private DreamBackend mBackend;
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+
+        mBackend = DreamBackend.getInstance(context);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DREAM;
+    }
+
+    @Override
+    protected List<? extends CandidateInfo> getCandidates() {
+        final String[] entries = entries();
+        final String[] values = keys();
+        final List<WhenToDreamCandidateInfo> candidates = new ArrayList<>();
+
+        if (entries == null || entries.length <= 0) return null;
+        if (values == null || values.length != entries.length) {
+            throw new IllegalArgumentException("Entries and values must be of the same length.");
+        }
+
+        for (int i = 0; i < entries.length; i++) {
+            candidates.add(new WhenToDreamCandidateInfo(entries[i], values[i]));
+        }
+
+        return candidates;
+    }
+
+    private String[] entries() {
+        return getResources().getStringArray(R.array.when_to_start_screensaver_entries);
+    }
+
+    private String[] keys() {
+        return getResources().getStringArray(R.array.when_to_start_screensaver_values);
+    }
+
+    @Override
+    protected String getDefaultKey() {
+        return DreamSettings.getKeyFromSetting(mBackend.getWhenToDreamSetting());
+    }
+
+    @Override
+    protected boolean setDefaultKey(String key) {
+        mBackend.setWhenToDream(DreamSettings.getSettingFromPrefKey(key));
+        return true;
+    }
+
+    @Override
+    protected void onSelectionPerformed(boolean success) {
+        super.onSelectionPerformed(success);
+
+        getActivity().finish();
+    }
+
+    private final class WhenToDreamCandidateInfo extends CandidateInfo {
+        private final String name;
+        private final String key;
+
+        WhenToDreamCandidateInfo(String title, String value) {
+            super(true);
+
+            name = title;
+            key = value;
+        }
+
+        @Override
+        public CharSequence loadLabel() {
+            return name;
+        }
+
+        @Override
+        public Drawable loadIcon() {
+            return null;
+        }
+
+        @Override
+        public String getKey() {
+            return key;
+        }
+    }
+}
diff --git a/src/com/android/settings/dream/WhenToDreamPreferenceController.java b/src/com/android/settings/dream/WhenToDreamPreferenceController.java
new file mode 100644
index 0000000..0d870fd
--- /dev/null
+++ b/src/com/android/settings/dream/WhenToDreamPreferenceController.java
@@ -0,0 +1,52 @@
+/*
+ * 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.dream;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.dream.DreamBackend;
+
+public class WhenToDreamPreferenceController extends PreferenceController {
+
+    private static final String WHEN_TO_START = "when_to_start";
+    private final DreamBackend mBackend;
+
+    WhenToDreamPreferenceController(Context context) {
+        super(context);
+
+        mBackend = DreamBackend.getInstance(context);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        int resId = DreamSettings.getDreamSettingDescriptionResId(mBackend.getWhenToDreamSetting());
+        preference.setSummary(preference.getContext().getString(resId));
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return WHEN_TO_START;
+    }
+}
diff --git a/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java b/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java
index 003ed11..be41e4d 100644
--- a/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java
+++ b/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java
@@ -17,7 +17,7 @@
 import android.Manifest;
 import android.content.Context;
 
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class AdminGrantedCameraPermissionPreferenceController extends
         AdminGrantedPermissionsPreferenceControllerBase {
diff --git a/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceController.java b/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceController.java
index 5343483..77c6040 100644
--- a/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceController.java
+++ b/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceController.java
@@ -17,7 +17,7 @@
 import android.Manifest;
 import android.content.Context;
 
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class AdminGrantedLocationPermissionsPreferenceController extends
         AdminGrantedPermissionsPreferenceControllerBase {
diff --git a/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceController.java b/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceController.java
index 64396c5..9896420 100644
--- a/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceController.java
+++ b/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceController.java
@@ -17,7 +17,7 @@
 import android.Manifest;
 import android.content.Context;
 
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class AdminGrantedMicrophonePermissionPreferenceController extends
         AdminGrantedPermissionsPreferenceControllerBase {
diff --git a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
index 556baec..9187cec 100644
--- a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
@@ -21,8 +21,8 @@
 import com.android.settings.R;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public abstract class AdminGrantedPermissionsPreferenceControllerBase
         extends DynamicAvailabilityPreferenceController {
diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
index 32f2bbe..ed91fef 100644
--- a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
+++ b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
@@ -18,8 +18,8 @@
 
 import com.android.settings.R;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class AlwaysOnVpnCurrentUserPreferenceController
         extends DynamicAvailabilityPreferenceController {
diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
index 8486368..db6fc1d 100644
--- a/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
+++ b/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
@@ -16,8 +16,8 @@
 import android.content.Context;
 
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class AlwaysOnVpnManagedProfilePreferenceController
         extends DynamicAvailabilityPreferenceController {
diff --git a/src/com/android/settings/enterprise/CaCertsPreferenceController.java b/src/com/android/settings/enterprise/CaCertsPreferenceController.java
index fc89dc8..65c109c 100644
--- a/src/com/android/settings/enterprise/CaCertsPreferenceController.java
+++ b/src/com/android/settings/enterprise/CaCertsPreferenceController.java
@@ -20,8 +20,8 @@
 
 import com.android.settings.R;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class CaCertsPreferenceController extends DynamicAvailabilityPreferenceController {
 
diff --git a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
index 9876f71..cced8e8 100644
--- a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
@@ -19,8 +19,8 @@
 import com.android.settings.R;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class EnterpriseInstalledPackagesPreferenceController
         extends DynamicAvailabilityPreferenceController {
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
index 372982f..6ec091b 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
@@ -18,8 +18,8 @@
 
 import com.android.settings.R;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class EnterprisePrivacyPreferenceController extends DynamicAvailabilityPreferenceController {
 
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
index f7327c8..54f0508 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
@@ -22,10 +22,10 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
index 35f6e41..537ef78 100644
--- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
@@ -22,9 +22,9 @@
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.applications.EnterpriseDefaultApps;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.users.UserFeatureProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class EnterpriseSetDefaultAppsPreferenceController
         extends DynamicAvailabilityPreferenceController {
diff --git a/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceController.java b/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceController.java
index 4c89659..7833325 100644
--- a/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceController.java
+++ b/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceController.java
@@ -20,7 +20,7 @@
 
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
 import com.android.settings.core.PreferenceAvailabilityObserver;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.HashSet;
 import java.util.List;
diff --git a/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceController.java
index d3f9a98..d7f8dc0 100644
--- a/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceController.java
+++ b/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceController.java
@@ -15,7 +15,7 @@
 
 import android.content.Context;
 
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class FailedPasswordWipeCurrentUserPreferenceController
         extends FailedPasswordWipePreferenceControllerBase {
diff --git a/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java
index 205d7c1..739003a 100644
--- a/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java
+++ b/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java
@@ -14,7 +14,7 @@
 package com.android.settings.enterprise;
 
 import android.content.Context;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class FailedPasswordWipeManagedProfilePreferenceController
         extends FailedPasswordWipePreferenceControllerBase {
diff --git a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
index 7485fe2..298f911 100644
--- a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
@@ -20,8 +20,8 @@
 
 import com.android.settings.R;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public abstract class FailedPasswordWipePreferenceControllerBase
         extends DynamicAvailabilityPreferenceController {
diff --git a/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java b/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java
index 76c49da..55552b6 100644
--- a/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java
+++ b/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java
@@ -16,8 +16,8 @@
 import android.content.Context;
 
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class GlobalHttpProxyPreferenceController extends DynamicAvailabilityPreferenceController {
 
diff --git a/src/com/android/settings/enterprise/ImePreferenceController.java b/src/com/android/settings/enterprise/ImePreferenceController.java
index b13aec7..ca52fc0 100644
--- a/src/com/android/settings/enterprise/ImePreferenceController.java
+++ b/src/com/android/settings/enterprise/ImePreferenceController.java
@@ -20,8 +20,8 @@
 
 import com.android.settings.R;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class ImePreferenceController extends DynamicAvailabilityPreferenceController {
 
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java b/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
index d581804..df7bf3c 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
@@ -26,9 +26,9 @@
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.android.settings.ChooseLockSettingsHelper;
-import com.android.settings.core.InstrumentedActivity;
 import com.android.settings.R;
+import com.android.settings.core.InstrumentedActivity;
+import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.setupwizardlib.GlifLayout;
 
 /**
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index 7454c60..14c5ae2 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -40,9 +40,9 @@
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.password.ChooseLockSettingsHelper;
 
 /**
  * Activity which handles the actual enrolling for fingerprint.
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
index 5152d31..e34a90b 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
@@ -20,12 +20,14 @@
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.support.annotation.Nullable;
+import android.view.View;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.fingerprint.FingerprintEnrollSidecar.Listener;
+import com.android.settings.password.ChooseLockSettingsHelper;
 
 /**
  * Activity explaining the fingerprint sensor location for fingerprint enrollment.
@@ -36,6 +38,7 @@
     private static final int ENROLLING = 2;
     public static final String EXTRA_KEY_LAUNCHED_CONFIRM = "launched_confirm_lock";
 
+    @Nullable
     private FingerprintFindSensorAnimation mAnimation;
     private boolean mLaunchedConfirmLock;
     private FingerprintEnrollSidecar mSidecar;
@@ -56,8 +59,12 @@
         } else if (mToken != null) {
             startLookingForFingerprint(); // already confirmed, so start looking for fingerprint
         }
-        mAnimation = (FingerprintFindSensorAnimation) findViewById(
-                R.id.fingerprint_sensor_location_animation);
+        View animationView = findViewById(R.id.fingerprint_sensor_location_animation);
+        if (animationView instanceof FingerprintFindSensorAnimation) {
+            mAnimation = (FingerprintFindSensorAnimation) animationView;
+        } else {
+            mAnimation = null;
+        }
     }
 
     protected int getContentView() {
@@ -67,7 +74,9 @@
     @Override
     protected void onStart() {
         super.onStart();
-        mAnimation.startAnimation();
+        if (mAnimation != null) {
+            mAnimation.startAnimation();
+        }
     }
 
     private void startLookingForFingerprint() {
@@ -102,13 +111,17 @@
     @Override
     protected void onStop() {
         super.onStop();
-        mAnimation.pauseAnimation();
+        if (mAnimation != null) {
+            mAnimation.pauseAnimation();
+        }
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        mAnimation.stopAnimation();
+        if (mAnimation != null) {
+            mAnimation.stopAnimation();
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
index 551564d..dd83121 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
@@ -29,10 +29,10 @@
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.ChooseLockGeneric;
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.Utils;
+import com.android.settings.password.ChooseLockGeneric;
+import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settingslib.HelpUtils;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.setupwizardlib.span.LinkSpan;
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
index cbfec0c..9ab561d 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
@@ -26,9 +26,10 @@
 import android.os.UserHandle;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.Utils;
 import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.password.ChooseLockSettingsHelper;
+
 import com.android.settings.password.IFingerprintManager;
 
 import java.util.ArrayList;
diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java
index fb59c59..a5595f9 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -46,8 +46,8 @@
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.TextPaint;
-import android.text.style.URLSpan;
 import android.text.TextUtils;
+import android.text.style.URLSpan;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
@@ -56,21 +56,20 @@
 import android.widget.Toast;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.ChooseLockGeneric;
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.SubSettings;
 import com.android.settings.Utils;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settings.widget.FooterPreference;
+import com.android.settings.password.ChooseLockGeneric;
+import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settingslib.HelpUtils;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.widget.FooterPreference;
 
-import java.util.List;
 import java.util.HashMap;
-
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import java.util.List;
 
 /**
  * Settings screen for fingerprints
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
index aff1028..d7a4a73 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
@@ -21,9 +21,9 @@
 import android.os.UserHandle;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
+import com.android.settings.password.ChooseLockSettingsHelper;
 
 public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor {
 
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
index 92ea5cb..43ff097 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
@@ -23,9 +23,9 @@
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
+import com.android.settings.password.ChooseLockSettingsHelper;
 
 public class SetupFingerprintEnrollFinish extends FingerprintEnrollFinish {
 
@@ -49,12 +49,6 @@
     @Override
     protected void initViews() {
         super.initViews();
-
-        final TextView message = (TextView) findViewById(R.id.message);
-        message.setText(R.string.setup_fingerprint_enroll_finish_message);
-
-        final TextView secondaryMessage = (TextView) findViewById(R.id.message_secondary);
-        secondaryMessage.setVisibility(View.VISIBLE);
     }
 
     @Override
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
index 3951aff..26b3427 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
@@ -17,6 +17,7 @@
 package com.android.settings.fingerprint;
 
 import android.app.KeyguardManager;
+import android.app.admin.DevicePolicyManager;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.UserHandle;
@@ -26,14 +27,20 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
-import com.android.settings.SetupChooseLockGeneric;
 import com.android.settings.SetupWizardUtils;
+import com.android.settings.password.ChooseLockGeneric;
+import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
+import com.android.settings.password.SetupChooseLockGeneric;
 
 public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntroduction {
 
     @Override
     protected Intent getChooseLockIntent() {
-        Intent intent = new Intent(this, SetupChooseLockGeneric.class);
+        Intent intent = new Intent(this, SetupChooseLockGeneric.class)
+                .putExtra(
+                        LockPatternUtils.PASSWORD_TYPE_KEY,
+                        DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
+        intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, true);
         SetupWizardUtils.copySetupExtras(getIntent(), intent);
         return intent;
     }
diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
index 42b049a..016690c 100644
--- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
@@ -28,6 +28,7 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.PreferenceFragment;
 import android.support.v7.preference.Preference;
+import android.text.TextUtils;
 import android.view.View;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -37,13 +38,12 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
-import com.android.settings.applications.AppHeaderController;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.enterprise.DevicePolicyManagerWrapperImpl;
-import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
 
@@ -87,9 +87,12 @@
     @VisibleForTesting
     BatteryUtils mBatteryUtils;
 
-    private Preference mForegroundPreference;
-    private Preference mBackgroundPreference;
-    private Preference mPowerUsagePreference;
+    @VisibleForTesting
+    Preference mForegroundPreference;
+    @VisibleForTesting
+    Preference mBackgroundPreference;
+    @VisibleForTesting
+    Preference mPowerUsagePreference;
     private AppButtonsPreferenceController mAppButtonsPreferenceController;
 
     private DevicePolicyManagerWrapper mDpm;
@@ -175,30 +178,19 @@
         super.onResume();
 
         initHeader();
-
-        final Bundle bundle = getArguments();
-        final Context context = getContext();
-
-        final long foregroundTimeMs = bundle.getLong(EXTRA_FOREGROUND_TIME);
-        final long backgroundTimeMs = bundle.getLong(EXTRA_BACKGROUND_TIME);
-        final String usagePercent = bundle.getString(EXTRA_POWER_USAGE_PERCENT);
-        final int powerMah = bundle.getInt(EXTRA_POWER_USAGE_AMOUNT);
-        mForegroundPreference.setSummary(Utils.formatElapsedTime(context, foregroundTimeMs, false));
-        mBackgroundPreference.setSummary(Utils.formatElapsedTime(context, backgroundTimeMs, false));
-        mPowerUsagePreference.setSummary(
-                getString(R.string.battery_detail_power_percentage, usagePercent, powerMah));
+        initPreference();
     }
 
     @VisibleForTesting
     void initHeader() {
-        final View appSnippet = mHeaderPreference.findViewById(R.id.app_snippet);
+        final View appSnippet = mHeaderPreference.findViewById(R.id.entity_header);
         final Activity context = getActivity();
         final Bundle bundle = getArguments();
-        AppHeaderController controller = FeatureFactory.getFactory(context)
-                .getApplicationFeatureProvider(context)
-                .newAppHeaderController(this, appSnippet)
-                .setButtonActions(AppHeaderController.ActionType.ACTION_NONE,
-                        AppHeaderController.ActionType.ACTION_NONE);
+        EntityHeaderController controller = EntityHeaderController
+                .newInstance(context, this, appSnippet)
+                .setRecyclerView(getListView(), getLifecycle())
+                .setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,
+                        EntityHeaderController.ActionType.ACTION_NONE);
 
         if (mAppEntry == null) {
             controller.setLabel(bundle.getString(EXTRA_LABEL));
@@ -223,6 +215,25 @@
         controller.done(context, true /* rebindActions */);
     }
 
+    @VisibleForTesting
+    void initPreference() {
+        final Bundle bundle = getArguments();
+        final Context context = getContext();
+
+        final long foregroundTimeMs = bundle.getLong(EXTRA_FOREGROUND_TIME);
+        final long backgroundTimeMs = bundle.getLong(EXTRA_BACKGROUND_TIME);
+        final String usagePercent = bundle.getString(EXTRA_POWER_USAGE_PERCENT);
+        final int powerMah = bundle.getInt(EXTRA_POWER_USAGE_AMOUNT);
+        mForegroundPreference.setSummary(
+                TextUtils.expandTemplate(getText(R.string.battery_used_for),
+                        Utils.formatElapsedTime(context, foregroundTimeMs, false)));
+        mBackgroundPreference.setSummary(
+                TextUtils.expandTemplate(getText(R.string.battery_active_for),
+                        Utils.formatElapsedTime(context, backgroundTimeMs, false)));
+        mPowerUsagePreference.setSummary(
+                getString(R.string.battery_detail_power_percentage, usagePercent, powerMah));
+    }
+
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.FUELGAUGE_POWER_USAGE_DETAIL;
@@ -235,7 +246,7 @@
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.power_usage_detail_ia;
+        return R.xml.power_usage_detail;
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
index 89f03b3..6b4c8a9 100644
--- a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
@@ -52,16 +52,16 @@
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnDestroy;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnDestroy;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/com/android/settings/fuelgauge/BatteryCellParser.java b/src/com/android/settings/fuelgauge/BatteryCellParser.java
index aaac024f..2b39877 100644
--- a/src/com/android/settings/fuelgauge/BatteryCellParser.java
+++ b/src/com/android/settings/fuelgauge/BatteryCellParser.java
@@ -19,7 +19,6 @@
 import android.util.SparseIntArray;
 import com.android.settings.Utils;
 import com.android.settings.fuelgauge.BatteryActiveView.BatteryActiveProvider;
-import com.android.settingslib.BatteryInfo;
 
 public class BatteryCellParser implements BatteryInfo.BatteryDataParser, BatteryActiveProvider {
 
diff --git a/src/com/android/settings/fuelgauge/BatteryFlagParser.java b/src/com/android/settings/fuelgauge/BatteryFlagParser.java
index cd5d89b..d4f3fb2 100644
--- a/src/com/android/settings/fuelgauge/BatteryFlagParser.java
+++ b/src/com/android/settings/fuelgauge/BatteryFlagParser.java
@@ -18,7 +18,6 @@
 import android.util.SparseBooleanArray;
 import android.util.SparseIntArray;
 import com.android.settings.fuelgauge.BatteryActiveView.BatteryActiveProvider;
-import com.android.settingslib.BatteryInfo;
 
 public class BatteryFlagParser implements BatteryInfo.BatteryDataParser, BatteryActiveProvider {
 
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index 04e2c7a..bdd2413 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -17,47 +17,67 @@
 
 package com.android.settings.fuelgauge;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.PreferenceFragment;
 import android.support.v7.preference.PreferenceScreen;
 import android.widget.TextView;
 
 import com.android.settings.R;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.core.PreferenceController;
-import com.android.settingslib.BatteryInfo;
+import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.Utils;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
 
 /**
  * Controller that update the battery header view
  */
-public class BatteryHeaderPreferenceController extends PreferenceController {
+public class BatteryHeaderPreferenceController extends PreferenceController
+        implements LifecycleObserver, OnStart {
     @VisibleForTesting
     static final String KEY_BATTERY_HEADER = "battery_header";
+
     @VisibleForTesting
     BatteryMeterView mBatteryMeterView;
     @VisibleForTesting
     TextView mTimeText;
     @VisibleForTesting
-    TextView mSummary;
+    TextView mSummary1;
+    @VisibleForTesting
+    TextView mSummary2;
+
+    private final Activity mActivity;
+    private final PreferenceFragment mHost;
+    private final Lifecycle mLifecycle;
 
     private LayoutPreference mBatteryLayoutPref;
 
-    public BatteryHeaderPreferenceController(Context context) {
+    public BatteryHeaderPreferenceController(Context context, Activity activity,
+            PreferenceFragment host, Lifecycle lifecycle) {
         super(context);
+        mActivity = activity;
+        mHost = host;
+        mLifecycle = lifecycle;
+        if (mLifecycle != null) {
+            mLifecycle.addObserver(this);
+        }
     }
 
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-
         mBatteryLayoutPref = (LayoutPreference) screen.findPreference(KEY_BATTERY_HEADER);
         mBatteryMeterView = (BatteryMeterView) mBatteryLayoutPref
                 .findViewById(R.id.battery_header_icon);
-        mTimeText = (TextView) mBatteryLayoutPref.findViewById(R.id.battery_percent);
-        mSummary = (TextView) mBatteryLayoutPref.findViewById(R.id.summary1);
+        mTimeText = mBatteryLayoutPref.findViewById(R.id.battery_percent);
+        mSummary1 = mBatteryLayoutPref.findViewById(R.id.summary1);
+        mSummary2 = mBatteryLayoutPref.findViewById(R.id.summary2);
 
         Intent batteryBroadcast = mContext.registerReceiver(null,
                 new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
@@ -77,13 +97,24 @@
         return KEY_BATTERY_HEADER;
     }
 
+    @Override
+    public void onStart() {
+        EntityHeaderController.newInstance(mActivity, mHost,
+                mBatteryLayoutPref.findViewById(R.id.battery_entity_header))
+                .setRecyclerView(mHost.getListView(), mLifecycle)
+                .styleActionBar(mActivity);
+    }
+
     public void updateHeaderPreference(BatteryInfo info) {
         mTimeText.setText(Utils.formatPercentage(info.batteryLevel));
         if (info.remainingLabel == null) {
-            mSummary.setText(info.statusLabel);
+            mSummary1.setText(info.statusLabel);
         } else {
-            mSummary.setText(info.remainingLabel);
+            mSummary1.setText(info.remainingLabel);
         }
+        // Clear this just to be sure we don't get UI jank on re-entering this view from another
+        // activity.
+        mSummary2.setText("");
 
         mBatteryMeterView.setBatteryLevel(info.batteryLevel);
         mBatteryMeterView.setCharging(!info.discharging);
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index 8588f77..e9a2250 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -40,7 +40,6 @@
 import android.view.View;
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settingslib.BatteryInfo;
 import libcore.icu.LocaleData;
 
 import java.util.ArrayList;
@@ -507,81 +506,82 @@
 
         mMaxPercentLabelString = Utils.formatPercentage(100);
         mMinPercentLabelString = Utils.formatPercentage(0);
-        mInfo = BatteryInfo.getBatteryInfo(getContext(), mBatteryBroadcast, mStats,
-                elapsedRealtimeUs);
-        mDrainString = "";
-        mChargeDurationString = "";
-        setContentDescription(mInfo.chargeLabelString);
+        BatteryInfo.getBatteryInfo(getContext(), info -> {
+            mInfo = info;
+            mDrainString = "";
+            mChargeDurationString = "";
+            setContentDescription(mInfo.chargeLabel);
 
-        int pos = 0;
-        int lastInteresting = 0;
-        byte lastLevel = -1;
-        mBatLow = 0;
-        mBatHigh = 100;
-        mStartWallTime = 0;
-        mEndDataWallTime = 0;
-        mEndWallTime = 0;
-        mHistStart = 0;
-        mHistEnd = 0;
-        long lastWallTime = 0;
-        long lastRealtime = 0;
-        int aggrStates = 0;
-        int aggrStates2 = 0;
-        boolean first = true;
-        if (stats.startIteratingHistoryLocked()) {
-            final HistoryItem rec = new HistoryItem();
-            while (stats.getNextHistoryLocked(rec)) {
-                pos++;
-                if (first) {
-                    first = false;
-                    mHistStart = 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 < (mHistStart+(5*60*1000L))) {
-                        mStartWallTime = 0;
+            int pos = 0;
+            int lastInteresting = 0;
+            byte lastLevel = -1;
+            mBatLow = 0;
+            mBatHigh = 100;
+            mStartWallTime = 0;
+            mEndDataWallTime = 0;
+            mEndWallTime = 0;
+            mHistStart = 0;
+            mHistEnd = 0;
+            long lastWallTime = 0;
+            long lastRealtime = 0;
+            int aggrStates = 0;
+            int aggrStates2 = 0;
+            boolean first = true;
+            if (stats.startIteratingHistoryLocked()) {
+                final HistoryItem rec = new HistoryItem();
+                while (stats.getNextHistoryLocked(rec)) {
+                    pos++;
+                    if (first) {
+                        first = false;
+                        mHistStart = rec.time;
                     }
-                    lastWallTime = rec.currentTime;
-                    lastRealtime = rec.time;
-                    if (mStartWallTime == 0) {
-                        mStartWallTime = lastWallTime - (lastRealtime-mHistStart);
+                    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 < (mHistStart+(5*60*1000L))) {
+                            mStartWallTime = 0;
+                        }
+                        lastWallTime = rec.currentTime;
+                        lastRealtime = rec.time;
+                        if (mStartWallTime == 0) {
+                            mStartWallTime = lastWallTime - (lastRealtime-mHistStart);
+                        }
                     }
-                }
-                if (rec.isDeltaData()) {
-                    if (rec.batteryLevel != lastLevel || pos == 1) {
-                        lastLevel = rec.batteryLevel;
+                    if (rec.isDeltaData()) {
+                        if (rec.batteryLevel != lastLevel || pos == 1) {
+                            lastLevel = rec.batteryLevel;
+                        }
+                        lastInteresting = pos;
+                        mHistDataEnd = rec.time;
+                        aggrStates |= rec.states;
+                        aggrStates2 |= rec.states2;
                     }
-                    lastInteresting = pos;
-                    mHistDataEnd = rec.time;
-                    aggrStates |= rec.states;
-                    aggrStates2 |= rec.states2;
                 }
             }
-        }
-        mHistEnd = mHistDataEnd + (mInfo.remainingTimeUs/1000);
-        mEndDataWallTime = lastWallTime + mHistDataEnd - lastRealtime;
-        mEndWallTime = mEndDataWallTime + (mInfo.remainingTimeUs/1000);
-        mNumHist = lastInteresting;
-        mHaveGps = (aggrStates&HistoryItem.STATE_GPS_ON_FLAG) != 0;
-        mHaveFlashlight = (aggrStates2&HistoryItem.STATE2_FLASHLIGHT_FLAG) != 0;
-        mHaveCamera = (aggrStates2&HistoryItem.STATE2_CAMERA_FLAG) != 0;
-        mHaveWifi = (aggrStates2&HistoryItem.STATE2_WIFI_RUNNING_FLAG) != 0
-                || (aggrStates&(HistoryItem.STATE_WIFI_FULL_LOCK_FLAG
-                        |HistoryItem.STATE_WIFI_MULTICAST_ON_FLAG
-                        |HistoryItem.STATE_WIFI_SCAN_FLAG)) != 0;
-        if (!com.android.settings.Utils.isWifiOnly(getContext())) {
-            mHavePhoneSignal = true;
-        }
-        if (mHistEnd <= mHistStart) mHistEnd = mHistStart+1;
+            mHistEnd = mHistDataEnd + (mInfo.remainingTimeUs/1000);
+            mEndDataWallTime = lastWallTime + mHistDataEnd - lastRealtime;
+            mEndWallTime = mEndDataWallTime + (mInfo.remainingTimeUs/1000);
+            mNumHist = lastInteresting;
+            mHaveGps = (aggrStates&HistoryItem.STATE_GPS_ON_FLAG) != 0;
+            mHaveFlashlight = (aggrStates2&HistoryItem.STATE2_FLASHLIGHT_FLAG) != 0;
+            mHaveCamera = (aggrStates2&HistoryItem.STATE2_CAMERA_FLAG) != 0;
+            mHaveWifi = (aggrStates2&HistoryItem.STATE2_WIFI_RUNNING_FLAG) != 0
+                    || (aggrStates&(HistoryItem.STATE_WIFI_FULL_LOCK_FLAG
+                    |HistoryItem.STATE_WIFI_MULTICAST_ON_FLAG
+                    |HistoryItem.STATE_WIFI_SCAN_FLAG)) != 0;
+            if (!com.android.settings.Utils.isWifiOnly(getContext())) {
+                mHavePhoneSignal = true;
+            }
+            if (mHistEnd <= mHistStart) mHistEnd = mHistStart+1;
+        }, mStats, false /* shortString */);
     }
 
     @Override
@@ -589,7 +589,8 @@
         mMaxPercentLabelStringWidth = (int)mTextPaint.measureText(mMaxPercentLabelString);
         mMinPercentLabelStringWidth = (int)mTextPaint.measureText(mMinPercentLabelString);
         mDrainStringWidth = (int)mHeaderTextPaint.measureText(mDrainString);
-        mChargeLabelStringWidth = (int)mHeaderTextPaint.measureText(mInfo.chargeLabelString);
+        mChargeLabelStringWidth = (int) mHeaderTextPaint.measureText(
+                mInfo.chargeLabel.toString());
         mChargeDurationStringWidth = (int)mHeaderTextPaint.measureText(mChargeDurationString);
         mTextAscent = (int)mTextPaint.ascent();
         mTextDescent = (int)mTextPaint.descent();
@@ -1211,8 +1212,9 @@
 
         int headerTop = -mHeaderTextAscent + (mHeaderTextDescent-mHeaderTextAscent)/3;
         mHeaderTextPaint.setTextAlign(textAlignLeft);
-        if (DEBUG) Log.d(TAG, "Drawing charge label string: " + mInfo.chargeLabelString);
-        canvas.drawText(mInfo.chargeLabelString, textStartX, headerTop, mHeaderTextPaint);
+        if (DEBUG) Log.d(TAG, "Drawing charge label string: " + mInfo.chargeLabel);
+        canvas.drawText(mInfo.chargeLabel.toString(), textStartX, headerTop,
+                mHeaderTextPaint);
         int stringHalfWidth = mChargeDurationStringWidth / 2;
         if (layoutRtl) stringHalfWidth = -stringHalfWidth;
         int headerCenter = ((width-mChargeDurationStringWidth-mDrainStringWidth)/2)
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
index 7d3e1d1..3661467 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
@@ -20,7 +20,6 @@
 import android.os.BatteryStats;
 import android.os.BatteryStats.HistoryItem;
 import android.os.Bundle;
-import android.os.SystemClock;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -31,8 +30,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.fuelgauge.BatteryActiveView.BatteryActiveProvider;
-import com.android.settingslib.BatteryInfo;
-import com.android.settingslib.graph.UsageView;
+import com.android.settings.graph.UsageView;
 
 public class BatteryHistoryDetail extends SettingsPreferenceFragment {
     public static final String EXTRA_STATS = "stats";
@@ -92,24 +90,25 @@
     }
 
     private void updateEverything() {
-        BatteryInfo info = BatteryInfo.getBatteryInfo(getContext(), mBatteryBroadcast, mStats,
-                SystemClock.elapsedRealtime() * 1000);
-        final View view = getView();
-        info.bindHistory((UsageView) view.findViewById(R.id.battery_usage), mChargingParser,
-                mScreenOn, mGpsParser, mFlashlightParser, mCameraParser, mWifiParser, mCpuParser,
-                mPhoneParser);
-        ((TextView) view.findViewById(R.id.charge)).setText(info.batteryPercentString);
-        ((TextView) view.findViewById(R.id.estimation)).setText(info.remainingLabel);
+        BatteryInfo.getBatteryInfo(getContext(), info -> {
+            final View view = getView();
+            info.bindHistory((UsageView) view.findViewById(R.id.battery_usage), mChargingParser,
+                    mScreenOn, mGpsParser, mFlashlightParser, mCameraParser, mWifiParser,
+                    mCpuParser, mPhoneParser);
+            ((TextView) view.findViewById(R.id.charge)).setText(info.batteryPercentString);
+            ((TextView) view.findViewById(R.id.estimation)).setText(info.remainingLabel);
 
-        bindData(mChargingParser, R.string.battery_stats_charging_label, R.id.charging_group);
-        bindData(mScreenOn, R.string.battery_stats_screen_on_label, R.id.screen_on_group);
-        bindData(mGpsParser, R.string.battery_stats_gps_on_label, R.id.gps_group);
-        bindData(mFlashlightParser, R.string.battery_stats_flashlight_on_label,
-                R.id.flashlight_group);
-        bindData(mCameraParser, R.string.battery_stats_camera_on_label, R.id.camera_group);
-        bindData(mWifiParser, R.string.battery_stats_wifi_running_label, R.id.wifi_group);
-        bindData(mCpuParser, R.string.battery_stats_wake_lock_label, R.id.cpu_group);
-        bindData(mPhoneParser, R.string.battery_stats_phone_signal_label, R.id.cell_network_group);
+            bindData(mChargingParser, R.string.battery_stats_charging_label, R.id.charging_group);
+            bindData(mScreenOn, R.string.battery_stats_screen_on_label, R.id.screen_on_group);
+            bindData(mGpsParser, R.string.battery_stats_gps_on_label, R.id.gps_group);
+            bindData(mFlashlightParser, R.string.battery_stats_flashlight_on_label,
+                    R.id.flashlight_group);
+            bindData(mCameraParser, R.string.battery_stats_camera_on_label, R.id.camera_group);
+            bindData(mWifiParser, R.string.battery_stats_wifi_running_label, R.id.wifi_group);
+            bindData(mCpuParser, R.string.battery_stats_wake_lock_label, R.id.cpu_group);
+            bindData(mPhoneParser, R.string.battery_stats_phone_signal_label,
+                    R.id.cell_network_group);
+        }, mStats, false /* shortString */);
     }
 
     private void bindData(BatteryActiveProvider provider, int label, int groupId) {
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
index 1f6030e..920f0e2 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
@@ -17,8 +17,6 @@
 package com.android.settings.fuelgauge;
 
 import android.content.Context;
-import android.os.Bundle;
-import android.os.SystemClock;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
@@ -26,10 +24,7 @@
 import android.widget.TextView;
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.BatteryInfo;
-import com.android.settingslib.graph.UsageView;
+import com.android.settings.graph.UsageView;
 
 /**
  * Custom preference for displaying power consumption as a bar and an icon on the left for the
@@ -47,10 +42,10 @@
     }
 
     public void setStats(BatteryStatsHelper batteryStats) {
-        final long elapsedRealtimeUs = SystemClock.elapsedRealtime() * 1000;
-        mBatteryInfo = BatteryInfo.getBatteryInfo(getContext(), batteryStats.getBatteryBroadcast(),
-                batteryStats.getStats(), elapsedRealtimeUs);
-        notifyChanged();
+        BatteryInfo.getBatteryInfo(getContext(), info -> {
+            mBatteryInfo = info;
+            notifyChanged();
+        }, batteryStats.getStats(), false);
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java
new file mode 100644
index 0000000..48aa0b3
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -0,0 +1,346 @@
+/*
+ * Copyright (C) 2016 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.content.Intent;
+import android.content.IntentFilter;
+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.SystemClock;
+import android.support.annotation.WorkerThread;
+import android.text.TextUtils;
+import android.text.format.Formatter;
+import android.util.SparseIntArray;
+
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.R;
+import com.android.settings.Utils;
+import com.android.settings.graph.UsageView;
+
+public class BatteryInfo {
+
+    public CharSequence chargeLabel;
+    public CharSequence remainingLabel;
+    public int batteryLevel;
+    public boolean discharging = true;
+    public long remainingTimeUs = 0;
+    public String batteryPercentString;
+    public String statusLabel;
+    private boolean mCharging;
+    private BatteryStats mStats;
+    private long timePeriod;
+
+    public interface Callback {
+        void onBatteryInfoLoaded(BatteryInfo info);
+    }
+
+    public void bindHistory(final UsageView view, BatteryDataParser... parsers) {
+        BatteryDataParser parser = new BatteryDataParser() {
+            SparseIntArray points = new SparseIntArray();
+            int lastTime = -1;
+            byte lastLevel;
+            int maxTime;
+
+            @Override
+            public void onParsingStarted(long startTime, long endTime) {
+                this.maxTime = (int) (endTime - startTime);
+                timePeriod = maxTime - (remainingTimeUs / 1000);
+                view.clearPaths();
+                view.configureGraph(maxTime, 100);
+            }
+
+            @Override
+            public void onDataPoint(long time, HistoryItem record) {
+                lastTime = (int) time;
+                lastLevel = record.batteryLevel;
+                points.put(lastTime, lastLevel);
+            }
+
+            @Override
+            public void onDataGap() {
+                if (points.size() > 1) {
+                    view.addPath(points);
+                }
+                points.clear();
+            }
+
+            @Override
+            public void onParsingDone() {
+                onDataGap();
+
+                // Add linear projection
+                if (lastTime >= 0 && remainingTimeUs != 0) {
+                    points.put(lastTime, lastLevel);
+                    points.put(maxTime, mCharging ? 100 : 0);
+                    view.addProjectedPath(points);
+                }
+            }
+        };
+        BatteryDataParser[] parserList = new BatteryDataParser[parsers.length + 1];
+        for (int i = 0; i < parsers.length; i++) {
+            parserList[i] = parsers[i];
+        }
+        parserList[parsers.length] = parser;
+        parse(mStats, remainingTimeUs, parserList);
+        final Context context = view.getContext();
+        String timeString = context.getString(R.string.charge_length_format,
+                Formatter.formatShortElapsedTime(context, timePeriod));
+        String remaining = "";
+        if (remainingTimeUs != 0) {
+            remaining = context.getString(R.string.remaining_length_format,
+                    Formatter.formatShortElapsedTime(context, remainingTimeUs / 1000));
+        }
+        view.setBottomLabels(new CharSequence[]{timeString, remaining});
+    }
+
+    public static void getBatteryInfo(final Context context, final Callback callback) {
+        BatteryInfo.getBatteryInfo(context, callback, false /* shortString */);
+    }
+
+    public static void getBatteryInfo(final Context context, final Callback callback,
+            boolean shortString) {
+        BatteryStatsHelper statsHelper = new BatteryStatsHelper(context, true);
+        statsHelper.create((Bundle) null);
+        BatteryInfo.getBatteryInfo(context, callback, statsHelper, shortString);
+    }
+
+    public static void getBatteryInfo(final Context context, final Callback callback,
+            BatteryStatsHelper statsHelper, boolean shortString) {
+        getBatteryInfo(context, callback, statsHelper.getStats(), shortString);
+    }
+
+    public static void getBatteryInfo(final Context context, final Callback callback,
+            BatteryStats stats, boolean shortString) {
+        new AsyncTask<Void, Void, BatteryInfo>() {
+            @Override
+            protected BatteryInfo doInBackground(Void... params) {
+                PowerUsageFeatureProvider provider =
+                        FeatureFactory.getFactory(context).getPowerUsageFeatureProvider(context);
+                final BatteryUtils batteryUtils = BatteryUtils.getInstance(context);
+                final long elapsedRealtimeUs =
+                        batteryUtils.convertMsToUs(SystemClock.elapsedRealtime());
+                Intent batteryBroadcast = context.registerReceiver(null,
+                        new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+                BatteryUtils utils = BatteryUtils.getInstance(context);
+
+                if (provider != null && provider.isEnhancedBatteryPredictionEnabled(context)) {
+                    return BatteryInfo.getBatteryInfo(context, batteryBroadcast, stats,
+                            elapsedRealtimeUs, shortString,
+                            utils.convertMsToUs(provider.getEnhancedBatteryPrediction(context)),
+                            true);
+                } else {
+                    return BatteryInfo.getBatteryInfo(context, batteryBroadcast, stats,
+                            elapsedRealtimeUs, shortString,
+                            stats.computeBatteryTimeRemaining(elapsedRealtimeUs), false);
+                }
+            }
+
+            @Override
+            protected void onPostExecute(BatteryInfo batteryInfo) {
+                callback.onBatteryInfoLoaded(batteryInfo);
+            }
+        }.execute();
+    }
+
+    @WorkerThread
+    public static BatteryInfo getBatteryInfoOld(Context context, Intent batteryBroadcast,
+            BatteryStats stats, long elapsedRealtimeUs, boolean shortString) {
+        return getBatteryInfo(context, batteryBroadcast, stats, elapsedRealtimeUs, shortString,
+                stats.computeBatteryTimeRemaining(elapsedRealtimeUs), false);
+    }
+
+    @WorkerThread
+    public static BatteryInfo getBatteryInfo(Context context, Intent batteryBroadcast,
+            BatteryStats stats, long elapsedRealtimeUs, boolean shortString, long drainTimeUs,
+            boolean basedOnUsage) {
+        BatteryInfo info = new BatteryInfo();
+        info.mStats = stats;
+        info.batteryLevel = Utils.getBatteryLevel(batteryBroadcast);
+        info.batteryPercentString = Utils.formatPercentage(info.batteryLevel);
+        info.mCharging = batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) != 0;
+        final Resources resources = context.getResources();
+        final BatteryUtils batteryUtils = BatteryUtils.getInstance(context);
+
+        info.statusLabel = Utils.getBatteryStatus(resources, batteryBroadcast);
+        if (!info.mCharging) {
+            if (drainTimeUs > 0) {
+                info.remainingTimeUs = drainTimeUs;
+                CharSequence timeString = Utils.formatElapsedTime(context,
+                        batteryUtils.convertUsToMs(drainTimeUs), false /* withSeconds */);
+                info.remainingLabel = TextUtils.expandTemplate(context.getText(shortString ?
+                        (basedOnUsage ?
+                                R.string.power_remaining_duration_only_short_enhanced :
+                                R.string.power_remaining_duration_only_short) :
+                        (basedOnUsage ?
+                                R.string.power_remaining_duration_only_enhanced :
+                                R.string.power_remaining_duration_only)), timeString);
+                info.chargeLabel = TextUtils.expandTemplate(context.getText(
+                        shortString ?
+                                R.string.power_discharging_duration_short :
+                                basedOnUsage ?
+                                        R.string.power_discharging_duration_enhanced :
+                                        R.string.power_discharging_duration),
+                        info.batteryPercentString, timeString);
+            } else {
+                info.remainingLabel = null;
+                info.chargeLabel = info.batteryPercentString;
+            }
+        } else {
+            final long chargeTime = stats.computeChargeTimeRemaining(elapsedRealtimeUs);
+            final int status = batteryBroadcast.getIntExtra(BatteryManager.EXTRA_STATUS,
+                    BatteryManager.BATTERY_STATUS_UNKNOWN);
+            info.discharging = false;
+            if (chargeTime > 0 && status != BatteryManager.BATTERY_STATUS_FULL) {
+                info.remainingTimeUs = chargeTime;
+                CharSequence timeString = Utils.formatElapsedTime(context,
+                        batteryUtils.convertUsToMs(drainTimeUs), false /* withSeconds */);
+                int resId = shortString ? R.string.power_charging_duration_short
+                        : R.string.power_charging_duration;
+                info.remainingLabel = TextUtils.expandTemplate(context.getText(
+                        R.string.power_remaining_charging_duration_only), timeString);
+                info.chargeLabel = TextUtils.expandTemplate(context.getText(resId),
+                        info.batteryPercentString, timeString);
+            } else {
+                final String chargeStatusLabel = resources.getString(
+                        R.string.battery_info_status_charging_lower);
+                info.remainingLabel = null;
+                info.chargeLabel = resources.getString(
+                        R.string.power_charging, info.batteryPercentString, chargeStatusLabel);
+            }
+        }
+        return info;
+    }
+
+    public interface BatteryDataParser {
+        void onParsingStarted(long startTime, long endTime);
+
+        void onDataPoint(long time, HistoryItem record);
+
+        void onDataGap();
+
+        void onParsingDone();
+    }
+
+    private static void parse(BatteryStats stats, long remainingTimeUs,
+            BatteryDataParser... parsers) {
+        long startWalltime = 0;
+        long endDateWalltime = 0;
+        long endWalltime = 0;
+        long historyStart = 0;
+        long historyEnd = 0;
+        byte lastLevel = -1;
+        long curWalltime = startWalltime;
+        long lastWallTime = 0;
+        long lastRealtime = 0;
+        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;
+                }
+                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()) {
+                    if (rec.batteryLevel != lastLevel || pos == 1) {
+                        lastLevel = rec.batteryLevel;
+                    }
+                    lastInteresting = pos;
+                    historyEnd = rec.time;
+                }
+            }
+        }
+        stats.finishIteratingHistoryLocked();
+        endDateWalltime = lastWallTime + historyEnd - lastRealtime;
+        endWalltime = endDateWalltime + (remainingTimeUs / 1000);
+
+        int i = 0;
+        final int N = lastInteresting;
+
+        for (int j = 0; j < parsers.length; j++) {
+            parsers[j].onParsingStarted(startWalltime, endWalltime);
+        }
+        if (endDateWalltime > startWalltime && stats.startIteratingHistoryLocked()) {
+            final HistoryItem rec = new HistoryItem();
+            while (stats.getNextHistoryLocked(rec) && i < N) {
+                if (rec.isDeltaData()) {
+                    curWalltime += rec.time - lastRealtime;
+                    lastRealtime = rec.time;
+                    long x = (curWalltime - startWalltime);
+                    if (x < 0) {
+                        x = 0;
+                    }
+                    for (int j = 0; j < parsers.length; j++) {
+                        parsers[j].onDataPoint(x, rec);
+                    }
+                } else {
+                    long lastWalltime = curWalltime;
+                    if (rec.cmd == HistoryItem.CMD_CURRENT_TIME
+                            || rec.cmd == HistoryItem.CMD_RESET) {
+                        if (rec.currentTime >= startWalltime) {
+                            curWalltime = rec.currentTime;
+                        } else {
+                            curWalltime = startWalltime + (rec.time - historyStart);
+                        }
+                        lastRealtime = rec.time;
+                    }
+
+                    if (rec.cmd != HistoryItem.CMD_OVERFLOW
+                            && (rec.cmd != HistoryItem.CMD_CURRENT_TIME
+                            || Math.abs(lastWalltime - curWalltime) > (60 * 60 * 1000))) {
+                        for (int j = 0; j < parsers.length; j++) {
+                            parsers[j].onDataGap();
+                        }
+                    }
+                }
+                i++;
+            }
+        }
+
+        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
new file mode 100644
index 0000000..f1c2547
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryInfoLoader.java
@@ -0,0 +1,80 @@
+/*
+ * 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.content.Intent;
+import android.content.IntentFilter;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.BatteryStats;
+import android.os.SystemClock;
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.utils.AsyncLoader;
+
+/**
+ * Loader that can be used by classes to load BatteryInfo in a background thread. This loader will
+ * automatically grab enhanced battery estimates if available or fall back to the system estimate
+ * when not available.
+ */
+public class BatteryInfoLoader extends AsyncLoader<BatteryInfo>{
+    BatteryStatsHelper mStatsHelper;
+
+    public BatteryInfoLoader(Context context, BatteryStatsHelper batteryStatsHelper) {
+        super(context);
+        mStatsHelper = batteryStatsHelper;
+    }
+
+    @Override
+    protected void onDiscardResult(BatteryInfo result) {
+
+    }
+
+    @Override
+    public BatteryInfo loadInBackground() {
+        Context context = getContext();
+        PowerUsageFeatureProvider powerUsageFeatureProvider =
+                FeatureFactory.getFactory(context).getPowerUsageFeatureProvider(context);
+
+        // Stuff we always need to get BatteryInfo
+        BatteryUtils batteryUtils = BatteryUtils.getInstance(context);
+        Intent batteryBroadcast = getContext().registerReceiver(null,
+                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        final long elapsedRealtimeUs = batteryUtils.convertMsToUs(SystemClock.elapsedRealtime());
+        BatteryInfo batteryInfo;
+
+        // Get enhanced prediction if available, otherwise use the old prediction code
+        Cursor cursor = null;
+        if (powerUsageFeatureProvider.isEnhancedBatteryPredictionEnabled(context)) {
+            final Uri queryUri = powerUsageFeatureProvider.getEnhancedBatteryPredictionUri();
+            cursor = context.getContentResolver().query(queryUri, null, null, null, null);
+        }
+        if (cursor != null && cursor.moveToFirst()) {
+            long enhancedEstimate = powerUsageFeatureProvider.getTimeRemainingEstimate(cursor);
+            batteryInfo = BatteryInfo.getBatteryInfo(context, batteryBroadcast,
+                    mStatsHelper.getStats(), elapsedRealtimeUs, false /* shortString */,
+                    batteryUtils.convertMsToUs(enhancedEstimate), true /* basedOnUsage */);
+        } else {
+            BatteryStats stats = mStatsHelper.getStats();
+            batteryInfo = BatteryInfo.getBatteryInfo(context, batteryBroadcast, stats,
+                    elapsedRealtimeUs, false /* shortString */,
+                    stats.computeBatteryTimeRemaining(elapsedRealtimeUs), false /* basedOnUsage */);
+        }
+
+        return batteryInfo;
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatterySaverController.java b/src/com/android/settings/fuelgauge/BatterySaverController.java
index 34c9a26..5d64f1c 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverController.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverController.java
@@ -31,13 +31,13 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnStart;
-import com.android.settings.core.lifecycle.events.OnStop;
 import com.android.settings.dashboard.conditional.BatterySaverCondition;
 import com.android.settings.dashboard.conditional.ConditionManager;
 import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
 
 import static android.os.PowerManager.ACTION_POWER_SAVE_MODE_CHANGING;
 
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index a3ff1f4..0aad7ba 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -28,6 +28,7 @@
 
 import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatteryStatsHelper;
+import com.android.internal.util.ArrayUtils;
 import com.android.settings.overlay.FeatureFactory;
 
 import java.lang.annotation.Retention;
@@ -40,6 +41,7 @@
  * Utils for battery operation
  */
 public class BatteryUtils {
+    public static final int UID_NULL = -1;
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({StatusType.FOREGROUND,
             StatusType.BACKGROUND,
@@ -217,8 +219,39 @@
     }
 
     /**
+     * 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 = convertMsToUs(SystemClock.elapsedRealtime());
+        // Return the battery time (millisecond) on status mStatsType
+        return convertUsToMs(
+                batteryStatsHelper.getStats().computeBatteryRealtime(elapsedRealtimeUs, statsType));
+
+    }
+
+    /**
+     * Find the package name for a {@link android.os.BatteryStats.Uid}
+     *
+     * @param uid id to get the package name
+     * @return the package name. If there are multiple packages related to
+     * given id, return the first one. Or return null if there are no known
+     * packages with the given id
+     *
+     * @see PackageManager#getPackagesForUid(int)
+     */
+    public String getPackageName(int uid) {
+        final String[] packageNames = mPackageManager.getPackagesForUid(uid);
+
+        return ArrayUtils.isEmpty(packageNames) ? null : packageNames[0];
+    }
+
+    /**
      * Sort the {@code usageList} based on {@link BatterySipper#totalPowerMah}
-     * @param usageList
      */
     public void sortUsageList(List<BatterySipper> usageList) {
         Collections.sort(usageList, new Comparator<BatterySipper>() {
@@ -242,11 +275,27 @@
 
     }
 
-    private long convertUsToMs(long timeUs) {
+    /**
+     * Find package uid from package name
+     *
+     * @param packageName used to find the uid
+     * @return uid for packageName, or {@link #UID_NULL} if exception happens or
+     * {@code packageName} is null
+     */
+    public int getPackageUid(String packageName) {
+        try {
+            return packageName == null ? UID_NULL : mPackageManager.getPackageUid(packageName,
+                    PackageManager.GET_META_DATA);
+        } catch (PackageManager.NameNotFoundException e) {
+            return UID_NULL;
+        }
+    }
+
+    public long convertUsToMs(long timeUs) {
         return timeUs / 1000;
     }
 
-    private long convertMsToUs(long timeMs) {
+    public long convertMsToUs(long timeMs) {
         return timeMs * 1000;
     }
 
diff --git a/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java b/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java
new file mode 100644
index 0000000..08bd148
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java
@@ -0,0 +1,68 @@
+/*
+ * 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.content.Intent;
+import android.content.IntentFilter;
+import android.os.BatteryStats;
+import android.os.SystemClock;
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.utils.AsyncLoader;
+import java.util.ArrayList;
+import java.util.List;
+
+public class DebugEstimatesLoader extends AsyncLoader<List<BatteryInfo>> {
+    private BatteryStatsHelper mStatsHelper;
+
+    public DebugEstimatesLoader(Context context, BatteryStatsHelper statsHelper) {
+        super(context);
+        mStatsHelper = statsHelper;
+    }
+
+    @Override
+    protected void onDiscardResult(List<BatteryInfo> result) {
+
+    }
+
+    @Override
+    public List<BatteryInfo> loadInBackground() {
+        Context context = getContext();
+        PowerUsageFeatureProvider powerUsageFeatureProvider =
+                FeatureFactory.getFactory(context).getPowerUsageFeatureProvider(context);
+
+        // get stuff we'll need for both BatteryInfo
+        BatteryUtils batteryUtils = BatteryUtils.getInstance(context);
+        final long elapsedRealtimeUs = batteryUtils.convertMsToUs(SystemClock.elapsedRealtime());
+        Intent batteryBroadcast = getContext().registerReceiver(null,
+                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        BatteryStats stats = mStatsHelper.getStats();
+
+        BatteryInfo oldinfo = BatteryInfo.getBatteryInfoOld(getContext(), batteryBroadcast,
+                stats, elapsedRealtimeUs, false);
+
+        final long timeRemainingEnhanced = batteryUtils.convertMsToUs(
+                powerUsageFeatureProvider.getEnhancedBatteryPrediction(getContext()));
+        BatteryInfo newinfo = BatteryInfo.getBatteryInfo(getContext(), batteryBroadcast, stats,
+                elapsedRealtimeUs, false, timeRemainingEnhanced, true);
+
+        List<BatteryInfo> infos = new ArrayList<>();
+        infos.add(oldinfo);
+        infos.add(newinfo);
+        return infos;
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
index b124c81..ef0bf29 100644
--- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java
+++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
@@ -21,6 +21,7 @@
 import android.graphics.drawable.Drawable;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -41,6 +42,7 @@
     private BatteryEntry mInfo;
     private CharSequence mContentDescription;
     private CharSequence mProgress;
+    private boolean mShowAnomalyIcon;
 
     public PowerGaugePreference(Context context, Drawable icon, CharSequence contentDescription,
             BatteryEntry info) {
@@ -63,6 +65,7 @@
         mInfo = info;
         mContentDescription = contentDescription;
         mIconSize = context.getResources().getDimensionPixelSize(R.dimen.app_icon_size);
+        mShowAnomalyIcon = false;
     }
 
     public void setContentDescription(String name) {
@@ -88,6 +91,11 @@
         return mProgress;
     }
 
+    public void shouldShowAnomalyIcon(boolean showAnomalyIcon) {
+        mShowAnomalyIcon = showAnomalyIcon;
+        notifyChanged();
+    }
+
     BatteryEntry getInfo() {
         return mInfo;
     }
@@ -98,7 +106,14 @@
         ImageView icon = (ImageView) view.findViewById(android.R.id.icon);
         icon.setLayoutParams(new LinearLayout.LayoutParams(mIconSize, mIconSize));
 
-        ((TextView) view.findViewById(R.id.widget_summary)).setText(mProgress);
+        final TextView subtitle = (TextView) view.findViewById(R.id.widget_summary);
+        subtitle.setText(mProgress);
+        if (mShowAnomalyIcon) {
+            subtitle.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_warning_24dp, 0,
+                    0, 0);
+        } else {
+            subtitle.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0);
+        }
         if (mContentDescription != null) {
             final TextView titleView = (TextView) view.findViewById(android.R.id.title);
             titleView.setContentDescription(mContentDescription);
diff --git a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java
new file mode 100644
index 0000000..085b88f
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java
@@ -0,0 +1,158 @@
+/*
+ * 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.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroup;
+import android.util.IconDrawableFactory;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+import com.android.settings.fuelgauge.anomaly.AnomalyDialogFragment;
+import com.android.settings.fuelgauge.anomaly.AnomalyPreference;
+
+import java.util.List;
+
+/**
+ * Fragment to show a list of anomaly apps, where user could handle these anomalies
+ */
+public class PowerUsageAnomalyDetails extends DashboardFragment implements
+        AnomalyDialogFragment.AnomalyDialogListener {
+
+    public static final String TAG = "PowerAbnormalUsageDetail";
+    @VisibleForTesting
+    static final String EXTRA_ANOMALY_LIST = "anomaly_list";
+    private static final int REQUEST_ANOMALY_ACTION = 0;
+    private static final String KEY_PREF_ANOMALY_LIST = "app_abnormal_list";
+
+    @VisibleForTesting
+    List<Anomaly> mAnomalies;
+    @VisibleForTesting
+    PreferenceGroup mAbnormalListGroup;
+    @VisibleForTesting
+    PackageManager mPackageManager;
+    IconDrawableFactory mIconDrawableFactory;
+
+    public static void startBatteryAbnormalPage(SettingsActivity caller,
+            PreferenceFragment fragment, List<Anomaly> anomalies) {
+        Bundle args = new Bundle();
+        args.putParcelableList(EXTRA_ANOMALY_LIST, anomalies);
+
+        caller.startPreferencePanelAsUser(fragment, PowerUsageAnomalyDetails.class.getName(), args,
+                R.string.battery_abnormal_details_title, null,
+                new UserHandle(UserHandle.myUserId()));
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        final Context context = getContext();
+
+        mAnomalies = getArguments().getParcelableArrayList(EXTRA_ANOMALY_LIST);
+        mAbnormalListGroup = (PreferenceGroup) findPreference(KEY_PREF_ANOMALY_LIST);
+        mPackageManager = context.getPackageManager();
+        mIconDrawableFactory = IconDrawableFactory.newInstance(context, false /* EmbedShadow */);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        refreshUi();
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        if (preference instanceof AnomalyPreference) {
+            AnomalyPreference anomalyPreference = (AnomalyPreference) preference;
+            final Anomaly anomaly = anomalyPreference.getAnomaly();
+
+            AnomalyDialogFragment dialogFragment = AnomalyDialogFragment.newInstance(anomaly,
+                    MetricsProto.MetricsEvent.FUELGAUGE_ANOMALY_DETAIL);
+            dialogFragment.setTargetFragment(this, REQUEST_ANOMALY_ACTION);
+            dialogFragment.show(getFragmentManager(), TAG);
+
+            return true;
+        }
+
+        return super.onPreferenceTreeClick(preference);
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.power_abnormal_detail;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return null;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        //TODO(b/37681923): add correct metrics category
+        return 0;
+    }
+
+    void refreshUi() {
+        //TODO(b/37681665): cache the preference so we don't need to create new one every time.
+        mAbnormalListGroup.removeAll();
+        for (int i = 0, size = mAnomalies.size(); i < size; i++) {
+            final Anomaly anomaly = mAnomalies.get(i);
+            Preference pref = new AnomalyPreference(getPrefContext(), anomaly);
+
+            Drawable icon = getIconFromPackageName(anomaly.packageName);
+            if (icon != null) {
+                pref.setIcon(icon);
+            }
+            mAbnormalListGroup.addPreference(pref);
+        }
+    }
+
+    @Override
+    public void onAnomalyHandled(Anomaly anomaly) {
+        mAnomalies.remove(anomaly);
+        refreshUi();
+    }
+
+    Drawable getIconFromPackageName(String packageName) {
+        try {
+            final ApplicationInfo appInfo = mPackageManager.getApplicationInfo(packageName,
+                    PackageManager.GET_META_DATA);
+            return mIconDrawableFactory.getBadgedIcon(appInfo);
+        } catch (PackageManager.NameNotFoundException e) {
+            return mPackageManager.getDefaultActivityIcon();
+        }
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
index 7cb6c00..e003e6d 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
@@ -16,8 +16,12 @@
 
 package com.android.settings.fuelgauge;
 
+import android.content.Context;
 import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
 import com.android.internal.os.BatterySipper;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
 
 /**
  * Feature Provider used in power usage
@@ -57,4 +61,56 @@
      * Check whether the toggle for power accounting is enabled
      */
     boolean isPowerAccountingToggleEnabled();
+
+    /**
+     * Check whether the anomaly detection is enabled
+     */
+    boolean isAnomalyDetectionEnabled();
+
+    /**
+     * Returns an improved prediction for battery time remaining.
+     */
+    long getEnhancedBatteryPrediction(Context context);
+
+    /**
+     * Checks whether the toggle for enhanced battery predictions is enabled.
+     */
+    boolean isEnhancedBatteryPredictionEnabled(Context context);
+
+    /**
+     * Returns the Uri used to query for an enhanced battery prediction from a cursor loader.
+     */
+    Uri getEnhancedBatteryPredictionUri();
+
+    /**
+     * Returns the the estimate in the cursor as a long or -1 if the cursor is null
+     */
+    long getTimeRemainingEstimate(Cursor cursor);
+
+    /**
+     * Check whether a specific anomaly detector is enabled
+     */
+    //TODO(b/62096650): remove this method and use AnomalyDetectionPolicy instead
+    boolean isAnomalyDetectorEnabled(@Anomaly.AnomalyType int type);
+
+    /**
+     * Checks whether debugging should be enabled for battery estimates.
+     * @return
+     */
+    boolean isEstimateDebugEnabled();
+
+    /**
+     * Converts the provided string containing the remaining time into a debug string for enhanced
+     * estimates.
+     * @param timeRemaining
+     * @return A string containing the estimate and a label indicating it is an enhanced estimate
+     */
+    String getEnhancedEstimateDebugString(String timeRemaining);
+
+    /**
+     * Converts the provided string containing the remaining time into a debug string.
+     * @param timeRemaining
+     * @return A string containing the estimate and a label indicating it is a normal estimate
+     */
+    String getOldEstimateDebugString(String timeRemaining);
 }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
index be38855..c43eebd 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
@@ -19,9 +19,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.net.Uri;
 import android.os.Process;
 import com.android.internal.os.BatterySipper;
 import com.android.internal.util.ArrayUtils;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
 
 public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider {
 
@@ -84,4 +87,49 @@
     public boolean isPowerAccountingToggleEnabled() {
         return true;
     }
+
+    @Override
+    public boolean isAnomalyDetectionEnabled() {
+        return false;
+    }
+
+    @Override
+    public long getEnhancedBatteryPrediction(Context context) {
+        return -1;
+    }
+
+    @Override
+    public boolean isEnhancedBatteryPredictionEnabled(Context context) {
+        return false;
+    }
+
+    @Override
+    public Uri getEnhancedBatteryPredictionUri() {
+        return null;
+    }
+
+    @Override
+    public long getTimeRemainingEstimate(Cursor cursor) {
+        return 0;
+    }
+
+    @Override
+    public boolean isAnomalyDetectorEnabled(@Anomaly.AnomalyType int type) {
+        return false;
+    }
+
+    @Override
+    public String getEnhancedEstimateDebugString(String timeRemaining) {
+        return null;
+    }
+
+    @Override
+    public boolean isEstimateDebugEnabled() {
+        return false;
+    }
+
+    @Override
+    public String getOldEstimateDebugString(String timeRemaining) {
+        return null;
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 4a4d4de..1e4302a 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -17,9 +17,11 @@
 package com.android.settings.fuelgauge;
 
 import android.app.Activity;
+import android.app.LoaderManager;
+import android.app.LoaderManager.LoaderCallbacks;
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
+import android.content.Loader;
+import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.BatteryStats;
 import android.os.Build;
@@ -27,7 +29,6 @@
 import android.os.Handler;
 import android.os.Message;
 import android.os.Process;
-import android.os.SystemClock;
 import android.os.UserHandle;
 import android.provider.SearchIndexableResource;
 import android.support.annotation.VisibleForTesting;
@@ -35,13 +36,16 @@
 import android.support.v7.preference.PreferenceGroup;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
+import android.text.format.Formatter;
 import android.util.Log;
 import android.util.SparseArray;
-import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
+import android.widget.TextView;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatterySipper.DrainType;
@@ -58,11 +62,12 @@
 import com.android.settings.display.AutoBrightnessPreferenceController;
 import com.android.settings.display.BatteryPercentagePreferenceController;
 import com.android.settings.display.TimeoutPreferenceController;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+import com.android.settings.fuelgauge.anomaly.AnomalyDialogFragment.AnomalyDialogListener;
+import com.android.settings.fuelgauge.anomaly.AnomalyLoader;
+import com.android.settings.fuelgauge.anomaly.AnomalySummaryPreferenceController;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.widget.FooterPreferenceMixin;
-import com.android.settingslib.BatteryInfo;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -71,7 +76,8 @@
  * Displays a list of apps and subsystems that consume power, ordered by how much power was
  * consumed since the last time it was unplugged.
  */
-public class PowerUsageSummary extends PowerUsageBase {
+public class PowerUsageSummary extends PowerUsageBase implements
+        AnomalyDialogListener, OnLongClickListener, OnClickListener {
 
     static final String TAG = "PowerUsageSummary";
 
@@ -89,7 +95,12 @@
     private static final String KEY_AUTO_BRIGHTNESS = "auto_brightness_battery";
     private static final String KEY_SCREEN_TIMEOUT = "screen_timeout_battery";
     private static final String KEY_BATTERY_SAVER_SUMMARY = "battery_saver_summary";
+    private static final String KEY_HIGH_USAGE = "high_usage";
 
+    @VisibleForTesting
+    static final int ANOMALY_LOADER = 1;
+    @VisibleForTesting
+    static final int BATTERY_INFO_LOADER = 2;
     private static final int MENU_STATS_TYPE = Menu.FIRST;
     @VisibleForTesting
     static final int MENU_HIGH_POWER_APPS = Menu.FIRST + 3;
@@ -98,9 +109,7 @@
     @VisibleForTesting
     static final int MENU_TOGGLE_APPS = Menu.FIRST + 5;
     private static final int MENU_HELP = Menu.FIRST + 6;
-
-    private final FooterPreferenceMixin mFooterPreferenceMixin =
-            new FooterPreferenceMixin(this, getLifecycle());
+    public static final int DEBUG_INFO_LOADER = 3;
 
     @VisibleForTesting
     boolean mShowAllApps = false;
@@ -112,28 +121,129 @@
     PowerUsageFeatureProvider mPowerFeatureProvider;
     @VisibleForTesting
     BatteryUtils mBatteryUtils;
+    @VisibleForTesting
+    LayoutPreference mBatteryLayoutPref;
 
+    /**
+     * SparseArray that maps uid to {@link Anomaly}, so we could find {@link Anomaly} by uid
+     */
+    @VisibleForTesting
+    SparseArray<List<Anomaly>> mAnomalySparseArray;
     private BatteryHeaderPreferenceController mBatteryHeaderPreferenceController;
-    private LayoutPreference mBatteryLayoutPref;
     private PreferenceGroup mAppListGroup;
+    private AnomalySummaryPreferenceController mAnomalySummaryPreferenceController;
     private int mStatsType = BatteryStats.STATS_SINCE_CHARGED;
 
+    private LoaderManager.LoaderCallbacks<List<Anomaly>> mAnomalyLoaderCallbacks =
+            new LoaderManager.LoaderCallbacks<List<Anomaly>>() {
+
+                @Override
+                public Loader<List<Anomaly>> onCreateLoader(int id, Bundle args) {
+                    return new AnomalyLoader(getContext(), mStatsHelper);
+                }
+
+                @Override
+                public void onLoadFinished(Loader<List<Anomaly>> loader, List<Anomaly> data) {
+                    // show high usage preference if possible
+                    mAnomalySummaryPreferenceController.updateAnomalySummaryPreference(data);
+
+                    updateAnomalySparseArray(data);
+                    refreshAppListGroup();
+                }
+
+                @Override
+                public void onLoaderReset(Loader<List<Anomaly>> loader) {
+
+                }
+            };
+
+    @VisibleForTesting
+    LoaderManager.LoaderCallbacks<BatteryInfo> mBatteryInfoLoaderCallbacks =
+            new LoaderManager.LoaderCallbacks<BatteryInfo>() {
+
+                @Override
+                public Loader<BatteryInfo> onCreateLoader(int i, Bundle bundle) {
+                    return new BatteryInfoLoader(getContext(), mStatsHelper);
+                }
+
+                @Override
+                public void onLoadFinished(Loader<BatteryInfo> loader, BatteryInfo batteryInfo) {
+                    mBatteryHeaderPreferenceController.updateHeaderPreference(batteryInfo);
+                }
+
+                @Override
+                public void onLoaderReset(Loader<BatteryInfo> loader) {
+                    // do nothing
+                }
+            };
+
+    LoaderManager.LoaderCallbacks<List<BatteryInfo>> mBatteryInfoDebugLoaderCallbacks =
+            new LoaderCallbacks<List<BatteryInfo>>() {
+                @Override
+                public Loader<List<BatteryInfo>> onCreateLoader(int i, Bundle bundle) {
+                    return new DebugEstimatesLoader(getContext(), mStatsHelper);
+                }
+
+                @Override
+                public void onLoadFinished(Loader<List<BatteryInfo>> loader,
+                        List<BatteryInfo> batteryInfos) {
+                    final BatteryMeterView batteryView = (BatteryMeterView) mBatteryLayoutPref
+                            .findViewById(R.id.battery_header_icon);
+                    final TextView percentRemaining =
+                            mBatteryLayoutPref.findViewById(R.id.battery_percent);
+                    final TextView summary1 = mBatteryLayoutPref.findViewById(R.id.summary1);
+                    final TextView summary2 = mBatteryLayoutPref.findViewById(R.id.summary2);
+                    BatteryInfo oldInfo = batteryInfos.get(0);
+                    BatteryInfo newInfo = batteryInfos.get(1);
+                    percentRemaining.setText(Utils.formatPercentage(oldInfo.batteryLevel));
+
+                    // set the text to the old estimate (copied from battery info). Note that this
+                    // can sometimes say 0 time remaining because battery stats requires the phone
+                    // be unplugged for a period of time before being willing ot make an estimate.
+                    summary1.setText(mPowerFeatureProvider.getOldEstimateDebugString(
+                            Formatter.formatShortElapsedTime(getContext(),
+                                    mBatteryUtils.convertUsToMs(oldInfo.remainingTimeUs))));
+
+                    // for this one we can just set the string directly
+                    summary2.setText(mPowerFeatureProvider.getEnhancedEstimateDebugString(
+                            Formatter.formatShortElapsedTime(getContext(),
+                                    mBatteryUtils.convertUsToMs(newInfo.remainingTimeUs))));
+
+                    batteryView.setBatteryLevel(oldInfo.batteryLevel);
+                    batteryView.setCharging(!oldInfo.discharging);
+                }
+
+                @Override
+                public void onLoaderReset(Loader<List<BatteryInfo>> loader) {
+                }
+            };
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         setAnimationAllowed(true);
 
+        initFeatureProvider();
         mBatteryLayoutPref = (LayoutPreference) findPreference(KEY_BATTERY_HEADER);
+        View header = mBatteryLayoutPref.findViewById(R.id.summary1);
+        // Unfortunately setting a long click listener on a means it will no longer pass the regular
+        // click event to the parent, so we have to register a regular click listener as well.
+        if (mPowerFeatureProvider.isEstimateDebugEnabled()) {
+            header.setOnLongClickListener(this);
+            header.setOnClickListener(this);
+        }
         mAppListGroup = (PreferenceGroup) findPreference(KEY_APP_LIST);
         mScreenUsagePref = (PowerGaugePreference) findPreference(KEY_SCREEN_USAGE);
         mLastFullChargePref = (PowerGaugePreference) findPreference(
                 KEY_TIME_SINCE_LAST_FULL_CHARGE);
         mFooterPreferenceMixin.createFooterPreference().setTitle(R.string.battery_footer_summary);
-
+        mAnomalySummaryPreferenceController = new AnomalySummaryPreferenceController(
+                (SettingsActivity) getActivity(), this, MetricsEvent.FUELGAUGE_POWER_USAGE_SUMMARY);
         mBatteryUtils = BatteryUtils.getInstance(getContext());
+        mAnomalySparseArray = new SparseArray<>();
 
+        restartBatteryInfoLoader();
         restoreSavedInstance(icicle);
-        initFeatureProvider();
     }
 
     @Override
@@ -164,6 +274,9 @@
 
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
+        if (mAnomalySummaryPreferenceController.onPreferenceTreeClick(preference)) {
+            return true;
+        }
         if (KEY_BATTERY_HEADER.equals(preference.getKey())) {
             performBatteryHeaderClick();
             return true;
@@ -190,7 +303,8 @@
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
         final List<PreferenceController> controllers = new ArrayList<>();
-        mBatteryHeaderPreferenceController = new BatteryHeaderPreferenceController(context);
+        mBatteryHeaderPreferenceController = new BatteryHeaderPreferenceController(
+                context, getActivity(), this /* host */, getLifecycle());
         controllers.add(mBatteryHeaderPreferenceController);
         controllers.add(new AutoBrightnessPreferenceController(context, KEY_AUTO_BRIGHTNESS));
         controllers.add(new TimeoutPreferenceController(context, KEY_SCREEN_TIMEOUT));
@@ -252,8 +366,7 @@
                         MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_OPTIMIZATION);
                 return true;
             case MENU_ADDITIONAL_BATTERY_INFO:
-                startActivity(FeatureFactory.getFactory(getContext())
-                        .getPowerUsageFeatureProvider(getContext())
+                startActivity(mPowerFeatureProvider
                         .getAdditionalBatteryInfoIntent());
                 metricsFeatureProvider.action(context,
                         MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_USAGE_ALERTS);
@@ -289,11 +402,7 @@
     }
 
     private void performBatteryHeaderClick() {
-        final Context context = getContext();
-        final PowerUsageFeatureProvider featureProvider = FeatureFactory.getFactory(context)
-                .getPowerUsageFeatureProvider(context);
-
-        if (featureProvider.isAdvancedUiEnabled()) {
+        if (mPowerFeatureProvider.isAdvancedUiEnabled()) {
             Utils.startWithFragment(getContext(), PowerUsageAdvanced.class.getName(), null,
                     null, 0, R.string.advanced_battery_title, null, getMetricsCategory());
         } else {
@@ -408,27 +517,10 @@
             return;
         }
 
-        cacheRemoveAllPrefs(mAppListGroup);
-        mAppListGroup.setOrderingAsAdded(false);
-        boolean addedSome = false;
+        initAnomalyDetectionIfPossible();
 
-        final PowerProfile powerProfile = mStatsHelper.getPowerProfile();
-        final BatteryStats stats = mStatsHelper.getStats();
-        final double averagePower = powerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL);
-
-        final long elapsedRealtimeUs = SystemClock.elapsedRealtime() * 1000;
-        Intent batteryBroadcast = context.registerReceiver(null,
-                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
-        BatteryInfo batteryInfo = BatteryInfo.getBatteryInfo(context, batteryBroadcast,
-                mStatsHelper.getStats(), elapsedRealtimeUs, false);
-        mBatteryHeaderPreferenceController.updateHeaderPreference(batteryInfo);
-
-        final TypedValue value = new TypedValue();
-        context.getTheme().resolveAttribute(android.R.attr.colorControlNormal, value, true);
-        final int colorControl = context.getColor(value.resourceId);
-        final int dischargeAmount = USE_FAKE_DATA ? 5000
-                : stats != null ? stats.getDischargeAmount(mStatsType) : 0;
-
+        // reload BatteryInfo and updateUI
+        restartBatteryInfoLoader();
         final long lastFullChargeTime = mBatteryUtils.calculateLastFullChargeTime(mStatsHelper,
                 System.currentTimeMillis());
         updateScreenPreference();
@@ -440,6 +532,27 @@
                 : R.string.power_usage_list_summary;
         mAppListGroup.setTitle(TextUtils.expandTemplate(getText(resId), timeSequence));
 
+        refreshAppListGroup();
+    }
+
+    private void refreshAppListGroup() {
+        final Context context = getContext();
+        final PowerProfile powerProfile = mStatsHelper.getPowerProfile();
+        final BatteryStats stats = mStatsHelper.getStats();
+        final double averagePower = powerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL);
+        boolean addedSome = false;
+
+        TypedArray array = context.obtainStyledAttributes(
+                new int[]{android.R.attr.colorControlNormal});
+        final int colorControl = array.getColor(0, 0);
+        array.recycle();
+
+        final int dischargeAmount = USE_FAKE_DATA ? 5000
+                : stats != null ? stats.getDischargeAmount(mStatsType) : 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() : mStatsHelper.getUsageList());
@@ -505,6 +618,7 @@
                 pref.setTitle(entry.getLabel());
                 pref.setOrder(i + 1);
                 pref.setPercent(percentOfTotal);
+                pref.shouldShowAnomalyIcon(mAnomalySparseArray.get(sipper.getUid()) != null);
                 if (sipper.usageTimeMs == 0 && sipper.drainType == DrainType.APP) {
                     sipper.usageTimeMs = mBatteryUtils.getProcessTimeMs(
                             BatteryUtils.StatusType.FOREGROUND, sipper.uidObj, mStatsType);
@@ -532,6 +646,13 @@
     }
 
     @VisibleForTesting
+    void initAnomalyDetectionIfPossible() {
+        if (mPowerFeatureProvider.isAnomalyDetectionEnabled()) {
+            getLoaderManager().initLoader(ANOMALY_LOADER, Bundle.EMPTY, mAnomalyLoaderCallbacks);
+        }
+    }
+
+    @VisibleForTesting
     BatterySipper findBatterySipperByType(List<BatterySipper> usageList, DrainType type) {
         for (int i = 0, size = usageList.size(); i < size; i++) {
             final BatterySipper sipper = usageList.get(i);
@@ -560,11 +681,14 @@
     }
 
     @VisibleForTesting
-    long calculateRunningTimeBasedOnStatsType() {
-        final long elapsedRealtimeUs = SystemClock.elapsedRealtime() * 1000;
-        // Return the battery time (millisecond) on status mStatsType
-        return mStatsHelper.getStats().computeBatteryRealtime(elapsedRealtimeUs,
-                mStatsType /* STATS_SINCE_CHARGED */) / 1000;
+    void showBothEstimates() {
+        final Context context = getContext();
+        if (context == null
+                || !mPowerFeatureProvider.isEnhancedBatteryPredictionEnabled(context)) {
+            return;
+        }
+        getLoaderManager().restartLoader(DEBUG_INFO_LOADER, Bundle.EMPTY,
+                mBatteryInfoDebugLoaderCallbacks);
     }
 
     @VisibleForTesting
@@ -612,6 +736,27 @@
                 .getPowerUsageFeatureProvider(context);
     }
 
+    @VisibleForTesting
+    void updateAnomalySparseArray(List<Anomaly> anomalies) {
+        mAnomalySparseArray.clear();
+        for (int i = 0, size = anomalies.size(); i < size; i++) {
+            final Anomaly anomaly = anomalies.get(i);
+            if (mAnomalySparseArray.get(anomaly.uid) == null) {
+                mAnomalySparseArray.append(anomaly.uid, new ArrayList<>());
+            }
+            mAnomalySparseArray.get(anomaly.uid).add(anomaly);
+        }
+    }
+
+    @VisibleForTesting
+    void restartBatteryInfoLoader() {
+        if (mPowerFeatureProvider != null
+                && mPowerFeatureProvider.isEnhancedBatteryPredictionEnabled(getContext())) {
+            getLoaderManager().restartLoader(BATTERY_INFO_LOADER, Bundle.EMPTY,
+                    mBatteryInfoLoaderCallbacks);
+        }
+    }
+
     private static List<BatterySipper> getFakeStats() {
         ArrayList<BatterySipper> stats = new ArrayList<>();
         float use = 5;
@@ -678,6 +823,23 @@
         }
     };
 
+    @Override
+    public void onAnomalyHandled(Anomaly anomaly) {
+        mAnomalySummaryPreferenceController.hideHighUsagePreference();
+    }
+
+    @Override
+    public boolean onLongClick(View view) {
+        showBothEstimates();
+        view.setOnLongClickListener(null);
+        return true;
+    }
+
+    @Override
+    public void onClick(View view) {
+        performBatteryHeaderClick();
+    }
+
     private static class SummaryProvider implements SummaryLoader.SummaryProvider {
         private final Context mContext;
         private final SummaryLoader mLoader;
@@ -691,7 +853,7 @@
                 BatteryInfo.getBatteryInfo(mContext, new BatteryInfo.Callback() {
                     @Override
                     public void onBatteryInfoLoaded(BatteryInfo info) {
-                        mLoader.setSummary(SummaryProvider.this, info.chargeLabelString);
+                        mLoader.setSummary(SummaryProvider.this, info.chargeLabel);
                     }
                 });
             });
@@ -719,11 +881,12 @@
 
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
-                    List<String> niks = new ArrayList<>();
+                    List<String> niks = super.getNonIndexableKeys(context);
                     // Duplicates in display
                     niks.add(KEY_AUTO_BRIGHTNESS);
                     niks.add(KEY_SCREEN_TIMEOUT);
                     niks.add(KEY_BATTERY_SAVER_SUMMARY);
+                    niks.add(KEY_HIGH_USAGE);
                     return niks;
                 }
             };
diff --git a/src/com/android/settings/fuelgauge/anomaly/Anomaly.java b/src/com/android/settings/fuelgauge/anomaly/Anomaly.java
new file mode 100644
index 0000000..37b52fc
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/Anomaly.java
@@ -0,0 +1,168 @@
+/*
+ * 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.anomaly;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.IntDef;
+import android.text.TextUtils;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.Objects;
+
+/**
+ * Data that represents an app has been detected as anomaly. It contains
+ *
+ * 1. Basic information of the app(i.e. uid, package name)
+ * 2. Type of anomaly
+ * 3. Data that has been detected as anomaly(i.e wakelock time)
+ */
+public class Anomaly implements Parcelable {
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({AnomalyType.WAKE_LOCK,
+            AnomalyType.WAKEUP_ALARM})
+    public @interface AnomalyType {
+        int WAKE_LOCK = 0;
+        int WAKEUP_ALARM = 1;
+    }
+
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({AnomalyActionType.FORCE_STOP,
+            AnomalyActionType.BACKGROUND_CHECK})
+    public @interface AnomalyActionType {
+        int FORCE_STOP = 0;
+        int BACKGROUND_CHECK = 1;
+    }
+
+    @AnomalyType
+    public static final int[] ANOMALY_TYPE_LIST =
+            {AnomalyType.WAKE_LOCK,
+            AnomalyType.WAKEUP_ALARM};
+
+    /**
+     * Type of this this anomaly
+     */
+    public final int type;
+    public final int uid;
+    public final long wakelockTimeMs;
+    /**
+     * Display name of this anomaly, usually it is the app name
+     */
+    public final CharSequence displayName;
+    public final String packageName;
+
+    private Anomaly(Builder builder) {
+        type = builder.mType;
+        uid = builder.mUid;
+        displayName = builder.mDisplayName;
+        packageName = builder.mPackageName;
+        wakelockTimeMs = builder.mWakeLockTimeMs;
+    }
+
+    private Anomaly(Parcel in) {
+        type = in.readInt();
+        uid = in.readInt();
+        displayName = in.readCharSequence();
+        packageName = in.readString();
+        wakelockTimeMs = in.readLong();
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeInt(type);
+        dest.writeInt(uid);
+        dest.writeCharSequence(displayName);
+        dest.writeString(packageName);
+        dest.writeLong(wakelockTimeMs);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof Anomaly)) {
+            return false;
+        }
+
+        Anomaly other = (Anomaly) obj;
+        return type == other.type
+                && uid == other.uid
+                && wakelockTimeMs == other.wakelockTimeMs
+                && TextUtils.equals(displayName, other.displayName)
+                && TextUtils.equals(packageName, other.packageName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(type, uid, displayName, packageName, wakelockTimeMs);
+    }
+
+    public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
+        public Anomaly createFromParcel(Parcel in) {
+            return new Anomaly(in);
+        }
+
+        public Anomaly[] newArray(int size) {
+            return new Anomaly[size];
+        }
+    };
+
+    public static final class Builder {
+        @AnomalyType
+        private int mType;
+        private int mUid;
+        private CharSequence mDisplayName;
+        private String mPackageName;
+        private long mWakeLockTimeMs;
+
+        public Builder setType(@AnomalyType int type) {
+            mType = type;
+            return this;
+        }
+
+        public Builder setUid(int uid) {
+            mUid = uid;
+            return this;
+        }
+
+        public Builder setDisplayName(CharSequence displayName) {
+            mDisplayName = displayName;
+            return this;
+        }
+
+        public Builder setPackageName(String packageName) {
+            mPackageName = packageName;
+            return this;
+        }
+
+        public Builder setWakeLockTimeMs(long wakeLockTimeMs) {
+            mWakeLockTimeMs = wakeLockTimeMs;
+            return this;
+        }
+
+        public Anomaly build() {
+            return new Anomaly(this);
+        }
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java
new file mode 100644
index 0000000..7dbae36
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java
@@ -0,0 +1,121 @@
+/*
+ * 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.anomaly;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.text.format.DateUtils;
+import android.util.KeyValueListParser;
+import android.util.Log;
+
+/**
+ * Class to store the policy for anomaly detection, which comes from
+ * {@link android.provider.Settings.Global}
+ */
+public class AnomalyDetectionPolicy {
+    public static final String TAG = "AnomalyDetectionPolicy";
+
+    @VisibleForTesting
+    static final String KEY_ANOMALY_DETECTION_ENABLED = "anomaly_detection_enabled";
+    @VisibleForTesting
+    static final String KEY_WAKELOCK_DETECTION_ENABLED = "wakelock_enabled";
+    @VisibleForTesting
+    static final String KEY_WAKEUP_ALARM_DETECTION_ENABLED = "wakeup_alarm_enabled";
+    @VisibleForTesting
+    static final String KEY_WAKELOCK_THRESHOLD = "wakelock_threshold";
+    @VisibleForTesting
+    static final String KEY_WAKEUP_ALARM_THRESHOLD = "wakeup_alarm_threshold";
+
+    /**
+     * {@code true} if general anomaly detection is enabled
+     *
+     * @see Settings.Global#ANOMALY_DETECTION_CONSTANTS
+     * @see #KEY_ANOMALY_DETECTION_ENABLED
+     */
+    public final boolean anomalyDetectionEnabled;
+
+    /**
+     * {@code true} if wakelock anomaly detection is enabled
+     *
+     * @see Settings.Global#ANOMALY_DETECTION_CONSTANTS
+     * @see #KEY_WAKELOCK_DETECTION_ENABLED
+     */
+    public final boolean wakeLockDetectionEnabled;
+
+    /**
+     * {@code true} if wakeup alarm detection is enabled
+     *
+     * @see Settings.Global#ANOMALY_DETECTION_CONSTANTS
+     * @see #KEY_WAKEUP_ALARM_DETECTION_ENABLED
+     */
+    public final boolean wakeupAlarmDetectionEnabled;
+
+    /**
+     * Threshold for wakelock time in milli seconds
+     *
+     * @see Settings.Global#ANOMALY_DETECTION_CONSTANTS
+     * @see #KEY_WAKELOCK_THRESHOLD
+     */
+    public final long wakeLockThreshold;
+
+    /**
+     * Threshold for wakeup alarm count per hour
+     *
+     * @see Settings.Global#ANOMALY_DETECTION_CONSTANTS
+     * @see #KEY_WAKEUP_ALARM_THRESHOLD
+     */
+    public final long wakeupAlarmThreshold;
+
+    private final KeyValueListParserWrapper mParserWrapper;
+
+    public AnomalyDetectionPolicy(Context context) {
+        this(context, new KeyValueListParserWrapperImpl(new KeyValueListParser(',')));
+    }
+
+    @VisibleForTesting
+    AnomalyDetectionPolicy(Context context, KeyValueListParserWrapper parserWrapper) {
+        mParserWrapper = parserWrapper;
+        final String value = Settings.Global.getString(context.getContentResolver(),
+                Settings.Global.ANOMALY_DETECTION_CONSTANTS);
+
+        try {
+            mParserWrapper.setString(value);
+        } catch (IllegalArgumentException e) {
+            Log.e(TAG, "Bad anomaly detection constants");
+        }
+
+        anomalyDetectionEnabled = mParserWrapper.getBoolean(KEY_ANOMALY_DETECTION_ENABLED, true);
+        wakeLockDetectionEnabled = mParserWrapper.getBoolean(KEY_WAKELOCK_DETECTION_ENABLED, true);
+        wakeupAlarmDetectionEnabled = mParserWrapper.getBoolean(KEY_WAKEUP_ALARM_DETECTION_ENABLED,
+                true);
+        wakeLockThreshold = mParserWrapper.getLong(KEY_WAKELOCK_THRESHOLD,
+                DateUtils.HOUR_IN_MILLIS);
+        wakeupAlarmThreshold = mParserWrapper.getLong(KEY_WAKEUP_ALARM_THRESHOLD, 60);
+    }
+
+    public boolean isAnomalyDetectorEnabled(@Anomaly.AnomalyType int type) {
+        switch (type) {
+            case Anomaly.AnomalyType.WAKE_LOCK:
+                return wakeLockDetectionEnabled;
+            case Anomaly.AnomalyType.WAKEUP_ALARM:
+                return wakeupAlarmDetectionEnabled;
+            default:
+                return false; // Disabled when no this type
+        }
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java
new file mode 100644
index 0000000..ef15d51
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java
@@ -0,0 +1,114 @@
+/*
+ * 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.anomaly;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
+
+/**
+ * Dialog Fragment to show action dialog for each anomaly
+ */
+public class AnomalyDialogFragment extends InstrumentedDialogFragment implements
+        DialogInterface.OnClickListener {
+
+    private static final String ARG_ANOMALY = "anomaly";
+    private static final String ARG_METRICS_KEY = "metrics_key";
+
+    @VisibleForTesting
+    Anomaly mAnomaly;
+    private AnomalyUtils mAnomalyUtils;
+
+    /**
+     * Listener to give the control back to target fragment
+     */
+    public interface AnomalyDialogListener {
+        /**
+         * This method is invoked once anomaly is handled, then target fragment could do
+         * extra work. One example is that fragment could remove the anomaly preference
+         * since it has been handled
+         *
+         * @param anomaly that has been handled
+         */
+        void onAnomalyHandled(Anomaly anomaly);
+    }
+
+    public static AnomalyDialogFragment newInstance(Anomaly anomaly, int metricsKey) {
+        AnomalyDialogFragment dialogFragment = new AnomalyDialogFragment();
+
+        Bundle args = new Bundle(2);
+        args.putParcelable(ARG_ANOMALY, anomaly);
+        args.putInt(ARG_METRICS_KEY, metricsKey);
+        dialogFragment.setArguments(args);
+
+        return dialogFragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mAnomalyUtils = AnomalyUtils.getInstance(getContext());
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        // TODO(b/37681923): add anomaly metric id
+        return 0;
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        final AnomalyDialogListener lsn = (AnomalyDialogListener) getTargetFragment();
+        if (lsn == null) {
+            return;
+        }
+
+        final AnomalyAction anomalyAction = mAnomalyUtils.getAnomalyAction(mAnomaly.type);
+        final int metricsKey = getArguments().getInt(ARG_METRICS_KEY);
+
+        anomalyAction.handlePositiveAction(mAnomaly, metricsKey);
+        lsn.onAnomalyHandled(mAnomaly);
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final Bundle bundle = getArguments();
+        mAnomaly = bundle.getParcelable(ARG_ANOMALY);
+
+        final Context context = getContext();
+        final AnomalyAction anomalyAction = mAnomalyUtils.getAnomalyAction(mAnomaly.type);
+        switch (anomalyAction.getActionType()) {
+            case Anomaly.AnomalyActionType.FORCE_STOP:
+                return new AlertDialog.Builder(context)
+                        .setTitle(R.string.force_stop_dlg_title)
+                        .setMessage(R.string.force_stop_dlg_text)
+                        .setPositiveButton(R.string.dlg_ok, this)
+                        .setNegativeButton(R.string.dlg_cancel, null)
+                        .create();
+            default:
+                throw new IllegalArgumentException("unknown type " + mAnomaly.type);
+        }
+    }
+
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java
new file mode 100644
index 0000000..264c390
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java
@@ -0,0 +1,134 @@
+/*
+ * 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.anomaly;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.BatteryStats;
+import android.os.Bundle;
+import android.os.UserManager;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.Utils;
+import com.android.settings.utils.AsyncLoader;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Loader to compute which apps are anomaly and return a anomaly list. It will return
+ * an empty list if there is no anomaly.
+ */
+public class AnomalyLoader extends AsyncLoader<List<Anomaly>> {
+    private static final boolean USE_FAKE_DATA = false;
+    private BatteryStatsHelper mBatteryStatsHelper;
+    private String mPackageName;
+    private UserManager mUserManager;
+    @VisibleForTesting
+    AnomalyUtils mAnomalyUtils;
+    @VisibleForTesting
+    AnomalyDetectionPolicy mPolicy;
+
+    /**
+     * Create {@link AnomalyLoader} that runs anomaly check for all apps.
+     */
+    public AnomalyLoader(Context context, BatteryStatsHelper batteryStatsHelper) {
+        this(context, batteryStatsHelper, null, new AnomalyDetectionPolicy(context));
+
+    }
+
+    /**
+     * Create {@link AnomalyLoader} with {@code packageName}, so this loader will only
+     * detect anomalies related to {@code packageName}, or check all apps if {@code packageName}
+     * is {@code null}.
+     *
+     * This constructor will create {@link BatteryStatsHelper} in background thread.
+     *
+     * @param packageName if set, only finds anomalies for this package. If {@code null},
+     *                    detects all anomalies of this type.
+     */
+    public AnomalyLoader(Context context, String packageName) {
+        this(context, null, packageName, new AnomalyDetectionPolicy(context));
+    }
+
+    @VisibleForTesting
+    AnomalyLoader(Context context, BatteryStatsHelper batteryStatsHelper,
+            String packageName, AnomalyDetectionPolicy policy) {
+        super(context);
+        mBatteryStatsHelper = batteryStatsHelper;
+        mPackageName = packageName;
+        mAnomalyUtils = AnomalyUtils.getInstance(context);
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        mPolicy = policy;
+    }
+
+    @Override
+    protected void onDiscardResult(List<Anomaly> result) {
+    }
+
+    @Override
+    public List<Anomaly> loadInBackground() {
+        if (USE_FAKE_DATA) {
+            return generateFakeData();
+        }
+        if (mBatteryStatsHelper == null) {
+            mBatteryStatsHelper = new BatteryStatsHelper(getContext());
+            mBatteryStatsHelper.create((Bundle) null);
+            mBatteryStatsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED,
+                    mUserManager.getUserProfiles());
+        }
+
+        final List<Anomaly> anomalies = new ArrayList<>();
+        for (@Anomaly.AnomalyType int type : Anomaly.ANOMALY_TYPE_LIST) {
+            if (mPolicy.isAnomalyDetectorEnabled(type)) {
+                anomalies.addAll(mAnomalyUtils.getAnomalyDetector(type).detectAnomalies(
+                        mBatteryStatsHelper, mPackageName));
+            }
+        }
+
+        return anomalies;
+    }
+
+    @VisibleForTesting
+    List<Anomaly> generateFakeData() {
+        final List<Anomaly> anomalies = new ArrayList<>();
+        final Context context = getContext();
+        try {
+            final String packageName = "com.android.settings";
+            final CharSequence displayName = "Settings";
+            final int uid = context.getPackageManager().getPackageUid(packageName, 0);
+
+            anomalies.add(new Anomaly.Builder()
+                    .setUid(uid)
+                    .setType(Anomaly.AnomalyType.WAKE_LOCK)
+                    .setPackageName(packageName)
+                    .setDisplayName(displayName)
+                    .build());
+            anomalies.add(new Anomaly.Builder()
+                    .setUid(uid)
+                    .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
+                    .setPackageName(packageName)
+                    .setDisplayName(displayName)
+                    .build());
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        return anomalies;
+    }
+
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyPreference.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyPreference.java
new file mode 100644
index 0000000..d874494
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyPreference.java
@@ -0,0 +1,28 @@
+package com.android.settings.fuelgauge.anomaly;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+
+/**
+ * Preference that stores {@link Anomaly}
+ */
+public class AnomalyPreference extends Preference {
+    private Anomaly mAnomaly;
+
+    public AnomalyPreference(Context context, Anomaly anomaly) {
+        super(context);
+        mAnomaly = anomaly;
+        setLayoutResource(R.layout.preference_app);
+
+        if (anomaly != null) {
+            setTitle(anomaly.displayName);
+        }
+    }
+
+    public Anomaly getAnomaly() {
+        return mAnomaly;
+    }
+
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java b/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java
new file mode 100644
index 0000000..23b4e77
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java
@@ -0,0 +1,102 @@
+/*
+ * 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.anomaly;
+
+import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.fuelgauge.PowerUsageAnomalyDetails;
+
+import java.util.List;
+
+/**
+ * Manager that responsible for updating high usage preference and handling preference click.
+ */
+public class AnomalySummaryPreferenceController {
+    private static final String TAG = "HighUsagePreferenceController";
+    @VisibleForTesting
+    static final String ANOMALY_KEY = "high_usage";
+    private static final int REQUEST_ANOMALY_ACTION = 0;
+    private PreferenceFragment mFragment;
+    @VisibleForTesting
+    Preference mAnomalyPreference;
+    @VisibleForTesting
+    List<Anomaly> mAnomalies;
+    private SettingsActivity mSettingsActivity;
+
+    /**
+     * Metrics key about fragment that create this controller
+     *
+     * @see com.android.internal.logging.nano.MetricsProto.MetricsEvent
+     */
+    private int mMetricsKey;
+
+    public AnomalySummaryPreferenceController(SettingsActivity activity,
+            PreferenceFragment fragment, int metricsKey) {
+        mFragment = fragment;
+        mSettingsActivity = activity;
+        mAnomalyPreference = mFragment.getPreferenceScreen().findPreference(ANOMALY_KEY);
+        mMetricsKey = metricsKey;
+        hideHighUsagePreference();
+    }
+
+    public boolean onPreferenceTreeClick(Preference preference) {
+        if (mAnomalies != null && ANOMALY_KEY.equals(preference.getKey())) {
+            if (mAnomalies.size() == 1) {
+                final Anomaly anomaly = mAnomalies.get(0);
+                AnomalyDialogFragment dialogFragment = AnomalyDialogFragment.newInstance(anomaly,
+                        mMetricsKey);
+                dialogFragment.setTargetFragment(mFragment, REQUEST_ANOMALY_ACTION);
+                dialogFragment.show(mFragment.getFragmentManager(), TAG);
+            } else {
+                PowerUsageAnomalyDetails.startBatteryAbnormalPage(mSettingsActivity, mFragment,
+                        mAnomalies);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Update anomaly preference based on {@code anomalies}, also store a reference
+     * of {@paramref anomalies}, which would be used in {@link #onPreferenceTreeClick(Preference)}
+     *
+     * @param anomalies used to update the summary, this method will store a reference of it
+     */
+    public void updateAnomalySummaryPreference(List<Anomaly> anomalies) {
+        final Context context = mFragment.getContext();
+        mAnomalies = anomalies;
+
+        if (!mAnomalies.isEmpty()) {
+            mAnomalyPreference.setVisible(true);
+            final int count = mAnomalies.size();
+            final String summary = context.getResources().getQuantityString(
+                    R.plurals.power_high_usage_summary, count,
+                    mAnomalies.get(0).displayName, count);
+
+            mAnomalyPreference.setSummary(summary);
+        }
+    }
+
+    public void hideHighUsagePreference() {
+        mAnomalyPreference.setVisible(false);
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java
new file mode 100644
index 0000000..d226899
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java
@@ -0,0 +1,81 @@
+/*
+ * 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.anomaly;
+
+import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
+import com.android.settings.fuelgauge.anomaly.action.BackgroundCheckAction;
+import com.android.settings.fuelgauge.anomaly.action.ForceStopAction;
+import com.android.settings.fuelgauge.anomaly.checker.AnomalyDetector;
+import com.android.settings.fuelgauge.anomaly.checker.WakeLockAnomalyDetector;
+import com.android.settings.fuelgauge.anomaly.checker.WakeupAlarmAnomalyDetector;
+
+/**
+ * Utility class for anomaly detection
+ */
+public class AnomalyUtils {
+    private Context mContext;
+    private static AnomalyUtils sInstance;
+
+    @VisibleForTesting
+    AnomalyUtils(Context context) {
+        mContext = context.getApplicationContext();
+    }
+
+    public static AnomalyUtils getInstance(Context context) {
+        if (sInstance == null) {
+            sInstance = new AnomalyUtils(context);
+        }
+        return sInstance;
+    }
+
+    /**
+     * Return the corresponding {@link AnomalyAction} according to
+     * {@link com.android.settings.fuelgauge.anomaly.Anomaly.AnomalyType}
+     *
+     * @return corresponding {@link AnomalyAction}, or null if cannot find it.
+     */
+    public AnomalyAction getAnomalyAction(@Anomaly.AnomalyType int anomalyType) {
+        switch (anomalyType) {
+            case Anomaly.AnomalyType.WAKE_LOCK:
+                return new ForceStopAction(mContext);
+            case Anomaly.AnomalyType.WAKEUP_ALARM:
+                return new BackgroundCheckAction(mContext);
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * Return the corresponding {@link AnomalyDetector} according to
+     * {@link com.android.settings.fuelgauge.anomaly.Anomaly.AnomalyType}
+     *
+     * @return corresponding {@link AnomalyDetector}, or null if cannot find it.
+     */
+    public AnomalyDetector getAnomalyDetector(@Anomaly.AnomalyType int anomalyType) {
+        switch (anomalyType) {
+            case Anomaly.AnomalyType.WAKE_LOCK:
+                return new WakeLockAnomalyDetector(mContext);
+            case Anomaly.AnomalyType.WAKEUP_ALARM:
+                return new WakeupAlarmAnomalyDetector(mContext);
+            default:
+                return null;
+        }
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapper.java b/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapper.java
new file mode 100644
index 0000000..4a9c2a9
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapper.java
@@ -0,0 +1,62 @@
+/*
+ * 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.anomaly;
+
+import android.util.KeyValueListParser;
+
+/**
+ * This interface replicates a subset of the {@link KeyValueListParser}. The interface
+ * exists so that we can use a thin wrapper around the PM in production code and a mock in tests.
+ * We cannot directly mock or shadow the {@link KeyValueListParser}, because some of the methods
+ * we rely on are newer than the API version supported by Robolectric.
+ */
+public interface KeyValueListParserWrapper {
+
+    /**
+     * Get real {@link KeyValueListParser}
+     */
+    KeyValueListParser getKeyValueListParser();
+
+    /**
+     * Resets the parser with a new string to parse. The string is expected to be in the following
+     * format:
+     * <pre>key1=value,key2=value,key3=value</pre>
+     *
+     * where the delimiter is a comma.
+     *
+     * @param str the string to parse.
+     * @throws IllegalArgumentException if the string is malformed.
+     */
+    void setString(String str) throws IllegalArgumentException;
+
+    /**
+     * Get the value for key as a boolean.
+     * @param key The key to lookup.
+     * @param defaultValue The value to return if the key was not found.
+     * @return the string value associated with the key.
+     */
+    boolean getBoolean(String key, boolean defaultValue);
+
+    /**
+     * Get the value for key as a long.
+     * @param key The key to lookup.
+     * @param defaultValue The value to return if the key was not found, or the value was not a
+     *                     long.
+     * @return the long value associated with the key.
+     */
+    long getLong(String key, long defaultValue);
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapperImpl.java b/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapperImpl.java
new file mode 100644
index 0000000..f724034
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapperImpl.java
@@ -0,0 +1,50 @@
+/*
+ * 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.anomaly;
+
+import android.util.KeyValueListParser;
+
+/**
+ * Impl of {@link KeyValueListParser}
+ */
+public class KeyValueListParserWrapperImpl implements KeyValueListParserWrapper {
+    private KeyValueListParser mParser;
+
+    public KeyValueListParserWrapperImpl(KeyValueListParser parser) {
+        mParser = parser;
+    }
+
+    @Override
+    public KeyValueListParser getKeyValueListParser() {
+        return mParser;
+    }
+
+    @Override
+    public void setString(String str) throws IllegalArgumentException {
+        mParser.setString(str);
+    }
+
+    @Override
+    public boolean getBoolean(String key, boolean defaultValue) {
+        return mParser.getBoolean(key, defaultValue);
+    }
+
+    @Override
+    public long getLong(String key, long defaultValue) {
+        return mParser.getLong(key, defaultValue);
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/action/AnomalyAction.java b/src/com/android/settings/fuelgauge/anomaly/action/AnomalyAction.java
new file mode 100644
index 0000000..4d4b136
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/action/AnomalyAction.java
@@ -0,0 +1,34 @@
+/*
+ * 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.anomaly.action;
+
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+
+/**
+ * Interface for anomaly action, which is triggered if we need to handle the anomaly
+ */
+public interface AnomalyAction {
+    /**
+     * handle the action when user clicks positive button
+     * @param Anomaly about the app that we need to handle
+     * @param metricsKey key for the page that invokes the action
+     *
+     * @see com.android.internal.logging.nano.MetricsProto
+     */
+    void handlePositiveAction(Anomaly Anomaly, int metricsKey);
+    int getActionType();
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java
new file mode 100644
index 0000000..8c7e827
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java
@@ -0,0 +1,52 @@
+/*
+ * 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.anomaly.action;
+
+import android.app.AppOpsManager;
+import android.content.Context;
+
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+import com.android.settings.overlay.FeatureFactory;
+
+/**
+ * Background check action for anomaly app, which means to stop app running in the background
+ */
+public class BackgroundCheckAction implements AnomalyAction {
+
+    private Context mContext;
+    private MetricsFeatureProvider mMetricsFeatureProvider;
+    private AppOpsManager mAppOpsManager;
+
+    public BackgroundCheckAction(Context context) {
+        mContext = context;
+        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+        mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+    }
+
+    @Override
+    public void handlePositiveAction(Anomaly anomaly, int metricsKey) {
+        // TODO(b/37681923): add metric log here if possible
+        mAppOpsManager.setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, anomaly.uid, anomaly.packageName,
+                AppOpsManager.MODE_IGNORED);
+    }
+
+    @Override
+    public int getActionType() {
+        return Anomaly.AnomalyActionType.BACKGROUND_CHECK;
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/action/ForceStopAction.java b/src/com/android/settings/fuelgauge/anomaly/action/ForceStopAction.java
new file mode 100644
index 0000000..c124c9e
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/action/ForceStopAction.java
@@ -0,0 +1,59 @@
+/*
+ * 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.anomaly.action;
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.util.Pair;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+import com.android.settings.overlay.FeatureFactory;
+
+/**
+ * Force stop action for anomaly app, which means to stop the app which causes anomaly
+ */
+public class ForceStopAction implements AnomalyAction {
+
+    private Context mContext;
+    private MetricsFeatureProvider mMetricsFeatureProvider;
+    private ActivityManager mActivityManager;
+
+    public ForceStopAction(Context context) {
+        mContext = context;
+        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+        mActivityManager = (ActivityManager) context.getSystemService(
+                Context.ACTIVITY_SERVICE);
+    }
+
+    @Override
+    public void handlePositiveAction(Anomaly anomaly, int metricsKey) {
+        final String packageName = anomaly.packageName;
+        // force stop the package
+        mMetricsFeatureProvider.action(mContext,
+                MetricsProto.MetricsEvent.ACTION_APP_FORCE_STOP, packageName,
+                Pair.create(MetricsProto.MetricsEvent.FIELD_CONTEXT, metricsKey));
+
+        mActivityManager.forceStopPackage(packageName);
+    }
+
+    @Override
+    public int getActionType() {
+        return Anomaly.AnomalyActionType.FORCE_STOP;
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/checker/AnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/AnomalyDetector.java
new file mode 100644
index 0000000..1921bef
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/checker/AnomalyDetector.java
@@ -0,0 +1,46 @@
+/*
+ * 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.anomaly.checker;
+
+import android.annotation.Nullable;
+
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+
+import java.util.List;
+
+public interface AnomalyDetector {
+    /**
+     * Detect whether there is anomaly among all the applications in the device
+     *
+     * @param batteryStatsHelper used to detect the anomaly
+     * @return anomaly list
+     */
+    List<Anomaly> detectAnomalies(BatteryStatsHelper batteryStatsHelper);
+
+    /**
+     * Detect whether application with {@code targetPackageName} has anomaly. When
+     * {@code targetPackageName} is null, start detection among all the applications.
+     *
+     * @param batteryStatsHelper used to detect the anomaly
+     * @param targetPackageName  represents the app need to be detected
+     * @return anomaly list
+     */
+    List<Anomaly> detectAnomalies(BatteryStatsHelper batteryStatsHelper,
+            @Nullable String targetPackageName);
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java
new file mode 100644
index 0000000..8568d37
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java
@@ -0,0 +1,128 @@
+/*
+ * 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.anomaly.checker;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.BatteryStats;
+import android.os.SystemClock;
+import android.support.annotation.VisibleForTesting;
+import android.text.format.DateUtils;
+import android.util.ArrayMap;
+import android.util.Log;
+
+import com.android.internal.os.BatterySipper;
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.Utils;
+import com.android.settings.fuelgauge.BatteryUtils;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Check whether apps holding wakelock too long
+ */
+public class WakeLockAnomalyDetector implements AnomalyDetector {
+    private static final String TAG = "WakeLockAnomalyChecker";
+    private PackageManager mPackageManager;
+    private Context mContext;
+    @VisibleForTesting
+    BatteryUtils mBatteryUtils;
+    @VisibleForTesting
+    long mWakeLockThresholdMs;
+
+    public WakeLockAnomalyDetector(Context context) {
+        this(context, new AnomalyDetectionPolicy(context));
+    }
+
+    @VisibleForTesting
+    WakeLockAnomalyDetector(Context context, AnomalyDetectionPolicy policy) {
+        mContext = context;
+        mPackageManager = context.getPackageManager();
+        mBatteryUtils = BatteryUtils.getInstance(context);
+
+        mWakeLockThresholdMs = policy.wakeLockThreshold;
+    }
+
+    @Override
+    public List<Anomaly> detectAnomalies(BatteryStatsHelper batteryStatsHelper) {
+        return detectAnomalies(batteryStatsHelper, null);
+    }
+
+    @Override
+    public List<Anomaly> detectAnomalies(BatteryStatsHelper batteryStatsHelper,
+            String targetPackageName) {
+        final List<BatterySipper> batterySippers = batteryStatsHelper.getUsageList();
+        final List<Anomaly> anomalies = new ArrayList<>();
+        final long rawRealtime = SystemClock.elapsedRealtime();
+        final int targetUid = mBatteryUtils.getPackageUid(targetPackageName);
+
+        // Check the app one by one
+        for (int i = 0, size = batterySippers.size(); i < size; i++) {
+            final BatterySipper sipper = batterySippers.get(i);
+            final BatteryStats.Uid uid = sipper.uidObj;
+            if (uid == null
+                    || mBatteryUtils.shouldHideSipper(sipper)
+                    || (targetUid != BatteryUtils.UID_NULL && targetUid != uid.getUid())) {
+                continue;
+            }
+
+            final ArrayMap<String, ? extends BatteryStats.Uid.Wakelock> wakelocks =
+                    uid.getWakelockStats();
+            long maxPartialWakeLockMs = 0;
+
+            for (int iw = wakelocks.size() - 1; iw >= 0; iw--) {
+                final BatteryStats.Timer timer = wakelocks.valueAt(iw).getWakeTime(
+                        BatteryStats.WAKE_TYPE_PARTIAL);
+                if (timer == null) {
+                    continue;
+                }
+                maxPartialWakeLockMs = Math.max(maxPartialWakeLockMs,
+                        getTotalDurationMs(timer, rawRealtime));
+            }
+
+            // Report application as anomaly if wakelock time is too long
+            // TODO(b/38233034): add more attributes to detect wakelock anomaly
+            if (maxPartialWakeLockMs > mWakeLockThresholdMs) {
+                final String packageName = mBatteryUtils.getPackageName(uid.getUid());
+                final CharSequence displayName = Utils.getApplicationLabel(mContext,
+                        packageName);
+
+                Anomaly anomaly = new Anomaly.Builder()
+                        .setUid(uid.getUid())
+                        .setType(Anomaly.AnomalyType.WAKE_LOCK)
+                        .setDisplayName(displayName)
+                        .setPackageName(packageName)
+                        .build();
+                anomalies.add(anomaly);
+            }
+
+        }
+        return anomalies;
+    }
+
+    @VisibleForTesting
+    long getTotalDurationMs(BatteryStats.Timer timer, long rawRealtime) {
+        if (timer == null) {
+            return 0;
+        }
+        return timer.getTotalDurationMsLocked(rawRealtime);
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java
new file mode 100644
index 0000000..83b8d9a
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java
@@ -0,0 +1,121 @@
+/*
+ * 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.anomaly.checker;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.BatteryStats;
+import android.os.SystemClock;
+import android.support.annotation.VisibleForTesting;
+import android.text.format.DateUtils;
+import android.util.ArrayMap;
+
+import com.android.internal.os.BatterySipper;
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.Utils;
+import com.android.settings.fuelgauge.BatteryUtils;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Check whether apps has too many wakeup alarms
+ */
+public class WakeupAlarmAnomalyDetector implements AnomalyDetector {
+    private static final String TAG = "WakeupAlarmAnomalyDetector";
+    @VisibleForTesting
+    BatteryUtils mBatteryUtils;
+    private long mWakeupAlarmThreshold;
+    private Context mContext;
+
+    public WakeupAlarmAnomalyDetector(Context context) {
+        this(context, new AnomalyDetectionPolicy(context));
+    }
+
+    @VisibleForTesting
+    WakeupAlarmAnomalyDetector(Context context, AnomalyDetectionPolicy policy) {
+        mContext = context;
+        mBatteryUtils = BatteryUtils.getInstance(context);
+        mWakeupAlarmThreshold = policy.wakeupAlarmThreshold;
+    }
+
+    @Override
+    public List<Anomaly> detectAnomalies(BatteryStatsHelper batteryStatsHelper) {
+        return detectAnomalies(batteryStatsHelper, null);
+    }
+
+    @Override
+    public List<Anomaly> detectAnomalies(BatteryStatsHelper batteryStatsHelper,
+            String targetPackageName) {
+        final List<BatterySipper> batterySippers = batteryStatsHelper.getUsageList();
+        final List<Anomaly> anomalies = new ArrayList<>();
+        final long totalRunningHours = mBatteryUtils.calculateRunningTimeBasedOnStatsType(
+                batteryStatsHelper, BatteryStats.STATS_SINCE_CHARGED) / DateUtils.HOUR_IN_MILLIS;
+        final int targetUid = mBatteryUtils.getPackageUid(targetPackageName);
+
+        if (totalRunningHours != 0) {
+            for (int i = 0, size = batterySippers.size(); i < size; i++) {
+                final BatterySipper sipper = batterySippers.get(i);
+                final BatteryStats.Uid uid = sipper.uidObj;
+                if (uid == null
+                        || mBatteryUtils.shouldHideSipper(sipper)
+                        || (targetUid != BatteryUtils.UID_NULL && targetUid != uid.getUid())) {
+                    continue;
+                }
+
+                final int wakeups = getWakeupAlarmCountFromUid(uid);
+                if ((wakeups / totalRunningHours) > mWakeupAlarmThreshold) {
+                    final String packageName = mBatteryUtils.getPackageName(uid.getUid());
+                    final CharSequence displayName = Utils.getApplicationLabel(mContext,
+                            packageName);
+
+                    Anomaly anomaly = new Anomaly.Builder()
+                            .setUid(uid.getUid())
+                            .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
+                            .setDisplayName(displayName)
+                            .setPackageName(packageName)
+                            .build();
+                    anomalies.add(anomaly);
+                }
+            }
+        }
+
+        return anomalies;
+    }
+
+    @VisibleForTesting
+    int getWakeupAlarmCountFromUid(BatteryStats.Uid uid) {
+        int wakeups = 0;
+        final ArrayMap<String, ? extends BatteryStats.Uid.Pkg> packageStats
+                = uid.getPackageStats();
+        for (int ipkg = packageStats.size() - 1; ipkg >= 0; ipkg--) {
+            final BatteryStats.Uid.Pkg ps = packageStats.valueAt(ipkg);
+            final ArrayMap<String, ? extends BatteryStats.Counter> alarms =
+                    ps.getWakeupAlarmStats();
+            for (int iwa = alarms.size() - 1; iwa >= 0; iwa--) {
+                int count = alarms.valueAt(iwa).getCountLocked(BatteryStats.STATS_SINCE_CHARGED);
+                wakeups += count;
+            }
+
+        }
+
+        return wakeups;
+    }
+
+}
diff --git a/src/com/android/settings/gestures/AssistGesturePreferenceController.java b/src/com/android/settings/gestures/AssistGesturePreferenceController.java
index c858511..3230804 100644
--- a/src/com/android/settings/gestures/AssistGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/AssistGesturePreferenceController.java
@@ -23,10 +23,10 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.applications.assist.AssistSettingObserver;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceController.java b/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceController.java
index 5334e62..0f42803 100644
--- a/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceController.java
+++ b/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceController.java
@@ -24,13 +24,13 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SeekBarPreference;
+import com.android.settings.widget.SeekBarPreference;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class AssistGestureSensitivityPreferenceController extends PreferenceController
         implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnPause, OnResume {
diff --git a/src/com/android/settings/gestures/AssistGestureSettings.java b/src/com/android/settings/gestures/AssistGestureSettings.java
index 0c4f278..64187a3 100644
--- a/src/com/android/settings/gestures/AssistGestureSettings.java
+++ b/src/com/android/settings/gestures/AssistGestureSettings.java
@@ -22,9 +22,9 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,7 +38,7 @@
 
     @Override
     public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.VIEW_UNKNOWN;
+        return MetricsProto.MetricsEvent.SETTINGS_ASSIST_GESTURE;
     }
 
     @Override
diff --git a/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java b/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java
new file mode 100644
index 0000000..9b7a851
--- /dev/null
+++ b/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java
@@ -0,0 +1,68 @@
+/*
+ * 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.gestures;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class CameraLiftTriggerPreferenceController extends GesturePreferenceController {
+
+    private static final String PREF_KEY_VIDEO = "gesture_camera_lift_trigger_video";
+
+    private final String mCameraLiftTriggerKey;
+
+    public CameraLiftTriggerPreferenceController(Context context, Lifecycle lifecycle, String key) {
+        super(context, lifecycle);
+        mCameraLiftTriggerKey = key;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mContext.getResources().getBoolean(
+                R.bool.config_cameraLiftTriggerAvailable);
+    }
+
+    @Override
+    protected String getVideoPrefKey() {
+        return PREF_KEY_VIDEO;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return mCameraLiftTriggerKey;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        boolean enabled = (boolean) newValue;
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED, enabled ? 1 : 0);
+        return true;
+    }
+
+    @Override
+    protected boolean isSwitchPrefEnabled() {
+        final int triggerEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED,
+                Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED_DEFAULT);
+        return triggerEnabled == 1;
+    }
+}
diff --git a/src/com/android/settings/gestures/CameraLiftTriggerSettings.java b/src/com/android/settings/gestures/CameraLiftTriggerSettings.java
new file mode 100644
index 0000000..a222b0b
--- /dev/null
+++ b/src/com/android/settings/gestures/CameraLiftTriggerSettings.java
@@ -0,0 +1,80 @@
+/*
+ * 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.gestures;
+
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class CameraLiftTriggerSettings extends DashboardFragment {
+
+    private static final String TAG = "CameraLiftTrigger";
+    private static final String KEY = "gesture_camera_lift_trigger";
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.SETTINGS_GESTURE_CAMERA_LIFT_TRIGGER;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.camera_lift_trigger_settings;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
+        final List<PreferenceController> controllers = new ArrayList<>();
+        controllers.add(new CameraLiftTriggerPreferenceController(context, lifecycle, KEY));
+        return controllers;
+    }
+
+    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.camera_lift_trigger_settings;
+                    return Arrays.asList(sir);
+                }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context, null /* lifecycle */);
+                }
+            };
+}
diff --git a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
index ba1d0f6..d36ecc4 100644
--- a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
@@ -20,7 +20,7 @@
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class DoubleTapPowerPreferenceController extends GesturePreferenceController {
 
diff --git a/src/com/android/settings/gestures/DoubleTapPowerSettings.java b/src/com/android/settings/gestures/DoubleTapPowerSettings.java
index a880c32..d38292d 100644
--- a/src/com/android/settings/gestures/DoubleTapPowerSettings.java
+++ b/src/com/android/settings/gestures/DoubleTapPowerSettings.java
@@ -22,9 +22,9 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
index 5f8dfb4..a38e4b6 100644
--- a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
@@ -22,7 +22,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class DoubleTapScreenPreferenceController extends GesturePreferenceController {
 
diff --git a/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/src/com/android/settings/gestures/DoubleTapScreenSettings.java
index 0804e7b..4690ead 100644
--- a/src/com/android/settings/gestures/DoubleTapScreenSettings.java
+++ b/src/com/android/settings/gestures/DoubleTapScreenSettings.java
@@ -24,9 +24,9 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -53,6 +53,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_double_tap_screen;
+    }
+
+    @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, getLifecycle());
     }
diff --git a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java
index cf5cfab..2b46cce 100644
--- a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java
+++ b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java
@@ -22,9 +22,9 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
index 12f28d2..baf2d31 100644
--- a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
@@ -29,7 +29,7 @@
 
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class DoubleTwistPreferenceController extends GesturePreferenceController {
 
diff --git a/src/com/android/settings/gestures/GesturePreferenceController.java b/src/com/android/settings/gestures/GesturePreferenceController.java
index ebfccb5..e647bf3 100644
--- a/src/com/android/settings/gestures/GesturePreferenceController.java
+++ b/src/com/android/settings/gestures/GesturePreferenceController.java
@@ -23,11 +23,11 @@
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnStart;
-import com.android.settings.core.lifecycle.events.OnStop;
 import com.android.settings.widget.VideoPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
 
 public abstract class GesturePreferenceController extends PreferenceController
         implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnStart, OnStop {
diff --git a/src/com/android/settings/gestures/PickupGesturePreferenceController.java b/src/com/android/settings/gestures/PickupGesturePreferenceController.java
index c0e6009..a6ce1a1 100644
--- a/src/com/android/settings/gestures/PickupGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/PickupGesturePreferenceController.java
@@ -22,7 +22,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class PickupGesturePreferenceController extends GesturePreferenceController {
 
diff --git a/src/com/android/settings/gestures/PickupGestureSettings.java b/src/com/android/settings/gestures/PickupGestureSettings.java
index 874f690..17d930f 100644
--- a/src/com/android/settings/gestures/PickupGestureSettings.java
+++ b/src/com/android/settings/gestures/PickupGestureSettings.java
@@ -24,9 +24,9 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -53,6 +53,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_pickup_gesture;
+    }
+
+    @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, getLifecycle());
     }
diff --git a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java
index 2a62674..b760c25 100644
--- a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java
+++ b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java
@@ -20,7 +20,7 @@
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class SwipeToNotificationPreferenceController extends GesturePreferenceController {
 
@@ -59,7 +59,7 @@
     @Override
     protected boolean isSwitchPrefEnabled() {
         return Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, 0)
+                Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, 1)
                 == 1;
     }
 }
diff --git a/src/com/android/settings/gestures/SwipeToNotificationSettings.java b/src/com/android/settings/gestures/SwipeToNotificationSettings.java
index f19565a..00d4700 100644
--- a/src/com/android/settings/gestures/SwipeToNotificationSettings.java
+++ b/src/com/android/settings/gestures/SwipeToNotificationSettings.java
@@ -22,9 +22,9 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/android/settings/graph/BottomLabelLayout.java b/src/com/android/settings/graph/BottomLabelLayout.java
new file mode 100644
index 0000000..45fab38
--- /dev/null
+++ b/src/com/android/settings/graph/BottomLabelLayout.java
@@ -0,0 +1,97 @@
+/*
+ * 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.graph;
+
+import android.annotation.Nullable;
+import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.android.settingslib.R;
+
+/**
+ * An extension of LinearLayout that automatically switches to vertical
+ * orientation when it can't fit its child views horizontally.
+ *
+ * Main logic in this class comes from {@link android.support.v7.widget.ButtonBarLayout}.
+ * Compared with {@link android.support.v7.widget.ButtonBarLayout}, this layout won't reverse
+ * children's order and won't update the minimum height
+ */
+public class BottomLabelLayout extends LinearLayout {
+    private static final String TAG = "BottomLabelLayout";
+
+    public BottomLabelLayout(Context context,
+            @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        final int widthSize = MeasureSpec.getSize(widthMeasureSpec);
+        final boolean isStacked = isStacked();
+        boolean needsRemeasure = false;
+
+        // If we're not stacked, make sure the measure spec is AT_MOST rather
+        // than EXACTLY. This ensures that we'll still get TOO_SMALL so that we
+        // know to stack the buttons.
+        final int initialWidthMeasureSpec;
+        if (!isStacked && MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.EXACTLY) {
+            initialWidthMeasureSpec = MeasureSpec.makeMeasureSpec(widthSize, MeasureSpec.AT_MOST);
+
+            // We'll need to remeasure again to fill excess space.
+            needsRemeasure = true;
+        } else {
+            initialWidthMeasureSpec = widthMeasureSpec;
+        }
+
+        super.onMeasure(initialWidthMeasureSpec, heightMeasureSpec);
+        if (!isStacked) {
+            final int measuredWidth = getMeasuredWidthAndState();
+            final int measuredWidthState = measuredWidth & View.MEASURED_STATE_MASK;
+
+            if (measuredWidthState == View.MEASURED_STATE_TOO_SMALL) {
+                setStacked(true);
+                // Measure again in the new orientation.
+                needsRemeasure = true;
+            }
+        }
+
+        if (needsRemeasure) {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        }
+
+    }
+
+    @VisibleForTesting
+    void setStacked(boolean stacked) {
+        setOrientation(stacked ? LinearLayout.VERTICAL : LinearLayout.HORIZONTAL);
+        setGravity(stacked ? Gravity.START : Gravity.BOTTOM);
+
+        final View spacer = findViewById(R.id.spacer);
+        if (spacer != null) {
+            spacer.setVisibility(stacked ? View.GONE : View.VISIBLE);
+        }
+    }
+
+    private boolean isStacked() {
+        return getOrientation() == LinearLayout.VERTICAL;
+    }
+}
diff --git a/src/com/android/settings/graph/UsageGraph.java b/src/com/android/settings/graph/UsageGraph.java
new file mode 100644
index 0000000..ccee89a
--- /dev/null
+++ b/src/com/android/settings/graph/UsageGraph.java
@@ -0,0 +1,284 @@
+/*
+ * Copyright (C) 2016 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.graph;
+
+import android.annotation.Nullable;
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.CornerPathEffect;
+import android.graphics.DashPathEffect;
+import android.graphics.LinearGradient;
+import android.graphics.Paint;
+import android.graphics.Paint.Cap;
+import android.graphics.Paint.Join;
+import android.graphics.Paint.Style;
+import android.graphics.Path;
+import android.graphics.Shader.TileMode;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.util.SparseIntArray;
+import android.util.TypedValue;
+import android.view.View;
+
+import com.android.settingslib.R;
+
+public class UsageGraph extends View {
+
+    private static final int PATH_DELIM = -1;
+
+    private final Paint mLinePaint;
+    private final Paint mFillPaint;
+    private final Paint mDottedPaint;
+
+    private final Drawable mDivider;
+    private final Drawable mTintedDivider;
+    private final int mDividerSize;
+
+    private final Path mPath = new Path();
+
+    // Paths in coordinates they are passed in.
+    private final SparseIntArray mPaths = new SparseIntArray();
+    // Paths in local coordinates for drawing.
+    private final SparseIntArray mLocalPaths = new SparseIntArray();
+
+    // Paths for projection in coordinates they are passed in.
+    private final SparseIntArray mProjectedPaths = new SparseIntArray();
+    // Paths for projection in local coordinates for drawing.
+    private final SparseIntArray mLocalProjectedPaths = new SparseIntArray();
+
+    private final int mCornerRadius;
+    private int mAccentColor;
+
+    private float mMaxX = 100;
+    private float mMaxY = 100;
+
+    private float mMiddleDividerLoc = .5f;
+    private int mMiddleDividerTint = -1;
+    private int mTopDividerTint = -1;
+
+    public UsageGraph(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        final Resources resources = context.getResources();
+
+        mLinePaint = new Paint();
+        mLinePaint.setStyle(Style.STROKE);
+        mLinePaint.setStrokeCap(Cap.ROUND);
+        mLinePaint.setStrokeJoin(Join.ROUND);
+        mLinePaint.setAntiAlias(true);
+        mCornerRadius = resources.getDimensionPixelSize(R.dimen.usage_graph_line_corner_radius);
+        mLinePaint.setPathEffect(new CornerPathEffect(mCornerRadius));
+        mLinePaint.setStrokeWidth(resources.getDimensionPixelSize(R.dimen.usage_graph_line_width));
+
+        mFillPaint = new Paint(mLinePaint);
+        mFillPaint.setStyle(Style.FILL);
+
+        mDottedPaint = new Paint(mLinePaint);
+        mDottedPaint.setStyle(Style.STROKE);
+        float dots = resources.getDimensionPixelSize(R.dimen.usage_graph_dot_size);
+        float interval = resources.getDimensionPixelSize(R.dimen.usage_graph_dot_interval);
+        mDottedPaint.setStrokeWidth(dots * 3);
+        mDottedPaint.setPathEffect(new DashPathEffect(new float[]{dots, interval}, 0));
+        mDottedPaint.setColor(context.getColor(R.color.usage_graph_dots));
+
+        TypedValue v = new TypedValue();
+        context.getTheme().resolveAttribute(com.android.internal.R.attr.listDivider, v, true);
+        mDivider = context.getDrawable(v.resourceId);
+        mTintedDivider = context.getDrawable(v.resourceId);
+        mDividerSize = resources.getDimensionPixelSize(R.dimen.usage_graph_divider_size);
+    }
+
+    void clearPaths() {
+        mPaths.clear();
+        mLocalPaths.clear();
+        mProjectedPaths.clear();
+        mLocalProjectedPaths.clear();
+    }
+
+    void setMax(int maxX, int maxY) {
+        mMaxX = maxX;
+        mMaxY = maxY;
+    }
+
+    void setDividerLoc(int height) {
+        mMiddleDividerLoc = 1 - height / mMaxY;
+    }
+
+    void setDividerColors(int middleColor, int topColor) {
+        mMiddleDividerTint = middleColor;
+        mTopDividerTint = topColor;
+    }
+
+    public void addPath(SparseIntArray points) {
+        addPathAndUpdate(points, mPaths, mLocalPaths);
+    }
+
+    public void addProjectedPath(SparseIntArray points) {
+        addPathAndUpdate(points, mProjectedPaths, mLocalProjectedPaths);
+    }
+
+    private void addPathAndUpdate(SparseIntArray points, SparseIntArray paths,
+            SparseIntArray localPaths) {
+        for (int i = 0, size = points.size(); i < size; i++) {
+            paths.put(points.keyAt(i), points.valueAt(i));
+        }
+        // Add a delimiting value immediately after the last point.
+        paths.put(points.keyAt(points.size() - 1) + 1, PATH_DELIM);
+        calculateLocalPaths(paths, localPaths);
+        postInvalidate();
+    }
+
+    void setAccentColor(int color) {
+        mAccentColor = color;
+        mLinePaint.setColor(mAccentColor);
+        updateGradient();
+        postInvalidate();
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        updateGradient();
+        calculateLocalPaths(mPaths, mLocalPaths);
+        calculateLocalPaths(mProjectedPaths, mLocalProjectedPaths);
+    }
+
+    private void calculateLocalPaths(SparseIntArray paths, SparseIntArray localPaths) {
+        if (getWidth() == 0) {
+            return;
+        }
+        localPaths.clear();
+        int pendingXLoc = 0;
+        int pendingYLoc = PATH_DELIM;
+        for (int i = 0; i < paths.size(); i++) {
+            int x = paths.keyAt(i);
+            int y = paths.valueAt(i);
+            if (y == PATH_DELIM) {
+                if (i == paths.size() - 1 && pendingYLoc != PATH_DELIM) {
+                    // Connect to the end of the graph.
+                    localPaths.put(pendingXLoc, pendingYLoc);
+                }
+                // Clear out any pending points.
+                pendingYLoc = PATH_DELIM;
+                localPaths.put(pendingXLoc + 1, PATH_DELIM);
+            } else {
+                final int lx = getX(x);
+                final int ly = getY(y);
+                pendingXLoc = lx;
+                if (localPaths.size() > 0) {
+                    int lastX = localPaths.keyAt(localPaths.size() - 1);
+                    int lastY = localPaths.valueAt(localPaths.size() - 1);
+                    if (lastY != PATH_DELIM && !hasDiff(lastX, lx) && !hasDiff(lastY, ly)) {
+                        pendingYLoc = ly;
+                        continue;
+                    }
+                }
+                localPaths.put(lx, ly);
+            }
+        }
+    }
+
+    private boolean hasDiff(int x1, int x2) {
+        return Math.abs(x2 - x1) >= mCornerRadius;
+    }
+
+    private int getX(float x) {
+        return (int) (x / mMaxX * getWidth());
+    }
+
+    private int getY(float y) {
+        return (int) (getHeight() * (1 - (y / mMaxY)));
+    }
+
+    private void updateGradient() {
+        mFillPaint.setShader(
+                new LinearGradient(0, 0, 0, getHeight(), getColor(mAccentColor, .2f), 0,
+                        TileMode.CLAMP));
+    }
+
+    private int getColor(int color, float alphaScale) {
+        return (color & (((int) (0xff * alphaScale) << 24) | 0xffffff));
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        // Draw lines across the top, middle, and bottom.
+        if (mMiddleDividerLoc != 0) {
+            drawDivider(0, canvas, mTopDividerTint);
+        }
+        drawDivider((int) ((canvas.getHeight() - mDividerSize) * mMiddleDividerLoc), canvas,
+                mMiddleDividerTint);
+        drawDivider(canvas.getHeight() - mDividerSize, canvas, -1);
+
+        if (mLocalPaths.size() == 0 && mProjectedPaths.size() == 0) {
+            return;
+        }
+        drawLinePath(canvas, mLocalProjectedPaths, mDottedPaint);
+        drawFilledPath(canvas, mLocalPaths, mFillPaint);
+        drawLinePath(canvas, mLocalPaths, mLinePaint);
+    }
+
+    private void drawLinePath(Canvas canvas, SparseIntArray localPaths, Paint paint) {
+        if (localPaths.size() == 0) {
+            return;
+        }
+        mPath.reset();
+        mPath.moveTo(localPaths.keyAt(0), localPaths.valueAt(0));
+        for (int i = 1; i < localPaths.size(); i++) {
+            int x = localPaths.keyAt(i);
+            int y = localPaths.valueAt(i);
+            if (y == PATH_DELIM) {
+                if (++i < localPaths.size()) {
+                    mPath.moveTo(localPaths.keyAt(i), localPaths.valueAt(i));
+                }
+            } else {
+                mPath.lineTo(x, y);
+            }
+        }
+        canvas.drawPath(mPath, paint);
+    }
+
+    private void drawFilledPath(Canvas canvas, SparseIntArray localPaths, Paint paint) {
+        mPath.reset();
+        float lastStartX = localPaths.keyAt(0);
+        mPath.moveTo(localPaths.keyAt(0), localPaths.valueAt(0));
+        for (int i = 1; i < localPaths.size(); i++) {
+            int x = localPaths.keyAt(i);
+            int y = localPaths.valueAt(i);
+            if (y == PATH_DELIM) {
+                mPath.lineTo(localPaths.keyAt(i - 1), getHeight());
+                mPath.lineTo(lastStartX, getHeight());
+                mPath.close();
+                if (++i < localPaths.size()) {
+                    lastStartX = localPaths.keyAt(i);
+                    mPath.moveTo(localPaths.keyAt(i), localPaths.valueAt(i));
+                }
+            } else {
+                mPath.lineTo(x, y);
+            }
+        }
+        canvas.drawPath(mPath, paint);
+    }
+
+    private void drawDivider(int y, Canvas canvas, int tintColor) {
+        Drawable d = mDivider;
+        if (tintColor != -1) {
+            mTintedDivider.setTint(tintColor);
+            d = mTintedDivider;
+        }
+        d.setBounds(0, y, canvas.getWidth(), y + mDividerSize);
+        d.draw(canvas);
+    }
+}
diff --git a/src/com/android/settings/graph/UsageView.java b/src/com/android/settings/graph/UsageView.java
new file mode 100644
index 0000000..38eb027
--- /dev/null
+++ b/src/com/android/settings/graph/UsageView.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2016 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.graph;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.util.SparseIntArray;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import com.android.settingslib.R;
+
+public class UsageView extends FrameLayout {
+
+    private final UsageGraph mUsageGraph;
+    private final TextView[] mLabels;
+    private final TextView[] mBottomLabels;
+
+    public UsageView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        LayoutInflater.from(context).inflate(R.layout.usage_view, this);
+        mUsageGraph = findViewById(R.id.usage_graph);
+        mLabels = new TextView[] {
+                findViewById(R.id.label_bottom),
+                findViewById(R.id.label_middle),
+                findViewById(R.id.label_top),
+        };
+        mBottomLabels = new TextView[] {
+                findViewById(R.id.label_start),
+                findViewById(R.id.label_end),
+        };
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.UsageView, 0, 0);
+        if (a.hasValue(R.styleable.UsageView_sideLabels)) {
+            setSideLabels(a.getTextArray(R.styleable.UsageView_sideLabels));
+        }
+        if (a.hasValue(R.styleable.UsageView_bottomLabels)) {
+            setBottomLabels(a.getTextArray(R.styleable.UsageView_bottomLabels));
+        }
+        if (a.hasValue(R.styleable.UsageView_textColor)) {
+            int color = a.getColor(R.styleable.UsageView_textColor, 0);
+            for (TextView v : mLabels) {
+                v.setTextColor(color);
+            }
+            for (TextView v : mBottomLabels) {
+                v.setTextColor(color);
+            }
+        }
+        if (a.hasValue(R.styleable.UsageView_android_gravity)) {
+            int gravity = a.getInt(R.styleable.UsageView_android_gravity, 0);
+            if (gravity == Gravity.END) {
+                LinearLayout layout = findViewById(R.id.graph_label_group);
+                LinearLayout labels = findViewById(R.id.label_group);
+                // Swap the children order.
+                layout.removeView(labels);
+                layout.addView(labels);
+                // Set gravity.
+                labels.setGravity(Gravity.END);
+                // Swap the bottom space order.
+                LinearLayout bottomLabels = findViewById(R.id.bottom_label_group);
+                View bottomSpace = bottomLabels.findViewById(R.id.bottom_label_space);
+                bottomLabels.removeView(bottomSpace);
+                bottomLabels.addView(bottomSpace);
+            } else if (gravity != Gravity.START) {
+                throw new IllegalArgumentException("Unsupported gravity " + gravity);
+            }
+        }
+        mUsageGraph.setAccentColor(a.getColor(R.styleable.UsageView_android_colorAccent, 0));
+    }
+
+    public void clearPaths() {
+        mUsageGraph.clearPaths();
+    }
+
+    public void addPath(SparseIntArray points) {
+        mUsageGraph.addPath(points);
+    }
+
+    public void addProjectedPath(SparseIntArray points) {
+        mUsageGraph.addProjectedPath(points);
+    }
+
+    public void configureGraph(int maxX, int maxY) {
+        mUsageGraph.setMax(maxX, maxY);
+    }
+
+    public void setAccentColor(int color) {
+        mUsageGraph.setAccentColor(color);
+    }
+
+    public void setDividerLoc(int dividerLoc) {
+        mUsageGraph.setDividerLoc(dividerLoc);
+    }
+
+    public void setDividerColors(int middleColor, int topColor) {
+        mUsageGraph.setDividerColors(middleColor, topColor);
+    }
+
+    public void setSideLabelWeights(float before, float after) {
+        setWeight(R.id.space1, before);
+        setWeight(R.id.space2, after);
+    }
+
+    private void setWeight(int id, float weight) {
+        View v = findViewById(id);
+        LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) v.getLayoutParams();
+        params.weight = weight;
+        v.setLayoutParams(params);
+    }
+
+    public void setSideLabels(CharSequence[] labels) {
+        if (labels.length != mLabels.length) {
+            throw new IllegalArgumentException("Invalid number of labels");
+        }
+        for (int i = 0; i < mLabels.length; i++) {
+            mLabels[i].setText(labels[i]);
+        }
+    }
+
+    public void setBottomLabels(CharSequence[] labels) {
+        if (labels.length != mBottomLabels.length) {
+            throw new IllegalArgumentException("Invalid number of labels");
+        }
+        for (int i = 0; i < mBottomLabels.length; i++) {
+            mBottomLabels[i].setText(labels[i]);
+        }
+    }
+
+}
diff --git a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
index f8232b8..40efb07 100644
--- a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
+++ b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
@@ -26,9 +26,9 @@
 import android.view.InputDevice;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class GameControllerPreferenceController extends PreferenceController
         implements InputManager.InputDeviceListener, LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
index aa9f5ad..03d8221 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
@@ -22,11 +22,11 @@
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.inputmethod.PhysicalKeyboardFragment.HardKeyboardDeviceInfo;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.List;
 
diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java
index 1c4d642..8bba103 100644
--- a/src/com/android/settings/language/LanguageAndInputSettings.java
+++ b/src/com/android/settings/language/LanguageAndInputSettings.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.language;
 
+import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -35,10 +36,11 @@
 import com.android.settings.R;
 import com.android.settings.applications.defaultapps.DefaultAutofillPreferenceController;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.gestures.AssistGestureFeatureProvider;
 import com.android.settings.gestures.AssistGesturePreferenceController;
+import com.android.settings.gestures.CameraLiftTriggerPreferenceController;
 import com.android.settings.gestures.DoubleTapPowerPreferenceController;
 import com.android.settings.gestures.DoubleTapScreenPreferenceController;
 import com.android.settings.gestures.DoubleTwistPreferenceController;
@@ -48,7 +50,9 @@
 import com.android.settings.inputmethod.PhysicalKeyboardPreferenceController;
 import com.android.settings.inputmethod.SpellCheckerPreferenceController;
 import com.android.settings.inputmethod.VirtualKeyboardPreferenceController;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -65,6 +69,7 @@
     private static final String KEY_DOUBLE_TWIST = "gesture_double_twist_input_summary";
     private static final String KEY_DOUBLE_TAP_SCREEN = "gesture_double_tap_screen_input_summary";
     private static final String KEY_PICK_UP = "gesture_pick_up_input_summary";
+    private static final String KEY_CAMERA_LIFT_TRIGGER = "gesture_camera_lift_trigger_summary";
 
     private AmbientDisplayConfiguration mAmbientDisplayConfig;
 
@@ -82,6 +87,20 @@
     public void onAttach(Context context) {
         super.onAttach(context);
         mProgressiveDisclosureMixin.setTileLimit(2);
+
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        // Hack to update action bar title. It's necessary to refresh title because this page user
+        // can change locale from here and fragment won't relaunch. Once language changes, title
+        // must display in the new language.
+        final Activity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
+        activity.setTitle(R.string.language_input_gesture_title);
     }
 
     @Override
@@ -128,6 +147,8 @@
                 ambientDisplayConfiguration, UserHandle.myUserId(), KEY_PICK_UP));
         controllers.add(new DoubleTapScreenPreferenceController(context, lifecycle,
                 ambientDisplayConfiguration, UserHandle.myUserId(), KEY_DOUBLE_TAP_SCREEN));
+        controllers.add(new CameraLiftTriggerPreferenceController(context, lifecycle,
+                KEY_CAMERA_LIFT_TRIGGER));
         controllers.add(new DefaultAutofillPreferenceController(context));
         return controllers;
     }
@@ -141,32 +162,42 @@
 
         private final Context mContext;
         private final SummaryLoader mSummaryLoader;
+        private final AssistGestureFeatureProvider mFeatureProvider;
 
         public SummaryProvider(Context context, SummaryLoader summaryLoader) {
             mContext = context;
             mSummaryLoader = summaryLoader;
+            mFeatureProvider = FeatureFactory.getFactory(context).getAssistGestureFeatureProvider();
         }
 
         @Override
         public void setListening(boolean listening) {
             if (listening) {
-                final String flattenComponent = Settings.Secure.getString(
+                if (mFeatureProvider.isSupported(mContext)) {
+                    final int assistGestureEnabled = Settings.Secure.getInt(
+                        mContext.getContentResolver(), Settings.Secure.ASSIST_GESTURE_ENABLED, 1);
+                    mSummaryLoader.setSummary(this, mContext.getString(assistGestureEnabled == 0
+                        ? R.string.language_input_gesture_summary_off
+                        : R.string.language_input_gesture_summary_on_with_assist));
+                } else {
+                    final String flattenComponent = Settings.Secure.getString(
                         mContext.getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
-                if (!TextUtils.isEmpty(flattenComponent)) {
-                    final PackageManager packageManage = mContext.getPackageManager();
-                    final String pkg = ComponentName.unflattenFromString(flattenComponent)
+                    if (!TextUtils.isEmpty(flattenComponent)) {
+                        final PackageManager packageManage = mContext.getPackageManager();
+                        final String pkg = ComponentName.unflattenFromString(flattenComponent)
                             .getPackageName();
-                    final InputMethodManager imm = (InputMethodManager) mContext.getSystemService(
-                            Context.INPUT_METHOD_SERVICE);
-                    final List<InputMethodInfo> imis = imm.getInputMethodList();
-                    for (InputMethodInfo imi : imis) {
-                        if (TextUtils.equals(imi.getPackageName(), pkg)) {
-                            mSummaryLoader.setSummary(this, imi.loadLabel(packageManage));
-                            return;
+                        final InputMethodManager imm = (InputMethodManager)
+                            mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
+                        final List<InputMethodInfo> imis = imm.getInputMethodList();
+                        for (InputMethodInfo imi : imis) {
+                            if (TextUtils.equals(imi.getPackageName(), pkg)) {
+                                mSummaryLoader.setSummary(this, imi.loadLabel(packageManage));
+                                return;
+                            }
                         }
                     }
+                    mSummaryLoader.setSummary(this, "");
                 }
-                mSummaryLoader.setSummary(this, "");
             }
         }
     }
diff --git a/src/com/android/settings/location/LocationPreferenceController.java b/src/com/android/settings/location/LocationPreferenceController.java
index 766ee47..e4d4ca0 100644
--- a/src/com/android/settings/location/LocationPreferenceController.java
+++ b/src/com/android/settings/location/LocationPreferenceController.java
@@ -15,20 +15,46 @@
  */
 package com.android.settings.location;
 
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.location.LocationManager;
 import android.provider.Settings.Secure;
+import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
-public class LocationPreferenceController extends PreferenceController {
+public class LocationPreferenceController extends PreferenceController implements
+        LifecycleObserver, OnResume, OnPause {
 
     private static final String KEY_LOCATION = "location";
+    private Context mContext;
     private Preference mPreference;
 
-    public LocationPreferenceController(Context context) {
+    @VisibleForTesting
+    BroadcastReceiver mLocationProvidersChangedReceiver;
+
+    public LocationPreferenceController(Context context, Lifecycle lifecycle) {
         super(context);
+        mContext = context;
+        mLocationProvidersChangedReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (intent.getAction().equals(LocationManager.PROVIDERS_CHANGED_ACTION)) {
+                    updateSummary();
+                }
+            }
+        };
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
     }
 
     @Override
@@ -38,6 +64,21 @@
     }
 
     @Override
+    public void onResume() {
+        if (mLocationProvidersChangedReceiver != null) {
+            mContext.registerReceiver(mLocationProvidersChangedReceiver, new IntentFilter(
+                    LocationManager.PROVIDERS_CHANGED_ACTION));
+        }
+    }
+
+    @Override
+    public void onPause() {
+        if (mLocationProvidersChangedReceiver != null) {
+            mContext.unregisterReceiver(mLocationProvidersChangedReceiver);
+        }
+    }
+
+    @Override
     public void updateState(Preference preference) {
         preference.setSummary(getLocationSummary(mContext));
     }
@@ -58,10 +99,10 @@
 
     public static String getLocationSummary(Context context) {
         int mode = Secure.getInt(context.getContentResolver(),
-            Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF);
+                Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF);
         if (mode != Secure.LOCATION_MODE_OFF) {
             return context.getString(R.string.location_on_summary,
-                context.getString(getLocationString(mode)));
+                    context.getString(getLocationString(mode)));
         }
         return context.getString(R.string.location_off_summary);
     }
@@ -79,5 +120,4 @@
         }
         return 0;
     }
-
 }
diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java
index a25c5f8..8422ab4 100644
--- a/src/com/android/settings/network/AirplaneModePreferenceController.java
+++ b/src/com/android/settings/network/AirplaneModePreferenceController.java
@@ -29,10 +29,10 @@
 import com.android.settings.AirplaneModeEnabler;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class AirplaneModePreferenceController extends PreferenceController
         implements LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/network/MobileNetworkPreferenceController.java b/src/com/android/settings/network/MobileNetworkPreferenceController.java
index c7abf90..b91552e 100644
--- a/src/com/android/settings/network/MobileNetworkPreferenceController.java
+++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java
@@ -26,9 +26,9 @@
 
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import static android.os.UserHandle.myUserId;
 import static android.os.UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS;
diff --git a/src/com/android/settings/network/MobilePlanPreferenceController.java b/src/com/android/settings/network/MobilePlanPreferenceController.java
index 9d0878f8..da4902d 100644
--- a/src/com/android/settings/network/MobilePlanPreferenceController.java
+++ b/src/com/android/settings/network/MobilePlanPreferenceController.java
@@ -32,9 +32,9 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnCreate;
-import com.android.settings.core.lifecycle.events.OnSaveInstanceState;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnCreate;
+import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
 
 import java.util.List;
 
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index a28a726..35de1bb 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -15,10 +15,12 @@
  */
 package com.android.settings.network;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.provider.SearchIndexableResource;
+import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -26,11 +28,11 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -68,6 +70,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_network_dashboard;
+    }
+
+    @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         mNetworkResetController.buildMenuItem(menu);
@@ -133,6 +140,66 @@
         return 0;
     }
 
+    @VisibleForTesting
+    static class SummaryProvider implements SummaryLoader.SummaryProvider {
+
+        private final Context mContext;
+        private final SummaryLoader mSummaryLoader;
+        private final MobileNetworkPreferenceController mMobileNetworkPreferenceController;
+        private final TetherPreferenceController mTetherPreferenceController;
+
+        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
+            this(context, summaryLoader,
+                    new MobileNetworkPreferenceController(context),
+                    new TetherPreferenceController(context, null /* lifecycle */));
+        }
+
+        @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+        SummaryProvider(Context context, SummaryLoader summaryLoader,
+                MobileNetworkPreferenceController mobileNetworkPreferenceController,
+                TetherPreferenceController tetherPreferenceController) {
+            mContext = context;
+            mSummaryLoader = summaryLoader;
+            mMobileNetworkPreferenceController = mobileNetworkPreferenceController;
+            mTetherPreferenceController = tetherPreferenceController;
+        }
+
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                String summary = mContext.getString(R.string.wifi_settings_title);
+                if (mMobileNetworkPreferenceController.isAvailable()) {
+                    final String mobileSettingSummary = mContext.getString(
+                            R.string.network_dashboard_summary_mobile);
+                    summary = mContext.getString(R.string.join_many_items_middle, summary,
+                            mobileSettingSummary);
+                }
+                final String dataUsageSettingSummary = mContext.getString(
+                        R.string.network_dashboard_summary_data_usage);
+                summary = mContext.getString(R.string.join_many_items_middle, summary,
+                        dataUsageSettingSummary);
+                if (mTetherPreferenceController.isAvailable()) {
+                    final String hotspotSettingSummary = mContext.getString(
+                            R.string.network_dashboard_summary_hotspot);
+                    summary = mContext.getString(R.string.join_many_items_middle, summary,
+                            hotspotSettingSummary);
+                }
+                mSummaryLoader.setSummary(this, summary);
+            }
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
+
+
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 @Override
@@ -145,7 +212,7 @@
 
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
-                    List<String> keys = new ArrayList<>();
+                    List<String> keys = super.getNonIndexableKeys(context);
                     // Remove master switch as a result
                     keys.add(WifiMasterSwitchPreferenceController.KEY_TOGGLE_WIFI);
                     return keys;
diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java
index fab700b..31a8526 100644
--- a/src/com/android/settings/network/TetherPreferenceController.java
+++ b/src/com/android/settings/network/TetherPreferenceController.java
@@ -35,11 +35,11 @@
 import com.android.settings.R;
 import com.android.settings.TetherSettings;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnDestroy;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnDestroy;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.concurrent.atomic.AtomicReference;
 
diff --git a/src/com/android/settings/network/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java
index 72b361a..a62be76 100644
--- a/src/com/android/settings/network/VpnPreferenceController.java
+++ b/src/com/android/settings/network/VpnPreferenceController.java
@@ -40,10 +40,10 @@
 import com.android.internal.net.VpnConfig;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.List;
 
diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java
index 7164b5b..0743871 100644
--- a/src/com/android/settings/nfc/NfcPreferenceController.java
+++ b/src/com/android/settings/nfc/NfcPreferenceController.java
@@ -27,12 +27,12 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.network.AirplaneModePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.List;
 
diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java
index 47de1a5..d914cd8 100644
--- a/src/com/android/settings/nfc/PaymentSettings.java
+++ b/src/com/android/settings/nfc/PaymentSettings.java
@@ -33,14 +33,13 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.search.SearchIndexableRaw;
 
-import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -126,10 +125,11 @@
                 PaymentBackend paymentBackend = new PaymentBackend(mContext);
                 paymentBackend.refresh();
                 PaymentAppInfo app = paymentBackend.getDefaultApp();
+                String summary = null;
                 if (app != null) {
-                    mSummaryLoader.setSummary(this, mContext.getString(R.string.payment_summary,
-                            app.label));
+                    summary = mContext.getString(R.string.payment_summary, app.label);
                 }
+                mSummaryLoader.setSummary(this, summary);
             }
         }
     }
@@ -162,11 +162,13 @@
 
             @Override
             public List<String> getNonIndexableKeys(Context context) {
+                final List<String> nonVisibleKeys = super.getNonIndexableKeys(context);
                 final PackageManager pm = context.getPackageManager();
-                if (pm.hasSystemFeature(PackageManager.FEATURE_NFC)) return null;
-                final List<String> nonVisibleKeys = new ArrayList<String>();
+                if (pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
+                    return nonVisibleKeys;
+                }
                 nonVisibleKeys.add(PAYMENT_KEY);
                 return nonVisibleKeys;
             }
-    };
+        };
 }
diff --git a/src/com/android/settings/notification/AlarmVolumePreferenceController.java b/src/com/android/settings/notification/AlarmVolumePreferenceController.java
index e9c4b57..cd1f6e3 100644
--- a/src/com/android/settings/notification/AlarmVolumePreferenceController.java
+++ b/src/com/android/settings/notification/AlarmVolumePreferenceController.java
@@ -20,8 +20,8 @@
 import android.media.AudioManager;
 
 import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.notification.VolumeSeekBarPreference.Callback;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class AlarmVolumePreferenceController extends
     VolumeSeekBarPreferenceController {
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index 5a38b98..db060b6 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -16,10 +16,6 @@
 
 package com.android.settings.notification;
 
-import static android.app.NotificationManager.IMPORTANCE_LOW;
-import static android.app.NotificationManager.IMPORTANCE_NONE;
-import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
-
 import android.app.Activity;
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
@@ -41,21 +37,24 @@
 import com.android.settings.AppHeader;
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.applications.AppHeaderController;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.notification.NotificationBackend.AppRow;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.FooterPreference;
+import com.android.settings.widget.EntityHeaderController;
 import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.widget.FooterPreference;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
+import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
+
 /** These settings are per app, so should not be returned in global search results. */
 public class AppNotificationSettings extends NotificationSettingsBase {
     private static final String TAG = "AppNotificationSettings";
@@ -127,19 +126,19 @@
     }
 
     private void addHeaderPref() {
-        ArrayMap<String, AppRow> rows = new ArrayMap<String, AppRow>();
+        ArrayMap<String, AppRow> rows = new ArrayMap<>();
         rows.put(mAppRow.pkg, mAppRow);
         collectConfigActivities(rows);
         final Activity activity = getActivity();
-        final Preference pref = FeatureFactory.getFactory(activity)
-                .getApplicationFeatureProvider(activity)
-                .newAppHeaderController(this /* fragment */, null /* appHeader */)
+        final Preference pref = EntityHeaderController
+                .newInstance(activity, this /* fragment */, null /* header */)
+                .setRecyclerView(getListView(), getLifecycle())
                 .setIcon(mAppRow.icon)
                 .setLabel(mAppRow.label)
                 .setPackageName(mAppRow.pkg)
                 .setUid(mAppRow.uid)
-                .setButtonActions(AppHeaderController.ActionType.ACTION_APP_INFO,
-                        AppHeaderController.ActionType.ACTION_NOTIF_PREFERENCE)
+                .setButtonActions(EntityHeaderController.ActionType.ACTION_APP_INFO,
+                        EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE)
                 .done(activity, getPrefContext());
         pref.setKey(KEY_HEADER);
         getPreferenceScreen().addPreference(pref);
@@ -339,15 +338,15 @@
             case NotificationManager.IMPORTANCE_NONE:
                 return getContext().getString(R.string.notification_toggle_off);
             case NotificationManager.IMPORTANCE_MIN:
-                return getContext().getString(R.string.notification_importance_min_title);
+                return getContext().getString(R.string.notification_channel_summary_min);
             case NotificationManager.IMPORTANCE_LOW:
-                return getContext().getString(R.string.notification_importance_low_title);
+                return getContext().getString(R.string.notification_channel_summary_low);
             case NotificationManager.IMPORTANCE_DEFAULT:
-                return getContext().getString(R.string.notification_importance_default_title);
+                return getContext().getString(R.string.notification_channel_summary_default);
             case NotificationManager.IMPORTANCE_HIGH:
             case NotificationManager.IMPORTANCE_MAX:
             default:
-                return getContext().getString(R.string.notification_importance_high_title);
+                return getContext().getString(R.string.notification_channel_summary_high);
         }
 
     }
diff --git a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
index 225ede5..decbe0b 100644
--- a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
@@ -28,9 +28,9 @@
 import android.util.Log;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import static android.provider.Settings.Secure.NOTIFICATION_BADGING;
 
diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java
index 3bd0557..c873c07 100644
--- a/src/com/android/settings/notification/ChannelNotificationSettings.java
+++ b/src/com/android/settings/notification/ChannelNotificationSettings.java
@@ -16,10 +16,6 @@
 
 package com.android.settings.notification;
 
-import static android.app.NotificationManager.IMPORTANCE_LOW;
-import static android.app.NotificationManager.IMPORTANCE_NONE;
-import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
-
 import android.app.Activity;
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
@@ -44,13 +40,16 @@
 import com.android.settings.R;
 import com.android.settings.RingtonePreference;
 import com.android.settings.Utils;
-import com.android.settings.applications.AppHeaderController;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.applications.LayoutPreference;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.FooterPreference;
+import com.android.settings.widget.EntityHeaderController;
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.widget.FooterPreference;
+
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
+import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
 
 public class ChannelNotificationSettings extends NotificationSettingsBase {
     private static final String TAG = "ChannelSettings";
@@ -66,7 +65,7 @@
     private NotificationSoundPreference mRingtone;
     private FooterPreference mFooter;
     private NotificationChannelGroup mChannelGroup;
-    private AppHeaderController mHeaderPref;
+    private EntityHeaderController mHeaderPref;
 
     @Override
     public int getMetricsCategory() {
@@ -134,21 +133,21 @@
     }
 
     private void addHeaderPref() {
-        ArrayMap<String, NotificationBackend.AppRow> rows = new ArrayMap<String, NotificationBackend.AppRow>();
+        ArrayMap<String, NotificationBackend.AppRow> rows = new ArrayMap<>();
         rows.put(mAppRow.pkg, mAppRow);
         collectConfigActivities(rows);
         final Activity activity = getActivity();
-        mHeaderPref = FeatureFactory.getFactory(activity)
-                .getApplicationFeatureProvider(activity)
-                .newAppHeaderController(this /* fragment */, null /* appHeader */);
+        mHeaderPref = EntityHeaderController
+                .newInstance(activity, this /* fragment */, null /* header */)
+                .setRecyclerView(getListView(), getLifecycle());
         final Preference pref = mHeaderPref
                 .setIcon(mAppRow.icon)
                 .setLabel(mChannel.getName())
                 .setSummary(mAppRow.label)
                 .setPackageName(mAppRow.pkg)
                 .setUid(mAppRow.uid)
-                .setButtonActions(AppHeaderController.ActionType.ACTION_APP_INFO,
-                        AppHeaderController.ActionType.ACTION_NOTIF_PREFERENCE)
+                .setButtonActions(EntityHeaderController.ActionType.ACTION_APP_INFO,
+                        EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE)
                 .done(activity, getPrefContext());
         getPreferenceScreen().addPreference(pref);
     }
diff --git a/src/com/android/settings/notification/ChargingSoundPreferenceController.java b/src/com/android/settings/notification/ChargingSoundPreferenceController.java
index 1114b4a..55cba96 100644
--- a/src/com/android/settings/notification/ChargingSoundPreferenceController.java
+++ b/src/com/android/settings/notification/ChargingSoundPreferenceController.java
@@ -22,7 +22,7 @@
 
 import android.provider.Settings.Global;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class ChargingSoundPreferenceController extends SettingPrefController {
 
diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java
index a06d069..26fc0a0 100644
--- a/src/com/android/settings/notification/ConfigureNotificationSettings.java
+++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java
@@ -16,17 +16,21 @@
 
 package com.android.settings.notification;
 
+import android.app.Activity;
 import android.content.Context;
 import android.provider.SearchIndexableResource;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.applications.NotificationApps;
+import com.android.settings.applications.NotificationApps.SummaryProvider;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.gestures.SwipeToNotificationPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -81,6 +85,15 @@
         return controllers;
     }
 
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+        = new SummaryLoader.SummaryProviderFactory() {
+            @Override
+            public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                    SummaryLoader summaryLoader) {
+                return new NotificationApps.SummaryProvider(activity, summaryLoader);
+            }
+    };
+
     /**
      * For Search.
      */
diff --git a/src/com/android/settings/notification/DialPadTonePreferenceController.java b/src/com/android/settings/notification/DialPadTonePreferenceController.java
index 08e1a7d..e0ca299 100644
--- a/src/com/android/settings/notification/DialPadTonePreferenceController.java
+++ b/src/com/android/settings/notification/DialPadTonePreferenceController.java
@@ -23,7 +23,7 @@
 import android.provider.Settings.System;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class DialPadTonePreferenceController extends SettingPrefController {
 
diff --git a/src/com/android/settings/notification/DockAudioMediaPreferenceController.java b/src/com/android/settings/notification/DockAudioMediaPreferenceController.java
index 20c20b4..f7f13c5 100644
--- a/src/com/android/settings/notification/DockAudioMediaPreferenceController.java
+++ b/src/com/android/settings/notification/DockAudioMediaPreferenceController.java
@@ -24,7 +24,7 @@
 import android.provider.Settings.Global;
 import android.telephony.TelephonyManager;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class DockAudioMediaPreferenceController extends SettingPrefController {
 
diff --git a/src/com/android/settings/notification/DockingSoundPreferenceController.java b/src/com/android/settings/notification/DockingSoundPreferenceController.java
index ee277f0..476fd6a 100644
--- a/src/com/android/settings/notification/DockingSoundPreferenceController.java
+++ b/src/com/android/settings/notification/DockingSoundPreferenceController.java
@@ -22,7 +22,7 @@
 import android.provider.Settings.Global;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class DockingSoundPreferenceController extends SettingPrefController {
 
diff --git a/src/com/android/settings/notification/EmergencyTonePreferenceController.java b/src/com/android/settings/notification/EmergencyTonePreferenceController.java
index bc21f44..a67ec8a 100644
--- a/src/com/android/settings/notification/EmergencyTonePreferenceController.java
+++ b/src/com/android/settings/notification/EmergencyTonePreferenceController.java
@@ -25,7 +25,7 @@
 import android.telephony.TelephonyManager;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class EmergencyTonePreferenceController extends SettingPrefController {
 
diff --git a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
index 1f0c4a8..228e185 100644
--- a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
@@ -33,10 +33,10 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/settings/notification/MediaVolumePreferenceController.java b/src/com/android/settings/notification/MediaVolumePreferenceController.java
index fb8dba5..4f167f8 100644
--- a/src/com/android/settings/notification/MediaVolumePreferenceController.java
+++ b/src/com/android/settings/notification/MediaVolumePreferenceController.java
@@ -18,8 +18,8 @@
 
 import android.content.Context;
 import android.media.AudioManager;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.notification.VolumeSeekBarPreference.Callback;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class MediaVolumePreferenceController extends
     VolumeSeekBarPreferenceController {
diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java
index c7b366e..48ca207 100644
--- a/src/com/android/settings/notification/NotificationSettingsBase.java
+++ b/src/com/android/settings/notification/NotificationSettingsBase.java
@@ -26,10 +26,10 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.applications.LayoutPreference;
-import com.android.settings.widget.FooterPreference;
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.widget.FooterPreference;
 
 import android.app.Notification;
 import android.app.NotificationChannel;
diff --git a/src/com/android/settings/notification/NotificationVolumePreferenceController.java b/src/com/android/settings/notification/NotificationVolumePreferenceController.java
index 40448a4..5f888f8 100644
--- a/src/com/android/settings/notification/NotificationVolumePreferenceController.java
+++ b/src/com/android/settings/notification/NotificationVolumePreferenceController.java
@@ -21,8 +21,8 @@
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.Utils;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.notification.VolumeSeekBarPreference.Callback;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class NotificationVolumePreferenceController extends
     RingVolumePreferenceController {
diff --git a/src/com/android/settings/notification/PulseNotificationPreferenceController.java b/src/com/android/settings/notification/PulseNotificationPreferenceController.java
index 3e37ab0..d6db8ac 100644
--- a/src/com/android/settings/notification/PulseNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/PulseNotificationPreferenceController.java
@@ -28,9 +28,9 @@
 import android.util.Log;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE;
 
diff --git a/src/com/android/settings/notification/RingVolumePreferenceController.java b/src/com/android/settings/notification/RingVolumePreferenceController.java
index a94d086..8b78225 100644
--- a/src/com/android/settings/notification/RingVolumePreferenceController.java
+++ b/src/com/android/settings/notification/RingVolumePreferenceController.java
@@ -33,8 +33,8 @@
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.Utils;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.notification.VolumeSeekBarPreference.Callback;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.Objects;
 
diff --git a/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java b/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java
index f9905c0..b08b8f8 100644
--- a/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java
+++ b/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java
@@ -22,7 +22,7 @@
 
 import android.provider.Settings.System;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class ScreenLockSoundPreferenceController extends SettingPrefController {
 
diff --git a/src/com/android/settings/notification/SettingPrefController.java b/src/com/android/settings/notification/SettingPrefController.java
index 64d65bb..413b4a2 100644
--- a/src/com/android/settings/notification/SettingPrefController.java
+++ b/src/com/android/settings/notification/SettingPrefController.java
@@ -28,10 +28,10 @@
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 import java.util.List;
 
 public abstract class SettingPrefController extends PreferenceController implements
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index ec7351a..8bee301 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -32,9 +32,9 @@
 import com.android.settings.R;
 import com.android.settings.RingtonePreference;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/android/settings/notification/TouchSoundPreferenceController.java b/src/com/android/settings/notification/TouchSoundPreferenceController.java
index 4ca5ea0..4e25507 100644
--- a/src/com/android/settings/notification/TouchSoundPreferenceController.java
+++ b/src/com/android/settings/notification/TouchSoundPreferenceController.java
@@ -24,7 +24,7 @@
 import android.os.AsyncTask;
 import android.provider.Settings.System;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class TouchSoundPreferenceController extends SettingPrefController {
 
diff --git a/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java b/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java
index 544c372..acb6b4d 100644
--- a/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java
+++ b/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java
@@ -22,7 +22,7 @@
 import android.os.Vibrator;
 import android.provider.Settings.System;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class VibrateOnTouchPreferenceController extends SettingPrefController {
 
diff --git a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java
index 2160f3d..338b652 100644
--- a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java
+++ b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java
@@ -28,9 +28,9 @@
 
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import static android.provider.Settings.System.VIBRATE_WHEN_RINGING;
 
diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java
index b4fe6d8..1428116 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreference.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java
@@ -31,7 +31,7 @@
 import android.widget.TextView;
 
 import com.android.settings.R;
-import com.android.settings.SeekBarPreference;
+import com.android.settings.widget.SeekBarPreference;
 
 import java.util.Objects;
 
diff --git a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
index eeb9c28..501cedc 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
@@ -19,11 +19,11 @@
 import android.content.Context;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.notification.VolumeSeekBarPreference.Callback;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
  * Base class for preference controller that handles VolumeSeekBarPreference
diff --git a/src/com/android/settings/notification/WorkSoundPreferenceController.java b/src/com/android/settings/notification/WorkSoundPreferenceController.java
index a80f503..465a2ec 100644
--- a/src/com/android/settings/notification/WorkSoundPreferenceController.java
+++ b/src/com/android/settings/notification/WorkSoundPreferenceController.java
@@ -45,10 +45,10 @@
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class WorkSoundPreferenceController extends PreferenceController implements
         OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/overlay/FeatureFactory.java b/src/com/android/settings/overlay/FeatureFactory.java
index e7d5088..4c4621a 100644
--- a/src/com/android/settings/overlay/FeatureFactory.java
+++ b/src/com/android/settings/overlay/FeatureFactory.java
@@ -22,6 +22,7 @@
 
 import com.android.settings.R;
 import com.android.settings.applications.ApplicationFeatureProvider;
+import com.android.settings.bluetooth.BluetoothFeatureProvider;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
@@ -30,7 +31,7 @@
 import com.android.settings.gestures.AssistGestureFeatureProvider;
 import com.android.settings.localepicker.LocaleFeatureProvider;
 import com.android.settings.security.SecurityFeatureProvider;
-import com.android.settings.search2.SearchFeatureProvider;
+import com.android.settings.search.SearchFeatureProvider;
 import com.android.settings.users.UserFeatureProvider;
 
 /**
@@ -97,6 +98,8 @@
 
     public abstract UserFeatureProvider getUserFeatureProvider(Context context);
 
+    public abstract BluetoothFeatureProvider getBluetoothFeatureProvider(Context context);
+
     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 b39a2a0..d4ee912 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -27,6 +27,8 @@
 import com.android.settings.applications.ApplicationFeatureProviderImpl;
 import com.android.settings.applications.IPackageManagerWrapperImpl;
 import com.android.settings.applications.PackageManagerWrapperImpl;
+import com.android.settings.bluetooth.BluetoothFeatureProvider;
+import com.android.settings.bluetooth.BluetoothFeatureProviderImpl;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.dashboard.DashboardFeatureProviderImpl;
@@ -41,8 +43,8 @@
 import com.android.settings.gestures.AssistGestureFeatureProviderImpl;
 import com.android.settings.localepicker.LocaleFeatureProvider;
 import com.android.settings.localepicker.LocaleFeatureProviderImpl;
-import com.android.settings.search2.SearchFeatureProvider;
-import com.android.settings.search2.SearchFeatureProviderImpl;
+import com.android.settings.search.SearchFeatureProvider;
+import com.android.settings.search.SearchFeatureProviderImpl;
 import com.android.settings.security.SecurityFeatureProvider;
 import com.android.settings.security.SecurityFeatureProviderImpl;
 import com.android.settings.users.UserFeatureProvider;
@@ -66,6 +68,7 @@
     private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
     private AssistGestureFeatureProvider mAssistGestureFeatureProvider;
     private UserFeatureProvider mUserFeatureProvider;
+    private BluetoothFeatureProvider mBluetoothFeatureProvider;
 
     @Override
     public SupportFeatureProvider getSupportFeatureProvider(Context context) {
@@ -169,6 +172,14 @@
     }
 
     @Override
+    public BluetoothFeatureProvider getBluetoothFeatureProvider(Context context) {
+        if (mBluetoothFeatureProvider == null) {
+            mBluetoothFeatureProvider = new BluetoothFeatureProviderImpl();
+        }
+        return mBluetoothFeatureProvider;
+    }
+
+    @Override
     public AssistGestureFeatureProvider getAssistGestureFeatureProvider() {
         if (mAssistGestureFeatureProvider == null) {
             mAssistGestureFeatureProvider = new AssistGestureFeatureProviderImpl();
diff --git a/src/com/android/settings/overlay/SupportFeatureProvider.java b/src/com/android/settings/overlay/SupportFeatureProvider.java
index 0f8d424..55d5d0e 100644
--- a/src/com/android/settings/overlay/SupportFeatureProvider.java
+++ b/src/com/android/settings/overlay/SupportFeatureProvider.java
@@ -24,8 +24,8 @@
 import android.app.FragmentManager;
 import android.content.Context;
 import android.content.Intent;
-
 import android.os.Bundle;
+
 import com.android.settings.support.SupportPhone;
 
 import java.lang.annotation.Retention;
@@ -123,12 +123,26 @@
      * Starts support activity of specified type
      *
      * @param activity Calling activity
-     * @param account A account that selected by user
-     * @param type The type of support account needs.
+     * @param account  A account that selected by user
+     * @param type     The type of support account needs.
      */
     void startSupport(Activity activity, Account account, @SupportType int type);
 
     /**
+     * Starts support v2, invokes the support home page. Will no-op if support v2 is not enabled.
+     *
+     * @param activity Calling activity.
+     */
+    void startSupportV2(Activity activity);
+
+    /**
+     * Checks if support v2 is enabled for this device.
+     *
+     * @return a boolean indicating if support v2 is enabled.
+     */
+    boolean isSupportV2Enabled();
+
+    /**
      * Returns an {@link Intent} that opens help and allow user get help on sign in.
      */
     Intent getSignInHelpIntent(Context context);
@@ -153,4 +167,9 @@
      * launches the fragment that displays the system information being sent to support agents.
      */
     void launchSystemInfoFragment(Bundle args, FragmentManager manager);
+
+    /**
+     * Returns a url with information to introduce user to new device.
+     */
+    String getNewDeviceIntroUrl(Context context);
 }
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
similarity index 73%
rename from src/com/android/settings/ChooseLockGeneric.java
rename to src/com/android/settings/password/ChooseLockGeneric.java
index 49784f6..4d20bcf 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PARENT_PROFILE_PASSWORD;
 import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD;
-import static com.android.settings.ChooseLockPassword.ChooseLockPasswordFragment.RESULT_FINISHED;
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
+import static com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment.RESULT_FINISHED;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.Activity;
@@ -29,7 +29,6 @@
 import android.app.FragmentManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.UserInfo;
 import android.hardware.fingerprint.Fingerprint;
@@ -40,6 +39,7 @@
 import android.os.UserManager;
 import android.os.storage.StorageManager;
 import android.security.KeyStore;
+import android.support.annotation.StringRes;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
@@ -50,10 +50,17 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.EncryptionInterstitial;
+import com.android.settings.EventLogTags;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.fingerprint.FingerprintEnrollBase;
 import com.android.settings.fingerprint.FingerprintEnrollFindSensor;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedPreference;
 
 import java.util.List;
@@ -88,14 +95,9 @@
     }
 
     public static class ChooseLockGenericFragment extends SettingsPreferenceFragment {
+
         private static final String TAG = "ChooseLockGenericFragment";
         private static final int MIN_PASSWORD_LENGTH = 4;
-        private static final String KEY_UNLOCK_SET_OFF = "unlock_set_off";
-        private static final String KEY_UNLOCK_SET_NONE = "unlock_set_none";
-        private static final String KEY_UNLOCK_SET_PIN = "unlock_set_pin";
-        private static final String KEY_UNLOCK_SET_PASSWORD = "unlock_set_password";
-        private static final String KEY_UNLOCK_SET_PATTERN = "unlock_set_pattern";
-        private static final String KEY_UNLOCK_SET_MANAGED = "unlock_set_managed";
         private static final String KEY_SKIP_FINGERPRINT = "unlock_skip_fingerprint";
         private static final String PASSWORD_CONFIRMED = "password_confirmed";
         private static final String WAITING_FOR_CONFIRMATION = "waiting_for_confirmation";
@@ -105,6 +107,27 @@
         public static final String ENCRYPT_REQUESTED_DISABLED = "encrypt_requested_disabled";
         public static final String TAG_FRP_WARNING_DIALOG = "frp_warning_dialog";
 
+        /**
+         * Boolean extra determining whether a "screen lock options" button should be shown. This
+         * extra is both sent and received by ChooseLockGeneric.
+         *
+         * When this extra is false, nothing will be done.
+         * When ChooseLockGeneric receives this extra set as true, and if ChooseLockGeneric is
+         * starting ChooseLockPassword or ChooseLockPattern automatically without user interaction,
+         * ChooseLockGeneric will set this extra to true when starting ChooseLockPassword/Pattern.
+         *
+         * This gives the user the choice to select a different screen lock type, even if
+         * ChooseLockGeneric selected a default.
+         */
+        public static final String EXTRA_SHOW_OPTIONS_BUTTON = "show_options_button";
+
+        /**
+         * Original intent extras used to start this activity. This is passed to ChooseLockPassword
+         * when the "screen lock options" button is shown, so that when that button is clicked,
+         * ChooseLockGeneric can be relaunched with the same extras.
+         */
+        public static final String EXTRA_CHOOSE_LOCK_GENERIC_EXTRAS = "choose_lock_generic_extras";
+
         private static final int CONFIRM_EXISTING_REQUEST = 100;
         private static final int ENABLE_ENCRYPTION_REQUEST = 101;
         private static final int CHOOSE_LOCK_REQUEST = 102;
@@ -120,7 +143,6 @@
         private boolean mWaitingForConfirmation = false;
         private int mEncryptionRequestQuality;
         private boolean mEncryptionRequestDisabled;
-        private boolean mRequirePassword;
         private boolean mForChangeCredRequiredForBoot = false;
         private String mUserPassword;
         private LockPatternUtils mLockPatternUtils;
@@ -130,6 +152,7 @@
         private ManagedLockPasswordProvider mManagedPasswordProvider;
         private boolean mIsSetNewPassword = false;
         private UserManager mUserManager;
+        private ChooseLockGenericController mController;
 
         protected boolean mForFingerprint = false;
 
@@ -186,6 +209,7 @@
                     UserManager.get(getActivity()),
                     getArguments(),
                     getActivity().getIntent().getExtras()).getIdentifier();
+            mController = new ChooseLockGenericController(getContext(), mUserId);
             if (ACTION_SET_NEW_PASSWORD.equals(chooseLockAction)
                     && UserManager.get(getActivity()).isManagedProfile(mUserId)
                     && mLockPatternUtils.isSeparateProfileChallengeEnabled(mUserId)) {
@@ -271,7 +295,7 @@
                 mEncryptionRequestDisabled = disabled;
                 // Get the intent that the encryption interstitial should start for creating
                 // the new unlock method.
-                Intent unlockMethodIntent = getIntentForUnlockMethod(quality, disabled);
+                Intent unlockMethodIntent = getIntentForUnlockMethod(quality);
                 unlockMethodIntent.putExtra(
                         ChooseLockSettingsHelper.EXTRA_KEY_FOR_CHANGE_CRED_REQUIRED_FOR_BOOT,
                         mForChangeCredRequiredForBoot);
@@ -297,8 +321,7 @@
                     finish();
                     return;
                 }
-                mRequirePassword = false; // device encryption not enabled or not device owner.
-                updateUnlockMethodAndFinish(quality, disabled);
+                updateUnlockMethodAndFinish(quality, disabled, false /* chooseLockSkipped */);
             }
         }
 
@@ -323,6 +346,15 @@
                 if (resultCode != RESULT_CANCELED || mForChangeCredRequiredForBoot) {
                     getActivity().setResult(resultCode, data);
                     finish();
+                } else {
+                    // If PASSWORD_TYPE_KEY is set, this activity is used as a trampoline to start
+                    // the actual password enrollment. If the result is canceled, which means the
+                    // user pressed back, finish the activity with result canceled.
+                    int quality = getIntent().getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, -1);
+                    if (quality != -1) {
+                        getActivity().setResult(RESULT_CANCELED, data);
+                        finish();
+                    }
                 }
             } else if (requestCode == CHOOSE_LOCK_BEFORE_FINGERPRINT_REQUEST
                     && resultCode == FingerprintEnrollBase.RESULT_FINISHED) {
@@ -369,7 +401,7 @@
             if (quality == -1) {
                 // If caller didn't specify password quality, show UI and allow the user to choose.
                 quality = intent.getIntExtra(MINIMUM_QUALITY_KEY, -1);
-                quality = upgradeQuality(quality);
+                quality = mController.upgradeQuality(quality);
                 final boolean hideDisabledPrefs = intent.getBooleanExtra(
                         HIDE_DISABLED_PREFS, false);
                 final PreferenceScreen prefScreen = getPreferenceScreen();
@@ -382,7 +414,7 @@
                 updateCurrentPreference();
                 updatePreferenceSummaryIfNeeded();
             } else {
-                updateUnlockMethodAndFinish(quality, false);
+                updateUnlockMethodAndFinish(quality, false, true /* chooseLockSkipped */);
             }
         }
 
@@ -390,33 +422,26 @@
             addPreferencesFromResource(R.xml.security_settings_picker);
 
             // Used for testing purposes
-            findPreference(KEY_UNLOCK_SET_NONE).setViewId(R.id.lock_none);
+            findPreference(ScreenLockType.NONE.preferenceKey).setViewId(R.id.lock_none);
             findPreference(KEY_SKIP_FINGERPRINT).setViewId(R.id.lock_none);
-            findPreference(KEY_UNLOCK_SET_PIN).setViewId(R.id.lock_pin);
-            findPreference(KEY_UNLOCK_SET_PASSWORD).setViewId(R.id.lock_password);
+            findPreference(ScreenLockType.PIN.preferenceKey).setViewId(R.id.lock_pin);
+            findPreference(ScreenLockType.PASSWORD.preferenceKey).setViewId(R.id.lock_password);
         }
 
         private void updatePreferenceText() {
             if (mForFingerprint) {
-                final String key[] = { KEY_UNLOCK_SET_PATTERN,
-                        KEY_UNLOCK_SET_PIN,
-                        KEY_UNLOCK_SET_PASSWORD };
-                final int res[] = { R.string.fingerprint_unlock_set_unlock_pattern,
-                        R.string.fingerprint_unlock_set_unlock_pin,
-                        R.string.fingerprint_unlock_set_unlock_password };
-                for (int i = 0; i < key.length; i++) {
-                    Preference pref = findPreference(key[i]);
-                    if (pref != null) { // can be removed by device admin
-                        pref.setTitle(res[i]);
-                    }
-                }
+                setPreferenceTitle(ScreenLockType.PATTERN,
+                        R.string.fingerprint_unlock_set_unlock_pattern);
+                setPreferenceTitle(ScreenLockType.PIN, R.string.fingerprint_unlock_set_unlock_pin);
+                setPreferenceTitle(ScreenLockType.PASSWORD,
+                        R.string.fingerprint_unlock_set_unlock_password);
             }
 
             if (mManagedPasswordProvider.isSettingManagedPasswordSupported()) {
-                Preference managed = findPreference(KEY_UNLOCK_SET_MANAGED);
-                managed.setTitle(mManagedPasswordProvider.getPickerOptionTitle(mForFingerprint));
+                setPreferenceTitle(ScreenLockType.MANAGED,
+                        mManagedPasswordProvider.getPickerOptionTitle(mForFingerprint));
             } else {
-                removePreference(KEY_UNLOCK_SET_MANAGED);
+                removePreference(ScreenLockType.MANAGED.preferenceKey);
             }
 
             if (!(mForFingerprint && mIsSetNewPassword)) {
@@ -424,6 +449,27 @@
             }
         }
 
+        private void setPreferenceTitle(ScreenLockType lock, @StringRes int title) {
+            Preference preference = findPreference(lock.preferenceKey);
+            if (preference != null) {
+                preference.setTitle(title);
+            }
+        }
+
+        private void setPreferenceTitle(ScreenLockType lock, CharSequence title) {
+            Preference preference = findPreference(lock.preferenceKey);
+            if (preference != null) {
+                preference.setTitle(title);
+            }
+        }
+
+        private void setPreferenceSummary(ScreenLockType lock, @StringRes int summary) {
+            Preference preference = findPreference(lock.preferenceKey);
+            if (preference != null) {
+                preference.setSummary(summary);
+            }
+        }
+
         private void updateCurrentPreference() {
             String currentKey = getKeyForCurrent();
             Preference preference = findPreference(currentKey);
@@ -436,39 +482,12 @@
             final int credentialOwner = UserManager.get(getContext())
                     .getCredentialOwnerProfile(mUserId);
             if (mLockPatternUtils.isLockScreenDisabled(credentialOwner)) {
-                return KEY_UNLOCK_SET_OFF;
+                return ScreenLockType.NONE.preferenceKey;
             }
-            switch (mLockPatternUtils.getKeyguardStoredPasswordQuality(credentialOwner)) {
-                case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
-                    return KEY_UNLOCK_SET_PATTERN;
-                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
-                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
-                    return KEY_UNLOCK_SET_PIN;
-                case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
-                case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
-                case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
-                    return KEY_UNLOCK_SET_PASSWORD;
-                case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
-                    return KEY_UNLOCK_SET_MANAGED;
-                case DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED:
-                    return KEY_UNLOCK_SET_NONE;
-            }
-            return null;
-        }
-
-        /** increases the quality if necessary */
-        private int upgradeQuality(int quality) {
-            quality = upgradeQualityForDPM(quality);
-            return quality;
-        }
-
-        private int upgradeQualityForDPM(int quality) {
-            // Compare min allowed password quality
-            int minQuality = mDPM.getPasswordQuality(null, mUserId);
-            if (quality < minQuality) {
-                quality = minQuality;
-            }
-            return quality;
+            ScreenLockType lock =
+                    ScreenLockType.fromQuality(
+                            mLockPatternUtils.getKeyguardStoredPasswordQuality(credentialOwner));
+            return lock != null ? lock.preferenceKey : null;
         }
 
         /***
@@ -496,54 +515,17 @@
             int adminEnforcedQuality = mDPM.getPasswordQuality(null, mUserId);
             EnforcedAdmin enforcedAdmin = RestrictedLockUtils.checkIfPasswordQualityIsSet(
                     getActivity(), mUserId);
-            for (int i = entries.getPreferenceCount() - 1; i >= 0; --i) {
-                Preference pref = entries.getPreference(i);
+
+            for (ScreenLockType lock : ScreenLockType.values()) {
+                String key = lock.preferenceKey;
+                Preference pref = findPreference(key);
                 if (pref instanceof RestrictedPreference) {
-                    final String key = pref.getKey();
-                    boolean enabled = true;
-                    boolean visible = true;
-                    boolean disabledByAdmin = false;
-                    if (KEY_UNLOCK_SET_OFF.equals(key)) {
-                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
-                        if (getResources().getBoolean(R.bool.config_hide_none_security_option)) {
-                            enabled = false;
-                            visible = false;
-                        }
-                        disabledByAdmin = adminEnforcedQuality
-                                > DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
-                    } else if (KEY_UNLOCK_SET_NONE.equals(key)) {
-                        if (getResources().getBoolean(R.bool.config_hide_swipe_security_option)) {
-                            enabled = false;
-                            visible = false;
-                        } else {
-                            if (mUserId != UserHandle.myUserId()) {
-                                // Swipe doesn't make sense for profiles.
-                                visible = false;
-                            }
-                            enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
-                        }
-                        disabledByAdmin = adminEnforcedQuality
-                                > DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
-                    } else if (KEY_UNLOCK_SET_PATTERN.equals(key)) {
-                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
-                        disabledByAdmin = adminEnforcedQuality
-                                > DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
-                    } else if (KEY_UNLOCK_SET_PIN.equals(key)) {
-                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX;
-                        disabledByAdmin = adminEnforcedQuality
-                                > DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX;
-                    } else if (KEY_UNLOCK_SET_PASSWORD.equals(key)) {
-                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_COMPLEX;
-                        disabledByAdmin = adminEnforcedQuality
-                                > DevicePolicyManager.PASSWORD_QUALITY_COMPLEX;
-                    } else if (KEY_UNLOCK_SET_MANAGED.equals(key)) {
-                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_MANAGED
-                                && mManagedPasswordProvider.isManagedPasswordChoosable();
-                        disabledByAdmin = adminEnforcedQuality
-                                > DevicePolicyManager.PASSWORD_QUALITY_MANAGED;
-                    }
+                    boolean visible = mController.isScreenLockVisible(lock);
+                    boolean enabled = mController.isScreenLockEnabled(lock, quality);
+                    boolean disabledByAdmin =
+                            mController.isScreenLockDisabledByAdmin(lock, adminEnforcedQuality);
                     if (hideDisabled) {
-                        visible = enabled;
+                        visible = visible && enabled;
                     }
                     if (!visible) {
                         entries.removePreference(pref);
@@ -578,61 +560,42 @@
                 return;
             }
 
-            CharSequence summary = getString(R.string.secure_lock_encryption_warning);
+            setPreferenceSummary(ScreenLockType.PATTERN, R.string.secure_lock_encryption_warning);
+            setPreferenceSummary(ScreenLockType.PIN, R.string.secure_lock_encryption_warning);
+            setPreferenceSummary(ScreenLockType.PASSWORD, R.string.secure_lock_encryption_warning);
+            setPreferenceSummary(ScreenLockType.MANAGED, R.string.secure_lock_encryption_warning);
+        }
 
-            PreferenceScreen screen = getPreferenceScreen();
-            final int preferenceCount = screen.getPreferenceCount();
-            for (int i = 0; i < preferenceCount; i++) {
-                Preference preference = screen.getPreference(i);
-                switch (preference.getKey()) {
-                    case KEY_UNLOCK_SET_PATTERN:
-                    case KEY_UNLOCK_SET_PIN:
-                    case KEY_UNLOCK_SET_PASSWORD:
-                    case KEY_UNLOCK_SET_MANAGED: {
-                        preference.setSummary(summary);
-                    } break;
-                }
+        protected Intent getLockManagedPasswordIntent(String password) {
+            return mManagedPasswordProvider.createIntent(false, password);
+        }
+
+        protected Intent getLockPasswordIntent(int quality, int minLength, int maxLength) {
+            ChooseLockPassword.IntentBuilder builder =
+                    new ChooseLockPassword.IntentBuilder(getContext())
+                            .setPasswordQuality(quality)
+                            .setPasswordLengthRange(minLength, maxLength)
+                            .setForFingerprint(mForFingerprint)
+                            .setUserId(mUserId);
+            if (mHasChallenge) {
+                builder.setChallenge(mChallenge);
+            } else {
+                builder.setPassword(mUserPassword);
             }
+            return builder.build();
         }
 
-        protected Intent getLockManagedPasswordIntent(boolean requirePassword, String password) {
-            return mManagedPasswordProvider.createIntent(requirePassword, password);
-        }
-
-        protected Intent getLockPasswordIntent(Context context, int quality,
-                int minLength, final int maxLength,
-                boolean requirePasswordToDecrypt, boolean confirmCredentials, int userId) {
-            return ChooseLockPassword.createIntent(context, quality, minLength,
-                    maxLength, requirePasswordToDecrypt, confirmCredentials, userId);
-        }
-
-        protected Intent getLockPasswordIntent(Context context, int quality,
-                int minLength, final int maxLength,
-                boolean requirePasswordToDecrypt, long challenge, int userId) {
-            return ChooseLockPassword.createIntent(context, quality, minLength,
-                    maxLength, requirePasswordToDecrypt, challenge, userId);
-        }
-
-        protected Intent getLockPasswordIntent(Context context, int quality, int minLength,
-                int maxLength, boolean requirePasswordToDecrypt, String password, int userId) {
-            return ChooseLockPassword.createIntent(context, quality, minLength, maxLength,
-                    requirePasswordToDecrypt, password, userId);
-        }
-
-        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
-                final boolean confirmCredentials, int userId) {
-            return ChooseLockPattern.createIntent(context, requirePassword,
-                    confirmCredentials, userId);
-        }
-
-        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
-               long challenge, int userId) {
-            return ChooseLockPattern.createIntent(context, requirePassword, challenge, userId);
-        }
-
-        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
-                final String pattern, int userId) {
-            return ChooseLockPattern.createIntent(context, requirePassword, pattern, userId);
+        protected Intent getLockPatternIntent() {
+            ChooseLockPattern.IntentBuilder builder =
+                    new ChooseLockPattern.IntentBuilder(getContext())
+                            .setForFingerprint(mForFingerprint)
+                            .setUserId(mUserId);
+            if (mHasChallenge) {
+                builder.setChallenge(mChallenge);
+            } else {
+                builder.setPattern(mUserPassword);
+            }
+            return builder.build();
         }
 
         protected Intent getEncryptionInterstitialIntent(Context context, int quality,
@@ -648,17 +611,24 @@
          *
          * @param quality the desired quality. Ignored if DevicePolicyManager requires more security
          * @param disabled whether or not to show LockScreen at all. Only meaningful when quality is
+         * @param chooseLockSkipped whether or not this activity is skipped. This is true when this
+         * activity was not shown to the user at all, instead automatically proceeding based on
+         * the given intent extras, typically {@link LockPatternUtils#PASSWORD_TYPE_KEY}.
          * {@link DevicePolicyManager#PASSWORD_QUALITY_UNSPECIFIED}
          */
-        void updateUnlockMethodAndFinish(int quality, boolean disabled) {
+        void updateUnlockMethodAndFinish(int quality, boolean disabled, boolean chooseLockSkipped) {
             // Sanity check. We should never get here without confirming user's existing password.
             if (!mPasswordConfirmed) {
                 throw new IllegalStateException("Tried to update password without confirming it");
             }
 
-            quality = upgradeQuality(quality);
-            Intent intent = getIntentForUnlockMethod(quality, disabled);
+            quality = mController.upgradeQuality(quality);
+            Intent intent = getIntentForUnlockMethod(quality);
             if (intent != null) {
+                if (getIntent().getBooleanExtra(EXTRA_SHOW_OPTIONS_BUTTON, false)) {
+                    intent.putExtra(EXTRA_SHOW_OPTIONS_BUTTON, chooseLockSkipped);
+                }
+                intent.putExtra(EXTRA_CHOOSE_LOCK_GENERIC_EXTRAS, getIntent().getExtras());
                 startActivityForResult(intent,
                         mIsSetNewPassword && mHasChallenge
                                 ? CHOOSE_LOCK_BEFORE_FINGERPRINT_REQUEST
@@ -677,32 +647,19 @@
             }
         }
 
-        private Intent getIntentForUnlockMethod(int quality, boolean disabled) {
+        private Intent getIntentForUnlockMethod(int quality) {
             Intent intent = null;
-            final Context context = getActivity();
             if (quality >= DevicePolicyManager.PASSWORD_QUALITY_MANAGED) {
-                intent = getLockManagedPasswordIntent(mRequirePassword, mUserPassword);
+                intent = getLockManagedPasswordIntent(mUserPassword);
             } else if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {
                 int minLength = mDPM.getPasswordMinimumLength(null, mUserId);
                 if (minLength < MIN_PASSWORD_LENGTH) {
                     minLength = MIN_PASSWORD_LENGTH;
                 }
                 final int maxLength = mDPM.getPasswordMaximumLength(quality);
-                if (mHasChallenge) {
-                    intent = getLockPasswordIntent(context, quality, minLength,
-                            maxLength, mRequirePassword, mChallenge, mUserId);
-                } else {
-                    intent = getLockPasswordIntent(context, quality, minLength,
-                            maxLength, mRequirePassword, mUserPassword, mUserId);
-                }
+                intent = getLockPasswordIntent(quality, minLength, maxLength);
             } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
-                if (mHasChallenge) {
-                    intent = getLockPatternIntent(context, mRequirePassword,
-                            mChallenge, mUserId);
-                } else {
-                    intent = getLockPatternIntent(context, mRequirePassword,
-                            mUserPassword, mUserId);
-                }
+                intent = getLockPatternIntent();
             }
             if (intent != null) {
                 intent.putExtra(EXTRA_HIDE_DRAWER, mHideDrawer);
@@ -850,35 +807,33 @@
         }
 
         private boolean isUnlockMethodSecure(String unlockMethod) {
-            return !(KEY_UNLOCK_SET_OFF.equals(unlockMethod) ||
-                    KEY_UNLOCK_SET_NONE.equals(unlockMethod));
+            return !(ScreenLockType.SWIPE.preferenceKey.equals(unlockMethod) ||
+                    ScreenLockType.NONE.preferenceKey.equals(unlockMethod));
         }
 
         private boolean setUnlockMethod(String unlockMethod) {
             EventLog.writeEvent(EventLogTags.LOCK_SCREEN_TYPE, unlockMethod);
 
-            if (KEY_UNLOCK_SET_OFF.equals(unlockMethod)) {
-                updateUnlockMethodAndFinish(
-                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, true /* disabled */ );
-            } else if (KEY_UNLOCK_SET_NONE.equals(unlockMethod)) {
-                updateUnlockMethodAndFinish(
-                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, false /* disabled */ );
-            } else if (KEY_UNLOCK_SET_MANAGED.equals(unlockMethod)) {
-                maybeEnableEncryption(DevicePolicyManager.PASSWORD_QUALITY_MANAGED, false);
-            } else if (KEY_UNLOCK_SET_PATTERN.equals(unlockMethod)) {
-                maybeEnableEncryption(
-                        DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, false);
-            } else if (KEY_UNLOCK_SET_PIN.equals(unlockMethod)) {
-                maybeEnableEncryption(
-                        DevicePolicyManager.PASSWORD_QUALITY_NUMERIC, false);
-            } else if (KEY_UNLOCK_SET_PASSWORD.equals(unlockMethod)) {
-                maybeEnableEncryption(
-                        DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC, false);
-            } else {
-                Log.e(TAG, "Encountered unknown unlock method to set: " + unlockMethod);
-                return false;
+            ScreenLockType lock = ScreenLockType.fromKey(unlockMethod);
+            if (lock != null) {
+                switch (lock) {
+                    case NONE:
+                    case SWIPE:
+                        updateUnlockMethodAndFinish(
+                                lock.defaultQuality,
+                                lock == ScreenLockType.NONE,
+                                false /* chooseLockSkipped */);
+                        return true;
+                    case PATTERN:
+                    case PIN:
+                    case PASSWORD:
+                    case MANAGED:
+                        maybeEnableEncryption(lock.defaultQuality, false);
+                        return true;
+                }
             }
-            return true;
+            Log.e(TAG, "Encountered unknown unlock method to set: " + unlockMethod);
+            return false;
         }
 
         private void showFactoryResetProtectionWarningDialog(String unlockMethodToSet) {
@@ -924,23 +879,12 @@
                         .setTitle(args.getInt(ARG_TITLE_RES))
                         .setMessage(args.getInt(ARG_MESSAGE_RES))
                         .setPositiveButton(R.string.unlock_disable_frp_warning_ok,
-                                new DialogInterface.OnClickListener() {
-                                    @Override
-                                    public void onClick(DialogInterface dialog, int whichButton) {
-                                        ((ChooseLockGenericFragment) getParentFragment())
-                                                .setUnlockMethod(
-                                                        args.getString(ARG_UNLOCK_METHOD_TO_SET));
-                                    }
-                                }
-                        )
-                        .setNegativeButton(R.string.cancel,
-                                new DialogInterface.OnClickListener() {
-                                    @Override
-                                    public void onClick(DialogInterface dialog, int whichButton) {
-                                        dismiss();
-                                    }
-                                }
-                        )
+                                (dialog, whichButton) -> {
+                                    String unlockMethod = args.getString(ARG_UNLOCK_METHOD_TO_SET);
+                                    ((ChooseLockGenericFragment) getParentFragment())
+                                            .setUnlockMethod(unlockMethod);
+                                })
+                        .setNegativeButton(R.string.cancel, (dialog, whichButton) -> dismiss())
                         .create();
             }
 
diff --git a/src/com/android/settings/password/ChooseLockGenericController.java b/src/com/android/settings/password/ChooseLockGenericController.java
new file mode 100644
index 0000000..a6a1701
--- /dev/null
+++ b/src/com/android/settings/password/ChooseLockGenericController.java
@@ -0,0 +1,158 @@
+/*
+ * 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.password;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.os.UserHandle;
+import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.settings.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A controller for ChooseLockGeneric, and other similar classes which shows a list of possible
+ * screen locks for the user to choose from.
+ */
+public class ChooseLockGenericController {
+
+    private final Context mContext;
+    private final int mUserId;
+    private ManagedLockPasswordProvider mManagedPasswordProvider;
+    private DevicePolicyManager mDpm;
+
+    public ChooseLockGenericController(Context context, int userId) {
+        this(
+                context,
+                userId,
+                context.getSystemService(DevicePolicyManager.class),
+                ManagedLockPasswordProvider.get(context, userId));
+    }
+
+    @VisibleForTesting
+    ChooseLockGenericController(
+            Context context,
+            int userId,
+            DevicePolicyManager dpm,
+            ManagedLockPasswordProvider managedLockPasswordProvider) {
+        mContext = context;
+        mUserId = userId;
+        mManagedPasswordProvider = managedLockPasswordProvider;
+        mDpm = dpm;
+    }
+
+    /**
+     * @return The higher quality of either the specified {@code quality} or the quality required
+     *         by {@link DevicePolicyManager#getPasswordQuality}.
+     */
+    public int upgradeQuality(int quality) {
+        // Compare min allowed password quality
+        return Math.max(quality, mDpm.getPasswordQuality(null, mUserId));
+    }
+
+    /**
+     * Whether the given screen lock type should be visible in the given context.
+     */
+    public boolean isScreenLockVisible(ScreenLockType type) {
+        switch (type) {
+            case NONE:
+                return !mContext.getResources().getBoolean(R.bool.config_hide_none_security_option);
+            case SWIPE:
+                return !mContext.getResources().getBoolean(R.bool.config_hide_swipe_security_option)
+                    // Swipe doesn't make sense for profiles.
+                    && mUserId == UserHandle.myUserId();
+            case MANAGED:
+                return mManagedPasswordProvider.isManagedPasswordChoosable();
+        }
+        return true;
+    }
+
+    /**
+     * Whether screen lock with {@code type} should be enabled.
+     *
+     * @param type The screen lock type.
+     * @param quality The minimum required quality. This can either be requirement by device policy
+     *                manager or because some flow only makes sense with secure lock screens.
+     */
+    public boolean isScreenLockEnabled(ScreenLockType type, int quality) {
+        return type.maxQuality >= quality;
+    }
+
+    /**
+     * Whether screen lock with {@code type} is disabled by device policy admin.
+     *
+     * @param type The screen lock type.
+     * @param adminEnforcedQuality The minimum quality that the admin enforces.
+     */
+    public boolean isScreenLockDisabledByAdmin(ScreenLockType type, int adminEnforcedQuality) {
+        boolean disabledByAdmin = type.maxQuality < adminEnforcedQuality;
+        if (type == ScreenLockType.MANAGED) {
+            disabledByAdmin = disabledByAdmin
+                    || !mManagedPasswordProvider.isManagedPasswordChoosable();
+        }
+        return disabledByAdmin;
+    }
+
+    /**
+     * User friendly title for the given screen lock type.
+     */
+    public CharSequence getTitle(ScreenLockType type) {
+        switch (type) {
+            case NONE:
+                return mContext.getText(R.string.unlock_set_unlock_off_title);
+            case SWIPE:
+                return mContext.getText(R.string.unlock_set_unlock_none_title);
+            case PATTERN:
+                return mContext.getText(R.string.unlock_set_unlock_pattern_title);
+            case PIN:
+                return mContext.getText(R.string.unlock_set_unlock_pin_title);
+            case PASSWORD:
+                return mContext.getText(R.string.unlock_set_unlock_password_title);
+            case MANAGED:
+                return mManagedPasswordProvider.getPickerOptionTitle(false);
+        }
+        return null;
+    }
+
+    /**
+     * Gets a list of screen locks that should be visible for the given quality. The returned list
+     * is ordered in the natural order of the enum (the order those enums were defined).
+     *
+     * @param quality The minimum quality required in the context of the current flow. This should
+     *                be one of the constants defined in
+     *                {@code DevicePolicyManager#PASSWORD_QUALITY_*}.
+     * @param includeDisabled Whether to include screen locks disabled by {@code quality}
+     *                        requirements in the returned list.
+     */
+    @NonNull
+    public List<ScreenLockType> getVisibleScreenLockTypes(int quality, boolean includeDisabled) {
+        int upgradedQuality = upgradeQuality(quality);
+        List<ScreenLockType> locks = new ArrayList<>();
+        // EnumSet's iterator guarantees the natural order of the enums
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            if (isScreenLockVisible(lock)) {
+                if (includeDisabled || isScreenLockEnabled(lock, upgradedQuality)) {
+                    locks.add(lock);
+                }
+            }
+        }
+        return locks;
+    }
+}
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
similarity index 87%
rename from src/com/android/settings/ChooseLockPassword.java
rename to src/com/android/settings/password/ChooseLockPassword.java
index 351c2a2..d4bc076 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -14,7 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.password;
+
+import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC;
+import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC;
+import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_COMPLEX;
+import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
+import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX;
 
 import android.app.Activity;
 import android.app.Fragment;
@@ -22,10 +28,11 @@
 import android.app.admin.PasswordMetrics;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.InsetDrawable;
+import android.graphics.Insets;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.support.annotation.StringRes;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
@@ -35,12 +42,12 @@
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Log;
-import android.view.inputmethod.EditorInfo;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
@@ -51,20 +58,17 @@
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.LockPatternUtils.RequestThrottledException;
 import com.android.internal.widget.TextViewInputDisabler;
+import com.android.settings.EncryptionInterstitial;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.notification.RedactionInterstitial;
-import com.android.settings.password.PasswordRequirementAdapter;
 import com.android.setupwizardlib.GlifLayout;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC;
-import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC;
-import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_COMPLEX;
-import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
-import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX;
-
 public class ChooseLockPassword extends SettingsActivity {
     public static final String PASSWORD_MIN_KEY = "lockscreen.password_min";
     public static final String PASSWORD_MAX_KEY = "lockscreen.password_max";
@@ -84,58 +88,52 @@
         return modIntent;
     }
 
-    public static Intent createIntent(Context context, int quality,
-            int minLength, final int maxLength, boolean requirePasswordToDecrypt,
-            boolean confirmCredentials) {
-        Intent intent = new Intent().setClass(context, ChooseLockPassword.class);
-        intent.putExtra(LockPatternUtils.PASSWORD_TYPE_KEY, quality);
-        intent.putExtra(PASSWORD_MIN_KEY, minLength);
-        intent.putExtra(PASSWORD_MAX_KEY, maxLength);
-        intent.putExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, confirmCredentials);
-        intent.putExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, requirePasswordToDecrypt);
-        return intent;
-    }
+    public static class IntentBuilder {
 
-    public static Intent createIntent(Context context, int quality,
-            int minLength, final int maxLength, boolean requirePasswordToDecrypt,
-            boolean confirmCredentials, int userId) {
-        Intent intent = createIntent(context, quality, minLength, maxLength,
-                requirePasswordToDecrypt, confirmCredentials);
-        intent.putExtra(Intent.EXTRA_USER_ID, userId);
-        return intent;
-    }
+        private final Intent mIntent;
 
-    public static Intent createIntent(Context context, int quality,
-            int minLength, final int maxLength, boolean requirePasswordToDecrypt, String password) {
-        Intent intent = createIntent(context, quality, minLength, maxLength,
-                requirePasswordToDecrypt, false);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, password);
-        return intent;
-    }
+        public IntentBuilder(Context context) {
+            mIntent = new Intent(context, ChooseLockPassword.class);
+            mIntent.putExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, false);
+            mIntent.putExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, false);
+        }
 
-    public static Intent createIntent(Context context, int quality, int minLength,
-            int maxLength, boolean requirePasswordToDecrypt, String password, int userId) {
-        Intent intent = createIntent(context, quality, minLength, maxLength,
-                requirePasswordToDecrypt, password);
-        intent.putExtra(Intent.EXTRA_USER_ID, userId);
-        return intent;
-    }
+        public IntentBuilder setPasswordQuality(int quality) {
+            mIntent.putExtra(LockPatternUtils.PASSWORD_TYPE_KEY, quality);
+            return this;
+        }
 
-    public static Intent createIntent(Context context, int quality,
-            int minLength, final int maxLength, boolean requirePasswordToDecrypt, long challenge) {
-        Intent intent = createIntent(context, quality, minLength, maxLength,
-                requirePasswordToDecrypt, false);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
-        return intent;
-    }
+        public IntentBuilder setPasswordLengthRange(int min, int max) {
+            mIntent.putExtra(PASSWORD_MIN_KEY, min);
+            mIntent.putExtra(PASSWORD_MAX_KEY, max);
+            return this;
+        }
 
-    public static Intent createIntent(Context context, int quality, int minLength,
-            int maxLength, boolean requirePasswordToDecrypt, long challenge, int userId) {
-        Intent intent = createIntent(context, quality, minLength, maxLength,
-                requirePasswordToDecrypt, challenge);
-        intent.putExtra(Intent.EXTRA_USER_ID, userId);
-        return intent;
+        public IntentBuilder setUserId(int userId) {
+            mIntent.putExtra(Intent.EXTRA_USER_ID, userId);
+            return this;
+        }
+
+        public IntentBuilder setChallenge(long challenge) {
+            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
+            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+            return this;
+        }
+
+        public IntentBuilder setPassword(String password) {
+            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
+            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, password);
+            return this;
+        }
+
+        public IntentBuilder setForFingerprint(boolean forFingerprint) {
+            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, forFingerprint);
+            return this;
+        }
+
+        public Intent build() {
+            return mIntent;
+        }
     }
 
     @Override
@@ -151,7 +149,11 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        CharSequence msg = getText(R.string.lockpassword_choose_your_password_header);
+        boolean forFingerprint = getIntent()
+                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
+        CharSequence msg = getText(forFingerprint
+                ? R.string.lockpassword_choose_your_password_header_for_fingerprint
+                : R.string.lockpassword_choose_your_password_header);
         setTitle(msg);
         LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
         layout.setFitsSystemWindows(false);
@@ -180,7 +182,7 @@
         private int mPasswordMinNumeric = 0;
         private int mPasswordMinNonLetter = 0;
         private int mPasswordMinLengthToFulfillAllPolicies = 0;
-        private int mUserId;
+        protected int mUserId;
         private boolean mHideDrawer = false;
         /**
          * Password requirements that we need to verify.
@@ -193,11 +195,12 @@
         private ChooseLockSettingsHelper mChooseLockSettingsHelper;
         private Stage mUiStage = Stage.Introduction;
         private PasswordRequirementAdapter mPasswordRequirementAdapter;
+        private GlifLayout mLayout;
+        private boolean mForFingerprint;
 
-        private TextView mHeaderText;
         private String mFirstPin;
         private RecyclerView mPasswordRestrictionView;
-        private boolean mIsAlphaMode;
+        protected boolean mIsAlphaMode;
         private Button mCancelButton;
         private Button mNextButton;
 
@@ -233,27 +236,49 @@
          */
         protected enum Stage {
 
-            Introduction(R.string.lockpassword_choose_your_password_header,
+            Introduction(
+                    R.string.lockpassword_choose_your_password_header,
+                    R.string.lockpassword_choose_your_password_header_for_fingerprint,
                     R.string.lockpassword_choose_your_pin_header,
+                    R.string.lockpassword_choose_your_pin_header_for_fingerprint,
                     R.string.lockpassword_continue_label),
 
-            NeedToConfirm(R.string.lockpassword_confirm_your_password_header,
+            NeedToConfirm(
+                    R.string.lockpassword_confirm_your_password_header,
+                    R.string.lockpassword_confirm_your_password_header,
+                    R.string.lockpassword_confirm_your_pin_header,
                     R.string.lockpassword_confirm_your_pin_header,
                     R.string.lockpassword_ok_label),
 
-            ConfirmWrong(R.string.lockpassword_confirm_passwords_dont_match,
+            ConfirmWrong(
+                    R.string.lockpassword_confirm_passwords_dont_match,
+                    R.string.lockpassword_confirm_passwords_dont_match,
+                    R.string.lockpassword_confirm_pins_dont_match,
                     R.string.lockpassword_confirm_pins_dont_match,
                     R.string.lockpassword_continue_label);
 
-            Stage(int hintInAlpha, int hintInNumeric, int nextButtonText) {
+            Stage(int hintInAlpha, int hintInAlphaForFingerprint,
+                    int hintInNumeric, int hintInNumericForFingerprint, int nextButtonText) {
                 this.alphaHint = hintInAlpha;
+                this.alphaHintForFingerprint = hintInAlphaForFingerprint;
                 this.numericHint = hintInNumeric;
+                this.numericHintForFingerprint = hintInNumericForFingerprint;
                 this.buttonText = nextButtonText;
             }
 
             public final int alphaHint;
+            public final int alphaHintForFingerprint;
             public final int numericHint;
+            public final int numericHintForFingerprint;
             public final int buttonText;
+
+            public @StringRes int getHint(boolean isAlpha, boolean isFingerprint) {
+                if (isAlpha) {
+                    return isFingerprint ? alphaHintForFingerprint : alphaHint;
+                } else {
+                    return isFingerprint ? numericHintForFingerprint : numericHint;
+                }
+            }
         }
 
         // required constructor for fragments
@@ -271,6 +296,8 @@
             }
             // Only take this argument into account if it belongs to the current profile.
             mUserId = Utils.getUserIdFromBundle(getActivity(), intent.getExtras());
+            mForFingerprint = intent.getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
             processPasswordRequirements(intent);
             mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());
             mHideDrawer = getActivity().getIntent().getBooleanExtra(EXTRA_HIDE_DRAWER, false);
@@ -300,6 +327,13 @@
         public void onViewCreated(View view, Bundle savedInstanceState) {
             super.onViewCreated(view, savedInstanceState);
 
+            mLayout = (GlifLayout) view;
+
+            // Make the password container consume the optical insets so the edit text is aligned
+            // with the sides of the parent visually.
+            ViewGroup container = view.findViewById(R.id.password_container);
+            container.setOpticalInsets(Insets.NONE);
+
             mCancelButton = (Button) view.findViewById(R.id.cancel_button);
             mCancelButton.setOnClickListener(this);
             mNextButton = (Button) view.findViewById(R.id.next_button);
@@ -319,7 +353,6 @@
             mPasswordEntryInputDisabler = new TextViewInputDisabler(mPasswordEntry);
 
             final Activity activity = getActivity();
-            mHeaderText = (TextView) view.findViewById(R.id.headerText);
 
             int currentType = mPasswordEntry.getInputType();
             mPasswordEntry.setInputType(mIsAlphaMode ? currentType
@@ -357,30 +390,11 @@
                         FRAGMENT_TAG_SAVE_AND_FINISH);
             }
 
-            // Workaround to show one password requirement below EditText when IME is shown.
-            // By adding an inset to the edit text background, we make the EditText occupy more
-            // vertical space, and the keyboard will then avoid hiding it. We have also set
-            // negative margin in the layout below in order to have them show in the correct
-            // position.
-            final int visibleVerticalSpaceBelowPassword =
-                    getResources().getDimensionPixelOffset(
-                        R.dimen.visible_vertical_space_below_password);
-            InsetDrawable drawable =
-                    new InsetDrawable(
-                    mPasswordEntry.getBackground(), 0, 0, 0, visibleVerticalSpaceBelowPassword);
-            mPasswordEntry.setBackgroundDrawable(drawable);
-            LinearLayout bottomContainer = (LinearLayout) view.findViewById(R.id.bottom_container);
-            LinearLayout.LayoutParams bottomContainerLp =
-                    (LinearLayout.LayoutParams) bottomContainer.getLayoutParams();
-            bottomContainerLp.setMargins(0, -visibleVerticalSpaceBelowPassword, 0, 0);
-
             if (activity instanceof SettingsActivity) {
                 final SettingsActivity sa = (SettingsActivity) activity;
-                int id = mIsAlphaMode ? R.string.lockpassword_choose_your_password_header
-                        : R.string.lockpassword_choose_your_pin_header;
-                CharSequence title = getText(id);
+                int title = Stage.Introduction.getHint(mIsAlphaMode, mForFingerprint);
                 sa.setTitle(title);
-                ((GlifLayout) view).setHeaderText(title);
+                mLayout.setHeaderText(title);
             }
         }
 
@@ -499,7 +513,7 @@
             // If the stage changed, announce the header for accessibility. This
             // is a no-op when accessibility is disabled.
             if (previousStage != stage) {
-                mHeaderText.announceForAccessibility(mHeaderText.getText());
+                mLayout.announceForAccessibility(mLayout.getHeaderText());
             }
         }
 
@@ -798,8 +812,7 @@
             } else {
                 // Hide password requirement view when we are just asking user to confirm the pw.
                 mPasswordRestrictionView.setVisibility(View.GONE);
-                setHeaderText(getString(
-                        mIsAlphaMode ? mUiStage.alphaHint : mUiStage.numericHint));
+                setHeaderText(getString(mUiStage.getHint(mIsAlphaMode, mForFingerprint)));
                 setNextEnabled(canInput && length > 0);
             }
             setNextText(mUiStage.buttonText);
@@ -808,11 +821,11 @@
 
         private void setHeaderText(String text) {
             // Only set the text if it is different than the existing one to avoid announcing again.
-            if (!TextUtils.isEmpty(mHeaderText.getText())
-                    && mHeaderText.getText().toString().equals(text)) {
+            if (!TextUtils.isEmpty(mLayout.getHeaderText())
+                    && mLayout.getHeaderText().toString().equals(text)) {
                 return;
             }
-            mHeaderText.setText(text);
+            mLayout.setHeaderText(text);
         }
 
         public void afterTextChanged(Editable s) {
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
similarity index 93%
rename from src/com/android/settings/ChooseLockPattern.java
rename to src/com/android/settings/password/ChooseLockPattern.java
index 4afeae0..1ae2af2 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import android.app.Activity;
 import android.app.Fragment;
@@ -37,9 +37,14 @@
 import com.android.internal.widget.LockPatternView;
 import com.android.internal.widget.LockPatternView.Cell;
 import com.android.internal.widget.LockPatternView.DisplayMode;
+import com.android.settings.EncryptionInterstitial;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.notification.RedactionInterstitial;
 import com.android.setupwizardlib.GlifLayout;
+
 import com.google.android.collect.Lists;
 
 import java.util.ArrayList;
@@ -75,29 +80,40 @@
         return modIntent;
     }
 
-    public static Intent createIntent(Context context,
-            boolean requirePassword, boolean confirmCredentials, int userId) {
-        Intent intent = new Intent(context, ChooseLockPattern.class);
-        intent.putExtra("key_lock_method", "pattern");
-        intent.putExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, confirmCredentials);
-        intent.putExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, requirePassword);
-        intent.putExtra(Intent.EXTRA_USER_ID, userId);
-        return intent;
-    }
+    public static class IntentBuilder {
+        private final Intent mIntent;
 
-    public static Intent createIntent(Context context,
-            boolean requirePassword, String pattern, int userId) {
-        Intent intent = createIntent(context, requirePassword, false, userId);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, pattern);
-        return intent;
-    }
+        public IntentBuilder(Context context) {
+            mIntent = new Intent(context, ChooseLockPattern.class);
+            mIntent.putExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, false);
+            mIntent.putExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, false);
+        }
 
-    public static Intent createIntent(Context context,
-            boolean requirePassword, long challenge, int userId) {
-        Intent intent = createIntent(context, requirePassword, false, userId);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
-        return intent;
+        public IntentBuilder setUserId(int userId) {
+            mIntent.putExtra(Intent.EXTRA_USER_ID, userId);
+            return this;
+        }
+
+        public IntentBuilder setChallenge(long challenge) {
+            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
+            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+            return this;
+        }
+
+        public IntentBuilder setPattern(String pattern) {
+            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
+            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, pattern);
+            return this;
+        }
+
+        public IntentBuilder setForFingerprint(boolean forFingerprint) {
+            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, forFingerprint);
+            return this;
+        }
+
+        public Intent build() {
+            return mIntent;
+        }
     }
 
     @Override
@@ -114,8 +130,10 @@
     protected void onCreate(Bundle savedInstanceState) {
         // requestWindowFeature(Window.FEATURE_NO_TITLE);
         super.onCreate(savedInstanceState);
-        CharSequence msg = getText(R.string.lockpassword_choose_your_pattern_header);
-        setTitle(msg);
+        boolean forFingerprint = getIntent()
+                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
+        setTitle(forFingerprint ? R.string.lockpassword_choose_your_pattern_header_for_fingerprint
+                : R.string.lockpassword_choose_your_pattern_header);
         LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
         layout.setFitsSystemWindows(false);
     }
@@ -442,7 +460,7 @@
             topLayout.setDefaultTouchRecepient(mLockPatternView);
 
             final boolean confirmCredentials = getActivity().getIntent()
-                    .getBooleanExtra("confirm_credentials", true);
+                    .getBooleanExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, true);
             Intent intent = getActivity().getIntent();
             mCurrentPattern = intent.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
             mHasChallenge = intent.getBooleanExtra(
diff --git a/src/com/android/settings/ChooseLockSettingsHelper.java b/src/com/android/settings/password/ChooseLockSettingsHelper.java
similarity index 89%
rename from src/com/android/settings/ChooseLockSettingsHelper.java
rename to src/com/android/settings/password/ChooseLockSettingsHelper.java
index 6f0c453..95f5a54 100644
--- a/src/com/android/settings/ChooseLockSettingsHelper.java
+++ b/src/com/android/settings/password/ChooseLockSettingsHelper.java
@@ -14,23 +14,28 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import android.annotation.Nullable;
 import android.app.Activity;
 import android.app.Fragment;
+import android.app.KeyguardManager;
 import android.app.admin.DevicePolicyManager;
+import android.content.Context;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.os.UserManager;
+import android.provider.Settings;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
 
 public final class ChooseLockSettingsHelper {
 
-    static final String EXTRA_KEY_TYPE = "type";
-    static final String EXTRA_KEY_PASSWORD = "password";
+    public static final String EXTRA_KEY_TYPE = "type";
+    public static final String EXTRA_KEY_PASSWORD = "password";
     public static final String EXTRA_KEY_RETURN_CREDENTIALS = "return_credentials";
     public static final String EXTRA_KEY_HAS_CHALLENGE = "has_challenge";
     public static final String EXTRA_KEY_CHALLENGE = "challenge";
@@ -77,7 +82,7 @@
      * @return true if one exists and we launched an activity to confirm it
      * @see Activity#onActivityResult(int, int, android.content.Intent)
      */
-    boolean launchConfirmationActivity(int request, CharSequence title, boolean returnCredentials) {
+    public boolean launchConfirmationActivity(int request, CharSequence title, boolean returnCredentials) {
         return launchConfirmationActivity(request, title, null, null, returnCredentials, false);
     }
 
@@ -200,6 +205,21 @@
             @Nullable CharSequence header, @Nullable CharSequence description,
             boolean returnCredentials, boolean external, boolean hasChallenge,
             long challenge, int userId) {
+        return launchConfirmationActivity(request, title, header, description, returnCredentials,
+                external, hasChallenge, challenge, userId, null /* alternateButton */);
+    }
+
+    public boolean launchFrpConfirmationActivity(int request, @Nullable CharSequence header,
+            @Nullable CharSequence description, @Nullable CharSequence alternateButton) {
+        return launchConfirmationActivity(request, null /* title */, header, description,
+                false /* returnCredentials */, true /* external */, false /* hasChallenge */,
+                0 /* challenge */, LockPatternUtils.USER_FRP, alternateButton);
+    }
+
+    private boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
+            @Nullable CharSequence header, @Nullable CharSequence description,
+            boolean returnCredentials, boolean external, boolean hasChallenge,
+            long challenge, int userId, @Nullable CharSequence alternateButton) {
         final int effectiveUserId = UserManager.get(mActivity).getCredentialOwnerProfile(userId);
         boolean launched = false;
 
@@ -209,7 +229,7 @@
                         returnCredentials || hasChallenge
                                 ? ConfirmLockPattern.InternalActivity.class
                                 : ConfirmLockPattern.class, returnCredentials, external,
-                                hasChallenge, challenge, userId);
+                                hasChallenge, challenge, userId, alternateButton);
                 break;
             case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
             case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
@@ -221,7 +241,7 @@
                         returnCredentials || hasChallenge
                                 ? ConfirmLockPassword.InternalActivity.class
                                 : ConfirmLockPassword.class, returnCredentials, external,
-                                hasChallenge, challenge, userId);
+                                hasChallenge, challenge, userId, alternateButton);
                 break;
         }
         return launched;
@@ -230,7 +250,7 @@
     private boolean launchConfirmationActivity(int request, CharSequence title, CharSequence header,
             CharSequence message, Class<?> activityClass, boolean returnCredentials,
             boolean external, boolean hasChallenge, long challenge,
-            int userId) {
+            int userId, @Nullable CharSequence alternateButton) {
         final Intent intent = new Intent();
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.TITLE_TEXT, title);
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.HEADER_TEXT, header);
@@ -245,6 +265,7 @@
         // we should never have a drawer when confirming device credentials.
         intent.putExtra(SettingsActivity.EXTRA_HIDE_DRAWER, true);
         intent.putExtra(Intent.EXTRA_USER_ID, userId);
+        intent.putExtra(KeyguardManager.EXTRA_ALTERNATE_BUTTON_LABEL, alternateButton);
         intent.setClassName(ConfirmDeviceCredentialBaseFragment.PACKAGE, activityClass.getName());
         if (external) {
             intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
diff --git a/src/com/android/settings/password/ChooseLockTypeDialogFragment.java b/src/com/android/settings/password/ChooseLockTypeDialogFragment.java
new file mode 100644
index 0000000..ba69e64
--- /dev/null
+++ b/src/com/android/settings/password/ChooseLockTypeDialogFragment.java
@@ -0,0 +1,158 @@
+/*
+ * 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.password;
+
+import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
+import android.app.Dialog;
+import android.app.Fragment;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
+import java.util.List;
+
+/**
+ * A dialog fragment similar to {@link ChooseLockGeneric} where the user can select from a few
+ * lock screen types.
+ */
+public class ChooseLockTypeDialogFragment extends InstrumentedDialogFragment
+        implements OnClickListener {
+
+    private static final String ARG_USER_ID = "userId";
+    private static final String ARG_EXCLUDE_LOCK = "excludeLock";
+
+    private ScreenLockAdapter mAdapter;
+    private ChooseLockGenericController mController;
+
+    public static ChooseLockTypeDialogFragment newInstance(int userId, String excludeLock) {
+        Bundle args = new Bundle();
+        args.putInt(ARG_USER_ID, userId);
+        args.putString(ARG_EXCLUDE_LOCK, excludeLock);
+        ChooseLockTypeDialogFragment fragment = new ChooseLockTypeDialogFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    public interface OnLockTypeSelectedListener {
+        void onLockTypeSelected(ScreenLockType lock);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final int userId = getArguments().getInt(ARG_USER_ID);
+        mController = new ChooseLockGenericController(getContext(), userId);
+    }
+
+    @Override
+    public void onClick(DialogInterface dialogInterface, int i) {
+        OnLockTypeSelectedListener listener = null;
+        Fragment parentFragment = getParentFragment();
+        if (parentFragment instanceof OnLockTypeSelectedListener) {
+            listener = (OnLockTypeSelectedListener) parentFragment;
+        } else {
+            Context context = getContext();
+            if (context instanceof OnLockTypeSelectedListener) {
+                listener = (OnLockTypeSelectedListener) context;
+            }
+        }
+        if (listener != null) {
+            listener.onLockTypeSelected(mAdapter.getItem(i));
+        }
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        Context context = getContext();
+        Builder builder = new Builder(context);
+        List<ScreenLockType> locks =
+                mController.getVisibleScreenLockTypes(
+                        DevicePolicyManager.PASSWORD_QUALITY_SOMETHING,
+                        false /* includeDisabled */);
+        String excludeLockName = getArguments().getString(ARG_EXCLUDE_LOCK);
+        if (excludeLockName != null) {
+            locks.remove(ScreenLockType.valueOf(excludeLockName));
+        }
+        mAdapter = new ScreenLockAdapter(context, locks, mController);
+        builder.setAdapter(mAdapter, this);
+        builder.setTitle(R.string.setup_lock_settings_options_dialog_title);
+        AlertDialog alertDialog = builder.create();
+        return alertDialog;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.SETTINGS_CHOOSE_LOCK_DIALOG;
+    }
+
+    private static class ScreenLockAdapter extends ArrayAdapter<ScreenLockType> {
+
+        private final ChooseLockGenericController mController;
+
+        ScreenLockAdapter(
+                Context context,
+                List<ScreenLockType> locks,
+                ChooseLockGenericController controller) {
+            super(context, R.layout.choose_lock_dialog_item, locks);
+            mController = controller;
+        }
+
+        @Override
+        public View getView(int position, View view, ViewGroup parent) {
+            Context context = parent.getContext();
+            if (view == null) {
+                view = LayoutInflater.from(context)
+                        .inflate(R.layout.choose_lock_dialog_item, parent, false);
+            }
+            ScreenLockType lock = getItem(position);
+            TextView textView = (TextView) view;
+            textView.setText(mController.getTitle(lock));
+            textView.setCompoundDrawablesRelativeWithIntrinsicBounds(
+                    getIconForScreenLock(context, lock), null, null, null);
+            return view;
+        }
+
+        private static Drawable getIconForScreenLock(Context context, ScreenLockType lock) {
+            switch (lock) {
+                case PATTERN:
+                    return context.getDrawable(R.drawable.ic_pattern);
+                case PIN:
+                    return context.getDrawable(R.drawable.ic_pin);
+                case PASSWORD:
+                    return context.getDrawable(R.drawable.ic_password);
+                case NONE:
+                case SWIPE:
+                case MANAGED:
+                default:
+                        return null;
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
similarity index 91%
rename from src/com/android/settings/ConfirmDeviceCredentialActivity.java
rename to src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
index 22f1e52..65d72f1 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import android.app.Activity;
 import android.app.KeyguardManager;
@@ -27,6 +27,7 @@
 import android.util.Log;
 
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.Utils;
 
 /**
  * Launch this when you want to confirm the user is present by asking them to enter their
@@ -65,6 +66,10 @@
         Intent intent = getIntent();
         String title = intent.getStringExtra(KeyguardManager.EXTRA_TITLE);
         String details = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION);
+        String alternateButton = intent.getStringExtra(
+                KeyguardManager.EXTRA_ALTERNATE_BUTTON_LABEL);
+        boolean frp = KeyguardManager.ACTION_CONFIRM_FRP_CREDENTIAL.equals(intent.getAction());
+
         int userId = Utils.getCredentialOwnerUserId(this);
         if (isInternalActivity()) {
             try {
@@ -85,7 +90,9 @@
         // If the target is a managed user and user key not unlocked yet, we will force unlock
         // tied profile so it will enable work mode and unlock managed profile, when personal
         // challenge is unlocked.
-        if (isManagedProfile && isInternalActivity()
+        if (frp) {
+            launched = helper.launchFrpConfirmationActivity(0, title, details, alternateButton);
+        } else if (isManagedProfile && isInternalActivity()
                 && !lockPatternUtils.isSeparateProfileChallengeEnabled(userId)) {
             // We set the challenge as 0L, so it will force to unlock managed profile when it
             // unlocks primary profile screen lock, by calling verifyTiedProfileChallenge()
diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
similarity index 96%
rename from src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
rename to src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
index 489dbbe..2de955f 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import android.app.Fragment;
 import android.app.KeyguardManager;
@@ -24,6 +24,10 @@
 import android.view.WindowManager;
 import android.widget.LinearLayout;
 
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
+
 public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivity {
 
     private static final String STATE_IS_KEYGUARD_LOCKED = "STATE_IS_KEYGUARD_LOCKED";
@@ -52,7 +56,7 @@
             setTheme(R.style.Theme_ConfirmDeviceCredentialsDark);
             mConfirmCredentialTheme = ConfirmCredentialTheme.DARK;
         } else {
-            setTheme(R.style.SetupWizardTheme_Light);
+            setTheme(R.style.GlifTheme_Light);
             mConfirmCredentialTheme = ConfirmCredentialTheme.INTERNAL;
         }
         super.onCreate(savedState);
diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
similarity index 73%
rename from src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
rename to src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
index 2c97e1a..64f3a6f 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
@@ -15,7 +15,7 @@
  */
 
 // TODO (b/35202196): move this class out of the root of the package.
-package com.android.settings;
+package com.android.settings.password;
 
 import android.annotation.Nullable;
 import android.app.ActivityManager;
@@ -25,12 +25,14 @@
 import android.app.DialogFragment;
 import android.app.FragmentManager;
 import android.app.IActivityManager;
+import android.app.KeyguardManager;
 import android.app.admin.DevicePolicyManager;
 import android.app.trust.TrustManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentSender;
+import android.content.pm.UserInfo;
 import android.graphics.Point;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.ColorDrawable;
@@ -39,6 +41,7 @@
 import android.os.Handler;
 import android.os.RemoteException;
 import android.os.UserManager;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -47,6 +50,9 @@
 import android.widget.TextView;
 
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.OptionsMenuFragment;
+import com.android.settings.R;
+import com.android.settings.Utils;
 import com.android.settings.fingerprint.FingerprintUiHelper;
 
 /**
@@ -67,6 +73,10 @@
     public static final String SHOW_WHEN_LOCKED =
             PACKAGE + ".ConfirmCredentials.showWhenLocked";
 
+    protected static final int USER_TYPE_PRIMARY = 1;
+    protected static final int USER_TYPE_MANAGED_PROFILE = 2;
+    protected static final int USER_TYPE_SECONDARY = 3;
+
     private FingerprintUiHelper mFingerprintHelper;
     protected boolean mReturnCredentials = false;
     protected Button mCancelButton;
@@ -75,20 +85,28 @@
     protected int mUserId;
     protected UserManager mUserManager;
     protected LockPatternUtils mLockPatternUtils;
+    protected DevicePolicyManager mDevicePolicyManager;
     protected TextView mErrorTextView;
     protected final Handler mHandler = new Handler();
+    protected boolean mFrp;
+    private CharSequence mFrpAlternateButtonText;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        mFrpAlternateButtonText = getActivity().getIntent().getCharSequenceExtra(
+                KeyguardManager.EXTRA_ALTERNATE_BUTTON_LABEL);
         mReturnCredentials = getActivity().getIntent().getBooleanExtra(
                 ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, false);
         // Only take this argument into account if it belongs to the current profile.
         Intent intent = getActivity().getIntent();
         mUserId = Utils.getUserIdFromBundle(getActivity(), intent.getExtras());
+        mFrp = (mUserId == LockPatternUtils.USER_FRP);
         mUserManager = UserManager.get(getActivity());
         mEffectiveUserId = mUserManager.getCredentialOwnerProfile(mUserId);
         mLockPatternUtils = new LockPatternUtils(getActivity());
+        mDevicePolicyManager = (DevicePolicyManager) getActivity().getSystemService(
+                Context.DEVICE_POLICY_SERVICE);
     }
 
     @Override
@@ -101,10 +119,18 @@
                 (TextView) view.findViewById(R.id.errorText), this, mEffectiveUserId);
         boolean showCancelButton = getActivity().getIntent().getBooleanExtra(
                 SHOW_CANCEL_BUTTON, false);
-        mCancelButton.setVisibility(showCancelButton ? View.VISIBLE : View.GONE);
+        boolean hasAlternateButton = mFrp && !TextUtils.isEmpty(mFrpAlternateButtonText);
+        mCancelButton.setVisibility(showCancelButton || hasAlternateButton
+                ? View.VISIBLE : View.GONE);
+        if (hasAlternateButton) {
+            mCancelButton.setText(mFrpAlternateButtonText);
+        }
         mCancelButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (hasAlternateButton) {
+                    getActivity().setResult(KeyguardManager.RESULT_ALTERNATE);
+                }
                 getActivity().finish();
             }
         });
@@ -119,9 +145,8 @@
     }
 
     private boolean isFingerprintDisabledByAdmin() {
-        DevicePolicyManager dpm = (DevicePolicyManager) getActivity().getSystemService(
-                Context.DEVICE_POLICY_SERVICE);
-        final int disabledFeatures = dpm.getKeyguardDisabledFeatures(null, mEffectiveUserId);
+        final int disabledFeatures =
+                mDevicePolicyManager.getKeyguardDisabledFeatures(null, mEffectiveUserId);
         return (disabledFeatures & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) != 0;
     }
 
@@ -129,15 +154,16 @@
     // credential. Otherwise, fingerprint can't unlock fbe/keystore through
     // verifyTiedProfileChallenge. In such case, we also wanna show the user message that
     // fingerprint is disabled due to device restart.
-    protected boolean isFingerprintDisallowedByStrongAuth() {
-        return !(mLockPatternUtils.isFingerprintAllowedForUser(mEffectiveUserId)
-                && mUserManager.isUserUnlocked(mUserId));
+    protected boolean isStrongAuthRequired() {
+        return mFrp
+                || !mLockPatternUtils.isFingerprintAllowedForUser(mEffectiveUserId)
+                || !mUserManager.isUserUnlocked(mUserId);
     }
 
     private boolean isFingerprintAllowed() {
         return !mReturnCredentials
                 && getActivity().getIntent().getBooleanExtra(ALLOW_FP_AUTHENTICATION, false)
-                && !isFingerprintDisallowedByStrongAuth()
+                && !isStrongAuthRequired()
                 && !isFingerprintDisabledByAdmin();
     }
 
@@ -155,10 +181,7 @@
                 mFingerprintHelper.stopListening();
             }
         }
-        if (isProfileChallenge()) {
-            updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(
-                    mEffectiveUserId));
-        }
+        updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId));
     }
 
     protected void setAccessibilityTitle(CharSequence supplementalText) {
@@ -242,9 +265,8 @@
             mainContent.setPadding(0, 0, 0, 0);
         }
 
-        DevicePolicyManager dpm = (DevicePolicyManager) getActivity().getSystemService(
-                Context.DEVICE_POLICY_SERVICE);
-        baseView.setBackground(new ColorDrawable(dpm.getOrganizationColorForUser(userId)));
+        baseView.setBackground(
+                new ColorDrawable(mDevicePolicyManager.getOrganizationColorForUser(userId)));
         ImageView imageView = (ImageView) baseView.findViewById(R.id.background_image);
         if (imageView != null) {
             Drawable image = getResources().getDrawable(R.drawable.work_challenge_background);
@@ -260,13 +282,9 @@
         }
     }
 
-    protected boolean isProfileChallenge() {
-        return mUserManager.isManagedProfile(mEffectiveUserId);
-    }
-
-    protected void reportSuccessfullAttempt() {
-        if (isProfileChallenge()) {
-            mLockPatternUtils.reportSuccessfulPasswordAttempt(mEffectiveUserId);
+    protected void reportSuccessfulAttempt() {
+        mLockPatternUtils.reportSuccessfulPasswordAttempt(mEffectiveUserId);
+        if (mUserManager.isManagedProfile(mEffectiveUserId)) {
             // Keyguard is responsible to disable StrongAuth for primary user. Disable StrongAuth
             // for work challenge only here.
             mLockPatternUtils.userPresent(mEffectiveUserId);
@@ -274,40 +292,73 @@
     }
 
     protected void reportFailedAttempt() {
-        if (isProfileChallenge()) {
-            // + 1 for this attempt.
-            updateErrorMessage(
-                    mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId) + 1);
-            mLockPatternUtils.reportFailedPasswordAttempt(mEffectiveUserId);
-        }
+        updateErrorMessage(
+                mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId) + 1);
+        mLockPatternUtils.reportFailedPasswordAttempt(mEffectiveUserId);
     }
 
     protected void updateErrorMessage(int numAttempts) {
         final int maxAttempts =
                 mLockPatternUtils.getMaximumFailedPasswordsForWipe(mEffectiveUserId);
-        if (maxAttempts > 0 && numAttempts > 0) {
-            int remainingAttempts = maxAttempts - numAttempts;
-            if (remainingAttempts == 1) {
-                // Last try
-                final String title = getActivity().getString(
-                        R.string.lock_profile_wipe_warning_title);
-                LastTryDialog.show(getFragmentManager(), title, getLastTryErrorMessage(),
-                        android.R.string.ok, false /* dismiss */);
-            } else if (remainingAttempts <= 0) {
-                // Profile is wiped
-                LastTryDialog.show(getFragmentManager(), null /* title */,
-                        R.string.lock_profile_wipe_content, R.string.lock_profile_wipe_dismiss,
-                        true /* dismiss */);
-            }
-            if (mErrorTextView != null) {
-                final String message = getActivity().getString(R.string.lock_profile_wipe_attempts,
-                        numAttempts, maxAttempts);
-                showError(message, 0);
-            }
+        if (maxAttempts <= 0 || numAttempts <= 0) {
+            return;
+        }
+
+        // Update the on-screen error string
+        if (mErrorTextView != null) {
+            final String message = getActivity().getString(
+                    R.string.lock_failed_attempts_before_wipe, numAttempts, maxAttempts);
+            showError(message, 0);
+        }
+
+        // Only show popup dialog before the last attempt and before wipe
+        final int remainingAttempts = maxAttempts - numAttempts;
+        if (remainingAttempts > 1) {
+            return;
+        }
+        final FragmentManager fragmentManager = getChildFragmentManager();
+        final int userType = getUserTypeForWipe();
+        if (remainingAttempts == 1) {
+            // Last try
+            final String title = getActivity().getString(
+                    R.string.lock_last_attempt_before_wipe_warning_title);
+            final int messageId = getLastTryErrorMessage(userType);
+            LastTryDialog.show(fragmentManager, title, messageId,
+                    android.R.string.ok, false /* dismiss */);
+        } else {
+            // Device, profile, or secondary user is wiped
+            final int messageId = getWipeMessage(userType);
+            LastTryDialog.show(fragmentManager, null /* title */, messageId,
+                    R.string.lock_failed_attempts_now_wiping_dialog_dismiss, true /* dismiss */);
         }
     }
 
-    protected abstract int getLastTryErrorMessage();
+    private int getUserTypeForWipe() {
+        final UserInfo userToBeWiped = mUserManager.getUserInfo(
+                mDevicePolicyManager.getProfileWithMinimumFailedPasswordsForWipe(mEffectiveUserId));
+        if (userToBeWiped == null || userToBeWiped.isPrimary()) {
+            return USER_TYPE_PRIMARY;
+        } else if (userToBeWiped.isManagedProfile()) {
+            return USER_TYPE_MANAGED_PROFILE;
+        } else {
+            return USER_TYPE_SECONDARY;
+        }
+    }
+
+    protected abstract int getLastTryErrorMessage(int userType);
+
+    private int getWipeMessage(int userType) {
+        switch (userType) {
+            case USER_TYPE_PRIMARY:
+                return R.string.lock_failed_attempts_now_wiping_device;
+            case USER_TYPE_MANAGED_PROFILE:
+                return R.string.lock_failed_attempts_now_wiping_profile;
+            case USER_TYPE_SECONDARY:
+                return R.string.lock_failed_attempts_now_wiping_user;
+            default:
+                throw new IllegalArgumentException("Unrecognized user type:" + userType);
+        }
+    }
 
     private final Runnable mResetErrorRunnable = new Runnable() {
         @Override
@@ -354,6 +405,7 @@
             DialogFragment dialog = new LastTryDialog();
             dialog.setArguments(args);
             dialog.show(from, TAG);
+            from.executePendingTransactions();
             return true;
         }
 
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java
similarity index 92%
rename from src/com/android/settings/ConfirmLockPassword.java
rename to src/com/android/settings/password/ConfirmLockPassword.java
index 9a285f2..9a494cb 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/password/ConfirmLockPassword.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import android.app.Fragment;
 import android.app.admin.DevicePolicyManager;
@@ -43,6 +43,7 @@
 import com.android.internal.widget.LockPatternChecker;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.TextViewInputDisabler;
+import com.android.settings.R;
 import com.android.settingslib.animation.AppearAnimationUtils;
 import com.android.settingslib.animation.DisappearAnimationUtils;
 
@@ -133,9 +134,14 @@
 
             mPasswordEntry = (TextView) view.findViewById(R.id.password_entry);
             mPasswordEntry.setOnEditorActionListener(this);
+            // EditText inside ScrollView doesn't automatically get focus.
+            mPasswordEntry.requestFocus();
             mPasswordEntryInputDisabler = new TextViewInputDisabler(mPasswordEntry);
 
             mHeaderTextView = (TextView) view.findViewById(R.id.headerText);
+            if (mHeaderTextView == null) {
+                mHeaderTextView = view.findViewById(R.id.suw_layout_title);
+            }
             mDetailsTextView = (TextView) view.findViewById(R.id.detailsText);
             mErrorTextView = (TextView) view.findViewById(R.id.errorText);
             mIsAlpha = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC == storedQuality
@@ -191,7 +197,7 @@
         }
 
         private int getDefaultDetails() {
-            boolean isStrongAuthRequired = isFingerprintDisallowedByStrongAuth();
+            boolean isStrongAuthRequired = isStrongAuthRequired();
             boolean isProfile = UserManager.get(getActivity()).isManagedProfile(mEffectiveUserId);
             // Map boolean flags to an index by isStrongAuth << 2 + isProfile << 1 + isAlpha.
             int index = ((isStrongAuthRequired ? 1 : 0) << 2) + ((isProfile ? 1 : 0) << 1)
@@ -205,9 +211,20 @@
         }
 
         @Override
-        protected int getLastTryErrorMessage() {
-            return mIsAlpha ? R.string.lock_profile_wipe_warning_content_password
-                    : R.string.lock_profile_wipe_warning_content_pin;
+        protected int getLastTryErrorMessage(int userType) {
+            switch (userType) {
+                case USER_TYPE_PRIMARY:
+                    return mIsAlpha ? R.string.lock_last_password_attempt_before_wipe_device
+                            : R.string.lock_last_pin_attempt_before_wipe_device;
+                case USER_TYPE_MANAGED_PROFILE:
+                    return mIsAlpha ? R.string.lock_last_password_attempt_before_wipe_profile
+                            : R.string.lock_last_pin_attempt_before_wipe_profile;
+                case USER_TYPE_SECONDARY:
+                    return mIsAlpha ? R.string.lock_last_password_attempt_before_wipe_user
+                            : R.string.lock_last_pin_attempt_before_wipe_user;
+                default:
+                    throw new IllegalArgumentException("Unrecognized user type:" + userType);
+            }
         }
 
         @Override
@@ -272,10 +289,8 @@
             } else {
                 resetState();
                 mErrorTextView.setText("");
-                if (isProfileChallenge()) {
-                    updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(
-                            mEffectiveUserId));
-                }
+                updateErrorMessage(
+                        mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId));
             }
             mCredentialCheckResultTracker.setListener(this);
         }
@@ -438,7 +453,7 @@
             mPasswordEntryInputDisabler.setInputEnabled(true);
             if (matched) {
                 if (newResult) {
-                    reportSuccessfullAttempt();
+                    reportSuccessfulAttempt();
                 }
                 startDisappearAnimation(intent);
                 checkForPendingIntent();
@@ -487,10 +502,8 @@
                 public void onFinish() {
                     resetState();
                     mErrorTextView.setText("");
-                    if (isProfileChallenge()) {
-                        updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(
-                                mEffectiveUserId));
-                    }
+                    updateErrorMessage(
+                            mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId));
                 }
             }.start();
         }
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java
similarity index 93%
rename from src/com/android/settings/ConfirmLockPattern.java
rename to src/com/android/settings/password/ConfirmLockPattern.java
index 56d92f1..2931596 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/password/ConfirmLockPattern.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -37,6 +37,7 @@
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.LockPatternView;
 import com.android.internal.widget.LockPatternView.Cell;
+import com.android.settings.R;
 import com.android.settingslib.animation.AppearAnimationCreator;
 import com.android.settingslib.animation.AppearAnimationUtils;
 import com.android.settingslib.animation.DisappearAnimationUtils;
@@ -153,7 +154,13 @@
                 // on first launch, if no lock pattern is set, then finish with
                 // success (don't want user to get stuck confirming something that
                 // doesn't exist).
-                if (!mLockPatternUtils.isLockPatternEnabled(mEffectiveUserId)) {
+                // Don't do this check for FRP though, because the pattern is not stored
+                // in a way that isLockPatternEnabled is aware of for that case.
+                // TODO(roosa): This block should no longer be needed since we removed the
+                //              ability to disable the pattern in L. Remove this block after
+                //              ensuring it's safe to do so. (Note that ConfirmLockPassword
+                //              doesn't have this).
+                if (!mFrp && !mLockPatternUtils.isLockPatternEnabled(mEffectiveUserId)) {
                     getActivity().setResult(Activity.RESULT_OK);
                     getActivity().finish();
                 }
@@ -236,7 +243,7 @@
         }
 
         private int getDefaultDetails() {
-            boolean isStrongAuthRequired = isFingerprintDisallowedByStrongAuth();
+            boolean isStrongAuthRequired = isStrongAuthRequired();
             if (UserManager.get(getActivity()).isManagedProfile(mEffectiveUserId)) {
                 return isStrongAuthRequired
                         ? R.string.lockpassword_strong_auth_required_reason_restart_work_pattern
@@ -297,10 +304,8 @@
                         mDetailsTextView.setText(getDefaultDetails());
                     }
                     mErrorTextView.setText("");
-                    if (isProfileChallenge()) {
-                        updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(
-                                mEffectiveUserId));
-                    }
+                    updateErrorMessage(
+                            mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId));
 
                     mLockPatternView.setEnabled(true);
                     mLockPatternView.enableInput();
@@ -495,7 +500,7 @@
             mLockPatternView.setEnabled(true);
             if (matched) {
                 if (newResult) {
-                    reportSuccessfullAttempt();
+                    reportSuccessfulAttempt();
                 }
                 startDisappearAnimation(intent);
                 checkForPendingIntent();
@@ -522,8 +527,17 @@
         }
 
         @Override
-        protected int getLastTryErrorMessage() {
-            return R.string.lock_profile_wipe_warning_content_pattern;
+        protected int getLastTryErrorMessage(int userType) {
+            switch (userType) {
+                case USER_TYPE_PRIMARY:
+                    return R.string.lock_last_pattern_attempt_before_wipe_device;
+                case USER_TYPE_MANAGED_PROFILE:
+                    return R.string.lock_last_pattern_attempt_before_wipe_profile;
+                case USER_TYPE_SECONDARY:
+                    return R.string.lock_last_pattern_attempt_before_wipe_user;
+                default:
+                    throw new IllegalArgumentException("Unrecognized user type:" + userType);
+            }
         }
 
         private void handleAttemptLockout(long elapsedRealtimeDeadline) {
diff --git a/src/com/android/settings/CredentialCheckResultTracker.java b/src/com/android/settings/password/CredentialCheckResultTracker.java
similarity index 98%
rename from src/com/android/settings/CredentialCheckResultTracker.java
rename to src/com/android/settings/password/CredentialCheckResultTracker.java
index cfd6f29..a17939c 100644
--- a/src/com/android/settings/CredentialCheckResultTracker.java
+++ b/src/com/android/settings/password/CredentialCheckResultTracker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import android.app.Fragment;
 import android.content.Intent;
diff --git a/src/com/android/settings/ManagedLockPasswordProvider.java b/src/com/android/settings/password/ManagedLockPasswordProvider.java
similarity index 90%
rename from src/com/android/settings/ManagedLockPasswordProvider.java
rename to src/com/android/settings/password/ManagedLockPasswordProvider.java
index b9725d7..09fe104 100644
--- a/src/com/android/settings/ManagedLockPasswordProvider.java
+++ b/src/com/android/settings/password/ManagedLockPasswordProvider.java
@@ -14,11 +14,13 @@
  * limitations under the License
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import android.content.Context;
 import android.content.Intent;
 
+import com.android.settings.R;
+
 /**
  * Helper for handling managed passwords in security settings UI.
  * It provides resources that should be shown in settings UI when lock password quality is set to
@@ -28,7 +30,7 @@
  */
 public class ManagedLockPasswordProvider {
     /** Factory method to make it easier to inject extended ManagedLockPasswordProviders. */
-    static ManagedLockPasswordProvider get(Context context, int userId) {
+    public static ManagedLockPasswordProvider get(Context context, int userId) {
         return new ManagedLockPasswordProvider();
     }
 
@@ -50,7 +52,7 @@
      * Should be overridden if {@link #isManagedPasswordSupported()} returns true.
      * @param forFingerprint Whether fingerprint unlock is enabled.
      */
-    String getPickerOptionTitle(boolean forFingerprint) { return ""; }
+    CharSequence getPickerOptionTitle(boolean forFingerprint) { return ""; }
 
     /**
      * Gets resource id of the lock screen preference that should be displayed in security settings
@@ -58,7 +60,7 @@
      * {@link android.app.admin.DevicePolicyManager#PASSWORD_QUALITY_MANAGED}.
      * @param forProfile Whether the settings are shown for a user profile rather than a user.
      */
-    int getResIdForLockUnlockScreen(boolean forProfile) {
+    public int getResIdForLockUnlockScreen(boolean forProfile) {
         return forProfile ? R.xml.security_settings_password_profile
                 : R.xml.security_settings_password;
     }
@@ -68,7 +70,7 @@
      * screen preference in security settings if the current password quality is set to
      * {@link android.app.admin.DevicePolicyManager#PASSWORD_QUALITY_MANAGED}.
      */
-    int getResIdForLockUnlockSubScreen() {
+    public int getResIdForLockUnlockSubScreen() {
         return R.xml.security_settings_password_sub;
     }
 
diff --git a/src/com/android/settings/password/PasswordRequirementAdapter.java b/src/com/android/settings/password/PasswordRequirementAdapter.java
index b05d8b8..5fcd8a9 100644
--- a/src/com/android/settings/password/PasswordRequirementAdapter.java
+++ b/src/com/android/settings/password/PasswordRequirementAdapter.java
@@ -23,12 +23,10 @@
 import android.widget.TextView;
 
 import com.android.settings.R;
-
-import static com.android.settings.password.PasswordRequirementAdapter
-        .PasswordRequirementViewHolder;
+import com.android.settings.password.PasswordRequirementAdapter.PasswordRequirementViewHolder;
 
 /**
- * Used in {@link com.android.settings.ChooseLockPassword} to show password requirements.
+ * Used in {@link ChooseLockPassword} to show password requirements.
  */
 public class PasswordRequirementAdapter extends
         RecyclerView.Adapter<PasswordRequirementViewHolder> {
diff --git a/src/com/android/settings/SaveChosenLockWorkerBase.java b/src/com/android/settings/password/SaveChosenLockWorkerBase.java
similarity index 98%
rename from src/com/android/settings/SaveChosenLockWorkerBase.java
rename to src/com/android/settings/password/SaveChosenLockWorkerBase.java
index 7ce7a90..95980e9 100644
--- a/src/com/android/settings/SaveChosenLockWorkerBase.java
+++ b/src/com/android/settings/password/SaveChosenLockWorkerBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import android.app.Fragment;
 import android.content.Context;
diff --git a/src/com/android/settings/password/ScreenLockType.java b/src/com/android/settings/password/ScreenLockType.java
new file mode 100644
index 0000000..608c8f6
--- /dev/null
+++ b/src/com/android/settings/password/ScreenLockType.java
@@ -0,0 +1,110 @@
+/*
+ * 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.password;
+
+import android.app.admin.DevicePolicyManager;
+
+/**
+ * List of screen lock type options that are available in ChooseLockGeneric. Provides the key and
+ * the associated quality, and also some helper functions to translate between them.
+ */
+public enum ScreenLockType {
+
+    NONE(
+            DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED,
+            "unlock_set_off"),
+    SWIPE(
+            DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED,
+            "unlock_set_none"),
+    PATTERN(
+            DevicePolicyManager.PASSWORD_QUALITY_SOMETHING,
+            "unlock_set_pattern"),
+    PIN(
+            DevicePolicyManager.PASSWORD_QUALITY_NUMERIC,
+            DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX,
+            "unlock_set_pin"),
+    PASSWORD(
+            DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC,
+            DevicePolicyManager.PASSWORD_QUALITY_COMPLEX,
+            "unlock_set_password"),
+    MANAGED(
+            DevicePolicyManager.PASSWORD_QUALITY_MANAGED,
+            "unlock_set_managed");
+
+    private static final ScreenLockType MIN_QUALITY = ScreenLockType.NONE;
+    private static final ScreenLockType MAX_QUALITY = ScreenLockType.MANAGED;
+
+    /**
+     * The default quality of the type of lock used. For example, in the case of PIN, the default
+     * quality if PASSWORD_QUALITY_NUMERIC, while the highest quality is
+     * PASSWORD_QUALITY_NUMERIC_COMPLEX.
+     */
+    public final int defaultQuality;
+
+    /**
+     * The highest quality for the given type of lock. For example, in the case of password, the
+     * default quality is PASSWORD_QUALITY_ALPHABETIC, but the highest possible quality is
+     * PASSWORD_QUALITY_COMPLEX.
+     */
+    public final int maxQuality;
+
+    public final String preferenceKey;
+
+    ScreenLockType(int quality, String preferenceKey) {
+        this(quality, quality, preferenceKey);
+    }
+
+    ScreenLockType(int defaultQuality, int maxQuality, String preferenceKey) {
+        this.defaultQuality = defaultQuality;
+        this.maxQuality = maxQuality;
+        this.preferenceKey = preferenceKey;
+    }
+
+    /**
+     * Gets the screen lock type for the given quality. Note that this method assumes that a screen
+     * lock is enabled, which means if the quality is
+     * {@link DevicePolicyManager#PASSWORD_QUALITY_UNSPECIFIED}, the returned type will be
+     * {@link #SWIPE} and not {@link #NONE}.
+     */
+    public static ScreenLockType fromQuality(int quality) {
+        switch (quality) {
+            case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
+                return ScreenLockType.PATTERN;
+            case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
+                return ScreenLockType.PIN;
+            case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
+                return ScreenLockType.PASSWORD;
+            case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
+                return ScreenLockType.MANAGED;
+            case DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED:
+                return ScreenLockType.SWIPE;
+        }
+        return null;
+    }
+
+    public static ScreenLockType fromKey(String key) {
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            if (lock.preferenceKey.equals(key)) {
+                return lock;
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/com/android/settings/password/SetNewPasswordActivity.java b/src/com/android/settings/password/SetNewPasswordActivity.java
index 4692609..99f67cb 100644
--- a/src/com/android/settings/password/SetNewPasswordActivity.java
+++ b/src/com/android/settings/password/SetNewPasswordActivity.java
@@ -25,8 +25,6 @@
 import android.os.Bundle;
 import android.util.Log;
 
-import com.android.settings.ChooseLockGeneric;
-import com.android.settings.SetupChooseLockGeneric;
 import com.android.settings.Utils;
 
 /**
diff --git a/src/com/android/settings/password/SetNewPasswordController.java b/src/com/android/settings/password/SetNewPasswordController.java
index 9443541..57aa8c1 100644
--- a/src/com/android/settings/password/SetNewPasswordController.java
+++ b/src/com/android/settings/password/SetNewPasswordController.java
@@ -19,6 +19,7 @@
 import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD;
 import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT;
 import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
+
 import static com.android.internal.util.Preconditions.checkNotNull;
 
 import android.annotation.Nullable;
@@ -34,8 +35,6 @@
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.ChooseLockGeneric;
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.Utils;
 
 /**
diff --git a/src/com/android/settings/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java
similarity index 69%
rename from src/com/android/settings/SetupChooseLockGeneric.java
rename to src/com/android/settings/password/SetupChooseLockGeneric.java
index 2c8195d..4e73b87 100644
--- a/src/com/android/settings/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/password/SetupChooseLockGeneric.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
@@ -31,6 +31,9 @@
 import android.widget.LinearLayout;
 
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
+import com.android.settings.SetupEncryptionInterstitial;
+import com.android.settings.SetupWizardUtils;
 import com.android.settings.fingerprint.SetupFingerprintEnrollFindSensor;
 import com.android.settings.fingerprint.SetupSkipDialog;
 import com.android.settings.utils.SettingsDividerItemDecoration;
@@ -108,20 +111,16 @@
 
         @Override
         public void onActivityResult(int requestCode, int resultCode, Intent data) {
-            if (resultCode != RESULT_CANCELED) {
-                if (data == null) {
-                    data = new Intent();
-                }
-                // Add the password quality extra to the intent data that will be sent back for
-                // Setup Wizard.
-                LockPatternUtils lockPatternUtils = new LockPatternUtils(getActivity());
-                data.putExtra(EXTRA_PASSWORD_QUALITY,
-                        lockPatternUtils.getKeyguardStoredPasswordQuality(UserHandle.myUserId()));
-
-                super.onActivityResult(requestCode, resultCode, data);
+            if (data == null) {
+                data = new Intent();
             }
-            // If the started activity was cancelled (e.g. the user presses back), then this
-            // activity will be resumed to foreground.
+            // Add the password quality extra to the intent data that will be sent back for
+            // Setup Wizard.
+            LockPatternUtils lockPatternUtils = new LockPatternUtils(getActivity());
+            data.putExtra(EXTRA_PASSWORD_QUALITY,
+                    lockPatternUtils.getKeyguardStoredPasswordQuality(UserHandle.myUserId()));
+
+            super.onActivityResult(requestCode, resultCode, data);
         }
 
         @Override
@@ -172,57 +171,17 @@
         }
 
         @Override
-        protected Intent getLockPasswordIntent(Context context, int quality,
-                int minLength, final int maxLength,
-                boolean requirePasswordToDecrypt, boolean confirmCredentials, int userId) {
-            final Intent intent = SetupChooseLockPassword.createIntent(context, quality, minLength,
-                    maxLength, requirePasswordToDecrypt, confirmCredentials);
+        protected Intent getLockPasswordIntent(int quality, int minLength, int maxLength) {
+            final Intent intent = SetupChooseLockPassword.modifyIntentForSetup(
+                    getContext(), super.getLockPasswordIntent(quality, minLength, maxLength));
             SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
             return intent;
         }
 
         @Override
-        protected Intent getLockPasswordIntent(Context context, int quality,
-                int minLength, final int maxLength,
-                boolean requirePasswordToDecrypt, long challenge, int userId) {
-            final Intent intent = SetupChooseLockPassword.createIntent(context, quality, minLength,
-                    maxLength, requirePasswordToDecrypt, challenge);
-            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
-            return intent;
-        }
-
-        @Override
-        protected Intent getLockPasswordIntent(Context context, int quality, int minLength,
-                int maxLength, boolean requirePasswordToDecrypt, String password, int userId) {
-            final Intent intent = SetupChooseLockPassword.createIntent(context, quality, minLength,
-                    maxLength, requirePasswordToDecrypt, password);
-            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
-            return intent;
-        }
-
-        @Override
-        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
-                final boolean confirmCredentials, int userId) {
-            final Intent intent = SetupChooseLockPattern.createIntent(context, requirePassword,
-                    confirmCredentials);
-            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
-            return intent;
-        }
-
-        @Override
-        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
-                long challenge, int userId) {
-            final Intent intent = SetupChooseLockPattern.createIntent(context, requirePassword,
-                    challenge);
-            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
-            return intent;
-        }
-
-        @Override
-        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
-                final String pattern, int userId) {
-            final Intent intent = SetupChooseLockPattern.createIntent(context, requirePassword,
-                    pattern);
+        protected Intent getLockPatternIntent() {
+            final Intent intent = SetupChooseLockPattern.modifyIntentForSetup(
+                    getContext(), super.getLockPatternIntent());
             SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
             return intent;
         }
diff --git a/src/com/android/settings/password/SetupChooseLockPassword.java b/src/com/android/settings/password/SetupChooseLockPassword.java
new file mode 100644
index 0000000..0c62c7c
--- /dev/null
+++ b/src/com/android/settings/password/SetupChooseLockPassword.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2014 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.password;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
+import com.android.settings.SetupRedactionInterstitial;
+import com.android.settings.SetupWizardUtils;
+import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
+import com.android.settings.password.ChooseLockTypeDialogFragment.OnLockTypeSelectedListener;
+import com.android.setupwizardlib.util.WizardManagerHelper;
+
+/**
+ * Setup Wizard's version of ChooseLockPassword screen. It inherits the logic and basic structure
+ * from ChooseLockPassword class, and should remain similar to that behaviorally. This class should
+ * only overload base methods for minor theme and behavior differences specific to Setup Wizard.
+ * Other changes should be done to ChooseLockPassword class instead and let this class inherit
+ * those changes.
+ */
+public class SetupChooseLockPassword extends ChooseLockPassword {
+
+    public static Intent modifyIntentForSetup(
+            Context context,
+            Intent chooseLockPasswordIntent) {
+        chooseLockPasswordIntent.setClass(context, SetupChooseLockPassword.class);
+        chooseLockPasswordIntent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false);
+        return chooseLockPasswordIntent;
+    }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        return SetupChooseLockPasswordFragment.class.getName().equals(fragmentName);
+    }
+
+    @Override
+    /* package */ Class<? extends Fragment> getFragmentClass() {
+        return SetupChooseLockPasswordFragment.class;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstance) {
+        super.onCreate(savedInstance);
+        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
+        layout.setFitsSystemWindows(false);
+    }
+
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        resid = SetupWizardUtils.getTheme(getIntent());
+        super.onApplyThemeResource(theme, resid, first);
+    }
+
+    public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment
+            implements OnLockTypeSelectedListener {
+
+        @VisibleForTesting
+        static final int REQUEST_SCREEN_LOCK_OPTIONS = 1;
+
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+            boolean showOptionsButton = getActivity().getIntent().getBooleanExtra(
+                    ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, false);
+            if (showOptionsButton) {
+                Button optionsButton = view.findViewById(R.id.screen_lock_options);
+                optionsButton.setVisibility(View.VISIBLE);
+                optionsButton.setOnClickListener(this);
+            }
+        }
+
+        @Override
+        public void onClick(View v) {
+            switch (v.getId()) {
+                case R.id.screen_lock_options:
+                    launchChooseLockGeneric();
+                    break;
+                default:
+                    super.onClick(v);
+            }
+        }
+
+        private void launchChooseLockGeneric() {
+            ScreenLockType currentLock = mIsAlphaMode
+                    ? ScreenLockType.PASSWORD : ScreenLockType.PIN;
+            ChooseLockTypeDialogFragment.newInstance(mUserId, currentLock.toString())
+                    .show(getChildFragmentManager(), null);
+        }
+
+        @Override
+        protected Intent getRedactionInterstitialIntent(Context context) {
+            // Setup wizard's redaction interstitial is deferred to optional step. Enable that
+            // optional step if the lock screen was set up.
+            SetupRedactionInterstitial.setEnabled(context, true);
+            return null;
+        }
+
+        @Override
+        public void onLockTypeSelected(ScreenLockType lock) {
+            Intent activityIntent = getActivity().getIntent();
+            Intent intent = new Intent(getContext(), SetupChooseLockGeneric.class);
+
+            // Copy the original extras into the new intent
+            if (activityIntent
+                    .hasExtra(ChooseLockGenericFragment.EXTRA_CHOOSE_LOCK_GENERIC_EXTRAS)) {
+                intent.putExtras(activityIntent.getBundleExtra(
+                        ChooseLockGenericFragment.EXTRA_CHOOSE_LOCK_GENERIC_EXTRAS));
+            }
+            intent.putExtra(LockPatternUtils.PASSWORD_TYPE_KEY, lock.defaultQuality);
+
+            // Propagate the fingerprint challenge
+            intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE,
+                    activityIntent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE,
+                            false));
+            intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE,
+                    activityIntent.getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0));
+
+            // The user is already given the choice of the what screen lock to set up. No need to
+            // show this button again.
+            intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, false);
+
+            WizardManagerHelper.copyWizardManagerExtras(activityIntent, intent);
+
+            startActivityForResult(intent, REQUEST_SCREEN_LOCK_OPTIONS);
+        }
+
+        @Override
+        public void onActivityResult(int requestCode, int resultCode, Intent data) {
+            super.onActivityResult(requestCode, resultCode, data);
+            if (requestCode == REQUEST_SCREEN_LOCK_OPTIONS) {
+                if (resultCode != Activity.RESULT_CANCELED) {
+                    Activity activity = getActivity();
+                    activity.setResult(resultCode, data);
+                    activity.finish();
+                }
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/SetupChooseLockPattern.java b/src/com/android/settings/password/SetupChooseLockPattern.java
similarity index 67%
rename from src/com/android/settings/SetupChooseLockPattern.java
rename to src/com/android/settings/password/SetupChooseLockPattern.java
index 762d3b3..7cb5afb 100644
--- a/src/com/android/settings/SetupChooseLockPattern.java
+++ b/src/com/android/settings/password/SetupChooseLockPattern.java
@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
-import android.os.UserHandle;
+
+import com.android.settings.SetupRedactionInterstitial;
+import com.android.settings.SetupWizardUtils;
 
 /**
  * Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure
@@ -31,26 +33,9 @@
  */
 public class SetupChooseLockPattern extends ChooseLockPattern {
 
-    public static Intent createIntent(Context context, boolean requirePassword,
-            boolean confirmCredentials) {
-        Intent intent = ChooseLockPattern.createIntent(context, requirePassword,
-                confirmCredentials, UserHandle.myUserId());
-        intent.setClass(context, SetupChooseLockPattern.class);
-        return intent;
-    }
-
-    public static Intent createIntent(Context context, boolean requirePassword, String pattern) {
-        Intent intent = ChooseLockPattern.createIntent(
-                context, requirePassword, pattern, UserHandle.myUserId());
-        intent.setClass(context, SetupChooseLockPattern.class);
-        return intent;
-    }
-
-    public static Intent createIntent(Context context, boolean requirePassword, long challenge) {
-        Intent intent = ChooseLockPattern.createIntent(
-                context, requirePassword, challenge, UserHandle.myUserId());
-        intent.setClass(context, SetupChooseLockPattern.class);
-        return intent;
+    public static Intent modifyIntentForSetup(Context context, Intent chooseLockPatternIntent) {
+        chooseLockPatternIntent.setClass(context, SetupChooseLockPattern.class);
+        return chooseLockPatternIntent;
     }
 
     @Override
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index a1c1660..26e760c 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -164,8 +164,7 @@
     /**
      * Adds preferences for all print services to the {@value PRINT_SERVICES_CATEGORY} cathegory.
      */
-    private final class PrintServicesController implements
-           LoaderCallbacks<List<PrintServiceInfo>> {
+    private final class PrintServicesController implements LoaderCallbacks<List<PrintServiceInfo>> {
         @Override
         public Loader<List<PrintServiceInfo>> onCreateLoader(int id, Bundle args) {
             PrintManager printManager =
@@ -290,7 +289,7 @@
         }
     }
 
-     private final class PrintJobsController implements LoaderCallbacks<List<PrintJobInfo>> {
+    private final class PrintJobsController implements LoaderCallbacks<List<PrintJobInfo>> {
 
         @Override
         public Loader<List<PrintJobInfo>> onCreateLoader(int id, Bundle args) {
@@ -326,7 +325,7 @@
 
                     switch (printJob.getState()) {
                         case PrintJobInfo.STATE_QUEUED:
-                        case PrintJobInfo.STATE_STARTED: {
+                        case PrintJobInfo.STATE_STARTED:
                             if (!printJob.isCancelling()) {
                                 preference.setTitle(getString(
                                         R.string.print_printing_state_title_template,
@@ -336,15 +335,13 @@
                                         R.string.print_cancelling_state_title_template,
                                         printJob.getLabel()));
                             }
-                        } break;
-
-                        case PrintJobInfo.STATE_FAILED: {
+                            break;
+                        case PrintJobInfo.STATE_FAILED:
                             preference.setTitle(getString(
                                     R.string.print_failed_state_title_template,
                                     printJob.getLabel()));
-                        } break;
-
-                        case PrintJobInfo.STATE_BLOCKED: {
+                            break;
+                        case PrintJobInfo.STATE_BLOCKED:
                             if (!printJob.isCancelling()) {
                                 preference.setTitle(getString(
                                         R.string.print_blocked_state_title_template,
@@ -354,7 +351,7 @@
                                         R.string.print_cancelling_state_title_template,
                                         printJob.getLabel()));
                             }
-                        } break;
+                            break;
                     }
 
                     preference.setSummary(getString(R.string.print_job_summary,
@@ -364,14 +361,13 @@
 
                     switch (printJob.getState()) {
                         case PrintJobInfo.STATE_QUEUED:
-                        case PrintJobInfo.STATE_STARTED: {
+                        case PrintJobInfo.STATE_STARTED:
                             preference.setIcon(R.drawable.ic_print);
-                        } break;
-
+                            break;
                         case PrintJobInfo.STATE_FAILED:
-                        case PrintJobInfo.STATE_BLOCKED: {
+                        case PrintJobInfo.STATE_BLOCKED:
                             preference.setIcon(R.drawable.ic_print_error);
-                        } break;
+                            break;
                     }
 
                     Bundle extras = preference.getExtras();
@@ -475,7 +471,7 @@
                 PrintJobInfo printJob = printJobs.get(i).getInfo();
                 if (shouldShowToUser(printJob)) {
                     if (printJobInfos == null) {
-                        printJobInfos = new ArrayList<PrintJobInfo>();
+                        printJobInfos = new ArrayList<>();
                     }
                     printJobInfos.add(printJob);
                 }
@@ -505,8 +501,9 @@
     /**
      * Provider for the print settings summary
      */
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-    static class PrintSummaryProvider implements SummaryLoader.SummaryProvider {
+    @VisibleForTesting
+    static class PrintSummaryProvider
+            implements SummaryLoader.SummaryProvider, PrintJobStateChangeListener {
         private final Context mContext;
         private final PrintManagerWrapper mPrintManager;
         private final SummaryLoader mSummaryLoader;
@@ -528,19 +525,43 @@
         public void setListening(boolean isListening) {
             if (mPrintManager != null) {
                 if (isListening) {
-                    List<PrintServiceInfo> services =
-                            mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES);
-                    if (services == null || services.isEmpty()) {
-                        mSummaryLoader.setSummary(this,
-                                mContext.getString(R.string.print_settings_summary_no_service));
-                    } else {
-                        final int count = services.size();
-                        mSummaryLoader.setSummary(this,
-                                mContext.getResources().getQuantityString(
-                                        R.plurals.print_settings_summary, count, count));
+                    mPrintManager.addPrintJobStateChanegListner(this);
+                    onPrintJobStateChanged(null);
+                } else {
+                    mPrintManager.removePrintJobStateChangeListener(this);
+                }
+            }
+        }
+
+        @Override
+        public void onPrintJobStateChanged(PrintJobId printJobId) {
+            final List<PrintJob> printJobs = mPrintManager.getPrintJobs();
+
+            int numActivePrintJobs = 0;
+            if (printJobs != null) {
+                for (PrintJob job : printJobs) {
+                    if (shouldShowToUser(job.getInfo())) {
+                        numActivePrintJobs++;
                     }
                 }
             }
+
+            if (numActivePrintJobs > 0) {
+                mSummaryLoader.setSummary(this, mContext.getResources().getQuantityString(
+                        R.plurals.print_jobs_summary, numActivePrintJobs, numActivePrintJobs));
+            } else {
+                List<PrintServiceInfo> services =
+                        mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES);
+                if (services == null || services.isEmpty()) {
+                    mSummaryLoader.setSummary(this,
+                            mContext.getString(R.string.print_settings_summary_no_service));
+                } else {
+                    final int count = services.size();
+                    mSummaryLoader.setSummary(this,
+                            mContext.getResources().getQuantityString(
+                                    R.plurals.print_settings_summary, count, count));
+                }
+            }
         }
 
         static class PrintManagerWrapper {
@@ -555,6 +576,18 @@
             public List<PrintServiceInfo> getPrintServices(int selectionFlags) {
                 return mPrintManager.getPrintServices(selectionFlags);
             }
+
+            public void addPrintJobStateChanegListner(PrintJobStateChangeListener listener) {
+                mPrintManager.addPrintJobStateChangeListener(listener);
+            }
+
+            public void removePrintJobStateChangeListener(PrintJobStateChangeListener listener) {
+                mPrintManager.removePrintJobStateChangeListener(listener);
+            }
+
+            public List<PrintJob> getPrintJobs() {
+                return mPrintManager.getPrintJobs();
+            }
         }
     }
 
diff --git a/src/com/android/settings/search2/AppSearchResult.java b/src/com/android/settings/search/AppSearchResult.java
similarity index 96%
rename from src/com/android/settings/search2/AppSearchResult.java
rename to src/com/android/settings/search/AppSearchResult.java
index 111f775..fcb83dc 100644
--- a/src/com/android/settings/search2/AppSearchResult.java
+++ b/src/com/android/settings/search/AppSearchResult.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.pm.ApplicationInfo;
 
diff --git a/src/com/android/settings/search/BaseSearchIndexProvider.java b/src/com/android/settings/search/BaseSearchIndexProvider.java
index f5e06ca..11b4db1 100644
--- a/src/com/android/settings/search/BaseSearchIndexProvider.java
+++ b/src/com/android/settings/search/BaseSearchIndexProvider.java
@@ -26,14 +26,12 @@
 import android.util.Xml;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.search2.XmlParserUtils;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -42,7 +40,6 @@
 public class BaseSearchIndexProvider implements Indexable.SearchIndexProvider {
 
     private static final String TAG = "BaseSearchIndex";
-    private static final List<String> EMPTY_LIST = new ArrayList<>();
 
     public BaseSearchIndexProvider() {
     }
@@ -93,7 +90,7 @@
         final List<SearchIndexableResource> resources = getXmlResourcesToIndex(
                 context, true /* not used*/);
         if (resources == null || resources.isEmpty()) {
-            return EMPTY_LIST;
+            return new ArrayList<>();
         }
         final List<String> nonIndexableKeys = new ArrayList<>();
         for (SearchIndexableResource res : resources) {
diff --git a/src/com/android/settings/search/CursorToSearchResultConverter.java b/src/com/android/settings/search/CursorToSearchResultConverter.java
new file mode 100644
index 0000000..26b46ff
--- /dev/null
+++ b/src/com/android/settings/search/CursorToSearchResultConverter.java
@@ -0,0 +1,213 @@
+/*
+ * 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.search;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.database.Cursor;
+import android.graphics.drawable.Drawable;
+import android.os.BadParcelableException;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.settings.dashboard.SiteMapManager;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static com.android.settings.search.DatabaseResultLoader.BASE_RANKS;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_CLASS_NAME;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_ICON;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_ID;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_KEY;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_PAYLOAD;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_PAYLOAD_TYPE;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_SCREEN_TITLE;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_SUMMARY_ON;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_TITLE;
+import static com.android.settings.search.SearchResult.TOP_RANK;
+
+/**
+ * Controller to Build search results from {@link Cursor} Objects.
+ *
+ * Each converted {@link Cursor} has the following fields:
+ * - String Title
+ * - String Summary
+ * - int rank
+ * - {@link Drawable} icon
+ * - {@link ResultPayload} payload
+ */
+public class CursorToSearchResultConverter {
+
+    private static final String TAG = "CursorConverter";
+
+    private final Context mContext;
+
+    private final int LONG_TITLE_LENGTH = 20;
+
+    private static final String[] whiteList = {
+            "main_toggle_wifi",
+            "main_toggle_bluetooth",
+            "main_toggle_bluetooth_obsolete",
+            "toggle_airplane",
+            "tether_settings",
+            "battery_saver",
+            "toggle_nfc",
+            "restrict_background",
+            "data_usage_enable",
+            "button_roaming_key",
+    };
+    private static final Set<String> prioritySettings = new HashSet(Arrays.asList(whiteList));
+
+
+    public CursorToSearchResultConverter(Context context) {
+        mContext = context;
+    }
+
+    public Set<SearchResult> convertCursor(SiteMapManager sitemapManager,
+            Cursor cursorResults, int baseRank) {
+        if (cursorResults == null) {
+            return null;
+        }
+        final Map<String, Context> contextMap = new HashMap<>();
+        final Set<SearchResult> results = new HashSet<>();
+
+        while (cursorResults.moveToNext()) {
+            SearchResult result = buildSingleSearchResultFromCursor(sitemapManager,
+                    contextMap, cursorResults, baseRank);
+            if (result != null) {
+                results.add(result);
+            }
+        }
+        return results;
+    }
+
+    public static ResultPayload getUnmarshalledPayload(byte[] marshalledPayload,
+            int payloadType) {
+        try {
+            switch (payloadType) {
+                case ResultPayload.PayloadType.INTENT:
+                    return ResultPayloadUtils.unmarshall(marshalledPayload,
+                            ResultPayload.CREATOR);
+                case ResultPayload.PayloadType.INLINE_SWITCH:
+                    return ResultPayloadUtils.unmarshall(marshalledPayload,
+                            InlineSwitchPayload.CREATOR);
+            }
+        } catch (BadParcelableException e) {
+            Log.w(TAG, "Error creating parcelable: " + e);
+        }
+        return null;
+    }
+
+    private SearchResult buildSingleSearchResultFromCursor(SiteMapManager sitemapManager,
+            Map<String, Context> contextMap, Cursor cursor, int baseRank) {
+        final int docId = cursor.getInt(COLUMN_INDEX_ID);
+        final String pkgName = cursor.getString(COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE);
+        final String title = cursor.getString(COLUMN_INDEX_TITLE);
+        final String summaryOn = cursor.getString(COLUMN_INDEX_SUMMARY_ON);
+        final String className = cursor.getString(COLUMN_INDEX_CLASS_NAME);
+        final String key = cursor.getString(COLUMN_INDEX_KEY);
+        final String iconResStr = cursor.getString(COLUMN_INDEX_ICON);
+        final int payloadType = cursor.getInt(COLUMN_INDEX_PAYLOAD_TYPE);
+        final byte[] marshalledPayload = cursor.getBlob(COLUMN_INDEX_PAYLOAD);
+        final ResultPayload payload = getUnmarshalledPayload(marshalledPayload, payloadType);
+
+        final List<String> breadcrumbs = getBreadcrumbs(sitemapManager, cursor);
+        final int rank = getRank(title, baseRank, key);
+
+        final SearchResult.Builder builder = new SearchResult.Builder()
+                .setStableId(docId)
+                .setTitle(title)
+                .setSummary(summaryOn)
+                .addBreadcrumbs(breadcrumbs)
+                .setRank(rank)
+                .setIcon(getIconForPackage(contextMap, pkgName, className, iconResStr))
+                .setPayload(payload);
+        return builder.build();
+    }
+
+    private Drawable getIconForPackage(Map<String, Context> contextMap, String pkgName,
+            String className, String iconResStr) {
+        final int iconId = TextUtils.isEmpty(iconResStr)
+                ? 0 : Integer.parseInt(iconResStr);
+        Drawable icon;
+        Context packageContext;
+        if (iconId == 0) {
+            icon = null;
+        } else {
+            if (TextUtils.isEmpty(className) && !TextUtils.isEmpty(pkgName)) {
+                packageContext = contextMap.get(pkgName);
+                if (packageContext == null) {
+                    try {
+                        packageContext = mContext.createPackageContext(pkgName, 0);
+                    } catch (PackageManager.NameNotFoundException e) {
+                        Log.e(TAG, "Cannot create Context for package: " + pkgName);
+                        return null;
+                    }
+                    contextMap.put(pkgName, packageContext);
+                }
+            } else {
+                packageContext = mContext;
+            }
+            try {
+                icon = packageContext.getDrawable(iconId);
+            } catch (Resources.NotFoundException nfe) {
+                icon = null;
+            }
+        }
+        return icon;
+    }
+
+    private List<String> getBreadcrumbs(SiteMapManager siteMapManager, Cursor cursor) {
+        final String screenTitle = cursor.getString(COLUMN_INDEX_SCREEN_TITLE);
+        final String screenClass = cursor.getString(COLUMN_INDEX_CLASS_NAME);
+        return siteMapManager == null ? null : siteMapManager.buildBreadCrumb(mContext, screenClass,
+                screenTitle);
+    }
+
+    /** Uses the breadcrumbs to determine the offset to the base rank.
+     *  There are three checks
+     *  A) If the result is prioritized and the highest base level
+     *  B) If the query matches the highest level menu title
+     *  C) If the query is longer than 20
+     *
+     *  If the query matches A, set it to TOP_RANK
+     *  If the query matches B, the offset is 0.
+     *  If the query matches C, the offset is 1
+
+     * @param title of the result.
+     * @param baseRank of the result. Lower if it's a better result.
+     * @return
+     */
+    private int getRank(String title, int baseRank, String key) {
+        // The result can only be prioritized if it is a top ranked result.
+        if (prioritySettings.contains(key) && baseRank < BASE_RANKS[1]) {
+            return TOP_RANK;
+        }
+        if (title.length() > LONG_TITLE_LENGTH) {
+            return baseRank + 1;
+        }
+        return baseRank;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/search2/DatabaseIndexingManager.java b/src/com/android/settings/search/DatabaseIndexingManager.java
similarity index 95%
rename from src/com/android/settings/search2/DatabaseIndexingManager.java
rename to src/com/android/settings/search/DatabaseIndexingManager.java
index 647219b..c681912 100644
--- a/src/com/android/settings/search2/DatabaseIndexingManager.java
+++ b/src/com/android/settings/search/DatabaseIndexingManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -15,8 +15,9 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
+import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
@@ -40,12 +41,8 @@
 import android.util.Log;
 import android.util.Xml;
 
+import com.android.settings.SettingsActivity;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.search.IndexDatabaseHelper;
-import com.android.settings.search.Indexable;
-import com.android.settings.search.IndexingCallback;
-import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.search.SearchIndexableResources;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -82,9 +79,9 @@
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_ACTION;
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_CLASS;
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_PACKAGE;
-import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RANK;
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RESID;
 
+import static com.android.settings.search.DatabaseResultLoader.*;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.CLASS_NAME;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_ENTRIES;
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS;
@@ -109,11 +106,6 @@
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.USER_ID;
 import static com.android.settings.search.IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX;
 
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_ID;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_KEY;
-import static com.android.settings.search2.DatabaseResultLoader.SELECT_COLUMNS;
-
 /**
  * Consumes the SearchIndexableProvider content providers.
  * Updates the Resource, Raw Data and non-indexable data for Search.
@@ -811,6 +803,7 @@
                         entries = XmlParserUtils.getDataEntries(context, attrs);
                     }
 
+                    // TODO (b/62254931) index primitives instead of payload
                     payload = DatabaseIndexingUtils.getPayloadFromUriMap(controllerUriMap, key);
                     childFragment = XmlParserUtils.getDataChildFragment(context, attrs);
 
@@ -935,7 +928,7 @@
                 .setNormalizedSummaryOff(normalizedSummaryOff)
                 .setSpaceDelimitedKeywords(spaceDelimitedKeywords);
 
-        updateOneRow(database, builder.build());
+        updateOneRow(database, builder.build(mContext));
     }
 
     private void updateOneRow(SQLiteDatabase database, DatabaseRow row) {
@@ -1069,10 +1062,11 @@
          * Returns the doc id for this row.
          */
         public int getDocId() {
-            // The DocID should contains more than the title string itself (you may have two
-            // settings with the same title). So we need to use a combination of multiple
-            // attributes from this row.
-            return Objects.hash(updatedTitle, screenTitle, key, payloadType);
+            // Eventually we want all DocIds to be the data_reference key. For settings values,
+            // this will be preference keys, and for non-settings they should be unique.
+            return TextUtils.isEmpty(key)
+                    ? Objects.hash(updatedTitle, className, screenTitle, intentTargetClass)
+                    : key.hashCode();
         }
 
         public static class Builder {
@@ -1220,7 +1214,45 @@
                 return this;
             }
 
-            public DatabaseRow build() {
+            /**
+             * Adds intent to inline payloads, or creates an Intent Payload as a fallback if the
+             * payload is null.
+             */
+            private void setIntent(Context context) {
+                if (mPayload != null) {
+                    return;
+                }
+                final Intent intent = buildIntent(context);
+                mPayload = new ResultPayload(intent);
+                mPayloadType = ResultPayload.PayloadType.INTENT;
+            }
+
+            /**
+             * Adds Intent payload to builder.
+             */
+            private Intent buildIntent(Context context) {
+                final Intent intent;
+
+                if (TextUtils.isEmpty(mIntentAction)) {
+                    // Action is null, we will launch it as a sub-setting
+                    intent = DatabaseIndexingUtils.buildSubsettingIntent(context, mClassName, mKey,
+                            mScreenTitle);
+                } else {
+                    intent = new Intent(mIntentAction);
+                    final String targetClass = mIntentTargetClass;
+                    if (!TextUtils.isEmpty(mIntentTargetPackage)
+                            && !TextUtils.isEmpty(targetClass)) {
+                        final ComponentName component = new ComponentName(mIntentTargetPackage,
+                                targetClass);
+                        intent.setComponent(component);
+                    }
+                    intent.putExtra(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, mKey);
+                }
+                return intent;
+            }
+
+            public DatabaseRow build(Context context) {
+                setIntent(context);
                 return new DatabaseRow(this);
             }
         }
diff --git a/src/com/android/settings/search2/DatabaseIndexingUtils.java b/src/com/android/settings/search/DatabaseIndexingUtils.java
similarity index 90%
rename from src/com/android/settings/search2/DatabaseIndexingUtils.java
rename to src/com/android/settings/search/DatabaseIndexingUtils.java
index bd06ef3..a6f3cb1 100644
--- a/src/com/android/settings/search2/DatabaseIndexingUtils.java
+++ b/src/com/android/settings/search/DatabaseIndexingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -15,21 +15,25 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.Manifest;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.Log;
 
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.search.Indexable;
 
 import java.lang.reflect.Field;
 import java.text.Normalizer;
@@ -58,6 +62,18 @@
             = Pattern.compile("\\p{InCombiningDiacriticalMarks}+");
 
     /**
+     * Builds intent into a subsetting.
+     */
+    public static Intent buildSubsettingIntent(Context context, String className, String key,
+            String screenTitle) {
+        final Bundle args = new Bundle();
+        args.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key);
+        return Utils.onBuildStartFragmentIntent(context,
+                className, args, null, 0, screenTitle, false,
+                MetricsProto.MetricsEvent.DASHBOARD_SEARCH_RESULTS);
+    }
+
+    /**
      * @param className which wil provide the map between from {@link Uri}s to
      * {@link PreferenceController}
      * @param context
diff --git a/src/com/android/settings/search2/DatabaseResultLoader.java b/src/com/android/settings/search/DatabaseResultLoader.java
similarity index 67%
rename from src/com/android/settings/search2/DatabaseResultLoader.java
rename to src/com/android/settings/search/DatabaseResultLoader.java
index 70cefe5..26bfd52 100644
--- a/src/com/android/settings/search2/DatabaseResultLoader.java
+++ b/src/com/android/settings/search/DatabaseResultLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -12,23 +12,21 @@
  * 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.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
-import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.search.IndexDatabaseHelper;
 import com.android.settings.utils.AsyncLoader;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns;
 import static com.android.settings.search.IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX;
@@ -36,7 +34,7 @@
 /**
  * AsyncTask to retrieve Settings, First party app and any intent based results.
  */
-public class DatabaseResultLoader extends AsyncLoader<List<? extends SearchResult>> {
+public class DatabaseResultLoader extends AsyncLoader<Set<? extends SearchResult>> {
     private static final String LOG = "DatabaseResultLoader";
 
     /* These indices are used to match the columns of the this loader's SELECT statement.
@@ -109,42 +107,27 @@
         mSiteMapManager = mapManager;
         mContext = context;
         mQueryText = cleanQuery(queryText);
-        mConverter = new CursorToSearchResultConverter(context, mQueryText);
+        mConverter = new CursorToSearchResultConverter(context);
     }
 
     @Override
-    protected void onDiscardResult(List<? extends SearchResult> result) {
+    protected void onDiscardResult(Set<? extends SearchResult> result) {
         // TODO Search
     }
 
     @Override
-    public List<? extends SearchResult> loadInBackground() {
+    public Set<? extends SearchResult> loadInBackground() {
         if (mQueryText == null || mQueryText.isEmpty()) {
             return null;
         }
 
-        final List<SearchResult> primaryFirstWordResults;
-        final List<SearchResult> primaryMidWordResults;
-        final List<SearchResult> secondaryResults;
-        final List<SearchResult> tertiaryResults;
+        final Set<SearchResult> results = new HashSet<>();
 
-        primaryFirstWordResults = firstWordQuery(MATCH_COLUMNS_PRIMARY, BASE_RANKS[0]);
-        primaryMidWordResults = secondaryWordQuery(MATCH_COLUMNS_PRIMARY, BASE_RANKS[1]);
-        secondaryResults = anyWordQuery(MATCH_COLUMNS_SECONDARY, BASE_RANKS[2]);
-        tertiaryResults = anyWordQuery(MATCH_COLUMNS_TERTIARY, BASE_RANKS[3]);
-
-        final List<SearchResult> results = new ArrayList<>(
-                primaryFirstWordResults.size()
-                + primaryMidWordResults.size()
-                + secondaryResults.size()
-                + tertiaryResults.size());
-
-        results.addAll(primaryFirstWordResults);
-        results.addAll(primaryMidWordResults);
-        results.addAll(secondaryResults);
-        results.addAll(tertiaryResults);
-
-        return removeDuplicates(results);
+        results.addAll(firstWordQuery(MATCH_COLUMNS_PRIMARY, BASE_RANKS[0]));
+        results.addAll(secondaryWordQuery(MATCH_COLUMNS_PRIMARY, BASE_RANKS[1]));
+        results.addAll(anyWordQuery(MATCH_COLUMNS_SECONDARY, BASE_RANKS[2]));
+        results.addAll(anyWordQuery(MATCH_COLUMNS_TERTIARY, BASE_RANKS[3]));
+        return results;
     }
 
     @Override
@@ -170,9 +153,9 @@
      *
      * @param matchColumns The columns to match on
      * @param baseRank The highest rank achievable by these results
-     * @return A list of the matching results.
+     * @return A set of the matching results.
      */
-    private List<SearchResult> firstWordQuery(String[] matchColumns, int baseRank) {
+    private Set<SearchResult> firstWordQuery(String[] matchColumns, int baseRank) {
         final String whereClause = buildSingleWordWhereClause(matchColumns);
         final String query = mQueryText + "%";
         final String[] selection = buildSingleWordSelection(query, matchColumns.length);
@@ -186,9 +169,9 @@
      *
      * @param matchColumns The columns to match on
      * @param baseRank The highest rank achievable by these results
-     * @return A list of the matching results.
+     * @return A set of the matching results.
      */
-    private List<SearchResult> secondaryWordQuery(String[] matchColumns, int baseRank) {
+    private Set<SearchResult> secondaryWordQuery(String[] matchColumns, int baseRank) {
         final String whereClause = buildSingleWordWhereClause(matchColumns);
         final String query = "% " + mQueryText + "%";
         final String[] selection = buildSingleWordSelection(query, matchColumns.length);
@@ -201,9 +184,9 @@
      *
      * @param matchColumns The columns to match on
      * @param baseRank The highest rank achievable by these results
-     * @return A list of the matching results.
+     * @return A set of the matching results.
      */
-    private List<SearchResult> anyWordQuery(String[] matchColumns, int baseRank) {
+    private Set<SearchResult> anyWordQuery(String[] matchColumns, int baseRank) {
         final String whereClause = buildTwoWordWhereClause(matchColumns);
         final String[] selection = buildAnyWordSelection(matchColumns.length * 2);
 
@@ -216,11 +199,10 @@
      * @param whereClause Where clause for the SQL query which uses bindings.
      * @param selection List of the transformed query to match each bind in the whereClause
      * @param baseRank The highest rank achievable by these results.
-     * @return A list of the matching results.
+     * @return A set of the matching results.
      */
-    private List<SearchResult> query(String whereClause, String[] selection, int baseRank) {
-        final SQLiteDatabase database = IndexDatabaseHelper.getInstance(mContext)
-                .getReadableDatabase();
+    private Set<SearchResult> query(String whereClause, String[] selection, int baseRank) {
+        SQLiteDatabase database = IndexDatabaseHelper.getInstance(mContext).getReadableDatabase();
         final Cursor resultCursor = database.query(TABLE_PREFS_INDEX, SELECT_COLUMNS, whereClause,
                 selection, null, null, null);
         return mConverter.convertCursor(mSiteMapManager, resultCursor, baseRank);
@@ -300,55 +282,4 @@
         }
         return selection;
     }
-
-    /**
-     * Goes through the list of search results and verifies that none of the results are duplicates.
-     * A duplicate is quantified by a result with the same Title and the same non-empty Summary.
-     *
-     * The method walks through the results starting with the highest priority result. It removes
-     * the duplicates by doing the first rule that applies below:
-     * - If a result is inline, remove the intent result.
-     * - Remove the lower rank item.
-     * @param results A list of results with potential duplicates
-     * @return The list of results with duplicates removed.
-     */
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-    List<SearchResult> removeDuplicates(List<SearchResult> results) {
-        SearchResult primaryResult, secondaryResult;
-
-        // We accept the O(n^2) solution because the number of results is small.
-        for (int i = results.size() - 1; i >= 0; i--) {
-            secondaryResult = results.get(i);
-
-            for (int j = i - 1; j >= 0; j--) {
-                primaryResult = results.get(j);
-                if (areDuplicateResults(primaryResult, secondaryResult)) {
-                    if (primaryResult.viewType != ResultPayload.PayloadType.INTENT) {
-                        // Case where both payloads are inline
-                        results.remove(i);
-                        break;
-                    } else if (secondaryResult.viewType != ResultPayload.PayloadType.INTENT) {
-                        // Case where only second result is inline.
-                        results.remove(j);
-                        i--; // shift the top index to reflect the lower element being removed
-                    } else {
-                        // Case where both payloads are intent.
-                        results.remove(i);
-                        break;
-                    }
-                }
-            }
-        }
-        return results;
-    }
-
-    /**
-     * @return True when the two {@link SearchResult SearchResults} have the same title, and the same
-     * non-empty summary.
-     */
-    private boolean areDuplicateResults(SearchResult primary, SearchResult secondary) {
-        return TextUtils.equals(primary.title, secondary.title)
-                && TextUtils.equals(primary.summary, secondary.summary)
-                && !TextUtils.isEmpty(primary.summary);
-    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/search/DynamicIndexableContentMonitor.java b/src/com/android/settings/search/DynamicIndexableContentMonitor.java
index bb9f5ad..0758387 100644
--- a/src/com/android/settings/search/DynamicIndexableContentMonitor.java
+++ b/src/com/android/settings/search/DynamicIndexableContentMonitor.java
@@ -54,7 +54,6 @@
 import com.android.settings.language.LanguageAndInputSettings;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.print.PrintSettingsFragment;
-import com.android.settings.search2.DatabaseIndexingManager;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/settings/search/HeaderDecorator.java b/src/com/android/settings/search/HeaderDecorator.java
new file mode 100644
index 0000000..bff344b
--- /dev/null
+++ b/src/com/android/settings/search/HeaderDecorator.java
@@ -0,0 +1,43 @@
+/*
+ * 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.search;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Rect;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+import com.android.settings.R;
+
+public class HeaderDecorator extends RecyclerView.ItemDecoration {
+    @Override
+    public void getItemOffsets(Rect outRect, View view, RecyclerView parent,
+            RecyclerView.State state) {
+        super.getItemOffsets(outRect, view, parent, state);
+        if (parent.getChildAdapterPosition(view) > 0) {
+            return;
+        }
+
+        Context context = view.getContext();
+        TypedArray ta = context.obtainStyledAttributes(new int[]{android.R.attr.actionBarSize});
+        outRect.top = ta.getDimensionPixelSize(0, 0);
+        ta.recycle();
+
+        outRect.top += 2 * context.getResources().getDimensionPixelSize(R.dimen.search_bar_margin);
+    }
+}
diff --git a/src/com/android/settings/search/InlinePayload.java b/src/com/android/settings/search/InlinePayload.java
new file mode 100644
index 0000000..439f111
--- /dev/null
+++ b/src/com/android/settings/search/InlinePayload.java
@@ -0,0 +1,111 @@
+/*
+ * 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.search;
+
+import android.content.Intent;
+
+import android.content.Context;
+import android.os.Parcel;
+import com.android.internal.annotations.VisibleForTesting;
+
+/**
+ * Abstract Payload for inline settings results.
+ */
+public abstract class InlinePayload extends ResultPayload {
+
+    public static final int FALSE = 0;
+    public static final int TRUE = 1;
+
+    /**
+     * Defines the key to access and store the Setting the inline result represents.
+     */
+    @VisibleForTesting
+    final String mSettingKey;
+
+    /**
+     * The UI type for the inline result.
+     */
+    @PayloadType final int mInlineType;
+
+    /**
+     * Defines where the Setting is stored.
+     */
+    @SettingsSource final int mSettingSource;
+
+    /**
+     * True when the setting is available for the device.
+     */
+    final boolean mIsDeviceSupported;
+
+    /**
+     * @param key uniquely identifies the stored setting.
+     * @param payloadType of the setting being stored.
+     * @param source of the setting. Used to determine where to get and set the setting.
+     * @param intent to the setting page.
+     * @param isDeviceSupported is true when the setting is valid for the given device.
+     */
+    public InlinePayload(String key, @PayloadType int payloadType, @SettingsSource int source,
+            Intent intent, boolean isDeviceSupported) {
+        super(intent);
+        mSettingKey = key;
+        mInlineType = payloadType;
+        mSettingSource = source;
+        mIsDeviceSupported = isDeviceSupported;
+    }
+
+    InlinePayload(Parcel parcel) {
+        super((Intent) parcel.readParcelable(Intent.class.getClassLoader()));
+        mSettingKey = parcel.readString();
+        mInlineType = parcel.readInt();
+        mSettingSource = parcel.readInt();
+        mIsDeviceSupported = parcel.readInt() == TRUE;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        super.writeToParcel(dest, flags);
+        dest.writeString(mSettingKey);
+        dest.writeInt(mInlineType);
+        dest.writeInt(mSettingSource);
+        dest.writeInt(mIsDeviceSupported ? TRUE : FALSE);
+    }
+
+    /**
+     * @returns the status of the underlying setting. See {@link ResultPayload.Availability} for
+     * possible values.
+     */
+    @Availability public int getAvailability() {
+        if (mIsDeviceSupported) {
+            return Availability.AVAILABLE;
+        }
+        return Availability.DISABLED_UNSUPPORTED;
+    }
+
+    /**
+     * @returns the current value of the setting.
+     */
+    public abstract int getValue(Context context);
+
+    /**
+     * Attempts to set the setting value.
+     *
+     * @param newValue is the requested new value for the setting.
+     * @returns true when the setting was changed, and false otherwise.
+     */
+    public abstract boolean setValue(Context context, int newValue);
+}
\ No newline at end of file
diff --git a/src/com/android/settings/search/InlineSwitchPayload.java b/src/com/android/settings/search/InlineSwitchPayload.java
new file mode 100644
index 0000000..a232054
--- /dev/null
+++ b/src/com/android/settings/search/InlineSwitchPayload.java
@@ -0,0 +1,148 @@
+/*
+ * 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.search;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.provider.Settings;
+
+/**
+ * Payload for inline Switch results. Mappings from integer to boolean.
+ */
+public class InlineSwitchPayload extends InlinePayload {
+
+    /**
+     * Provides a mapping for how switches are stored.
+     * If mIsStandard is true, then (0 == false) and (1 == true)
+     * If mIsStandard is false, then (1 == false) and (0 == true)
+     */
+    private boolean mIsStandard;
+
+    /**
+     *
+     * @param key uniquely identifies the stored setting.
+     * @param source of the setting. Used to determine where to get and set the setting.
+     * @param onValue is the value stored as on for the switch. Should be 0 or 1.
+     * @param intent to the setting page.
+     * @param isDeviceSupported is true when the setting is valid for the given device.
+     */
+    public InlineSwitchPayload(String key, @SettingsSource int source,
+            int onValue, Intent intent, boolean isDeviceSupported) {
+        super(key, PayloadType.INLINE_SWITCH, source, intent, isDeviceSupported);
+        // If on is stored as TRUE then the switch is standard.
+        mIsStandard = onValue == TRUE;
+    }
+
+    private InlineSwitchPayload(Parcel in) {
+        super(in);
+        mIsStandard = in.readInt() == TRUE;
+    }
+
+    @Override
+    public int getType() {
+        return mInlineType;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        super.writeToParcel(dest, flags);
+        dest.writeInt(mIsStandard ? TRUE : FALSE);
+    }
+
+    public static final Parcelable.Creator<InlineSwitchPayload> CREATOR =
+            new Parcelable.Creator<InlineSwitchPayload>() {
+        @Override
+        public InlineSwitchPayload createFromParcel(Parcel in) {
+            return new InlineSwitchPayload(in);
+        }
+
+        @Override
+        public InlineSwitchPayload[] newArray(int size) {
+            return new InlineSwitchPayload[size];
+        }
+    };
+
+    @Override
+    public int getValue(Context context) {
+        int settingsValue = -1;
+        switch(mSettingSource) {
+            case SettingsSource.SECURE:
+                settingsValue = Settings.Secure.getInt(context.getContentResolver(),
+                        mSettingKey, -1);
+                break;
+            case SettingsSource.SYSTEM:
+                settingsValue = Settings.System.getInt(context.getContentResolver(),
+                        mSettingKey, -1);
+                break;
+
+            case SettingsSource.GLOBAL:
+                settingsValue = Settings.Global.getInt(context.getContentResolver(),
+                        mSettingKey, -1);
+                break;
+        }
+
+        if (settingsValue == -1) {
+            throw new IllegalStateException("Unable to find setting from uri: "
+                    + mSettingKey.toString());
+        }
+
+        settingsValue = standardizeInput(settingsValue);
+
+        return settingsValue;
+    }
+
+    @Override
+    public boolean setValue(Context context, int newValue) {
+        if (newValue != 0 && newValue != 1) {
+            throw new IllegalArgumentException("newValue should be 0 for off and 1 for on."
+                    + "The passed value was: " + newValue);
+        }
+
+        newValue = standardizeInput(newValue);
+
+        switch(mSettingSource) {
+            case SettingsSource.GLOBAL:
+                return Settings.Global.putInt(context.getContentResolver(), mSettingKey, newValue);
+            case SettingsSource.SECURE:
+                return Settings.Secure.putInt(context.getContentResolver(), mSettingKey, newValue);
+            case SettingsSource.SYSTEM:
+                return Settings.System.putInt(context.getContentResolver(), mSettingKey, newValue);
+            case SettingsSource.UNKNOWN:
+                return false;
+        }
+
+        return false;
+    }
+
+    public boolean isStandard() {
+        return mIsStandard;
+    }
+
+    private int standardizeInput(int value) {
+        return mIsStandard
+                ? value
+                : 1 - value;
+    }
+}
diff --git a/src/com/android/settings/search2/InlineSwitchViewHolder.java b/src/com/android/settings/search/InlineSwitchViewHolder.java
similarity index 64%
rename from src/com/android/settings/search2/InlineSwitchViewHolder.java
rename to src/com/android/settings/search/InlineSwitchViewHolder.java
index d4a0ca2..bb8320d 100644
--- a/src/com/android/settings/search2/InlineSwitchViewHolder.java
+++ b/src/com/android/settings/search/InlineSwitchViewHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.util.Pair;
@@ -41,28 +41,25 @@
     }
 
     @Override
-    public void onBind(SearchFragment fragment, SearchResult result) {
+    public int getClickActionMetricName() {
+        return MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_INLINE_RESULT;
+    }
+
+    @Override
+    public void onBind(SearchFragment fragment, final SearchResult result) {
         super.onBind(fragment, result);
         if (mContext == null) {
             return;
         }
         final InlineSwitchPayload payload = (InlineSwitchPayload) result.payload;
-        switchView.setChecked(payload.getSwitchValue(mContext));
+        switchView.setChecked(payload.getValue(mContext) == InlineSwitchPayload.TRUE);
         switchView.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            final Pair<Integer, Object> name = Pair.create(
-                    MetricsEvent.FIELD_SETTINGS_SEARCH_INLINE_RESULT_NAME, payload.settingsUri);
             final Pair<Integer, Object> value = Pair.create(
                     MetricsEvent.FIELD_SETTINGS_SEARCH_INLINE_RESULT_VALUE, isChecked
-                            ? "checked"
-                            : "not-checked");
-            final Pair<Integer, Object> rank = Pair.create(
-                    MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_RANK, getAdapterPosition());
-            mMetricsFeatureProvider.action(mContext,
-                    MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_INLINE_RESULT,
-                    name, value, rank);
-
-            fragment.onSearchResultClicked();
-            payload.setSwitchValue(mContext, isChecked);
+                            ? 1L : 0L);
+            fragment.onSearchResultClicked(this, result, value);
+            int newValue = isChecked ? InlineSwitchPayload.TRUE : InlineSwitchPayload.FALSE;
+            payload.setValue(mContext, newValue);
         });
     }
 }
diff --git a/src/com/android/settings/search2/InstalledAppResultLoader.java b/src/com/android/settings/search/InstalledAppResultLoader.java
similarity index 83%
rename from src/com/android/settings/search2/InstalledAppResultLoader.java
rename to src/com/android/settings/search/InstalledAppResultLoader.java
index 47e1f67..81b96a1 100644
--- a/src/com/android/settings/search2/InstalledAppResultLoader.java
+++ b/src/com/android/settings/search/InstalledAppResultLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -12,9 +12,10 @@
  * 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.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.content.Intent;
@@ -34,17 +35,17 @@
 import com.android.settings.applications.ManageApplications;
 import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.utils.AsyncLoader;
 
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Search loader for installed apps.
  */
-public class InstalledAppResultLoader extends AsyncLoader<List<? extends SearchResult>> {
+public class InstalledAppResultLoader extends AsyncLoader<Set<? extends SearchResult>> {
 
     private static final int NAME_NO_MATCH = -1;
     private static final Intent LAUNCHER_PROBE = new Intent(Intent.ACTION_MAIN)
@@ -55,7 +56,7 @@
     private final String mQuery;
     private final UserManager mUserManager;
     private final PackageManagerWrapper mPackageManager;
-
+    private final List<ResolveInfo> mHomeActivities = new ArrayList<>();
 
     public InstalledAppResultLoader(Context context, PackageManagerWrapper pmWrapper,
             String query, SiteMapManager mapManager) {
@@ -67,10 +68,13 @@
     }
 
     @Override
-    public List<? extends SearchResult> loadInBackground() {
-        final List<AppSearchResult> results = new ArrayList<>();
+    public Set<? extends SearchResult> loadInBackground() {
+        final Set<AppSearchResult> results = new HashSet<>();
         final PackageManager pm = mPackageManager.getPackageManager();
 
+        mHomeActivities.clear();
+        mPackageManager.getHomeActivities(mHomeActivities);
+
         for (UserInfo user : getUsersToCount()) {
             final List<ApplicationInfo> apps =
                     mPackageManager.getInstalledApplicationsAsUser(
@@ -95,22 +99,29 @@
 
                 final AppSearchResult.Builder builder = new AppSearchResult.Builder();
                 builder.setAppInfo(info)
-                        .addTitle(info.loadLabel(pm))
-                        .addRank(getRank(wordDiff))
+                        .setStableId(info.packageName.hashCode())
+                        .setTitle(info.loadLabel(pm))
+                        .setRank(getRank(wordDiff))
                         .addBreadcrumbs(getBreadCrumb())
-                        .addPayload(new IntentPayload(intent));
+                        .setPayload(new ResultPayload(intent));
                 results.add(builder.build());
             }
         }
-        Collections.sort(results);
         return results;
     }
 
+    /**
+     * Returns true if the candidate should be included in candidate list
+     * <p/>
+     * This method matches logic in {@code ApplicationState#FILTER_DOWNLOADED_AND_LAUNCHER}.
+     */
     private boolean shouldIncludeAsCandidate(ApplicationInfo info, UserInfo user) {
+        // Not system app
         if ((info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0
                 || (info.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
             return true;
         }
+        // Shows up in launcher
         final Intent launchIntent = new Intent(LAUNCHER_PROBE)
                 .setPackage(info.packageName);
         final List<ResolveInfo> intents = mPackageManager.queryIntentActivitiesAsUser(
@@ -119,11 +130,15 @@
                         | PackageManager.MATCH_DIRECT_BOOT_AWARE
                         | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
                 user.id);
-        return intents != null && intents.size() != 0;
+        if (intents != null && intents.size() != 0) {
+            return true;
+        }
+        // Is launcher app itself
+        return isPackageInList(mHomeActivities, info.packageName);
     }
 
     @Override
-    protected void onDiscardResult(List<? extends SearchResult> result) {
+    protected void onDiscardResult(Set<? extends SearchResult> result) {
 
     }
 
@@ -194,6 +209,15 @@
         return NAME_NO_MATCH;
     }
 
+    private boolean isPackageInList(List<ResolveInfo> resolveInfos, String pkg) {
+        for (ResolveInfo info : resolveInfos) {
+            if (TextUtils.equals(info.activityInfo.packageName, pkg)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private List<String> getBreadCrumb() {
         if (mBreadcrumb == null || mBreadcrumb.isEmpty()) {
             final Context context = getContext();
@@ -206,6 +230,7 @@
 
     /**
      * A temporary ranking scheme for installed apps.
+     *
      * @param wordDiff difference between query length and app name length.
      * @return the ranking.
      */
diff --git a/src/com/android/settings/search/IntentSearchViewHolder.java b/src/com/android/settings/search/IntentSearchViewHolder.java
new file mode 100644
index 0000000..11adaef
--- /dev/null
+++ b/src/com/android/settings/search/IntentSearchViewHolder.java
@@ -0,0 +1,47 @@
+/*
+ * 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.search;
+
+import android.view.View;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
+/**
+ * ViewHolder for intent based search results.
+ * The DatabaseResultLoader is the primary use case for this ViewHolder.
+ */
+public class IntentSearchViewHolder extends SearchViewHolder {
+
+    public IntentSearchViewHolder(View view) {
+        super(view);
+    }
+
+    @Override
+    public int getClickActionMetricName() {
+        return MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT;
+    }
+
+    @Override
+    public void onBind(final SearchFragment fragment, final SearchResult result) {
+        super.onBind(fragment, result);
+
+        itemView.setOnClickListener(v -> {
+           fragment.onSearchResultClicked(this, result);
+           fragment.startActivity(result.payload.getIntent());
+        });
+    }
+}
diff --git a/src/com/android/settings/search/ResultPayload.java b/src/com/android/settings/search/ResultPayload.java
new file mode 100644
index 0000000..39688ac
--- /dev/null
+++ b/src/com/android/settings/search/ResultPayload.java
@@ -0,0 +1,140 @@
+/*
+ * 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.search;
+
+import android.annotation.IntDef;
+import android.content.Intent;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * A interface for search results types. Examples include Inline results, third party apps
+ * or any future possibilities.
+ */
+public class ResultPayload implements Parcelable {
+    protected final Intent mIntent;
+
+    @IntDef({PayloadType.INLINE_SLIDER, PayloadType.INLINE_SWITCH,
+            PayloadType.INTENT, PayloadType.SAVED_QUERY})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface PayloadType {
+        /**
+         * Resulting page will be started using an mIntent
+         */
+        int INTENT = 0;
+
+        /**
+         * Result is a inline widget, using a slider widget as UI.
+         */
+        int INLINE_SLIDER = 1;
+
+        /**
+         * Result is a inline widget, using a toggle widget as UI.
+         */
+        int INLINE_SWITCH = 2;
+
+        /**
+         * Result is a recently saved query.
+         */
+        int SAVED_QUERY = 3;
+    }
+
+    /**
+     * Enumerates the possible values for the Availability of a setting.
+     */
+    @IntDef({Availability.AVAILABLE,
+            Availability.DISABLED_DEPENDENCY,
+            Availability.DISABLED_UNSUPPORTED,
+            Availability.RESOURCE_CONTENTION})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface Availability {
+        /**
+         * The setting is available.
+         */
+        int AVAILABLE = 0;
+
+        /**
+         * The setting has a dependency which is currently disabled, blocking access.
+         */
+        int DISABLED_DEPENDENCY = 1;
+
+        /**
+         * The setting is not supported by the device.
+         */
+        int DISABLED_UNSUPPORTED = 2;
+
+        /**
+         * The setting you are trying to change is being used by another application and cannot
+         * be changed until it is released by said application.
+         */
+        int RESOURCE_CONTENTION = 3;
+    }
+
+    @IntDef({SettingsSource.UNKNOWN, SettingsSource.SYSTEM, SettingsSource.SECURE,
+            SettingsSource.GLOBAL})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface SettingsSource {
+        int UNKNOWN = 0;
+        int SYSTEM = 1;
+        int SECURE = 2;
+        int GLOBAL = 3;
+    }
+
+
+    private ResultPayload(Parcel in) {
+        mIntent = in.readParcelable(ResultPayload.class.getClassLoader());
+    }
+
+    public ResultPayload(Intent intent) {
+        mIntent = intent;
+    }
+
+    @ResultPayload.PayloadType
+    public int getType() {
+        return PayloadType.INTENT;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeParcelable(mIntent, flags);
+    }
+
+    public static final Creator<ResultPayload> CREATOR = new Creator<ResultPayload>() {
+        @Override
+        public ResultPayload createFromParcel(Parcel in) {
+            return new ResultPayload(in);
+        }
+
+        @Override
+        public ResultPayload[] newArray(int size) {
+            return new ResultPayload[size];
+        }
+    };
+
+    public Intent getIntent() {
+        return mIntent;
+    }
+}
diff --git a/src/com/android/settings/search2/ResultPayloadUtils.java b/src/com/android/settings/search/ResultPayloadUtils.java
similarity index 88%
rename from src/com/android/settings/search2/ResultPayloadUtils.java
rename to src/com/android/settings/search/ResultPayloadUtils.java
index 41d15e2..2c908c1 100644
--- a/src/com/android/settings/search2/ResultPayloadUtils.java
+++ b/src/com/android/settings/search/ResultPayloadUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -15,14 +15,10 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
-import android.os.BadParcelableException;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.util.Log;
-
-import java.io.StreamCorruptedException;
 
 /**
  * Utility class to Marshall and Unmarshall the payloads stored in the SQLite Database
diff --git a/src/com/android/settings/search2/SavedQueryController.java b/src/com/android/settings/search/SavedQueryController.java
similarity index 98%
rename from src/com/android/settings/search2/SavedQueryController.java
rename to src/com/android/settings/search/SavedQueryController.java
index 92ca42a..f6a3ff6 100644
--- a/src/com/android/settings/search2/SavedQueryController.java
+++ b/src/com/android/settings/search/SavedQueryController.java
@@ -12,9 +12,10 @@
  * 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.search2;
+package com.android.settings.search;
 
 import android.app.LoaderManager;
 import android.content.Context;
diff --git a/src/com/android/settings/search2/SavedQueryLoader.java b/src/com/android/settings/search/SavedQueryLoader.java
similarity index 93%
rename from src/com/android/settings/search2/SavedQueryLoader.java
rename to src/com/android/settings/search/SavedQueryLoader.java
index 245842c..87457f5 100644
--- a/src/com/android/settings/search2/SavedQueryLoader.java
+++ b/src/com/android/settings/search/SavedQueryLoader.java
@@ -12,16 +12,16 @@
  * 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.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.support.annotation.VisibleForTesting;
 
-import com.android.settings.search.IndexDatabaseHelper;
 import com.android.settings.search.IndexDatabaseHelper.SavedQueriesColumns;
 import com.android.settings.utils.AsyncLoader;
 
@@ -68,8 +68,9 @@
             final SavedQueryPayload payload = new SavedQueryPayload(
                     cursor.getString(cursor.getColumnIndex(SavedQueriesColumns.QUERY)));
             results.add(new SearchResult.Builder()
-                    .addTitle(payload.query)
-                    .addPayload(payload)
+                    .setStableId(payload.hashCode())
+                    .setTitle(payload.query)
+                    .setPayload(payload)
                     .build());
         }
         return results;
diff --git a/src/com/android/settings/search2/SavedQueryPayload.java b/src/com/android/settings/search/SavedQueryPayload.java
similarity index 93%
rename from src/com/android/settings/search2/SavedQueryPayload.java
rename to src/com/android/settings/search/SavedQueryPayload.java
index 6316894..0a151fc 100644
--- a/src/com/android/settings/search2/SavedQueryPayload.java
+++ b/src/com/android/settings/search/SavedQueryPayload.java
@@ -12,9 +12,10 @@
  * 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.search2;
+package com.android.settings.search;
 
 import android.os.Parcel;
 import android.support.annotation.VisibleForTesting;
@@ -27,11 +28,13 @@
     public final String query;
 
     public SavedQueryPayload(String query) {
+        super(null /* Intent */);
         this.query = query;
     }
 
     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
     SavedQueryPayload(Parcel in) {
+        super(null /* Intent */);
         query = in.readString();
     }
 
diff --git a/src/com/android/settings/search2/SavedQueryRecorder.java b/src/com/android/settings/search/SavedQueryRecorder.java
similarity index 98%
rename from src/com/android/settings/search2/SavedQueryRecorder.java
rename to src/com/android/settings/search/SavedQueryRecorder.java
index e2325e8..466af0b 100644
--- a/src/com/android/settings/search2/SavedQueryRecorder.java
+++ b/src/com/android/settings/search/SavedQueryRecorder.java
@@ -12,9 +12,10 @@
  * 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.search2;
+package com.android.settings.search;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/com/android/settings/search2/SavedQueryRemover.java b/src/com/android/settings/search/SavedQueryRemover.java
similarity index 97%
rename from src/com/android/settings/search2/SavedQueryRemover.java
rename to src/com/android/settings/search/SavedQueryRemover.java
index 4395cb6..47bb3ba 100644
--- a/src/com/android/settings/search2/SavedQueryRemover.java
+++ b/src/com/android/settings/search/SavedQueryRemover.java
@@ -12,9 +12,10 @@
  * 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.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/src/com/android/settings/search2/SavedQueryViewHolder.java b/src/com/android/settings/search/SavedQueryViewHolder.java
similarity index 84%
rename from src/com/android/settings/search2/SavedQueryViewHolder.java
rename to src/com/android/settings/search/SavedQueryViewHolder.java
index e468eb9..14509b6 100644
--- a/src/com/android/settings/search2/SavedQueryViewHolder.java
+++ b/src/com/android/settings/search/SavedQueryViewHolder.java
@@ -12,13 +12,16 @@
  * 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.search2;
+package com.android.settings.search;
 
 import android.view.View;
 import android.widget.TextView;
 
+import com.android.internal.logging.nano.MetricsProto;
+
 public class SavedQueryViewHolder extends SearchViewHolder {
 
     public final TextView titleView;
@@ -31,6 +34,11 @@
     }
 
     @Override
+    public int getClickActionMetricName() {
+        return MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_SAVED_QUERY;
+    }
+
+    @Override
     public void onBind(SearchFragment fragment, SearchResult result) {
         titleView.setText(result.title);
         titleView.setOnClickListener(v -> fragment.onSavedQueryClicked(result.title));
diff --git a/src/com/android/settings/search2/SearchActivity.java b/src/com/android/settings/search/SearchActivity.java
similarity index 93%
rename from src/com/android/settings/search2/SearchActivity.java
rename to src/com/android/settings/search/SearchActivity.java
index 5a8455b..61a580b 100644
--- a/src/com/android/settings/search2/SearchActivity.java
+++ b/src/com/android/settings/search/SearchActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -12,9 +12,10 @@
  * 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.search2;
+package com.android.settings.search;
 
 import android.app.Activity;
 import android.app.Fragment;
diff --git a/src/com/android/settings/search2/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java
similarity index 70%
rename from src/com/android/settings/search2/SearchFeatureProvider.java
rename to src/com/android/settings/search/SearchFeatureProvider.java
index fa052fc..50edae7 100644
--- a/src/com/android/settings/search2/SearchFeatureProvider.java
+++ b/src/com/android/settings/search/SearchFeatureProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -12,16 +12,19 @@
  * 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.search2;
+package com.android.settings.search;
 
 import android.app.Activity;
 import android.content.Context;
 import android.view.Menu;
-
 import android.view.View;
+
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.search.IndexingCallback;
+import com.android.settings.search.ranking.SearchResultsRankerCallback;
+
+import java.util.List;
 
 /**
  * FeatureProvider for Settings Search
@@ -95,5 +98,38 @@
     default void hideFeedbackButton() {
     }
 
+    /**
+     * Query search results based on the input query.
+     *
+     * @param context application context
+     * @param query input user query
+     * @param searchResultsRankerCallback {@link SearchResultsRankerCallback}
+     */
+    default void querySearchResults(Context context, String query,
+            SearchResultsRankerCallback searchResultsRankerCallback) {
+    }
+
+    /**
+     * Cancel pending search query
+     */
+    default void cancelPendingSearchQuery(Context context) {
+    }
+
+    /**
+     * Notify that a search result is clicked.
+     *
+     * @param context application context
+     * @param query input user query
+     * @param searchResult clicked result
+     */
+    default void searchResultClicked(Context context, String query, SearchResult searchResult) {
+    }
+
+    /**
+     * @return true to enable search ranking.
+     */
+    default boolean isSmartSearchRankingEnabled(Context context) {
+        return false;
+    }
 
 }
diff --git a/src/com/android/settings/search2/SearchFeatureProviderImpl.java b/src/com/android/settings/search/SearchFeatureProviderImpl.java
similarity index 84%
rename from src/com/android/settings/search2/SearchFeatureProviderImpl.java
rename to src/com/android/settings/search/SearchFeatureProviderImpl.java
index 4e47f9d..8bb57c6 100644
--- a/src/com/android/settings/search2/SearchFeatureProviderImpl.java
+++ b/src/com/android/settings/search/SearchFeatureProviderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -12,14 +12,14 @@
  * 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.search2;
+package com.android.settings.search;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -27,9 +27,6 @@
 import com.android.settings.R;
 import com.android.settings.applications.PackageManagerWrapperImpl;
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.search.IndexingCallback;
-
-import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * FeatureProvider for the refactored search code.
@@ -54,13 +51,10 @@
         String menuTitle = activity.getString(R.string.search_menu);
         MenuItem menuItem = menu.add(Menu.NONE, Menu.NONE, Menu.NONE, menuTitle)
                 .setIcon(R.drawable.ic_search_24dp)
-                .setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-                    @Override
-                    public boolean onMenuItemClick(MenuItem item) {
-                        Intent intent = new Intent(activity, SearchActivity.class);
-                        activity.startActivity(intent);
-                        return true;
-                    }
+                .setOnMenuItemClickListener(item -> {
+                    Intent intent = new Intent(activity, SearchActivity.class);
+                    activity.startActivity(intent);
+                    return true;
                 });
 
         menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
diff --git a/src/com/android/settings/search2/SearchFragment.java b/src/com/android/settings/search/SearchFragment.java
similarity index 75%
rename from src/com/android/settings/search2/SearchFragment.java
rename to src/com/android/settings/search/SearchFragment.java
index 2a5c961..90b46af 100644
--- a/src/com/android/settings/search2/SearchFragment.java
+++ b/src/com/android/settings/search/SearchFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -12,14 +12,16 @@
  * 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.search2;
+package com.android.settings.search;
 
-import android.app.ActionBar;
 import android.app.Activity;
 import android.app.LoaderManager;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.Loader;
 import android.os.Bundle;
 import android.support.annotation.VisibleForTesting;
@@ -27,23 +29,26 @@
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.LinearLayout;
-import android.widget.LinearLayout.LayoutParams;
 import android.widget.SearchView;
 
-import com.android.internal.logging.nano.MetricsProto;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.search.IndexingCallback;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -57,12 +62,9 @@
  * the query if the user has entered text.
  */
 public class SearchFragment extends InstrumentedFragment implements SearchView.OnQueryTextListener,
-        LoaderManager.LoaderCallbacks<List<? extends SearchResult>>, IndexingCallback {
+        LoaderManager.LoaderCallbacks<Set<? extends SearchResult>>, IndexingCallback {
     private static final String TAG = "SearchFragment";
 
-    @VisibleForTesting
-    static final int SEARCH_TAG = "SearchViewTag".hashCode();
-
     // State values
     private static final String STATE_QUERY = "state_query";
     private static final String STATE_SHOWING_SAVED_QUERY = "state_showing_saved_query";
@@ -95,16 +97,17 @@
     @VisibleForTesting
     SavedQueryController mSavedQueryController;
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     SearchFeatureProvider mSearchFeatureProvider;
 
     private SearchResultsAdapter mSearchAdapter;
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     RecyclerView mResultsRecyclerView;
     @VisibleForTesting
     SearchView mSearchView;
-    private LinearLayout mNoResultsView;
+    @VisibleForTesting
+    LinearLayout mNoResultsView;
 
     @VisibleForTesting
     final RecyclerView.OnScrollListener mScrollListener = new RecyclerView.OnScrollListener() {
@@ -118,7 +121,7 @@
 
     @Override
     public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.DASHBOARD_SEARCH_RESULTS;
+        return MetricsEvent.DASHBOARD_SEARCH_RESULTS;
     }
 
     @Override
@@ -134,7 +137,7 @@
         setHasOptionsMenu(true);
 
         final LoaderManager loaderManager = getLoaderManager();
-        mSearchAdapter = new SearchResultsAdapter(this);
+        mSearchAdapter = new SearchResultsAdapter(this, mSearchFeatureProvider);
         mSavedQueryController = new SavedQueryController(
                 getContext(), loaderManager, mSearchAdapter);
         mSearchFeatureProvider.initFeedbackButton();
@@ -149,13 +152,6 @@
         }
 
         final Activity activity = getActivity();
-        final ActionBar actionBar = activity.getActionBar();
-        mSearchView = makeSearchView(actionBar, mQuery);
-        actionBar.setCustomView(mSearchView);
-        actionBar.setDisplayShowCustomEnabled(true);
-        actionBar.setDisplayShowTitleEnabled(false);
-        mSearchView.requestFocus();
-
         // Run the Index update only if we have some space
         if (!Utils.isLowStorage(activity)) {
             mSearchFeatureProvider.updateIndex(activity, this /* indexingCallback */);
@@ -172,8 +168,14 @@
         mResultsRecyclerView.setAdapter(mSearchAdapter);
         mResultsRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         mResultsRecyclerView.addOnScrollListener(mScrollListener);
+        mResultsRecyclerView.addItemDecoration(new HeaderDecorator());
 
         mNoResultsView = view.findViewById(R.id.no_results_layout);
+
+        mSearchView = view.findViewById(R.id.search_view);
+        mSearchView.setQuery(mQuery, false /* submitQuery */);
+        mSearchView.setOnQueryTextListener(this);
+        mSearchView.requestFocus();
         return view;
     }
 
@@ -191,7 +193,7 @@
             mMetricsFeatureProvider.histogram(activity, RESULT_CLICK_COUNT, mResultClickCount);
             if (mNeverEnteredQuery) {
                 mMetricsFeatureProvider.action(activity,
-                        MetricsProto.MetricsEvent.ACTION_LEAVE_SEARCH_RESULT_WITHOUT_QUERY);
+                        MetricsEvent.ACTION_LEAVE_SEARCH_RESULT_WITHOUT_QUERY);
             }
         }
     }
@@ -214,8 +216,9 @@
         final boolean isEmptyQuery = TextUtils.isEmpty(query);
 
         // Hide no-results-view when the new query is not a super-string of the previous
-        if ((mQuery != null) && (mNoResultsView.getVisibility() == View.VISIBLE)
-                && (query.length() < mQuery.length())) {
+        if (mQuery != null
+                && mNoResultsView.getVisibility() == View.VISIBLE
+                && query.length() < mQuery.length()) {
             mNoResultsView.setVisibility(View.GONE);
         }
 
@@ -236,6 +239,7 @@
             mSavedQueryController.loadSavedQueries();
             mSearchFeatureProvider.hideFeedbackButton();
         } else {
+            mSearchAdapter.initializeSearch(mQuery);
             restartLoaders();
         }
 
@@ -251,7 +255,7 @@
     }
 
     @Override
-    public Loader<List<? extends SearchResult>> onCreateLoader(int id, Bundle args) {
+    public Loader<Set<? extends SearchResult>> onCreateLoader(int id, Bundle args) {
         final Activity activity = getActivity();
 
         switch (id) {
@@ -265,25 +269,18 @@
     }
 
     @Override
-    public void onLoadFinished(Loader<List<? extends SearchResult>> loader,
-            List<? extends SearchResult> data) {
+    public void onLoadFinished(Loader<Set<? extends SearchResult>> loader,
+            Set<? extends SearchResult> data) {
         mSearchAdapter.addSearchResults(data, loader.getClass().getName());
         if (mUnfinishedLoadersCount.decrementAndGet() != 0) {
             return;
         }
-        final int resultCount = mSearchAdapter.displaySearchResults();
 
-        if (resultCount == 0) {
-            mNoResultsView.setVisibility(View.VISIBLE);
-        } else {
-            mNoResultsView.setVisibility(View.GONE);
-            mResultsRecyclerView.scrollToPosition(0);
-        }
-        mSearchFeatureProvider.showFeedbackButton(this, getView());
+        mSearchAdapter.notifyResultsLoaded();
     }
 
     @Override
-    public void onLoaderReset(Loader<List<? extends SearchResult>> loader) {
+    public void onLoaderReset(Loader<Set<? extends SearchResult>> loader) {
     }
 
     /**
@@ -305,15 +302,30 @@
         requery();
     }
 
-    public void onSearchResultClicked() {
+    public void onSearchResultClicked(SearchViewHolder resultViewHolder, SearchResult result,
+            Pair<Integer, Object>... logTaggedData) {
+        logSearchResultClicked(resultViewHolder, result, logTaggedData);
+        mSearchFeatureProvider.searchResultClicked(getContext(), mQuery, result);
         mSavedQueryController.saveQuery(mQuery);
         mResultClickCount++;
     }
 
+    public void onSearchResultsDisplayed(int resultCount) {
+        if (resultCount == 0) {
+            mNoResultsView.setVisibility(View.VISIBLE);
+            mMetricsFeatureProvider.visible(getContext(), getMetricsCategory(),
+                    MetricsEvent.SETTINGS_SEARCH_NO_RESULT);
+        } else {
+            mNoResultsView.setVisibility(View.GONE);
+            mResultsRecyclerView.scrollToPosition(0);
+        }
+        mSearchFeatureProvider.showFeedbackButton(this, getView());
+    }
+
     public void onSavedQueryClicked(CharSequence query) {
         final String queryString = query.toString();
         mMetricsFeatureProvider.action(getContext(),
-                MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_SAVED_QUERY);
+                MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_SAVED_QUERY);
         mSearchView.setQuery(queryString, false /* submit */);
         onQueryTextChange(queryString);
     }
@@ -347,19 +359,6 @@
         onQueryTextChange(query);
     }
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-    SearchView makeSearchView(ActionBar actionBar, String query) {
-        final SearchView searchView = new SearchView(actionBar.getThemedContext());
-        searchView.setIconifiedByDefault(false);
-        searchView.setQuery(query, false /* submitQuery */);
-        searchView.setOnQueryTextListener(this);
-        searchView.setTag(SEARCH_TAG, searchView);
-        final LayoutParams lp =
-                new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-        searchView.setLayoutParams(lp);
-        return searchView;
-    }
-
     private void hideKeyboard() {
         final Activity activity = getActivity();
         if (activity != null) {
@@ -373,4 +372,37 @@
             mResultsRecyclerView.requestFocus();
         }
     }
-}
\ No newline at end of file
+
+    private void logSearchResultClicked(SearchViewHolder resultViewHolder, SearchResult result,
+            Pair<Integer, Object>... logTaggedData) {
+        final Intent intent = result.payload.getIntent();
+        if (intent == null) {
+            Log.w(TAG, "Skipped logging click on search result because of null intent, which can " +
+                    "happen on saved query results.");
+            return;
+        }
+        final ComponentName cn = intent.getComponent();
+        String resultName = intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT);
+        if (TextUtils.isEmpty(resultName) && cn != null) {
+            resultName = cn.flattenToString();
+        }
+        final List<Pair<Integer, Object>> taggedData = new ArrayList<>();
+        if (logTaggedData != null) {
+            taggedData.addAll(Arrays.asList(logTaggedData));
+        }
+        taggedData.add(Pair.create(
+                MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_COUNT,
+                mSearchAdapter.getItemCount()));
+        taggedData.add(Pair.create(
+                MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_RANK,
+                resultViewHolder.getAdapterPosition()));
+        taggedData.add(Pair.create(
+                MetricsEvent.FIELD_SETTINGS_SERACH_QUERY_LENGTH,
+                TextUtils.isEmpty(mQuery) ? 0 : mQuery.length()));
+
+        mMetricsFeatureProvider.action(getContext(),
+                resultViewHolder.getClickActionMetricName(),
+                resultName,
+                taggedData.toArray(new Pair[0]));
+    }
+}
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index d1d6945..431729f 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -40,18 +40,23 @@
 import com.android.settings.backup.BackupSettingsActivity;
 import com.android.settings.backup.BackupSettingsFragment;
 import com.android.settings.bluetooth.BluetoothSettings;
+import com.android.settings.bluetooth.BluetoothSettingsObsolete;
 import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
+import com.android.settings.support.SupportDashboardActivity;
 import com.android.settings.datausage.DataUsageMeteredSettings;
 import com.android.settings.datausage.DataUsageSummary;
 import com.android.settings.development.DevelopmentSettings;
 import com.android.settings.deviceinfo.StorageDashboardFragment;
 import com.android.settings.deviceinfo.StorageSettings;
+import com.android.settings.display.AmbientDisplaySettings;
 import com.android.settings.display.ScreenZoomSettings;
+import com.android.settings.dream.DreamSettings;
 import com.android.settings.enterprise.EnterprisePrivacySettings;
 import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageAdvanced;
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.gestures.AssistGestureSettings;
+import com.android.settings.gestures.CameraLiftTriggerSettings;
 import com.android.settings.gestures.DoubleTapPowerSettings;
 import com.android.settings.gestures.DoubleTapScreenSettings;
 import com.android.settings.gestures.DoubleTwistGestureSettings;
@@ -108,11 +113,13 @@
         addIndex(SavedAccessPointsWifiSettings.class, NO_DATA_RES_ID,
                 R.drawable.ic_settings_wireless);
         addIndex(BluetoothSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_bluetooth);
+        addIndex(BluetoothSettingsObsolete.class, NO_DATA_RES_ID, R.drawable.ic_settings_bluetooth);
         addIndex(SimSettings.class, NO_DATA_RES_ID, R.drawable.ic_sim_sd);
         addIndex(DataUsageSummary.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage);
         addIndex(DataUsageMeteredSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage);
         addIndex(ScreenZoomSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
         addIndex(DisplaySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
+        addIndex(AmbientDisplaySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
         addIndex(WallpaperTypeSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
         addIndex(ConfigureNotificationSettings.class,
                 R.xml.configure_notification_settings, R.drawable.ic_settings_notifications);
@@ -131,8 +138,7 @@
                 R.xml.battery_saver_settings, R.drawable.ic_settings_battery);
         addIndex(AdvancedAppSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_applications);
         addIndex(ManageAssist.class, NO_DATA_RES_ID, R.drawable.ic_settings_applications);
-        addIndex(SpecialAccessSettings.class,
-                R.xml.special_access, R.drawable.ic_settings_applications);
+        addIndex(SpecialAccessSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_applications);
         addIndex(UserSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_multiuser);
         addIndex(AssistGestureSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures);
         addIndex(PickupGestureSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures);
@@ -141,6 +147,8 @@
         addIndex(DoubleTwistGestureSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures);
         addIndex(SwipeToNotificationSettings.class, NO_DATA_RES_ID,
                 R.drawable.ic_settings_gestures);
+        addIndex(CameraLiftTriggerSettings.class, NO_DATA_RES_ID,
+                R.drawable.ic_settings_gestures);
         addIndex(LanguageAndInputSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_language);
         addIndex(LocationSettings.class, R.xml.location_settings, R.drawable.ic_settings_location);
         addIndex(ScanningSettings.class, R.xml.location_scanning, R.drawable.ic_settings_location);
@@ -182,6 +190,8 @@
                 R.drawable.ic_settings_accessibility);
         addIndex(ChannelImportanceSettings.class, NO_DATA_RES_ID,
                 R.drawable.ic_settings_notifications);
+        addIndex(DreamSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
+        addIndex(SupportDashboardActivity.class, NO_DATA_RES_ID, R.drawable.ic_help);
     }
 
     private SearchIndexableResources() {
diff --git a/src/com/android/settings/search2/SearchResult.java b/src/com/android/settings/search/SearchResult.java
similarity index 74%
rename from src/com/android/settings/search2/SearchResult.java
rename to src/com/android/settings/search/SearchResult.java
index ecc41b6..d96661a 100644
--- a/src/com/android/settings/search2/SearchResult.java
+++ b/src/com/android/settings/search/SearchResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -12,20 +12,24 @@
  * 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.search2;
+package com.android.settings.search;
 
 import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.util.Log;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
  * Data class as an interface for all Search Results.
  */
 public class SearchResult implements Comparable<SearchResult> {
 
+    private static final String TAG = "SearchResult";
+
     /**
      * Defines the lowest rank for a search result to be considered as ranked. Results with ranks
      * higher than this have no guarantee for sorting order.
@@ -83,9 +87,10 @@
     /**
      * Stable id for this object.
      */
-    public final long stableId;
+    public final int stableId;
 
     protected SearchResult(Builder builder) {
+        stableId = builder.mStableId;
         title = builder.mTitle;
         summary = builder.mSummary;
         breadcrumbs = builder.mBreadcrumbs;
@@ -93,7 +98,6 @@
         icon = builder.mIcon;
         payload = builder.mResultPayload;
         viewType = payload.getType();
-        stableId = Objects.hash(title, summary, breadcrumbs, rank, viewType);
     }
 
     @Override
@@ -105,19 +109,19 @@
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
+    public boolean equals(Object that) {
+        if (this == that) {
             return true;
         }
-        if (!(obj instanceof SearchResult)) {
+        if (!(that instanceof SearchResult)) {
             return false;
         }
-        return this.stableId == ((SearchResult) obj).stableId;
+        return this.stableId == ((SearchResult) that).stableId;
     }
 
     @Override
     public int hashCode() {
-        return (int) stableId;
+        return stableId;
     }
 
     public static class Builder {
@@ -127,13 +131,14 @@
         protected int mRank = 42;
         protected ResultPayload mResultPayload;
         protected Drawable mIcon;
+        protected int mStableId;
 
-        public Builder addTitle(CharSequence title) {
+        public Builder setTitle(CharSequence title) {
             mTitle = title;
             return this;
         }
 
-        public Builder addSummary(CharSequence summary) {
+        public Builder setSummary(CharSequence summary) {
             mSummary = summary;
             return this;
         }
@@ -143,29 +148,37 @@
             return this;
         }
 
-        public Builder addRank(int rank) {
+        public Builder setRank(int rank) {
             if (rank >= 0 && rank <= 9) {
                 mRank = rank;
             }
             return this;
         }
 
-        public Builder addIcon(Drawable icon) {
+        public Builder setIcon(Drawable icon) {
             mIcon = icon;
             return this;
         }
 
-        public Builder addPayload(ResultPayload payload) {
+        public Builder setPayload(ResultPayload payload) {
             mResultPayload = payload;
             return this;
         }
 
+        public Builder setStableId(int stableId) {
+            mStableId = stableId;
+            return this;
+        }
+
         public SearchResult build() {
             // Check that all of the mandatory fields are set.
-            if (mTitle == null) {
-                throw new IllegalArgumentException("SearchResult missing title argument");
+            if (TextUtils.isEmpty(mTitle)) {
+                throw new IllegalStateException("SearchResult missing title argument");
+            } else if (mStableId == 0) {
+                Log.v(TAG, "No stable ID on SearchResult with title: " + mTitle);
+                throw new IllegalStateException("SearchResult missing stableId argument");
             } else if (mResultPayload == null) {
-                throw new IllegalArgumentException("SearchResult missing Payload argument");
+                throw new IllegalStateException("SearchResult missing Payload argument");
             }
             return new SearchResult(this);
         }
diff --git a/src/com/android/settings/search2/SearchResultDiffCallback.java b/src/com/android/settings/search/SearchResultDiffCallback.java
similarity index 97%
rename from src/com/android/settings/search2/SearchResultDiffCallback.java
rename to src/com/android/settings/search/SearchResultDiffCallback.java
index 9bd1bde..b7bbc66 100644
--- a/src/com/android/settings/search2/SearchResultDiffCallback.java
+++ b/src/com/android/settings/search/SearchResultDiffCallback.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.support.v7.util.DiffUtil;
 
diff --git a/src/com/android/settings/search/SearchResultsAdapter.java b/src/com/android/settings/search/SearchResultsAdapter.java
new file mode 100644
index 0000000..199930f
--- /dev/null
+++ b/src/com/android/settings/search/SearchResultsAdapter.java
@@ -0,0 +1,396 @@
+/*
+ * 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.search;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.support.annotation.IntDef;
+import android.support.annotation.MainThread;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.util.DiffUtil;
+import android.support.v7.widget.RecyclerView;
+import android.util.ArrayMap;
+import android.util.Log;
+import android.util.Pair;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.settings.R;
+import com.android.settings.search.ranking.SearchResultsRankerCallback;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class SearchResultsAdapter extends RecyclerView.Adapter<SearchViewHolder>
+        implements SearchResultsRankerCallback {
+    private static final String TAG = "SearchResultsAdapter";
+
+    @VisibleForTesting
+    static final String DB_RESULTS_LOADER_KEY = DatabaseResultLoader.class.getName();
+
+    @VisibleForTesting
+    static final String APP_RESULTS_LOADER_KEY = InstalledAppResultLoader.class.getName();
+
+    @VisibleForTesting
+    static final int MSG_RANKING_TIMED_OUT = 1;
+
+    // TODO(b/38197948): Tune this timeout based on latency of static and async rankings. Also, we
+    // should add a gservices flag to control this.
+    private static final long RANKING_TIMEOUT_MS = 300;
+    private final SearchFragment mFragment;
+    private final Context mContext;
+    private final List<SearchResult> mSearchResults;
+    private final List<SearchResult> mStaticallyRankedSearchResults;
+    private Map<String, Set<? extends SearchResult>> mResultsMap;
+    private final SearchFeatureProvider mSearchFeatureProvider;
+    private List<Pair<String, Float>> mSearchRankingScores;
+    private Handler mHandler;
+    private boolean mSearchResultsLoaded;
+    private boolean mSearchResultsUpdated;
+
+    @IntDef({DISABLED, PENDING_RESULTS, SUCCEEDED, FAILED, TIMED_OUT})
+    @Retention(RetentionPolicy.SOURCE)
+    private @interface AsyncRankingState {}
+    private static final int DISABLED = 0;
+    private static final int PENDING_RESULTS = 1;
+    private static final int SUCCEEDED = 2;
+    private static final int FAILED = 3;
+    private static final int TIMED_OUT = 4;
+    private @AsyncRankingState int mAsyncRankingState;
+
+    public SearchResultsAdapter(SearchFragment fragment,
+            SearchFeatureProvider searchFeatureProvider) {
+        mFragment = fragment;
+        mContext = fragment.getContext().getApplicationContext();
+        mSearchResults = new ArrayList<>();
+        mResultsMap = new ArrayMap<>();
+        mSearchRankingScores = new ArrayList<>();
+        mStaticallyRankedSearchResults = new ArrayList<>();
+        mSearchFeatureProvider = searchFeatureProvider;
+
+        setHasStableIds(true);
+    }
+
+    @Override
+    public SearchViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        final Context context = parent.getContext();
+        final LayoutInflater inflater = LayoutInflater.from(context);
+        final View view;
+        switch (viewType) {
+            case ResultPayload.PayloadType.INTENT:
+                view = inflater.inflate(R.layout.search_intent_item, parent, false);
+                return new IntentSearchViewHolder(view);
+            case ResultPayload.PayloadType.INLINE_SWITCH:
+                view = inflater.inflate(R.layout.search_inline_switch_item, parent, false);
+                return new InlineSwitchViewHolder(view, context);
+            case ResultPayload.PayloadType.SAVED_QUERY:
+                view = inflater.inflate(R.layout.search_saved_query_item, parent, false);
+                return new SavedQueryViewHolder(view);
+            default:
+                return null;
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(SearchViewHolder holder, int position) {
+        holder.onBind(mFragment, mSearchResults.get(position));
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return mSearchResults.get(position).stableId;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return mSearchResults.get(position).viewType;
+    }
+
+    @Override
+    public int getItemCount() {
+        return mSearchResults.size();
+    }
+
+    @MainThread
+    @Override
+    public void onRankingScoresAvailable(List<Pair<String, Float>> searchRankingScores) {
+        // Received the scores, stop the timeout timer.
+        getHandler().removeMessages(MSG_RANKING_TIMED_OUT);
+        if (mAsyncRankingState == PENDING_RESULTS) {
+            mAsyncRankingState = SUCCEEDED;
+            mSearchRankingScores.clear();
+            mSearchRankingScores.addAll(searchRankingScores);
+            if (canUpdateSearchResults()) {
+                updateSearchResults();
+            }
+        } else {
+            Log.w(TAG, "Ranking scores became available in invalid state: " + mAsyncRankingState);
+        }
+    }
+
+    @MainThread
+    @Override
+    public void onRankingFailed() {
+        if (mAsyncRankingState == PENDING_RESULTS) {
+            mAsyncRankingState = FAILED;
+            if (canUpdateSearchResults()) {
+                updateSearchResults();
+            }
+        } else {
+            Log.w(TAG, "Ranking scores failed in invalid states: " + mAsyncRankingState);
+        }
+    }
+
+   /**
+     * Store the results from each of the loaders to be merged when all loaders are finished.
+     *
+     * @param results         the results from the loader.
+     * @param loaderClassName class name of the loader.
+     */
+    @MainThread
+    public void addSearchResults(Set<? extends SearchResult> results, String loaderClassName) {
+        if (results == null) {
+            return;
+        }
+        mResultsMap.put(loaderClassName, results);
+    }
+
+    /**
+     * Displays recent searched queries.
+     *
+     * @return The number of saved queries to display
+     */
+    public int displaySavedQuery(List<? extends SearchResult> data) {
+        clearResults();
+        mSearchResults.addAll(data);
+        notifyDataSetChanged();
+        return mSearchResults.size();
+    }
+
+    /**
+     * Notifies the adapter that all the unsorted results are loaded and now the ladapter can
+     * proceed with ranking the results.
+     */
+    @MainThread
+    public void notifyResultsLoaded() {
+        mSearchResultsLoaded = true;
+        // static ranking is skipped only if asyc ranking is already succeeded.
+        if (mAsyncRankingState != SUCCEEDED) {
+            doStaticRanking();
+        }
+        if (canUpdateSearchResults()) {
+            updateSearchResults();
+        }
+    }
+
+    public void clearResults() {
+        mSearchResults.clear();
+        mStaticallyRankedSearchResults.clear();
+        mResultsMap.clear();
+        notifyDataSetChanged();
+    }
+
+    @VisibleForTesting
+    public List<SearchResult> getSearchResults() {
+        return mSearchResults;
+    }
+
+    @MainThread
+    public void initializeSearch(String query) {
+        clearResults();
+        mSearchResultsLoaded = false;
+        mSearchResultsUpdated = false;
+        if (mSearchFeatureProvider.isSmartSearchRankingEnabled(mContext)) {
+            mAsyncRankingState = PENDING_RESULTS;
+            mSearchFeatureProvider.cancelPendingSearchQuery(mContext);
+            final Handler handler = getHandler();
+            handler.sendMessageDelayed(
+                    handler.obtainMessage(MSG_RANKING_TIMED_OUT), RANKING_TIMEOUT_MS);
+            mSearchFeatureProvider.querySearchResults(mContext, query, this);
+        } else {
+            mAsyncRankingState = DISABLED;
+        }
+    }
+
+    /**
+     * Merge the results from each of the loaders into one list for the adapter.
+     * Prioritizes results from the local database over installed apps.
+     */
+    private void doStaticRanking() {
+        List<? extends SearchResult> databaseResults =
+                getSortedLoadedResults(DB_RESULTS_LOADER_KEY);
+        List<? extends SearchResult> installedAppResults =
+                getSortedLoadedResults(APP_RESULTS_LOADER_KEY);
+        int dbSize = databaseResults.size();
+        int appSize = installedAppResults.size();
+
+        int dbIndex = 0;
+        int appIndex = 0;
+        int rank = SearchResult.TOP_RANK;
+
+        mStaticallyRankedSearchResults.clear();
+        while (rank <= SearchResult.BOTTOM_RANK) {
+            while ((dbIndex < dbSize) && (databaseResults.get(dbIndex).rank == rank)) {
+                mStaticallyRankedSearchResults.add(databaseResults.get(dbIndex++));
+            }
+            while ((appIndex < appSize) && (installedAppResults.get(appIndex).rank == rank)) {
+                mStaticallyRankedSearchResults.add(installedAppResults.get(appIndex++));
+            }
+            rank++;
+        }
+
+        while (dbIndex < dbSize) {
+            mStaticallyRankedSearchResults.add(databaseResults.get(dbIndex++));
+        }
+        while (appIndex < appSize) {
+            mStaticallyRankedSearchResults.add(installedAppResults.get(appIndex++));
+        }
+    }
+
+    private void updateSearchResults() {
+        switch (mAsyncRankingState) {
+            case PENDING_RESULTS:
+                break;
+            case DISABLED:
+            case FAILED:
+            case TIMED_OUT:
+                // When DISABLED or FAILED or TIMED_OUT, we use static ranking results.
+                postSearchResults(mStaticallyRankedSearchResults, false);
+                break;
+            case SUCCEEDED:
+                postSearchResults(doAsyncRanking(), true);
+                break;
+        }
+    }
+
+    private boolean canUpdateSearchResults() {
+        // Results are not updated yet and db results are loaded and we are not waiting on async
+        // ranking scores.
+        return !mSearchResultsUpdated
+                && mSearchResultsLoaded
+                && mAsyncRankingState != PENDING_RESULTS;
+    }
+
+    @VisibleForTesting
+    List<SearchResult> doAsyncRanking() {
+        Set<? extends SearchResult> databaseResults =
+                getUnsortedLoadedResults(DB_RESULTS_LOADER_KEY);
+        List<? extends SearchResult> installedAppResults =
+                getSortedLoadedResults(APP_RESULTS_LOADER_KEY);
+        int dbSize = databaseResults.size();
+        int appSize = installedAppResults.size();
+
+        final List<SearchResult> asyncRankingResults = new ArrayList<>(dbSize + appSize);
+        List<SearchResult> databaseResultsSortedByScores = new ArrayList<>(databaseResults);
+        Collections.sort(databaseResultsSortedByScores, new Comparator<SearchResult>() {
+            @Override
+            public int compare(SearchResult o1, SearchResult o2) {
+                float score1 = getRankingScoreByStableId(o1.stableId);
+                float score2 = getRankingScoreByStableId(o2.stableId);
+                if (score1 > score2) {
+                    return -1;
+                } else if (score1 == score2) {
+                    return 0;
+                } else {
+                    return 1;
+                }
+            }
+        });
+        asyncRankingResults.addAll(databaseResultsSortedByScores);
+        // App results are not ranked by async ranking and appended at the end of the list.
+        asyncRankingResults.addAll(installedAppResults);
+        return asyncRankingResults;
+    }
+
+    @VisibleForTesting
+    Set<? extends SearchResult> getUnsortedLoadedResults(String loaderKey) {
+        return mResultsMap.containsKey(loaderKey) ?
+                mResultsMap.get(loaderKey) : new HashSet<SearchResult>();
+    }
+
+    @VisibleForTesting
+    List<? extends SearchResult> getSortedLoadedResults(String loaderKey) {
+        List<? extends SearchResult> sortedLoadedResults =
+                new ArrayList<>(getUnsortedLoadedResults(loaderKey));
+        Collections.sort(sortedLoadedResults);
+        return sortedLoadedResults;
+    }
+
+    /**
+     * Looks up ranking score for stableId
+     * @param stableId String of stableId
+     * @return the ranking score corresponding to the given stableId. If there is no score
+     * available for this stableId, -Float.MAX_VALUE is returned.
+     */
+    @VisibleForTesting
+    Float getRankingScoreByStableId(int stableId) {
+        for (Pair<String, Float> rankingScore : mSearchRankingScores) {
+            if (Integer.toString(stableId).compareTo(rankingScore.first) == 0) {
+                return rankingScore.second;
+            }
+        }
+        // If stableId not found in the list, we assign the minimum score so it will appear at
+        // the end of the list.
+        Log.w(TAG, "stableId " + stableId + " was not in the ranking scores.");
+        return -Float.MAX_VALUE;
+    }
+
+    @VisibleForTesting
+    Handler getHandler() {
+        if (mHandler == null) {
+            mHandler = new Handler(Looper.getMainLooper()) {
+                @Override
+                public void handleMessage(Message msg) {
+                    if (msg.what == MSG_RANKING_TIMED_OUT) {
+                        mSearchFeatureProvider.cancelPendingSearchQuery(mContext);
+                        if (mAsyncRankingState == PENDING_RESULTS) {
+                            mAsyncRankingState = TIMED_OUT;
+                            if (canUpdateSearchResults()) {
+                                updateSearchResults();
+                            }
+                        } else {
+                            Log.w(TAG, "Ranking scores timed out in invalid state: " +
+                                    mAsyncRankingState);
+                        }
+                    }
+                }
+            };
+        }
+        return mHandler;
+    }
+
+    private void postSearchResults(List<SearchResult> newSearchResults, boolean detectMoves) {
+        final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(
+                new SearchResultDiffCallback(mSearchResults, newSearchResults), detectMoves);
+        mSearchResults.clear();
+        mSearchResults.addAll(newSearchResults);
+        diffResult.dispatchUpdatesTo(this);
+        mFragment.onSearchResultsDisplayed(mSearchResults.size());
+        mSearchResultsUpdated = true;
+    }
+}
diff --git a/src/com/android/settings/search2/SearchViewHolder.java b/src/com/android/settings/search/SearchViewHolder.java
similarity index 87%
rename from src/com/android/settings/search2/SearchViewHolder.java
rename to src/com/android/settings/search/SearchViewHolder.java
index ab13252..72fd02320 100644
--- a/src/com/android/settings/search2/SearchViewHolder.java
+++ b/src/com/android/settings/search/SearchViewHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -12,8 +12,9 @@
  * 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.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -44,11 +45,14 @@
     public final ImageView iconView;
 
     protected final MetricsFeatureProvider mMetricsFeatureProvider;
+    protected final SearchFeatureProvider mSearchFeatureProvider;
 
     public SearchViewHolder(View view) {
         super(view);
-        mMetricsFeatureProvider = FeatureFactory.getFactory(view.getContext())
-                .getMetricsFeatureProvider();
+        final FeatureFactory featureFactory = FeatureFactory
+                .getFactory(view.getContext().getApplicationContext());
+        mMetricsFeatureProvider = featureFactory.getMetricsFeatureProvider();
+        mSearchFeatureProvider = featureFactory.getSearchFeatureProvider();
         titleView = view.findViewById(android.R.id.title);
         summaryView = view.findViewById(android.R.id.summary);
         iconView = view.findViewById(android.R.id.icon);
@@ -57,6 +61,8 @@
         mPlaceholderSummary = view.getContext().getString(R.string.summary_placeholder);
     }
 
+    public abstract int getClickActionMetricName();
+
     public void onBind(SearchFragment fragment, SearchResult result) {
         titleView.setText(result.title);
         // TODO (b/36101902) remove check for DYNAMIC_PLACEHOLDER
diff --git a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
index 1bf0a15..f7c2a16 100644
--- a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
+++ b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
@@ -23,8 +23,6 @@
 import android.provider.SearchIndexablesProvider;
 import android.util.Log;
 
-import com.android.settings.search2.DatabaseIndexingUtils;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/src/com/android/settings/search2/XmlParserUtils.java b/src/com/android/settings/search/XmlParserUtils.java
similarity index 97%
rename from src/com/android/settings/search2/XmlParserUtils.java
rename to src/com/android/settings/search/XmlParserUtils.java
index 17f1743..c81381c 100644
--- a/src/com/android/settings/search2/XmlParserUtils.java
+++ b/src/com/android/settings/search/XmlParserUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/src/com/android/settings/search/ranking/SearchResultsRankerCallback.java b/src/com/android/settings/search/ranking/SearchResultsRankerCallback.java
new file mode 100644
index 0000000..c254a40
--- /dev/null
+++ b/src/com/android/settings/search/ranking/SearchResultsRankerCallback.java
@@ -0,0 +1,38 @@
+/*
+ * 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.search.ranking;
+
+import android.util.Pair;
+
+import java.util.List;
+
+public interface SearchResultsRankerCallback {
+
+    /**
+     * Called when ranker provides the ranking scores.
+     * @param searchRankingScores Ordered List of Pairs of String and Float corresponding to
+     *                            stableIds and ranking scores. The list must be descendingly
+     *                            ordered based on scores.
+     */
+    public void onRankingScoresAvailable(List<Pair<String, Float>> searchRankingScores);
+
+    /**
+     * Called when for any reason ranker fails, which notifies the client to proceed
+     * without ranking results.
+     */
+    public void onRankingFailed();
+}
diff --git a/src/com/android/settings/search2/CursorToSearchResultConverter.java b/src/com/android/settings/search2/CursorToSearchResultConverter.java
deleted file mode 100644
index 71d999e..0000000
--- a/src/com/android/settings/search2/CursorToSearchResultConverter.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright (C) 2016 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.search2;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.database.Cursor;
-import android.graphics.drawable.Drawable;
-import android.os.BadParcelableException;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsActivity;
-import com.android.settings.Utils;
-import com.android.settings.dashboard.SiteMapManager;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_CLASS_NAME;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_ICON;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_ID;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_INTENT_ACTION;
-import static com.android.settings.search2.DatabaseResultLoader
-        .COLUMN_INDEX_INTENT_ACTION_TARGET_CLASS;
-import static com.android.settings.search2.DatabaseResultLoader
-        .COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_KEY;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_PAYLOAD;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_PAYLOAD_TYPE;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_SCREEN_TITLE;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_SUMMARY_ON;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_TITLE;
-
-/**
- * Controller to Build search results from {@link Cursor} Objects.
- *
- * Each converted {@link Cursor} has the following fields:
- * - String Title
- * - String Summary
- * - int rank
- * - {@link Drawable} icon
- * - {@link ResultPayload} payload
- */
-class CursorToSearchResultConverter {
-
-    private final String TAG = "CursorConverter";
-
-    private final String mQueryText;
-
-    private final Context mContext;
-
-    private final Set<String> mKeys;
-
-    private final int LONG_TITLE_LENGTH = 20;
-
-    private static final String[] whiteList = {
-            "main_toggle_wifi",
-            "main_toggle_bluetooth",
-            "toggle_airplane",
-            "tether_settings",
-            "battery_saver",
-            "toggle_nfc",
-            "restrict_background",
-            "data_usage_enable",
-            "button_roaming_key",
-    };
-    private static final Set<String> prioritySettings = new HashSet(Arrays.asList(whiteList));
-
-
-    public CursorToSearchResultConverter(Context context, String queryText) {
-        mContext = context;
-        mKeys = new HashSet<>();
-        mQueryText = queryText;
-    }
-
-    public List<SearchResult> convertCursor(SiteMapManager sitemapManager,
-            Cursor cursorResults, int baseRank) {
-        if (cursorResults == null) {
-            return null;
-        }
-        final Map<String, Context> contextMap = new HashMap<>();
-        final List<SearchResult> results = new ArrayList<>();
-
-        while (cursorResults.moveToNext()) {
-            SearchResult result = buildSingleSearchResultFromCursor(sitemapManager,
-                    contextMap, cursorResults, baseRank);
-            if (result != null) {
-                results.add(result);
-            }
-        }
-        Collections.sort(results);
-        return results;
-    }
-
-    private SearchResult buildSingleSearchResultFromCursor(SiteMapManager sitemapManager,
-            Map<String, Context> contextMap, Cursor cursor, int baseRank) {
-        final String docId = cursor.getString(COLUMN_INDEX_ID);
-        /* Make sure that this result has not yet been added as a result. Checking the docID
-           covers the case of multiple queries matching the same row, but we need to also to check
-           for potentially the same named or slightly varied names pointing to the same page.
-         */
-        if (mKeys.contains(docId)) {
-            return null;
-        }
-        mKeys.add(docId);
-
-        final String pkgName = cursor.getString(COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE);
-        final String action = cursor.getString(COLUMN_INDEX_INTENT_ACTION);
-        final String title = cursor.getString(COLUMN_INDEX_TITLE);
-        final String summaryOn = cursor.getString(COLUMN_INDEX_SUMMARY_ON);
-        final String className = cursor.getString(COLUMN_INDEX_CLASS_NAME);
-        final String key = cursor.getString(COLUMN_INDEX_KEY);
-        final String iconResStr = cursor.getString(COLUMN_INDEX_ICON);
-        final int payloadType = cursor.getInt(COLUMN_INDEX_PAYLOAD_TYPE);
-        final byte[] marshalledPayload = cursor.getBlob(COLUMN_INDEX_PAYLOAD);
-        final ResultPayload payload;
-
-        if (marshalledPayload != null) {
-            payload = getUnmarshalledPayload(marshalledPayload, payloadType);
-        } else if (payloadType == ResultPayload.PayloadType.INTENT) {
-            payload = getIntentPayload(cursor, action, key, className, pkgName);
-        } else {
-            Log.w(TAG, "Error creating payload - bad marshalling data or mismatched types");
-            return null;
-        }
-
-        final List<String> breadcrumbs = getBreadcrumbs(sitemapManager, cursor);
-        final int rank = getRank(title, breadcrumbs, baseRank, key);
-
-        final SearchResult.Builder builder = new SearchResult.Builder();
-        builder.addTitle(title)
-                .addSummary(summaryOn)
-                .addBreadcrumbs(breadcrumbs)
-                .addRank(rank)
-                .addIcon(getIconForPackage(contextMap, pkgName, className, iconResStr))
-                .addPayload(payload);
-        return builder.build();
-    }
-
-    private Drawable getIconForPackage(Map<String, Context> contextMap, String pkgName,
-            String className, String iconResStr) {
-        final int iconId = TextUtils.isEmpty(iconResStr)
-                ? 0 : Integer.parseInt(iconResStr);
-        Drawable icon;
-        Context packageContext;
-        if (iconId == 0) {
-            icon = null;
-        } else {
-            if (TextUtils.isEmpty(className) && !TextUtils.isEmpty(pkgName)) {
-                packageContext = contextMap.get(pkgName);
-                if (packageContext == null) {
-                    try {
-                        packageContext = mContext.createPackageContext(pkgName, 0);
-                    } catch (PackageManager.NameNotFoundException e) {
-                        Log.e(TAG, "Cannot create Context for package: " + pkgName);
-                        return null;
-                    }
-                    contextMap.put(pkgName, packageContext);
-                }
-            } else {
-                packageContext = mContext;
-            }
-            try {
-                icon = packageContext.getDrawable(iconId);
-            } catch (Resources.NotFoundException nfe) {
-                icon = null;
-            }
-        }
-        return icon;
-    }
-
-    private IntentPayload getIntentPayload(Cursor cursor, String action, String key,
-            String className, String pkgName ) {
-        IntentPayload payload;
-        if (TextUtils.isEmpty(action)) {
-            final String screenTitle = cursor.getString(COLUMN_INDEX_SCREEN_TITLE);
-            // Action is null, we will launch it as a sub-setting
-            final Bundle args = new Bundle();
-            args.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key);
-            final Intent intent = Utils.onBuildStartFragmentIntent(mContext,
-                    className, args, null, 0, screenTitle, false,
-                    MetricsProto.MetricsEvent.DASHBOARD_SEARCH_RESULTS);
-            payload = new IntentPayload(intent);
-        } else {
-            final Intent intent = new Intent(action);
-            final String targetClass = cursor.getString(COLUMN_INDEX_INTENT_ACTION_TARGET_CLASS);
-            if (!TextUtils.isEmpty(pkgName) && !TextUtils.isEmpty(targetClass)) {
-                final ComponentName component = new ComponentName(pkgName, targetClass);
-                intent.setComponent(component);
-            }
-            intent.putExtra(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key);
-            payload = new IntentPayload(intent);
-        }
-        return payload;
-    }
-
-    private ResultPayload getUnmarshalledPayload(byte[] unmarshalledPayload, int payloadType) {
-        try {
-            switch (payloadType) {
-                case ResultPayload.PayloadType.INLINE_SWITCH:
-                    return ResultPayloadUtils.unmarshall(unmarshalledPayload,
-                            InlineSwitchPayload.CREATOR);
-            }
-        } catch (BadParcelableException e) {
-            Log.w(TAG, "Error creating parcelable: " + e);
-        }
-        return null;
-    }
-
-    private List<String> getBreadcrumbs(SiteMapManager siteMapManager, Cursor cursor) {
-        final String screenTitle = cursor.getString(COLUMN_INDEX_SCREEN_TITLE);
-        final String screenClass = cursor.getString(COLUMN_INDEX_CLASS_NAME);
-        return siteMapManager == null ? null : siteMapManager.buildBreadCrumb(mContext, screenClass,
-                screenTitle);
-    }
-
-    /** Uses the breadcrumbs to determine the offset to the base rank.
-     *  There are three checks
-     *  A) If the result is prioritized and the highest base level
-     *  B) If the query matches the highest level menu title
-     *  C) If the query matches a subsequent menu title
-     *  D) Is the title longer than 20
-     *
-     *  If the query matches A, set it to TOP_RANK
-     *  If the query matches B and C, the offset is 0.
-     *  If the query matches C only, the offset is 1.
-     *  If the query matches neither B nor C, the offset is 2.
-     *  If the query matches D, the offset is 2
-
-     * @param title of the result.
-     * @param crumbs from the Information Architecture
-     * @param baseRank of the result. Lower if it's a better result.
-     * @return
-     */
-    private int getRank(String title, List<String> crumbs, int baseRank, String key) {
-        // The result can only be prioritized if it is a top ranked result.
-        if (prioritySettings.contains(key) && baseRank < DatabaseResultLoader.BASE_RANKS[1]) {
-            return SearchResult.TOP_RANK;
-        }
-        if (title.length() > LONG_TITLE_LENGTH) {
-            return baseRank + 2;
-        }
-        return baseRank;
-    }
-
-}
diff --git a/src/com/android/settings/search2/InlinePayload.java b/src/com/android/settings/search2/InlinePayload.java
deleted file mode 100644
index 4b1c168..0000000
--- a/src/com/android/settings/search2/InlinePayload.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2016 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.search2;
-
-/**
- * Abstract Payload for inline settings results.
- */
-public abstract class InlinePayload extends ResultPayload {
-    /**
-     * Defines the URI to access and store the Setting the inline result represents
-     */
-    public String settingsUri;
-
-    /**
-     * The UI type for the inline result.
-     */
-    @PayloadType public int inlineType;
-
-    /**
-     * Defines where the Setting is stored.
-     */
-    @SettingsSource public int settingSource;
-
-    public InlinePayload(String uri, @PayloadType int type, @SettingsSource int source) {
-        settingsUri = uri;
-        inlineType = type;
-        settingSource = source;
-    }
-}
diff --git a/src/com/android/settings/search2/InlineSwitchPayload.java b/src/com/android/settings/search2/InlineSwitchPayload.java
deleted file mode 100644
index b009976..0000000
--- a/src/com/android/settings/search2/InlineSwitchPayload.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2016 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.search2;
-
-import android.content.Context;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.provider.Settings;
-
-import java.util.Map;
-
-/**
- * Payload for inline Switch results. Mappings from integer to boolean.
- */
-public class InlineSwitchPayload extends InlinePayload {
-    /**
-     * Maps Inline values to UI-consumable Values.
-     * For example, if you have a switch preference whose values are stored as ints, the two valid
-     * list of mappings would be:
-     * < (0,True), (1, false) >
-     * < (1,True), (0, false) >
-     */
-    public final Map<Integer, Boolean> valueMap;
-
-    public InlineSwitchPayload(String newUri, @SettingsSource int settingsSource,
-            Map<Integer, Boolean> map) {
-        super(newUri, PayloadType.INLINE_SWITCH, settingsSource);
-        valueMap = map;
-    }
-
-    private InlineSwitchPayload(Parcel in) {
-        super(in.readString() /* Uri */ , in.readInt() /* Payload Type */,
-                in.readInt() /* Settings Source */);
-        valueMap = in.readHashMap(Integer.class.getClassLoader());
-    }
-
-    @Override
-    public int getType() {
-        return inlineType;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(settingsUri);
-        dest.writeInt(inlineType);
-        dest.writeInt(settingSource);
-        dest.writeMap(valueMap);
-    }
-
-    public static final Parcelable.Creator<InlineSwitchPayload> CREATOR =
-            new Parcelable.Creator<InlineSwitchPayload>() {
-        @Override
-        public InlineSwitchPayload createFromParcel(Parcel in) {
-            return new InlineSwitchPayload(in);
-        }
-
-        @Override
-        public InlineSwitchPayload[] newArray(int size) {
-            return new InlineSwitchPayload[size];
-        }
-    };
-
-    public boolean getSwitchValue(Context context) {
-        if (valueMap == null) {
-            throw new IllegalStateException("Value map is null");
-        }
-
-        int settingsValue = -1;
-        switch(settingSource) {
-            case SettingsSource.SECURE:
-                settingsValue = Settings.Secure.getInt(context.getContentResolver(),
-                        settingsUri, 0);
-                break;
-            case SettingsSource.SYSTEM:
-                settingsValue = Settings.System.getInt(context.getContentResolver(),
-                        settingsUri, 0);
-                break;
-
-            case SettingsSource.GLOBAL:
-                settingsValue = Settings.Global.getInt(context.getContentResolver(),
-                        settingsUri, 0);
-                break;
-        }
-
-        if (settingsValue == -1) {
-            throw new IllegalStateException("Unable to find setting from uri: "
-                    + settingsUri.toString());
-        }
-
-        for (Integer key : valueMap.keySet()) {
-            if ((key == settingsValue)) {
-                return valueMap.get(key);
-            }
-        }
-
-        throw new IllegalStateException("No results matched the key: " + settingsValue);
-    }
-
-    public void setSwitchValue(Context context, boolean isChecked) {
-        if (valueMap == null) {
-            throw new IllegalStateException("Value map is null");
-        }
-        int switchValue = -1;
-
-        for (Map.Entry<Integer, Boolean> pair : valueMap.entrySet()) {
-            if (pair.getValue() == isChecked) {
-                switchValue = pair.getKey();
-                break;
-            }
-        }
-
-        if (switchValue == -1) {
-            throw new IllegalStateException("Switch value is not set");
-        }
-
-        switch(settingSource) {
-            case SettingsSource.GLOBAL:
-                Settings.Global.putInt(context.getContentResolver(), settingsUri, switchValue);
-                return;
-            case SettingsSource.SECURE:
-                Settings.Secure.putInt(context.getContentResolver(), settingsUri, switchValue);
-                return;
-            case SettingsSource.SYSTEM:
-                Settings.System.putInt(context.getContentResolver(), settingsUri, switchValue);
-                return;
-            case SettingsSource.UNKNOWN:
-                return;
-        }
-    }
-}
diff --git a/src/com/android/settings/search2/IntentPayload.java b/src/com/android/settings/search2/IntentPayload.java
deleted file mode 100644
index 3e1049e..0000000
--- a/src/com/android/settings/search2/IntentPayload.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2016 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.search2;
-
-import android.content.Intent;
-import android.os.Parcel;
-
-/**
- * Encapsulates the standard intent based results as seen in first party apps and Settings results.
- */
-public class IntentPayload extends ResultPayload {
-    public final Intent intent;
-
-    private IntentPayload(Parcel in) {
-        intent = in.readParcelable(IntentPayload.class.getClassLoader());
-    }
-
-    public IntentPayload(Intent newIntent) {
-        intent = newIntent;
-    }
-
-    @ResultPayload.PayloadType public int getType() {
-        return PayloadType.INTENT;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeParcelable(intent, flags);
-    }
-
-    public static final Creator<IntentPayload> CREATOR = new Creator<IntentPayload>() {
-        @Override
-        public IntentPayload createFromParcel(Parcel in) {
-            return new IntentPayload(in);
-        }
-
-        @Override
-        public IntentPayload[] newArray(int size) {
-            return new IntentPayload[size];
-        }
-    };
-
-}
\ No newline at end of file
diff --git a/src/com/android/settings/search2/IntentSearchViewHolder.java b/src/com/android/settings/search2/IntentSearchViewHolder.java
deleted file mode 100644
index f0cbc51..0000000
--- a/src/com/android/settings/search2/IntentSearchViewHolder.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2016 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.search2;
-
-import android.content.ComponentName;
-import android.content.Intent;
-import android.text.TextUtils;
-import android.util.Pair;
-import android.view.View;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.SettingsActivity;
-
-/**
- * ViewHolder for intent based search results.
- * The DatabaseResultLoader is the primary use case for this ViewHolder.
- */
-public class IntentSearchViewHolder extends SearchViewHolder {
-
-    public IntentSearchViewHolder(View view) {
-        super(view);
-    }
-
-    @Override
-    public void onBind(final SearchFragment fragment, final SearchResult result) {
-        super.onBind(fragment, result);
-
-        itemView.setOnClickListener(v -> {
-            fragment.onSearchResultClicked();
-            final Intent intent = ((IntentPayload) result.payload).intent;
-            final ComponentName cn = intent.getComponent();
-            final Pair<Integer, Object> rank = Pair.create(
-                    MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_RANK, getAdapterPosition());
-            String resultName = intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT);
-            if (TextUtils.isEmpty(resultName) && cn != null) {
-                resultName = cn.flattenToString();
-            }
-            mMetricsFeatureProvider.action(v.getContext(),
-                    MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT,
-                    resultName, rank);
-            fragment.startActivity(intent);
-        });
-    }
-}
diff --git a/src/com/android/settings/search2/ResultPayload.java b/src/com/android/settings/search2/ResultPayload.java
deleted file mode 100644
index 4294234..0000000
--- a/src/com/android/settings/search2/ResultPayload.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2016 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.search2;
-
-import android.annotation.IntDef;
-import android.os.Parcelable;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * A interface for search results types. Examples include Inline results, third party apps
- * or any future possibilities.
- */
-public abstract class ResultPayload implements Parcelable {
-
-    @IntDef({PayloadType.INLINE_SLIDER, PayloadType.INLINE_SWITCH,
-            PayloadType.INTENT, PayloadType.SAVED_QUERY})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface PayloadType {
-        /**
-         * Resulting page will be started using an intent
-         */
-        int INTENT = 0;
-
-        /**
-         * Result is a inline widget, using a slider widget as UI.
-         */
-        int INLINE_SLIDER = 1;
-
-        /**
-         * Result is a inline widget, using a toggle widget as UI.
-         */
-        int INLINE_SWITCH = 2;
-
-        /**
-         * Result is a recently saved query.
-         */
-        int SAVED_QUERY = 3;
-    }
-
-    @IntDef({SettingsSource.UNKNOWN, SettingsSource.SYSTEM, SettingsSource.SECURE,
-            SettingsSource.GLOBAL})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface SettingsSource {
-        int UNKNOWN = 0;
-        int SYSTEM = 1;
-        int SECURE = 2;
-        int GLOBAL = 3;
-    }
-
-
-    @ResultPayload.PayloadType
-    public abstract int getType();
-}
diff --git a/src/com/android/settings/search2/SearchResultsAdapter.java b/src/com/android/settings/search2/SearchResultsAdapter.java
deleted file mode 100644
index 60f2f7c..0000000
--- a/src/com/android/settings/search2/SearchResultsAdapter.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (C) 2016 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.search2;
-
-import android.content.Context;
-import android.support.annotation.MainThread;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.util.DiffUtil;
-import android.support.v7.widget.RecyclerView;
-import android.util.ArrayMap;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.android.settings.R;
-import com.android.settings.search2.ResultPayload.PayloadType;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static com.android.settings.search2.SearchResult.BOTTOM_RANK;
-import static com.android.settings.search2.SearchResult.TOP_RANK;
-
-public class SearchResultsAdapter extends RecyclerView.Adapter<SearchViewHolder> {
-
-    private final SearchFragment mFragment;
-
-    private List<SearchResult> mSearchResults;
-    private Map<String, List<? extends SearchResult>> mResultsMap;
-
-    public SearchResultsAdapter(SearchFragment fragment) {
-        mFragment = fragment;
-        mSearchResults = new ArrayList<>();
-        mResultsMap = new ArrayMap<>();
-
-        setHasStableIds(true);
-    }
-
-    @Override
-    public SearchViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        final Context context = parent.getContext();
-        final LayoutInflater inflater = LayoutInflater.from(context);
-        final View view;
-        switch (viewType) {
-            case PayloadType.INTENT:
-                view = inflater.inflate(R.layout.search_intent_item, parent, false);
-                return new IntentSearchViewHolder(view);
-            case PayloadType.INLINE_SWITCH:
-                view = inflater.inflate(R.layout.search_inline_switch_item, parent, false);
-                return new InlineSwitchViewHolder(view, context);
-            case PayloadType.SAVED_QUERY:
-                view = inflater.inflate(R.layout.search_saved_query_item, parent, false);
-                return new SavedQueryViewHolder(view);
-            default:
-                return null;
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(SearchViewHolder holder, int position) {
-        holder.onBind(mFragment, mSearchResults.get(position));
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return mSearchResults.get(position).stableId;
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        return mSearchResults.get(position).viewType;
-    }
-
-    @Override
-    public int getItemCount() {
-        return mSearchResults.size();
-    }
-
-    /**
-     * Store the results from each of the loaders to be merged when all loaders are finished.
-     *
-     * @param results         the results from the loader.
-     * @param loaderClassName class name of the loader.
-     */
-    @MainThread
-    public void addSearchResults(List<? extends SearchResult> results, String loaderClassName) {
-        if (results == null) {
-            return;
-        }
-        mResultsMap.put(loaderClassName, results);
-    }
-
-    /**
-     * Displays recent searched queries.
-     *
-     * @return The number of saved queries to display
-     */
-    public int displaySavedQuery(List<? extends SearchResult> data) {
-        clearResults();
-        mSearchResults.addAll(data);
-        notifyDataSetChanged();
-        return mSearchResults.size();
-    }
-
-    /**
-     * Merge the results from each of the loaders into one list for the adapter.
-     * Prioritizes results from the local database over installed apps.
-     *
-     * @return Number of matched results
-     */
-    public int displaySearchResults() {
-        final List<? extends SearchResult> databaseResults = mResultsMap
-                .get(DatabaseResultLoader.class.getName());
-        final List<? extends SearchResult> installedAppResults = mResultsMap
-                .get(InstalledAppResultLoader.class.getName());
-        final int dbSize = (databaseResults != null) ? databaseResults.size() : 0;
-        final int appSize = (installedAppResults != null) ? installedAppResults.size() : 0;
-        final List<SearchResult> newResults = new ArrayList<>(dbSize + appSize);
-
-        int dbIndex = 0;
-        int appIndex = 0;
-        int rank = TOP_RANK;
-
-        while (rank <= BOTTOM_RANK) {
-            while ((dbIndex < dbSize) && (databaseResults.get(dbIndex).rank == rank)) {
-                newResults.add(databaseResults.get(dbIndex++));
-            }
-            while ((appIndex < appSize) && (installedAppResults.get(appIndex).rank == rank)) {
-                newResults.add(installedAppResults.get(appIndex++));
-            }
-            rank++;
-        }
-
-        while (dbIndex < dbSize) {
-            newResults.add(databaseResults.get(dbIndex++));
-        }
-        while (appIndex < appSize) {
-            newResults.add(installedAppResults.get(appIndex++));
-        }
-
-        final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(
-                new SearchResultDiffCallback(mSearchResults, newResults), false /* detectMoves */);
-        mSearchResults = newResults;
-        diffResult.dispatchUpdatesTo(this);
-
-        return mSearchResults.size();
-    }
-
-    public void clearResults() {
-        mSearchResults.clear();
-        mResultsMap.clear();
-        notifyDataSetChanged();
-    }
-
-    @VisibleForTesting
-    public List<SearchResult> getSearchResults() {
-        return mSearchResults;
-    }
-}
diff --git a/src/com/android/settings/security/ConfigureKeyGuardDialog.java b/src/com/android/settings/security/ConfigureKeyGuardDialog.java
new file mode 100644
index 0000000..3c89340
--- /dev/null
+++ b/src/com/android/settings/security/ConfigureKeyGuardDialog.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.security;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.admin.DevicePolicyManager;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.CredentialStorage;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.password.ChooseLockGeneric;
+
+/**
+ * Prompt for key guard configuration confirmation.
+ */
+public class ConfigureKeyGuardDialog extends InstrumentedDialogFragment
+        implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
+
+    public static final String TAG = "ConfigureKeyGuardDialog";
+
+    private boolean mConfigureConfirmed;
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.CONFIGURE_KEYGUARD_DIALOG;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        return new AlertDialog.Builder(getActivity())
+                .setTitle(android.R.string.dialog_alert_title)
+                .setMessage(R.string.credentials_configure_lock_screen_hint)
+                .setPositiveButton(android.R.string.ok, this)
+                .setNegativeButton(android.R.string.cancel, this)
+                .create();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int button) {
+        mConfigureConfirmed = (button == DialogInterface.BUTTON_POSITIVE);
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        if (mConfigureConfirmed) {
+            mConfigureConfirmed = false;
+            startPasswordSetup();
+            return;
+        } else {
+            final Activity activity = getActivity();
+            if (activity != null) {
+                activity.finish();
+            }
+        }
+    }
+
+    @VisibleForTesting
+    void startPasswordSetup() {
+        Intent intent = new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD);
+        intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
+                CredentialStorage.MIN_PASSWORD_QUALITY);
+        startActivity(intent);
+    }
+}
diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java
index 3137863..e239a43 100644
--- a/src/com/android/settings/security/LockscreenDashboardFragment.java
+++ b/src/com/android/settings/security/LockscreenDashboardFragment.java
@@ -24,10 +24,10 @@
 import com.android.settings.R;
 import com.android.settings.accounts.AddUserWhenLockedPreferenceController;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.notification.LockScreenNotificationPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -68,6 +68,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_lockscreen;
+    }
+
+    @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
         final List<PreferenceController> controllers = new ArrayList<>();
         final Lifecycle lifecycle = getLifecycle();
diff --git a/src/com/android/settings/security/OwnerInfoPreferenceController.java b/src/com/android/settings/security/OwnerInfoPreferenceController.java
index 259ef12..a687cb9 100644
--- a/src/com/android/settings/security/OwnerInfoPreferenceController.java
+++ b/src/com/android/settings/security/OwnerInfoPreferenceController.java
@@ -25,12 +25,12 @@
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.OwnerInfoSettings;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class OwnerInfoPreferenceController extends PreferenceController
         implements LifecycleObserver, OnResume {
diff --git a/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java b/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java
new file mode 100644
index 0000000..2189184
--- /dev/null
+++ b/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java
@@ -0,0 +1,124 @@
+/*
+ * 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.support;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
+import android.text.TextUtils;
+import android.text.format.DateUtils;
+import android.util.Log;
+
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.overlay.SupportFeatureProvider;
+
+import java.util.List;
+
+public class NewDeviceIntroSuggestionActivity extends Activity {
+
+    private static final String TAG = "NewDeviceIntroSugg";
+    @VisibleForTesting
+    static final String PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME =
+            "pref_new_device_intro_suggestion_first_display_time_ms";
+    @VisibleForTesting
+    static final String PREF_KEY_SUGGGESTION_COMPLETE =
+            "pref_new_device_intro_suggestion_complete";
+    @VisibleForTesting
+    static final long PERMANENT_DISMISS_THRESHOLD = DateUtils.DAY_IN_MILLIS * 14;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final Intent intent = getLaunchIntent(this);
+        if (intent != null) {
+            final SuggestionFeatureProvider featureProvider = FeatureFactory.getFactory(this)
+                    .getSuggestionFeatureProvider(this);
+            final SharedPreferences prefs = featureProvider.getSharedPrefs(this);
+            prefs.edit().putBoolean(PREF_KEY_SUGGGESTION_COMPLETE, true).commit();
+            startActivity(intent);
+        }
+        finish();
+    }
+
+    public static boolean isSuggestionComplete(Context context) {
+        return isExpired(context) || hasLaunchedBefore(context) || !canOpenUrlInBrowser(context);
+    }
+
+    private static boolean isExpired(Context context) {
+        final SuggestionFeatureProvider featureProvider = FeatureFactory.getFactory(context)
+                .getSuggestionFeatureProvider(context);
+        final SharedPreferences prefs = featureProvider.getSharedPrefs(context);
+        final long currentTimeMs = System.currentTimeMillis();
+        final long firstDisplayTimeMs;
+
+        if (!prefs.contains(PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME)) {
+            firstDisplayTimeMs = currentTimeMs;
+            prefs.edit().putLong(PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME, currentTimeMs).commit();
+        } else {
+            firstDisplayTimeMs = prefs.getLong(PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME, -1);
+        }
+
+        final long dismissTimeMs = firstDisplayTimeMs + PERMANENT_DISMISS_THRESHOLD;
+
+        final boolean expired = currentTimeMs > dismissTimeMs;
+
+        Log.d(TAG, "is suggestion expired: " + expired);
+        return expired;
+    }
+
+    private static boolean canOpenUrlInBrowser(Context context) {
+        final Intent intent = getLaunchIntent(context);
+        if (intent == null) {
+            // No url/intent to launch.
+            return false;
+        }
+        // Make sure we can handle the intent.
+        final List<ResolveInfo> resolveInfos =
+                context.getPackageManager().queryIntentActivities(intent, 0);
+        return resolveInfos != null && resolveInfos.size() != 0;
+    }
+
+    private static boolean hasLaunchedBefore(Context context) {
+        final SuggestionFeatureProvider featureProvider = FeatureFactory.getFactory(context)
+                .getSuggestionFeatureProvider(context);
+        final SharedPreferences prefs = featureProvider.getSharedPrefs(context);
+        return prefs.getBoolean(PREF_KEY_SUGGGESTION_COMPLETE, false);
+    }
+
+    @VisibleForTesting
+    static Intent getLaunchIntent(Context context) {
+        final SupportFeatureProvider supportProvider = FeatureFactory.getFactory(context)
+                .getSupportFeatureProvider(context);
+        if (supportProvider == null) {
+            return null;
+        }
+        final String url = supportProvider.getNewDeviceIntroUrl(context);
+        if (TextUtils.isEmpty(url)) {
+            return null;
+        }
+        return new Intent()
+                .setAction(Intent.ACTION_VIEW)
+                .addCategory(Intent.CATEGORY_BROWSABLE)
+                .setData(Uri.parse(url));
+    }
+}
diff --git a/src/com/android/settings/support/SupportDashboardActivity.java b/src/com/android/settings/support/SupportDashboardActivity.java
new file mode 100644
index 0000000..d3fcf9a
--- /dev/null
+++ b/src/com/android/settings/support/SupportDashboardActivity.java
@@ -0,0 +1,91 @@
+/*
+ * 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.support;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.android.settings.R;
+import com.android.settings.Settings.LegacySupportActivity;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.overlay.SupportFeatureProvider;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.search.SearchIndexableRaw;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Trampoline activity that decides which version of support should be shown to the user.
+ */
+public class SupportDashboardActivity extends Activity implements Indexable {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        SupportFeatureProvider supportFeatureProvider = FeatureFactory.getFactory(this)
+                .getSupportFeatureProvider(this);
+
+        // try to launch support v2 if we have the feature provider
+        if (supportFeatureProvider != null && supportFeatureProvider.isSupportV2Enabled()) {
+            supportFeatureProvider.startSupportV2(this);
+        } else {
+            startActivity(new Intent(this, LegacySupportActivity.class));
+        }
+        finish();
+    }
+
+    /**
+     * For Search.
+     */
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                private static final String SUPPORT_SEARCH_INDEX_KEY = "support_dashboard_activity";
+
+                @Override
+                public List<SearchIndexableRaw> getRawDataToIndex(Context context,
+                        boolean enabled) {
+
+                    final List<SearchIndexableRaw> result = new ArrayList<>();
+
+                    // Add the activity title
+                    SearchIndexableRaw data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.page_tab_title_support);
+                    data.screenTitle = context.getString(R.string.settings_label);
+                    data.summaryOn = context.getString(R.string.support_summary);
+                    data.iconResId = R.drawable.ic_help;
+                    data.intentTargetPackage = context.getPackageName();
+                    data.intentTargetClass = SupportDashboardActivity.class.getName();
+                    data.intentAction = Intent.ACTION_MAIN;
+                    data.key = SUPPORT_SEARCH_INDEX_KEY;
+                    result.add(data);
+
+                    return result;
+                }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> keys = super.getNonIndexableKeys(context);
+                    if (!context.getResources().getBoolean(R.bool.config_support_enabled)) {
+                        keys.add(SUPPORT_SEARCH_INDEX_KEY);
+                    }
+                    return keys;
+                }
+            };
+}
diff --git a/src/com/android/settings/survey/SurveyMixin.java b/src/com/android/settings/survey/SurveyMixin.java
index 4eb14bd..9b7a9df 100644
--- a/src/com/android/settings/survey/SurveyMixin.java
+++ b/src/com/android/settings/survey/SurveyMixin.java
@@ -18,11 +18,11 @@
 import android.app.Activity;
 import android.app.Fragment;
 import android.content.BroadcastReceiver;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.overlay.SurveyFeatureProvider;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
  * attaches extra, survey related work to the onResume method of registered observable classes
diff --git a/src/com/android/settings/system/ResetDashboardFragment.java b/src/com/android/settings/system/ResetDashboardFragment.java
index d4685bc..c04e374 100644
--- a/src/com/android/settings/system/ResetDashboardFragment.java
+++ b/src/com/android/settings/system/ResetDashboardFragment.java
@@ -23,11 +23,11 @@
 import com.android.settings.R;
 import com.android.settings.applications.ResetAppPrefPreferenceController;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.network.NetworkResetPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/settings/system/SystemDashboardFragment.java b/src/com/android/settings/system/SystemDashboardFragment.java
index 1a5a182..fd164be 100644
--- a/src/com/android/settings/system/SystemDashboardFragment.java
+++ b/src/com/android/settings/system/SystemDashboardFragment.java
@@ -55,6 +55,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_system_dashboard;
+    }
+
+    @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context);
     }
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index 0dfdab6..e8823a6 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -36,7 +36,7 @@
 import com.android.settings.applications.LayoutPreference;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.SeekBarPreference;
+import com.android.settings.widget.SeekBarPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 8026e27..5cb27f9 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -54,7 +54,6 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.ChooseLockGeneric;
 import com.android.settings.DimmableIconPreference;
 import com.android.settings.OwnerInfoSettings;
 import com.android.settings.R;
@@ -62,11 +61,12 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.password.ChooseLockGeneric;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.drawable.CircleFramedDrawable;
 
 import java.util.ArrayList;
@@ -74,8 +74,6 @@
 import java.util.HashMap;
 import java.util.List;
 
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
 /**
  * Screen that manages the list of users on the device.
  * Guest user is an always visible entry, even if the guest is not currently
diff --git a/src/com/android/settings/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java
index 1dc6ae5..6e3841d 100644
--- a/src/com/android/settings/utils/ManagedServiceSettings.java
+++ b/src/com/android/settings/utils/ManagedServiceSettings.java
@@ -34,6 +34,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.PreferenceScreen;
+import android.util.Log;
 import android.view.View;
 
 import com.android.internal.logging.nano.MetricsProto;
@@ -46,10 +47,11 @@
 import java.util.List;
 
 public abstract class ManagedServiceSettings extends EmptyTextSettings {
+    private static final String TAG = "ManagedServiceSettings";
     private final Config mConfig;
 
     protected Context mContext;
-    private PackageManager mPM;
+    private PackageManager mPm;
     private DevicePolicyManager mDpm;
     protected ServiceListing mServiceListing;
 
@@ -64,7 +66,7 @@
         super.onCreate(icicle);
 
         mContext = getActivity();
-        mPM = mContext.getPackageManager();
+        mPm = mContext.getPackageManager();
         mDpm = (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
         mServiceListing = new ServiceListing(mContext, mConfig);
         mServiceListing.addCallback(new ServiceListing.Callback() {
@@ -101,14 +103,27 @@
 
         final PreferenceScreen screen = getPreferenceScreen();
         screen.removeAll();
-        Collections.sort(services, new PackageItemInfo.DisplayNameComparator(mPM));
+        Collections.sort(services, new PackageItemInfo.DisplayNameComparator(mPm));
         for (ServiceInfo service : services) {
             final ComponentName cn = new ComponentName(service.packageName, service.name);
-            final String title = service.loadLabel(mPM).toString();
+            CharSequence title = null;
+            try {
+                title = mPm.getApplicationInfoAsUser(
+                        service.packageName, 0, getCurrentUser(managedProfileId)).loadLabel(mPm);
+            } catch (PackageManager.NameNotFoundException e) {
+                // unlikely, as we are iterating over live services.
+                Log.e(TAG, "can't find package name", e);
+            }
+            final String summary = service.loadLabel(mPm).toString();
             final SwitchPreference pref = new SwitchPreference(getPrefContext());
             pref.setPersistent(false);
-            pref.setIcon(service.loadIcon(mPM));
-            pref.setTitle(title);
+            pref.setIcon(service.loadIcon(mPm));
+            if (title != null && !title.equals(summary)) {
+                pref.setTitle(title);
+                pref.setSummary(summary);
+            } else {
+                pref.setTitle(summary);
+            }
             pref.setChecked(mServiceListing.isEnabled(cn));
             if (managedProfileId != UserHandle.USER_NULL
                     && !mDpm.isNotificationListenerServicePermitted(
@@ -119,13 +134,20 @@
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object newValue) {
                     final boolean enable = (boolean) newValue;
-                    return setEnabled(cn, title, enable);
+                    return setEnabled(cn, summary, enable);
                 }
             });
             screen.addPreference(pref);
         }
     }
 
+    private int getCurrentUser(int managedProfileId) {
+        if (managedProfileId != UserHandle.USER_NULL) {
+            return managedProfileId;
+        }
+        return UserHandle.myUserId();
+    }
+
     protected boolean setEnabled(ComponentName service, String title, boolean enable) {
         if (!enable) {
             // the simple version: disabling
diff --git a/src/com/android/settings/utils/ThreadUtils.java b/src/com/android/settings/utils/ThreadUtils.java
deleted file mode 100644
index f71a2a9..0000000
--- a/src/com/android/settings/utils/ThreadUtils.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2016 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.Looper;
-
-public class ThreadUtils {
-    private static volatile Thread sMainThread;
-
-    /**
-     * Returns true if the current thread is the UI thread.
-     */
-    public static boolean isMainThread() {
-        if (sMainThread == null) {
-            sMainThread = Looper.getMainLooper().getThread();
-        }
-        return Thread.currentThread() == sMainThread;
-    }
-
-    /**
-     * Checks that the current thread is the UI thread. Otherwise throws an exception.
-     */
-    public static void ensureMainThread() {
-        if (!isMainThread()) {
-            throw new RuntimeException("Must be called on the UI thread");
-        }
-    }
-
-}
diff --git a/src/com/android/settings/widget/ActionBarShadowController.java b/src/com/android/settings/widget/ActionBarShadowController.java
new file mode 100644
index 0000000..75bdf0e
--- /dev/null
+++ b/src/com/android/settings/widget/ActionBarShadowController.java
@@ -0,0 +1,97 @@
+/*
+ * 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.widget;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+public class ActionBarShadowController implements LifecycleObserver, OnStart, OnStop {
+
+    private ScrollChangeWatcher mScrollChangeWatcher;
+    private RecyclerView mRecyclerView;
+    private boolean isScrollWatcherAttached;
+
+    public static ActionBarShadowController attachToRecyclerView(Activity activity,
+            Lifecycle lifecycle, RecyclerView recyclerView) {
+        return new ActionBarShadowController(activity, lifecycle, recyclerView);
+    }
+
+    private ActionBarShadowController(Activity activity, Lifecycle lifecycle,
+            RecyclerView recyclerView) {
+        mScrollChangeWatcher = new ScrollChangeWatcher(activity);
+        mRecyclerView = recyclerView;
+        attachScrollWatcher();
+        lifecycle.addObserver(this);
+    }
+
+    @Override
+    public void onStop() {
+        detachScrollWatcher();
+    }
+
+    private void detachScrollWatcher() {
+        mRecyclerView.removeOnScrollListener(mScrollChangeWatcher);
+        isScrollWatcherAttached = false;
+    }
+
+    @Override
+    public void onStart() {
+        attachScrollWatcher();
+    }
+
+    private void attachScrollWatcher() {
+        if (!isScrollWatcherAttached) {
+            isScrollWatcherAttached = true;
+            mRecyclerView.addOnScrollListener(mScrollChangeWatcher);
+            mScrollChangeWatcher.updateDropShadow(mRecyclerView);
+        }
+    }
+
+    /**
+     * Update the drop shadow as the scrollable entity is scrolled.
+     */
+    private final class ScrollChangeWatcher extends RecyclerView.OnScrollListener {
+
+        private Activity mActivity;
+
+        public ScrollChangeWatcher(Activity activity) {
+            mActivity = activity;
+        }
+
+        // RecyclerView scrolled.
+        @Override
+        public void onScrolled(RecyclerView view, int dx, int dy) {
+            updateDropShadow(view);
+        }
+
+        public void updateDropShadow(View view) {
+            final boolean shouldShowShadow = view.canScrollVertically(-1);
+            final ActionBar actionBar = mActivity.getActionBar();
+            if (actionBar != null) {
+                actionBar.setElevation(shouldShowShadow ? 8 : 0);
+            }
+        }
+    }
+
+}
diff --git a/src/com/android/settings/widget/DonutView.java b/src/com/android/settings/widget/DonutView.java
index 506ada9..295cb79 100644
--- a/src/com/android/settings/widget/DonutView.java
+++ b/src/com/android/settings/widget/DonutView.java
@@ -22,6 +22,7 @@
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
+import android.graphics.Typeface;
 import android.text.TextPaint;
 import android.util.AttributeSet;
 import android.view.View;
@@ -90,6 +91,9 @@
         mBigNumberPaint.setTextSize(
                 resources.getDimension(R.dimen.storage_donut_view_percent_text_size));
         mBigNumberPaint.setTextAlign(Paint.Align.CENTER);
+        mBigNumberPaint.setTypeface(Typeface.create(
+                getContext().getString(com.android.internal.R.string.config_headlineFontFamily),
+                Typeface.NORMAL));
     }
 
     @Override
diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java
new file mode 100644
index 0000000..c9e0805
--- /dev/null
+++ b/src/com/android/settings/widget/EntityHeaderController.java
@@ -0,0 +1,359 @@
+/*
+ * Copyright (C) 2016 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.widget;
+
+import android.annotation.IdRes;
+import android.annotation.UserIdInt;
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.ResolveInfo;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.UserHandle;
+import android.support.annotation.IntDef;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.settings.AppHeader;
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.applications.AppInfoBase;
+import com.android.settings.applications.InstalledAppDetails;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+public class EntityHeaderController {
+
+    @IntDef({ActionType.ACTION_NONE,
+            ActionType.ACTION_APP_INFO,
+            ActionType.ACTION_APP_PREFERENCE,
+            ActionType.ACTION_NOTIF_PREFERENCE})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface ActionType {
+        int ACTION_NONE = 0;
+        int ACTION_APP_INFO = 1;
+        int ACTION_APP_PREFERENCE = 2;
+        int ACTION_NOTIF_PREFERENCE = 3;
+    }
+
+    public static final String PREF_KEY_APP_HEADER = "pref_app_header";
+
+    private static final String TAG = "AppDetailFeature";
+
+    private final Context mAppContext;
+    private final Activity mActivity;
+    private final Fragment mFragment;
+    private final int mMetricsCategory;
+    private final View mHeader;
+    private Lifecycle mLifecycle;
+    private RecyclerView mRecyclerView;
+    private Drawable mIcon;
+    private String mIconContentDescription;
+    private CharSequence mLabel;
+    private CharSequence mSummary;
+    private String mPackageName;
+    private Intent mAppNotifPrefIntent;
+    @UserIdInt
+    private int mUid = UserHandle.USER_NULL;
+    @ActionType
+    private int mAction1;
+    @ActionType
+    private int mAction2;
+
+    private boolean mIsInstantApp;
+
+    /**
+     * Creates a new instance of the controller.
+     *
+     * @param fragment The fragment that header will be placed in.
+     * @param header   Optional: header view if it's already created.
+     */
+    public static EntityHeaderController newInstance(Activity activity, Fragment fragment,
+            View header) {
+        return new EntityHeaderController(activity, fragment, header);
+    }
+
+    private EntityHeaderController(Activity activity, Fragment fragment, View header) {
+        mActivity = activity;
+        mAppContext = activity.getApplicationContext();
+        mFragment = fragment;
+        mMetricsCategory = FeatureFactory.getFactory(mAppContext).getMetricsFeatureProvider()
+                .getMetricsCategory(fragment);
+        if (header != null) {
+            mHeader = header;
+        } else {
+            mHeader = LayoutInflater.from(fragment.getContext())
+                    .inflate(R.layout.settings_entity_header, null /* root */);
+        }
+    }
+
+    public EntityHeaderController setRecyclerView(RecyclerView recyclerView, Lifecycle lifecycle) {
+        mRecyclerView = recyclerView;
+        mLifecycle = lifecycle;
+        return this;
+    }
+
+    /**
+     * Set the icon in the header. Callers should also consider calling setIconContentDescription
+     * to provide a description of this icon for accessibility purposes.
+     */
+    public EntityHeaderController setIcon(Drawable icon) {
+        if (icon != null) {
+            mIcon = icon.getConstantState().newDrawable(mAppContext.getResources());
+        }
+        return this;
+    }
+
+    /**
+     * Convenience method to set the header icon from an ApplicationsState.AppEntry. Callers should
+     * also consider calling setIconContentDescription to provide a description of this icon for
+     * accessibility purposes.
+     */
+    public EntityHeaderController setIcon(ApplicationsState.AppEntry appEntry) {
+        if (appEntry.icon != null) {
+            mIcon = appEntry.icon.getConstantState().newDrawable(mAppContext.getResources());
+        }
+        return this;
+    }
+
+    public EntityHeaderController setIconContentDescription(String contentDescription) {
+        mIconContentDescription = contentDescription;
+        return this;
+    }
+
+    public EntityHeaderController setLabel(CharSequence label) {
+        mLabel = label;
+        return this;
+    }
+
+    public EntityHeaderController setLabel(ApplicationsState.AppEntry appEntry) {
+        mLabel = appEntry.label;
+        return this;
+    }
+
+    public EntityHeaderController setSummary(CharSequence summary) {
+        mSummary = summary;
+        return this;
+    }
+
+    public EntityHeaderController setSummary(PackageInfo packageInfo) {
+        if (packageInfo != null) {
+            mSummary = packageInfo.versionName;
+        }
+        return this;
+    }
+
+    public EntityHeaderController setButtonActions(@ActionType int action1,
+            @ActionType int action2) {
+        mAction1 = action1;
+        mAction2 = action2;
+        return this;
+    }
+
+    public EntityHeaderController setPackageName(String packageName) {
+        mPackageName = packageName;
+        return this;
+    }
+
+    public EntityHeaderController setUid(int uid) {
+        mUid = uid;
+        return this;
+    }
+
+    public EntityHeaderController setAppNotifPrefIntent(Intent appNotifPrefIntent) {
+        mAppNotifPrefIntent = appNotifPrefIntent;
+        return this;
+    }
+
+    public EntityHeaderController setIsInstantApp(boolean isInstantApp) {
+        this.mIsInstantApp = isInstantApp;
+        return this;
+    }
+
+    /**
+     * Done mutating entity header, rebinds everything and return a new {@link LayoutPreference}.
+     */
+    public LayoutPreference done(Activity activity, Context uiContext) {
+        final LayoutPreference pref = new LayoutPreference(uiContext, done(activity));
+        // Makes sure it's the first preference onscreen.
+        pref.setOrder(-1000);
+        pref.setKey(PREF_KEY_APP_HEADER);
+        return pref;
+    }
+
+    /**
+     * Done mutating entity header, rebinds everything (optionally skip rebinding buttons).
+     */
+    public View done(Activity activity, boolean rebindActions) {
+        styleActionBar(activity);
+        ImageView iconView = mHeader.findViewById(R.id.entity_header_icon);
+        if (iconView != null) {
+            iconView.setImageDrawable(mIcon);
+            iconView.setContentDescription(mIconContentDescription);
+        }
+        setText(R.id.entity_header_title, mLabel);
+        setText(R.id.entity_header_summary, mSummary);
+        if (mIsInstantApp) {
+            setText(R.id.install_type,
+                    mHeader.getResources().getString(R.string.install_type_instant));
+        }
+
+        if (rebindActions) {
+            bindHeaderButtons();
+        }
+
+        return mHeader;
+    }
+
+    /**
+     * Only binds entity header with button actions.
+     */
+    public EntityHeaderController bindHeaderButtons() {
+        ImageButton button1 = mHeader.findViewById(android.R.id.button1);
+        ImageButton button2 = mHeader.findViewById(android.R.id.button2);
+
+        bindButton(button1, mAction1);
+        bindButton(button2, mAction2);
+        return this;
+    }
+
+    public EntityHeaderController styleActionBar(Activity activity) {
+        if (activity == null) {
+            Log.w(TAG, "No activity, cannot style actionbar.");
+            return this;
+        }
+        final ActionBar actionBar = activity.getActionBar();
+        if (actionBar == null) {
+            Log.w(TAG, "No actionbar, cannot style actionbar.");
+            return this;
+        }
+        actionBar.setBackgroundDrawable(
+                new ColorDrawable(Utils.getColorAttr(activity, android.R.attr.colorSecondary)));
+        actionBar.setElevation(0);
+        if (mRecyclerView != null && mLifecycle != null) {
+            ActionBarShadowController.attachToRecyclerView(mActivity, mLifecycle, mRecyclerView);
+        }
+
+        return this;
+    }
+
+    /**
+     * Done mutating entity header, rebinds everything.
+     */
+    @VisibleForTesting
+    View done(Activity activity) {
+        return done(activity, true /* rebindActions */);
+    }
+
+    private void bindButton(ImageButton button, @ActionType int action) {
+        if (button == null) {
+            return;
+        }
+        switch (action) {
+            case ActionType.ACTION_APP_INFO: {
+                if (mPackageName == null || mPackageName.equals(Utils.OS_PKG)
+                        || mUid == UserHandle.USER_NULL
+                        || !AppHeader.includeAppInfo(mFragment)) {
+                    button.setVisibility(View.GONE);
+                } else {
+                    button.setContentDescription(
+                            mAppContext.getString(R.string.application_info_label));
+                    button.setImageResource(com.android.settings.R.drawable.ic_info);
+                    button.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            AppInfoBase.startAppInfoFragment(
+                                    InstalledAppDetails.class, R.string.application_info_label,
+                                    mPackageName, mUid, mFragment, 0 /* request */,
+                                    mMetricsCategory);
+
+                        }
+                    });
+                    button.setVisibility(View.VISIBLE);
+                }
+                return;
+            }
+            case ActionType.ACTION_NOTIF_PREFERENCE: {
+                if (mAppNotifPrefIntent == null) {
+                    button.setVisibility(View.GONE);
+                } else {
+                    button.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            mFragment.startActivity(mAppNotifPrefIntent);
+                        }
+                    });
+                    button.setVisibility(View.VISIBLE);
+                }
+                return;
+            }
+            case ActionType.ACTION_APP_PREFERENCE: {
+                final Intent intent = resolveIntent(
+                        new Intent(Intent.ACTION_APPLICATION_PREFERENCES).setPackage(mPackageName));
+                if (intent == null) {
+                    button.setVisibility(View.GONE);
+                    return;
+                }
+                button.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mFragment.startActivity(intent);
+                    }
+                });
+                button.setVisibility(View.VISIBLE);
+                return;
+            }
+            case ActionType.ACTION_NONE: {
+                button.setVisibility(View.GONE);
+                return;
+            }
+        }
+    }
+
+    private Intent resolveIntent(Intent i) {
+        ResolveInfo result = mAppContext.getPackageManager().resolveActivity(i, 0);
+        if (result != null) {
+            return new Intent(i.getAction())
+                    .setClassName(result.activityInfo.packageName, result.activityInfo.name);
+        }
+        return null;
+    }
+
+    private void setText(@IdRes int id, CharSequence text) {
+        TextView textView = mHeader.findViewById(id);
+        if (textView != null) {
+            textView.setText(text);
+            textView.setVisibility(TextUtils.isEmpty(text) ? View.GONE : View.VISIBLE);
+        }
+    }
+}
diff --git a/src/com/android/settings/widget/FixedLineSummaryPreference.java b/src/com/android/settings/widget/FixedLineSummaryPreference.java
new file mode 100644
index 0000000..c83dff4
--- /dev/null
+++ b/src/com/android/settings/widget/FixedLineSummaryPreference.java
@@ -0,0 +1,60 @@
+/*
+ * 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.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.text.TextUtils.TruncateAt;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+import com.android.settings.R;
+
+/**
+ * A preference whose summary text will only span one single line.
+ */
+public class FixedLineSummaryPreference extends Preference {
+
+    private int mSummaryLineCount;
+
+    public FixedLineSummaryPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.FixedLineSummaryPreference,
+                0, 0);
+        if (a.hasValue(R.styleable.FixedLineSummaryPreference_summaryLineCount)) {
+            mSummaryLineCount = a.getInteger(
+                    R.styleable.FixedLineSummaryPreference_summaryLineCount, 1);
+        } else {
+            mSummaryLineCount = 1;
+        }
+    }
+
+    public void setSummaryLineCount(int count) {
+        mSummaryLineCount = count;
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+        TextView summary = (TextView) holder.findViewById(android.R.id.summary);
+        if (summary != null) {
+            summary.setMinLines(mSummaryLineCount);
+            summary.setMaxLines(mSummaryLineCount);
+            summary.setEllipsize(TruncateAt.END);
+        }
+    }
+}
diff --git a/src/com/android/settings/widget/FooterPreference.java b/src/com/android/settings/widget/FooterPreference.java
deleted file mode 100644
index 84e3ed8..0000000
--- a/src/com/android/settings/widget/FooterPreference.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2016 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.widget;
-
-import android.content.Context;
-import android.support.v4.content.res.TypedArrayUtils;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.text.method.LinkMovementMethod;
-import android.util.AttributeSet;
-import android.widget.TextView;
-
-import com.android.settings.R;
-
-/**
- * A custom preference acting as "footer" of a page. It has a field for icon and text. It is added
- * to screen as the last preference.
- */
-public class FooterPreference extends Preference {
-
-    static final int ORDER_FOOTER = Integer.MAX_VALUE - 1;
-    static final String KEY_FOOTER = "footer_preference";
-
-    public FooterPreference(Context context, AttributeSet attrs) {
-        super(context, attrs, TypedArrayUtils.getAttr(
-                context, R.attr.footerPreferenceStyle, android.R.attr.preferenceStyle));
-        init();
-    }
-
-    public FooterPreference(Context context) {
-        this(context, null);
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder holder) {
-        super.onBindViewHolder(holder);
-        TextView title = holder.itemView.findViewById(android.R.id.title);
-        title.setMovementMethod(new LinkMovementMethod());
-        title.setClickable(false);
-        title.setLongClickable(false);
-    }
-
-    private void init() {
-        setIcon(R.drawable.ic_info_outline_24dp);
-        setKey(KEY_FOOTER);
-        setOrder(ORDER_FOOTER);
-        setSelectable(false);
-    }
-}
diff --git a/src/com/android/settings/widget/FooterPreferenceMixin.java b/src/com/android/settings/widget/FooterPreferenceMixin.java
deleted file mode 100644
index 53e3d75..0000000
--- a/src/com/android/settings/widget/FooterPreferenceMixin.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2016 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.widget;
-
-import android.content.Context;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.SetPreferenceScreen;
-
-public class FooterPreferenceMixin implements LifecycleObserver, SetPreferenceScreen {
-
-    private final PreferenceFragment mFragment;
-    private FooterPreference mFooterPreference;
-
-    public FooterPreferenceMixin(PreferenceFragment fragment, Lifecycle lifecycle) {
-        mFragment = fragment;
-        lifecycle.addObserver(this);
-    }
-
-    @Override
-    public void setPreferenceScreen(PreferenceScreen preferenceScreen) {
-        if (mFooterPreference != null) {
-            preferenceScreen.addPreference(mFooterPreference);
-        }
-    }
-
-    /**
-     * Creates a new {@link FooterPreference}.
-     */
-    public FooterPreference createFooterPreference() {
-        final PreferenceScreen screen = mFragment.getPreferenceScreen();
-        if (mFooterPreference != null && screen != null) {
-            screen.removePreference(mFooterPreference);
-        }
-        mFooterPreference = new FooterPreference(getPrefContext());
-
-        if (screen != null) {
-            screen.addPreference(mFooterPreference);
-        }
-        return mFooterPreference;
-    }
-
-    /**
-     * Returns an UI context with theme properly set for new Preference objects.
-     */
-    private Context getPrefContext() {
-        return mFragment.getPreferenceManager().getContext();
-    }
-
-    public boolean hasFooter() {
-        return mFooterPreference != null;
-    }
-}
-
diff --git a/src/com/android/settings/widget/ScrollToParentEditText.java b/src/com/android/settings/widget/ScrollToParentEditText.java
new file mode 100644
index 0000000..97602af
--- /dev/null
+++ b/src/com/android/settings/widget/ScrollToParentEditText.java
@@ -0,0 +1,51 @@
+/*
+ * 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.widget;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewParent;
+import android.widget.EditText;
+
+/**
+ * An EditText that, instead of scrolling to itself when focused, will request scrolling to its
+ * parent. This is used in ChooseLockPassword to do make a best effort for not hiding the error
+ * messages for why the password is invalid under the keyboard.
+ */
+public class ScrollToParentEditText extends EditText {
+
+    private Rect mRect = new Rect();
+
+    public ScrollToParentEditText(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public boolean requestRectangleOnScreen(Rect rectangle, boolean immediate) {
+        ViewParent parent = getParent();
+        if (parent instanceof View) {
+            // Request the entire parent view to be shown, which in ChooseLockPassword's case,
+            // will include messages for why the password is invalid (if any).
+            ((View) parent).getDrawingRect(mRect);
+            return ((View) parent).requestRectangleOnScreen(mRect, immediate);
+        } else {
+            return super.requestRectangleOnScreen(rectangle, immediate);
+        }
+    }
+}
diff --git a/src/com/android/settings/SeekBarPreference.java b/src/com/android/settings/widget/SeekBarPreference.java
similarity index 97%
rename from src/com/android/settings/SeekBarPreference.java
rename to src/com/android/settings/widget/SeekBarPreference.java
index a8d5fbf..4ab1af2 100644
--- a/src/com/android/settings/SeekBarPreference.java
+++ b/src/com/android/settings/widget/SeekBarPreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.widget;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -22,6 +22,7 @@
 import android.os.Parcelable;
 import android.support.v4.content.res.TypedArrayUtils;
 import android.support.v7.preference.PreferenceViewHolder;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.View;
@@ -89,6 +90,10 @@
         mSeekBar.setMax(mMax);
         mSeekBar.setProgress(mProgress);
         mSeekBar.setEnabled(isEnabled());
+        final CharSequence title = getTitle();
+        if (!TextUtils.isEmpty(title)) {
+            mSeekBar.setContentDescription(title);
+        }
         if (mSeekBar instanceof DefaultIndicatorSeekBar) {
             ((DefaultIndicatorSeekBar) mSeekBar).setDefaultProgress(mDefaultProgress);
         }
diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
index af80fd4..84c299e 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -82,7 +82,6 @@
                 networkScoreManagerWrapper));
         controllers.add(new NotifyOpenNetworksPreferenceController(context, getLifecycle()));
         controllers.add(mUseOpenWifiPreferenceController);
-        controllers.add(new WifiSleepPolicyPreferenceController(context));
         controllers.add(new WifiInfoPreferenceController(context, getLifecycle(), wifiManager));
         controllers.add(new CellularFallbackPreferenceController(context));
         controllers.add(new WifiP2pPreferenceController(context, getLifecycle(), wifiManager));
diff --git a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
index 6e88d79..7cf19f2 100644
--- a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
+++ b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
@@ -28,10 +28,10 @@
 import android.text.TextUtils;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
  * {@link PreferenceController} that controls whether we should notify user when open network is
diff --git a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
index 09f5e92..37cd692 100644
--- a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
+++ b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
@@ -22,10 +22,10 @@
 
 import com.android.settings.network.NetworkScoreManagerWrapper;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
  * {@link PreferenceController} that controls whether a user wants to enable the "use open networks
diff --git a/src/com/android/settings/wifi/WifiApEnabler.java b/src/com/android/settings/wifi/WifiApEnabler.java
index 8e577a4..5d725d8 100644
--- a/src/com/android/settings/wifi/WifiApEnabler.java
+++ b/src/com/android/settings/wifi/WifiApEnabler.java
@@ -25,6 +25,7 @@
 import android.net.wifi.WifiManager;
 import android.provider.Settings;
 import android.support.v14.preference.SwitchPreference;
+import android.text.BidiFormatter;
 
 import com.android.settings.R;
 import com.android.settings.datausage.DataSaverBackend;
@@ -109,12 +110,13 @@
         }
     }
 
-    public void updateConfigSummary(WifiConfiguration wifiConfig) {
+    private void updateConfigSummary(WifiConfiguration wifiConfig) {
         String s = mContext.getString(
                 com.android.internal.R.string.wifi_tether_configure_ssid_default);
-        mSwitch.setSummary(String.format(
-                    mContext.getString(R.string.wifi_tether_enabled_subtext),
-                    (wifiConfig == null) ? s : wifiConfig.SSID));
+
+        mSwitch.setSummary(mContext.getString(R.string.wifi_tether_enabled_subtext,
+                BidiFormatter.getInstance().unicodeWrap(
+                        (wifiConfig == null) ? s : wifiConfig.SSID)));
     }
 
     private void updateTetherState(Object[] available, Object[] tethered, Object[] errored) {
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index fb01f1f..2a17dfc 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -75,7 +75,7 @@
  */
 public class WifiConfigController implements TextWatcher,
         AdapterView.OnItemSelectedListener, OnCheckedChangeListener,
-        TextView.OnEditorActionListener, View.OnKeyListener{
+        TextView.OnEditorActionListener, View.OnKeyListener {
     private static final String TAG = "WifiConfigController";
 
     private static final String SYSTEM_CA_STORE_PATH = "/system/etc/security/cacerts";
@@ -110,6 +110,8 @@
     public static final int WIFI_PEAP_PHASE2_AKA        = 4;
     public static final int WIFI_PEAP_PHASE2_AKA_PRIME  = 5;
 
+    private static final int SSID_ASCII_MAX_LENGTH = 32;
+
     /* Phase2 methods supported by PEAP are limited */
     private final ArrayAdapter<String> mPhase2PeapAdapter;
     /* Full list of phase2 methods */
@@ -457,7 +459,14 @@
     void showWarningMessagesIfAppropriate() {
         mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.GONE);
         mView.findViewById(R.id.no_domain_warning).setVisibility(View.GONE);
+        mView.findViewById(R.id.ssid_too_long_warning).setVisibility(View.GONE);
 
+        if (mSsidView != null) {
+            final String ssid = mSsidView.getText().toString();
+            if (ssid.length() > SSID_ASCII_MAX_LENGTH) {
+                mView.findViewById(R.id.ssid_too_long_warning).setVisibility(View.VISIBLE);
+            }
+        }
         if (mEapCaCertSpinner != null
                 && mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
             String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
diff --git a/src/com/android/settings/wifi/WifiInfoPreferenceController.java b/src/com/android/settings/wifi/WifiInfoPreferenceController.java
index f88e38b..238f0e1 100644
--- a/src/com/android/settings/wifi/WifiInfoPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiInfoPreferenceController.java
@@ -29,10 +29,10 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
  * {@link PreferenceController} that updates MAC/IP address.
diff --git a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
index 09b3331..bc61cff 100644
--- a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
@@ -20,14 +20,14 @@
 
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
-import com.android.settings.core.lifecycle.events.OnStart;
-import com.android.settings.core.lifecycle.events.OnStop;
 import com.android.settings.widget.SummaryUpdater;
 import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settings.widget.MasterSwitchController;
+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.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
 
 public class WifiMasterSwitchPreferenceController extends PreferenceController
         implements SummaryUpdater.OnSummaryChangeListener,
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 01ccfee..6d575d8 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -697,6 +697,7 @@
 
             case WifiManager.WIFI_STATE_DISABLED:
                 setOffMessage();
+                setAdditionalSettingsSummaries();
                 setProgressBarVisible(false);
                 break;
         }
diff --git a/src/com/android/settings/wifi/WifiSleepPolicyPreferenceController.java b/src/com/android/settings/wifi/WifiSleepPolicyPreferenceController.java
deleted file mode 100644
index 3e7911b..0000000
--- a/src/com/android/settings/wifi/WifiSleepPolicyPreferenceController.java
+++ /dev/null
@@ -1,104 +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.wifi;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.util.Log;
-import android.widget.Toast;
-
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
-
-import static com.android.internal.os.MemoryPowerCalculator.TAG;
-
-public class WifiSleepPolicyPreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener {
-
-    private static final String KEY_SLEEP_POLICY = "sleep_policy";
-
-    public WifiSleepPolicyPreferenceController(Context context) {
-        super(context);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_SLEEP_POLICY;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        ListPreference sleepPolicyPref = (ListPreference) preference;
-        if (sleepPolicyPref != null) {
-            if (Utils.isWifiOnly(mContext)) {
-                sleepPolicyPref.setEntries(R.array.wifi_sleep_policy_entries_wifi_only);
-            }
-            int value = Settings.Global.getInt(mContext.getContentResolver(),
-                    Settings.Global.WIFI_SLEEP_POLICY,
-                    Settings.Global.WIFI_SLEEP_POLICY_NEVER);
-            String stringValue = String.valueOf(value);
-            sleepPolicyPref.setValue(stringValue);
-            updateSleepPolicySummary(sleepPolicyPref, stringValue);
-        }
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        try {
-            String stringValue = (String) newValue;
-            Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WIFI_SLEEP_POLICY,
-                    Integer.parseInt(stringValue));
-            updateSleepPolicySummary(preference, stringValue);
-        } catch (NumberFormatException e) {
-            Toast.makeText(mContext, R.string.wifi_setting_sleep_policy_error,
-                    Toast.LENGTH_SHORT).show();
-            return false;
-        }
-        return true;
-    }
-
-    private void updateSleepPolicySummary(Preference sleepPolicyPref, String value) {
-        if (value != null) {
-            String[] values = mContext.getResources().getStringArray(R.array
-                    .wifi_sleep_policy_values);
-            final int summaryArrayResId = Utils.isWifiOnly(mContext)
-                    ? R.array.wifi_sleep_policy_entries_wifi_only
-                    : R.array.wifi_sleep_policy_entries;
-            String[] summaries = mContext.getResources().getStringArray(summaryArrayResId);
-            for (int i = 0; i < values.length; i++) {
-                if (value.equals(values[i])) {
-                    if (i < summaries.length) {
-                        sleepPolicyPref.setSummary(summaries[i]);
-                        return;
-                    }
-                }
-            }
-        }
-
-        sleepPolicyPref.setSummary("");
-        Log.e(TAG, "Invalid sleep policy value: " + value);
-    }
-
-}
diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
index 9eea74a..9ec4c59 100644
--- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
@@ -29,10 +29,10 @@
 import com.android.settings.R;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
  * {@link PreferenceController} that controls whether the Wi-Fi Wakeup feature should be enabled.
diff --git a/src/com/android/settings/wifi/WpsDialog.java b/src/com/android/settings/wifi/WpsDialog.java
index 67367ad..3de2729 100644
--- a/src/com/android/settings/wifi/WpsDialog.java
+++ b/src/com/android/settings/wifi/WpsDialog.java
@@ -150,6 +150,9 @@
             DialogState dialogState = mDialogState.valueOf(savedInstanceState.getString(DIALOG_STATE));
             String msg = savedInstanceState.getString(DIALOG_MSG_STRING);
             updateDialog(dialogState, msg);
+            if (dialogState == DialogState.WPS_START) {
+                startWps();
+            }
         }
     }
 
@@ -180,9 +183,7 @@
 
         setView(mView);
         if (savedInstanceState == null) {
-            WpsInfo wpsConfig = new WpsInfo();
-            wpsConfig.setup = mWpsSetup;
-            mWifiManager.startWps(wpsConfig, mWpsListener);
+            startWps();
         }
         super.onCreate(savedInstanceState);
     }
@@ -276,4 +277,9 @@
         }
     }
 
+    private void startWps() {
+        WpsInfo wpsConfig = new WpsInfo();
+        wpsConfig.setup = mWpsSetup;
+        mWifiManager.startWps(wpsConfig, mWpsListener);
+    }
 }
diff --git a/src/com/android/settings/wifi/WpsPreferenceController.java b/src/com/android/settings/wifi/WpsPreferenceController.java
index 736d231..7aaa7eb 100644
--- a/src/com/android/settings/wifi/WpsPreferenceController.java
+++ b/src/com/android/settings/wifi/WpsPreferenceController.java
@@ -31,10 +31,10 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
  * {@link PreferenceController} that shows Dialog for WPS progress. Disabled when Wi-Fi is off.
@@ -151,4 +151,4 @@
             return new WpsDialog(getActivity(), mWpsSetup);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index f3db5e5..4ab0805 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -55,12 +55,12 @@
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.vpn2.ConnectivityManagerWrapper;
 import com.android.settings.wifi.WifiDetailPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+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.wifi.AccessPoint;
 
 import java.net.Inet4Address;
@@ -247,8 +247,7 @@
         mButtonsPref = (LayoutPreference) screen.findPreference(KEY_BUTTONS_PREF);
         mSignInButton = (Button) mButtonsPref.findViewById(R.id.signin_button);
         mSignInButton.setText(R.string.support_sign_in_button_text);
-        mSignInButton.setOnClickListener(
-            view -> mConnectivityManagerWrapper.startCaptivePortalApp(mNetwork));
+        mSignInButton.setOnClickListener(view -> signIntoNetwork());
 
         mSignalStrengthPref =
                 (WifiDetailPreference) screen.findPreference(KEY_SIGNAL_STRENGTH_PREF);
@@ -477,4 +476,13 @@
                 mFragment.getActivity(), MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
         mFragment.getActivity().finish();
     }
+
+    /**
+     * Sign in to the captive portal found on this wifi network associated with this preference.
+     */
+    private void signIntoNetwork() {
+        mMetricsFeatureProvider.action(
+                mFragment.getActivity(), MetricsProto.MetricsEvent.ACTION_WIFI_SIGNIN);
+        mConnectivityManagerWrapper.startCaptivePortalApp(mNetwork);
+    }
 }
diff --git a/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java
new file mode 100644
index 0000000..3df1978
--- /dev/null
+++ b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java
@@ -0,0 +1,64 @@
+/*
+ * 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.wifi.p2p;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroup;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceController;
+
+public abstract class P2pCategoryPreferenceController extends PreferenceController {
+
+    protected PreferenceGroup mCategory;
+
+    public P2pCategoryPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mCategory = (PreferenceGroup) screen.findPreference(getPreferenceKey());
+    }
+
+    public void removeAllChildren() {
+        if (mCategory != null) {
+            mCategory.removeAll();
+            mCategory.setVisible(false);
+        }
+    }
+
+    public void addChild(Preference child) {
+        if (mCategory != null) {
+            mCategory.addPreference(child);
+            mCategory.setVisible(true);
+        }
+    }
+
+    public void setEnabled(boolean enabled) {
+        if (mCategory != null) {
+            mCategory.setEnabled(enabled);
+        }
+    }
+}
diff --git a/src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java b/src/com/android/settings/wifi/p2p/P2pPeerCategoryPreferenceController.java
similarity index 63%
rename from src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java
rename to src/com/android/settings/wifi/p2p/P2pPeerCategoryPreferenceController.java
index b34b407..5baa403 100644
--- a/src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java
+++ b/src/com/android/settings/wifi/p2p/P2pPeerCategoryPreferenceController.java
@@ -14,10 +14,18 @@
  * limitations under the License.
  */
 
-package com.android.settings.core.lifecycle.events;
+package com.android.settings.wifi.p2p;
 
-import android.view.MenuItem;
+import android.content.Context;
 
-public interface OnOptionsItemSelected {
-    boolean onOptionsItemSelected(MenuItem menuItem);
+public class P2pPeerCategoryPreferenceController extends P2pCategoryPreferenceController {
+
+    public P2pPeerCategoryPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return "p2p_peer_devices";
+    }
 }
diff --git a/src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java b/src/com/android/settings/wifi/p2p/P2pPersistentCategoryPreferenceController.java
similarity index 62%
copy from src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java
copy to src/com/android/settings/wifi/p2p/P2pPersistentCategoryPreferenceController.java
index b34b407..139f698 100644
--- a/src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java
+++ b/src/com/android/settings/wifi/p2p/P2pPersistentCategoryPreferenceController.java
@@ -14,10 +14,18 @@
  * limitations under the License.
  */
 
-package com.android.settings.core.lifecycle.events;
+package com.android.settings.wifi.p2p;
 
-import android.view.MenuItem;
+import android.content.Context;
 
-public interface OnOptionsItemSelected {
-    boolean onOptionsItemSelected(MenuItem menuItem);
+public class P2pPersistentCategoryPreferenceController extends P2pCategoryPreferenceController {
+
+    public P2pPersistentCategoryPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return "p2p_persistent_group";
+    }
 }
diff --git a/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java
new file mode 100644
index 0000000..ca992a9
--- /dev/null
+++ b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java
@@ -0,0 +1,66 @@
+/*
+ * 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.wifi.p2p;
+
+import android.content.Context;
+import android.net.wifi.p2p.WifiP2pDevice;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.core.PreferenceController;
+
+public class P2pThisDevicePreferenceController extends PreferenceController {
+
+    private Preference mPreference;
+
+    public P2pThisDevicePreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return "p2p_this_device";
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    public void setEnabled(boolean enabled) {
+        if (mPreference != null) {
+            mPreference.setEnabled(enabled);
+        }
+    }
+
+    public void updateDeviceName(WifiP2pDevice thisDevice) {
+        if (mPreference != null && thisDevice != null) {
+            if (TextUtils.isEmpty(thisDevice.deviceName)) {
+                mPreference.setTitle(thisDevice.deviceAddress);
+            } else {
+                mPreference.setTitle(thisDevice.deviceName);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java
index df871ab..3eb2b7b 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java
@@ -25,10 +25,10 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
  * {@link PreferenceController} to toggle Wifi Direct preference on Wi-Fi state.
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 977be7e..cd328d9 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -39,8 +39,6 @@
 import android.os.Bundle;
 import android.os.SystemProperties;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceScreen;
 import android.text.InputFilter;
 import android.text.TextUtils;
@@ -53,12 +51,16 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /*
  * Displays Wi-fi p2p settings UI
  */
-public class WifiP2pSettings extends SettingsPreferenceFragment
+public class WifiP2pSettings extends DashboardFragment
         implements PersistentGroupInfoListener, PeerListListener {
 
     private static final String TAG = "WifiP2pSettings";
@@ -83,9 +85,9 @@
     private int mConnectedDevices;
     private boolean mLastGroupFormed = false;
 
-    private PreferenceGroup mPeersGroup;
-    private PreferenceGroup mPersistentGroup;
-    private Preference mThisDevicePref;
+    private P2pPeerCategoryPreferenceController mPeerCategoryController;
+    private P2pPersistentCategoryPreferenceController mPersistentCategoryController;
+    private P2pThisDevicePreferenceController mThisDevicePreferenceController;
 
     private static final int DIALOG_DISCONNECT  = 1;
     private static final int DIALOG_CANCEL_CONNECT = 2;
@@ -132,7 +134,7 @@
                 mThisDevice = (WifiP2pDevice) intent.getParcelableExtra(
                         WifiP2pManager.EXTRA_WIFI_P2P_DEVICE);
                 if (DBG) Log.d(TAG, "Update device info: " + mThisDevice);
-                updateDevicePref();
+                mThisDevicePreferenceController.updateDeviceName(mThisDevice);
             } else if (WifiP2pManager.WIFI_P2P_DISCOVERY_CHANGED_ACTION.equals(action)) {
                 int discoveryState = intent.getIntExtra(WifiP2pManager.EXTRA_DISCOVERY_STATE,
                     WifiP2pManager.WIFI_P2P_DISCOVERY_STOPPED);
@@ -150,21 +152,37 @@
         }
     };
 
-    public WifiP2pSettings() {
-        if (DBG) Log.d(TAG, "Creating WifiP2pSettings ...");
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.wifi_p2p_settings;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.WIFI_P2P;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        final List<PreferenceController> controllers = new ArrayList<>();
+        mPersistentCategoryController =
+                new P2pPersistentCategoryPreferenceController(context);
+        mPeerCategoryController =
+                new P2pPeerCategoryPreferenceController(context);
+        mThisDevicePreferenceController = new P2pThisDevicePreferenceController(context);
+        controllers.add(mPersistentCategoryController);
+        controllers.add(mPeerCategoryController);
+        controllers.add(mThisDevicePreferenceController);
+        return controllers;
     }
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
-        addPreferencesFromResource(R.xml.wifi_p2p_settings);
-
-        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_DISCOVERY_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_PERSISTENT_GROUPS_CHANGED_ACTION);
-
         final Activity activity = getActivity();
         mWifiP2pManager = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE);
         if (mWifiP2pManager != null) {
@@ -180,7 +198,7 @@
 
         if (savedInstanceState != null && savedInstanceState.containsKey(SAVE_DIALOG_PEER)) {
             WifiP2pDevice device = savedInstanceState.getParcelable(SAVE_DIALOG_PEER);
-            mSelectedWifiPeer = new WifiP2pPeer(getActivity(), device);
+            mSelectedWifiPeer = new WifiP2pPeer(getPrefContext(), device);
         }
         if (savedInstanceState != null && savedInstanceState.containsKey(SAVE_DEVICE_NAME)) {
             mSavedDeviceName = savedInstanceState.getString(SAVE_DEVICE_NAME);
@@ -274,16 +292,17 @@
                             mWifiP2pManager.deletePersistentGroup(mChannel,
                                     mSelectedGroup.getNetworkId(),
                                     new WifiP2pManager.ActionListener() {
-                                public void onSuccess() {
-                                    if (DBG) Log.d(TAG, " delete group success");
-                                }
-                                public void onFailure(int reason) {
-                                    if (DBG) Log.d(TAG, " delete group fail " + reason);
-                                }
-                            });
+                                        public void onSuccess() {
+                                            if (DBG) Log.d(TAG, " delete group success");
+                                        }
+
+                                        public void onFailure(int reason) {
+                                            if (DBG) Log.d(TAG, " delete group fail " + reason);
+                                        }
+                                    });
                             mSelectedGroup = null;
                         } else {
-                            if (DBG) Log.w(TAG, " No selected group to delete!" );
+                            if (DBG) Log.w(TAG, " No selected group to delete!");
                         }
                     }
                 } else if (which == DialogInterface.BUTTON_NEGATIVE) {
@@ -295,31 +314,20 @@
             }
         };
 
-        setHasOptionsMenu(true);
-
-        final PreferenceScreen preferenceScreen = getPreferenceScreen();
-        preferenceScreen.removeAll();
-        preferenceScreen.setOrderingAsAdded(true);
-
-        mThisDevicePref = new Preference(getPrefContext());
-        mThisDevicePref.setPersistent(false);
-        mThisDevicePref.setSelectable(false);
-        preferenceScreen.addPreference(mThisDevicePref);
-
-        mPeersGroup = new PreferenceCategory(getPrefContext());
-        mPeersGroup.setTitle(R.string.wifi_p2p_peer_devices);
-        preferenceScreen.addPreference(mPeersGroup);
-
-        mPersistentGroup = new PreferenceCategory(getPrefContext());
-        mPersistentGroup.setTitle(R.string.wifi_p2p_remembered_groups);
-        preferenceScreen.addPreference(mPersistentGroup);
-
         super.onActivityCreated(savedInstanceState);
     }
 
     @Override
     public void onResume() {
         super.onResume();
+        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION);
+        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION);
+        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION);
+        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION);
+        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_DISCOVERY_CHANGED_ACTION);
+        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_PERSISTENT_GROUPS_CHANGED_ACTION);
+        final PreferenceScreen preferenceScreen = getPreferenceScreen();
+
         getActivity().registerReceiver(mReceiver, mIntentFilter);
         if (mWifiP2pManager != null) {
             mWifiP2pManager.requestPeers(mChannel, WifiP2pSettings.this);
@@ -491,11 +499,6 @@
     }
 
     @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.WIFI_P2P;
-    }
-
-    @Override
     public int getDialogMetricsCategory(int dialogId) {
         switch (dialogId) {
             case DIALOG_DISCONNECT:
@@ -524,13 +527,13 @@
     }
 
     private void handlePeersChanged() {
-        mPeersGroup.removeAll();
+        mPeerCategoryController.removeAllChildren();
 
         mConnectedDevices = 0;
         if (DBG) Log.d(TAG, "List of available peers");
         for (WifiP2pDevice peer: mPeers.getDeviceList()) {
             if (DBG) Log.d(TAG, "-> " + peer);
-            mPeersGroup.addPreference(new WifiP2pPeer(getActivity(), peer));
+            mPeerCategoryController.addChild(new WifiP2pPeer(getPrefContext(), peer));
             if (peer.status == WifiP2pDevice.CONNECTED) mConnectedDevices++;
         }
         if (DBG) Log.d(TAG, " mConnectedDevices " + mConnectedDevices);
@@ -538,12 +541,12 @@
 
     @Override
     public void onPersistentGroupInfoAvailable(WifiP2pGroupList groups) {
-        mPersistentGroup.removeAll();
+        mPersistentCategoryController.removeAllChildren();
 
         for (WifiP2pGroup group: groups.getGroupList()) {
             if (DBG) Log.d(TAG, " group " + group);
-            WifiP2pPersistentGroup wppg = new WifiP2pPersistentGroup(getActivity(), group);
-            mPersistentGroup.addPreference(wppg);
+            WifiP2pPersistentGroup wppg = new WifiP2pPersistentGroup(getPrefContext(), group);
+            mPersistentCategoryController.addChild(wppg);
             if (wppg.getGroupName().equals(mSelectedGroupName)) {
                 if (DBG) Log.d(TAG, "Selecting group " + wppg.getGroupName());
                 mSelectedGroup = wppg;
@@ -568,9 +571,9 @@
 
     private void handleP2pStateChanged() {
         updateSearchMenu(false);
-        mThisDevicePref.setEnabled(mWifiP2pEnabled);
-        mPeersGroup.setEnabled(mWifiP2pEnabled);
-        mPersistentGroup.setEnabled(mWifiP2pEnabled);
+        mThisDevicePreferenceController.setEnabled(mWifiP2pEnabled);
+        mPersistentCategoryController.setEnabled(mWifiP2pEnabled);
+        mPeerCategoryController.setEnabled(mWifiP2pEnabled);
     }
 
     private void updateSearchMenu(boolean searching) {
@@ -590,14 +593,4 @@
             });
         }
     }
-
-    private void updateDevicePref() {
-        if (mThisDevice != null) {
-            if (TextUtils.isEmpty(mThisDevice.deviceName)) {
-                mThisDevicePref.setTitle(mThisDevice.deviceAddress);
-            } else {
-                mThisDevicePref.setTitle(mThisDevice.deviceName);
-            }
-        }
-    }
 }
diff --git a/tests/app/src/com/android/settings/ChooseLockGenericTest.java b/tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
similarity index 98%
rename from tests/app/src/com/android/settings/ChooseLockGenericTest.java
rename to tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
index 924e716..e2bd6ee 100644
--- a/tests/app/src/com/android/settings/ChooseLockGenericTest.java
+++ b/tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import static android.support.test.InstrumentationRegistry.getInstrumentation;
 import static android.support.test.InstrumentationRegistry.getTargetContext;
@@ -56,7 +56,7 @@
  * m SettingsTests &&
  * adb install \
  * -r -g  ${ANDROID_PRODUCT_OUT}/data/app/SettingsTests/SettingsTests.apk &&
- * adb shell am instrument -e class com.android.settings.ChooseLockGenericTest \
+ * adb shell am instrument -e class com.android.settings.password.ChooseLockGenericTest \
  * -w com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner
  */
 @RunWith(AndroidJUnit4.class)
diff --git a/tests/app/src/com/android/settings/ConfirmLockPasswordTest.java b/tests/app/src/com/android/settings/password/ConfirmLockPasswordTest.java
similarity index 97%
rename from tests/app/src/com/android/settings/ConfirmLockPasswordTest.java
rename to tests/app/src/com/android/settings/password/ConfirmLockPasswordTest.java
index 05464ad..25e7da0 100644
--- a/tests/app/src/com/android/settings/ConfirmLockPasswordTest.java
+++ b/tests/app/src/com/android/settings/password/ConfirmLockPasswordTest.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.action.ViewActions.pressKey;
@@ -30,6 +30,8 @@
 import android.support.test.runner.AndroidJUnit4;
 import android.view.KeyEvent;
 
+import com.android.settings.R;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/app/src/com/android/settings/search2/SearchFragmentEspressoTest.java b/tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java
similarity index 92%
rename from tests/app/src/com/android/settings/search2/SearchFragmentEspressoTest.java
rename to tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java
index e6fe899..d342881 100644
--- a/tests/app/src/com/android/settings/search2/SearchFragmentEspressoTest.java
+++ b/tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.support.test.filters.SmallTest;
 import android.support.test.rule.ActivityTestRule;
@@ -28,11 +28,13 @@
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.matcher.ViewMatchers.hasFocus;
 import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
-import static android.support.test.espresso.matcher.ViewMatchers.withTagKey;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.core.AllOf.allOf;
 
+import com.android.settings.R;
+
 
 @RunWith(AndroidJUnit4.class)
 @SmallTest
@@ -43,7 +45,7 @@
 
     @Test
     public void test_OpenKeyboardOnSearchLaunch() {
-        onView(allOf(hasFocus(), withTagKey(SearchFragment.SEARCH_TAG)))
+        onView(allOf(hasFocus(), withId(R.id.search_view)))
                 .check(matches(withClassName(containsString(SearchView.class.getName()))));
     }
 }
diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index b448433..ae0102f 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -8,7 +8,7 @@
 
 # Include the testing libraries (JUnit4 + Robolectric libs).
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    platform-system-robolectric \
+    mockito-robolectric-prebuilt \
     truth-prebuilt
 
 LOCAL_JAVA_LIBRARIES := \
diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider
index 767edf8..b9e328c 100644
--- a/tests/robotests/assets/grandfather_not_implementing_index_provider
+++ b/tests/robotests/assets/grandfather_not_implementing_index_provider
@@ -1,12 +1,15 @@
-com.android.settings.language.LanguageAndRegionSettings
+com.android.settings.bluetooth.DevicePickerFragment
+com.android.settings.bluetooth.BluetoothDeviceDetailsFragment
+com.android.settings.bluetooth.BluetoothPairingDetail
 com.android.settings.notification.ZenModePrioritySettings
 com.android.settings.accounts.AccountDetailDashboardFragment
-com.android.settings.fuelgauge.PowerUsageDetail
+com.android.settings.fuelgauge.PowerUsageAnomalyDetails
 com.android.settings.fuelgauge.AdvancedPowerUsageDetail
 com.android.settings.deviceinfo.StorageProfileFragment
 com.android.settings.wifi.details.WifiNetworkDetailsFragment
+com.android.settings.wifi.p2p.WifiP2pSettings
 com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionCamera
 com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionLocation
 com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionMicrophone
 com.android.settings.enterprise.ApplicationListFragment$EnterpriseInstalledPackages
-com.android.settings.enterprise.EnterpriseSetDefaultAppsListFragment
\ No newline at end of file
+com.android.settings.enterprise.EnterpriseSetDefaultAppsListFragment
diff --git a/tests/robotests/assets/grandfather_not_implementing_indexable b/tests/robotests/assets/grandfather_not_implementing_indexable
index 0f65f89..47711b0 100644
--- a/tests/robotests/assets/grandfather_not_implementing_indexable
+++ b/tests/robotests/assets/grandfather_not_implementing_indexable
@@ -18,16 +18,12 @@
 com.android.settings.applications.ProcessStatsDetail
 com.android.settings.wifi.WifiInfo
 com.android.settings.applications.VrListenerSettings
-com.android.settings.nfc.PaymentSettings
-com.android.settings.inputmethod.VirtualKeyboardFragment
-com.android.settings.bluetooth.DevicePickerFragment
 com.android.settings.inputmethod.UserDictionaryList
 com.android.settings.deviceinfo.Status
 com.android.settings.datausage.DataSaverSummary
 com.android.settings.notification.ChannelNotificationSettings
 com.android.settings.datausage.AppDataUsage
 com.android.settings.accessibility.FontSizePreferenceFragmentForSetupWizard
-com.android.settings.inputmethod.PhysicalKeyboardFragment
 com.android.settings.applications.ManageDomainUrls
 com.android.settings.applications.WriteSettingsDetails
 com.android.settings.location.LocationSettings
@@ -35,36 +31,28 @@
 com.android.settings.users.RestrictedProfileSettings
 com.android.settings.accounts.ChooseAccountActivity
 com.android.settings.accounts.ManagedProfileSettings
-com.android.settings.notification.ZenModeAutomationSettings
 com.android.settings.accessibility.ToggleAutoclickPreferenceFragment
 com.android.settings.applications.AppLaunchSettings
 com.android.settings.fuelgauge.BatterySaverSettings
 com.android.settings.location.ScanningSettings
 com.android.settings.tts.TextToSpeechSettings
 com.android.settings.applications.ProcessStatsUi
-com.android.settings.fuelgauge.PowerUsageDetail
 com.android.settings.notification.ZenModeScheduleRuleSettings
 com.android.settings.datausage.BillingCycleSettings
 com.android.settings.notification.NotificationStation
 com.android.settings.print.PrintJobSettingsFragment
-com.android.settings.applications.SpecialAccessSettings
 com.android.settings.accessibility.ToggleScreenReaderPreferenceFragmentForSetupWizard
 com.android.settings.accessibility.ToggleSelectToSpeakPreferenceFragmentForSetupWizard
 com.android.settings.accounts.AccountSyncSettings
 com.android.settings.notification.RedactionInterstitial$RedactionInterstitialFragment
 com.android.settings.inputmethod.InputMethodAndSubtypeEnabler
-com.android.settings.inputmethod.AvailableVirtualKeyboardFragment
 com.android.settings.applications.DrawOverlayDetails
-com.android.settings.tts.TtsEngineSettingsFragment
 com.android.settings.backup.ToggleBackupSettingFragment
 com.android.settings.users.UserDetailsSettings
 com.android.settings.datausage.UnrestrictedDataAccess
 com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragmentForSetupWizard
 com.android.settings.fuelgauge.BatteryHistoryDetail
-com.android.settings.fuelgauge.PowerUsageSummary
 com.android.settings.applications.RunningServices
-com.android.settings.wifi.p2p.WifiP2pSettings
-com.android.settings.applications.assistant.ManageAssist
 com.android.settings.applications.ConfirmConvertToFbe
 com.android.settings.deviceinfo.PublicVolumeSettings
 com.android.settings.applications.InstalledAppDetails
@@ -78,17 +66,28 @@
 com.android.settings.deletionhelper.AutomaticStorageManagerSettings
 com.android.settings.notification.ZenAccessSettings
 com.android.settings.accessibility.ToggleFontSizePreferenceFragment
-com.android.settings.accessibility.ToggleGlobalGesturePreferenceFragment
-com.android.settings.wifi.ConfigureWifiSettings
 com.android.settings.applications.PremiumSmsAccess
 com.android.settings.applications.UsageAccessDetails
 com.android.settings.applications.AppStorageSettings
 com.android.settings.notification.NotificationAccessSettings
 com.android.settings.notification.ZenModeSettings
 com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment
-com.android.settings.applications.ConvertToFbe
 com.android.settings.localepicker.LocaleListEditor
 com.android.settings.qstile.DevelopmentTileConfigActivity$DevelopmentTileConfigFragment
 com.android.settings.applications.ExternalSourcesDetails
 com.android.settings.applications.PictureInPictureSettings
 com.android.settings.applications.PictureInPictureDetails
+com.android.settings.ApnSettings
+com.android.settings.SecuritySettings$SecuritySubSettings
+com.android.settings.PrivacySettings
+com.android.settings.WifiCallingSettings
+com.android.settings.password.SetupChooseLockGeneric$SetupChooseLockGenericFragment
+com.android.settings.SetupRedactionInterstitial$SetupRedactionInterstitialFragment
+com.android.settings.TrustAgentSettings
+com.android.settings.password.ChooseLockGeneric$ChooseLockGenericFragment
+com.android.settings.IccLockSettings
+com.android.settings.TetherSettings
+com.android.settings.ApplicationSettings
+com.android.settings.ApnEditor
+com.android.settings.UserCredentialsSettings
+com.android.settings.TestingSettings
diff --git a/tests/robotests/assets/grandfather_not_implementing_instrumentable b/tests/robotests/assets/grandfather_not_implementing_instrumentable
index c1f0d60..992f25a 100644
--- a/tests/robotests/assets/grandfather_not_implementing_instrumentable
+++ b/tests/robotests/assets/grandfather_not_implementing_instrumentable
@@ -1,5 +1,11 @@
 com.android.settings.deletionhelper.ActivationWarningFragment
-com.android.settings.core.lifecycle.ObservableDialogFragment
-com.android.settings.core.lifecycle.ObservableFragment
 com.android.settings.applications.AppOpsCategory
 com.android.settings.inputmethod.UserDictionaryLocalePicker
+com.android.settings.CustomEditTextPreference$CustomPreferenceDialogFragment
+com.android.settings.CustomListPreference$CustomListPreferenceDialogFragment
+com.android.settings.password.ChooseLockPassword$SaveAndFinishWorker
+com.android.settings.password.ChooseLockPattern$SaveAndFinishWorker
+com.android.settings.RestrictedListPreference$RestrictedListPreferenceDialogFragment
+com.android.settings.CustomDialogPreference$CustomPreferenceDialogFragment
+com.android.settings.password.ConfirmDeviceCredentialBaseFragment$LastTryDialog
+com.android.settings.password.CredentialCheckResultTracker
diff --git a/tests/robotests/assets/grandfather_not_in_search_index_provider_registry b/tests/robotests/assets/grandfather_not_in_search_index_provider_registry
index a95fc0b..948b14a 100644
--- a/tests/robotests/assets/grandfather_not_in_search_index_provider_registry
+++ b/tests/robotests/assets/grandfather_not_in_search_index_provider_registry
@@ -1,2 +1 @@
 com.android.settings.display.ScreenZoomPreferenceFragmentForSetupWizard
-com.android.settings.print.PrintServiceSettingsFragment
diff --git a/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider b/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider
index 8184d2c..b329072 100644
--- a/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider
+++ b/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider
@@ -1,5 +1 @@
-com.android.settings.language.LanguageAndInputSettings
-com.android.settings.enterprise.EnterprisePrivacySettings
-com.android.settings.applications.AdvancedAppSettings
 com.android.settings.fuelgauge.PowerUsageSummary
-com.android.settings.inputmethod.InputMethodAndLanguageSettings
diff --git a/tests/robotests/assets/whitelist_duplicate_index_key b/tests/robotests/assets/whitelist_duplicate_index_key
index 020957e..a761f35 100644
--- a/tests/robotests/assets/whitelist_duplicate_index_key
+++ b/tests/robotests/assets/whitelist_duplicate_index_key
@@ -2,4 +2,4 @@
 additional_system_update_settings
 dashboard_tile_placeholder
 screen_zoom
-usage_access
\ No newline at end of file
+usage_access
diff --git a/res/layout/account_type_preference.xml b/tests/robotests/res/drawable/selectable_card.xml
similarity index 63%
copy from res/layout/account_type_preference.xml
copy to tests/robotests/res/drawable/selectable_card.xml
index f7ba859..8d1274a 100644
--- a/res/layout/account_type_preference.xml
+++ b/tests/robotests/res/drawable/selectable_card.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!--
+     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.
@@ -14,9 +15,9 @@
      limitations under the License.
 -->
 
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/accountTypeIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:contentDescription="@null" />
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <!-- Overlay this since Robolectric has trouble inflating ?android:attr/colorBackground -->
+    <item android:drawable="@android:color/transparent"/>
+</ripple>
\ No newline at end of file
diff --git a/tests/robotests/res/layout-mcc999/fingerprint_enroll_find_sensor.xml b/tests/robotests/res/layout-mcc999/fingerprint_enroll_find_sensor.xml
new file mode 100644
index 0000000..04489de
--- /dev/null
+++ b/tests/robotests/res/layout-mcc999/fingerprint_enroll_find_sensor.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    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.
+-->
+
+<com.android.setupwizardlib.GlifLayout
+    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">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:clipToPadding="false"
+        android:clipChildren="false">
+
+        <FrameLayout
+            android:layout_width="@dimen/fingerprint_find_sensor_graphic_size"
+            android:layout_height="@dimen/fingerprint_find_sensor_graphic_size"
+            android:layout_gravity="center_horizontal|bottom">
+
+            <ImageView
+                android:id="@+id/fingerprint_sensor_location_animation"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@string/security_settings_fingerprint_enroll_find_sensor_content_description"
+                android:src="@drawable/fingerprint_sensor_location"
+                android:scaleType="centerInside"/>
+
+        </FrameLayout>
+
+        <LinearLayout
+            style="@style/SuwContentFrame"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:clipToPadding="false"
+            android:clipChildren="false">
+
+            <TextView
+                style="@style/SuwDescription.Glif"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/suw_description_glif_margin_top"
+                android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
+
+            <View
+                android:layout_height="0dp"
+                android:layout_width="match_parent"
+                android:layout_weight="1"/>
+
+            <Button
+                style="@style/SuwGlifButton.Primary"
+                android:id="@+id/next_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_gravity="end"
+                android:text="@string/fingerprint_enroll_button_next" />
+
+        </LinearLayout>
+    </FrameLayout>
+</com.android.setupwizardlib.GlifLayout>
diff --git a/tests/robotests/src/android/app/admin/PasswordMetrics.java b/tests/robotests/src/android/app/admin/PasswordMetrics.java
new file mode 100644
index 0000000..a461306
--- /dev/null
+++ b/tests/robotests/src/android/app/admin/PasswordMetrics.java
@@ -0,0 +1,49 @@
+/*
+ * 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 android.app.admin;
+
+import android.annotation.NonNull;
+
+/**
+ * Stub implementation of framework's PasswordMetrics for Robolectric tests. Otherwise Robolectric
+ * is throwing ClassNotFoundError.
+ *
+ * TODO: Remove this class when Robolectric supports O
+ */
+public class PasswordMetrics {
+
+    // Maximum allowed number of repeated or ordered characters in a sequence before we'll
+    // consider it a complex PIN/password.
+    public static final int MAX_ALLOWED_SEQUENCE = 3;
+
+    public int length = 0;
+    public int letters = 0;
+    public int upperCase = 0;
+    public int lowerCase = 0;
+    public int numeric = 0;
+    public int symbols = 0;
+    public int nonLetter = 0;
+
+    public static int maxLengthSequence(@NonNull String string) {
+        // Stub implementation
+        return 1;
+    }
+
+    public static PasswordMetrics computeForPassword(@NonNull String password) {
+        return new PasswordMetrics();
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/android/service/oemlock/OemLockManager.java b/tests/robotests/src/android/service/oemlock/OemLockManager.java
new file mode 100644
index 0000000..7c015cf
--- /dev/null
+++ b/tests/robotests/src/android/service/oemlock/OemLockManager.java
@@ -0,0 +1,45 @@
+/*
+ * 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 android.service.oemlock;
+
+/**
+ * Make OemLockManager available to Robolectric.
+ */
+public class OemLockManager {
+    public void setOemUnlockAllowedByCarrier(boolean allowed, byte[] signature) {}
+
+    public boolean isOemUnlockAllowedByCarrier() {
+        return true;
+    }
+
+    public void setOemUnlockAllowedByUser(boolean allowed) {}
+
+    public boolean isOemUnlockAllowedByUser() {
+        return false;
+    }
+
+    public boolean canUserAllowOemUnlock() {
+        return true;
+    }
+    public boolean isOemUnlockAllowed() {
+        return false;
+    }
+
+    public boolean isDeviceOemUnlocked() {
+        return false;
+    }
+}
diff --git a/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java b/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java
index ffa6d96..7e3cd84 100644
--- a/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java
+++ b/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java
@@ -16,7 +16,6 @@
 
 package com.android.internal.hardware;
 
-import android.provider.Settings;
 import android.content.Context;
 
 /**
@@ -42,4 +41,28 @@
     public boolean pulseOnDoubleTapEnabled(int user) {
         return true;
     }
+
+    public boolean pulseOnNotificationEnabled(int user) {
+        return true;
+    }
+
+    public boolean pulseOnNotificationAvailable() {
+        return true;
+    }
+
+    public boolean alwaysOnEnabled(int user) {
+        return true;
+    }
+
+    public boolean alwaysOnAvailable() {
+        return true;
+    }
+
+    public boolean available() {
+        return true;
+    }
+
+    public boolean enabled(int user) {
+        return true;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java b/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java
index 42aed2b..cd891be 100644
--- a/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java
+++ b/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java
@@ -20,6 +20,7 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
index c64e582..51034dd 100644
--- a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
@@ -28,6 +28,7 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settingslib.DeviceInfoUtils;
diff --git a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
index f0c87cf..6b895d7 100644
--- a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
@@ -1,8 +1,11 @@
 package com.android.settings;
 
 import android.content.Context;
+
 import com.android.settings.core.PreferenceController;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
+import com.android.settings.testutils.shadow.ShadowPowerManagerWrapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -13,13 +16,18 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.mock;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DisplaySettingsTest {
 
     @Test
+    @Config(shadows = ShadowPowerManagerWrapper.class)
     public void testPreferenceControllers_getPreferenceKeys_existInPreferenceScreen() {
         final Context context = RuntimeEnvironment.application;
+//        PowerManager wrapper = mock(PowerManager.class);
+//        doReturn(wrapper).when(context).getSystemService(Context.POWER_SERVICE);
         final DisplaySettings fragment = new DisplaySettings();
         final List<String> preferenceScreenKeys = XmlTestUtils.getKeysFromPreferenceXml(context,
                 fragment.getPreferenceScreenResId());
diff --git a/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java b/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java
index 9a5002e..bc88b1a 100644
--- a/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java
+++ b/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java
@@ -17,6 +17,7 @@
 package com.android.settings;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/robotests/src/com/android/settings/LegalSettingsTest.java b/tests/robotests/src/com/android/settings/LegalSettingsTest.java
index 6cfe211..3d50c63 100644
--- a/tests/robotests/src/com/android/settings/LegalSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/LegalSettingsTest.java
@@ -17,6 +17,7 @@
 
 import android.content.Context;
 
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,7 +27,6 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.spy;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
diff --git a/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java b/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java
index ef36e5f..ea4b272 100644
--- a/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java
+++ b/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java
@@ -18,6 +18,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.io.ByteArrayInputStream;
diff --git a/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java b/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java
index 96e88c2..b16d315 100644
--- a/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java
@@ -23,13 +23,13 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 import android.content.Context;
 
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import java.io.File;
 import java.util.ArrayList;
-import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java
index 721d0e0..d913946 100644
--- a/tests/robotests/src/com/android/settings/MasterClearTest.java
+++ b/tests/robotests/src/com/android/settings/MasterClearTest.java
@@ -17,30 +17,72 @@
 package com.android.settings;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
 
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.ContentResolver;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.CheckBox;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowActivity;
+
+
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class MasterClearTest {
+
+    @Mock
     private MasterClear mMasterClear;
     @Mock
     private ScrollView mScrollView;
     @Mock
     private LinearLayout mLinearLayout;
+    private ShadowActivity mShadowActivity;
+    private Activity mActivity;
+    private View mContentView;
+
+    private class ActivityForTest extends SettingsActivity {
+        private Bundle mArgs;
+
+        @Override
+        public void startPreferencePanel(Fragment caller, String fragmentClass, Bundle args,
+            int titleRes, CharSequence titleText, Fragment resultTo, int resultRequestCode) {
+            mArgs = args;
+        }
+
+        public Bundle getArgs() {
+            return mArgs;
+        }
+    }
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mMasterClear = new MasterClear();
+        mMasterClear = spy(new MasterClear());
+        mActivity = Robolectric.setupActivity(Activity.class);
+        mShadowActivity = shadowOf(mActivity);
+        mContentView = LayoutInflater.from(mActivity).inflate(R.layout.master_clear, null);
 
         // Make scrollView only have one child
         when(mScrollView.getChildAt(0)).thenReturn(mLinearLayout);
@@ -48,6 +90,86 @@
     }
 
     @Test
+    public void testShowWipeEuicc_euiccDisabled() {
+        prepareEuiccState(
+                false /* isEuiccEnabled */, true /* isEuiccProvisioned */,
+                true /* isDevelopmentSettingsEnabled */);
+        assertThat(mMasterClear.showWipeEuicc()).isFalse();
+    }
+
+    @Test
+    public void testShowWipeEuicc_euiccEnabled_unprovisioned() {
+        prepareEuiccState(
+                true /* isEuiccEnabled */, false /* isEuiccProvisioned */,
+                false /* isDevelopmentSettingsEnabled */);
+        assertThat(mMasterClear.showWipeEuicc()).isFalse();
+    }
+
+    @Test
+    public void testShowWipeEuicc_euiccEnabled_provisioned() {
+        prepareEuiccState(
+                true /* isEuiccEnabled */, true /* isEuiccProvisioned */,
+                false /* isDevelopmentSettingsEnabled */);
+        assertThat(mMasterClear.showWipeEuicc()).isTrue();
+    }
+
+    @Test
+    public void testShowWipeEuicc_euiccEnabled_developmentSettingsEnabled() {
+        prepareEuiccState(
+                true /* isEuiccEnabled */, false /* isEuiccProvisioned */,
+                true /* isDevelopmentSettingsEnabled */);
+        assertThat(mMasterClear.showWipeEuicc()).isTrue();
+    }
+
+    @Test
+    public void testShowWipeEuicc_euiccEnabled_provisioned_developmentSettingsEnabled() {
+        prepareEuiccState(
+                true /* isEuiccEnabled */, true /* isEuiccProvisioned */,
+                true /* isDevelopmentSettingsEnabled */);
+        assertThat(mMasterClear.showWipeEuicc()).isTrue();
+    }
+
+    private void prepareEuiccState(
+            boolean isEuiccEnabled,
+            boolean isEuiccProvisioned,
+            boolean isDevelopmentSettingsEnabled) {
+        doReturn(mActivity).when(mMasterClear).getContext();
+        doReturn(isEuiccEnabled).when(mMasterClear).isEuiccEnabled(any());
+        ContentResolver cr = mActivity.getContentResolver();
+        Settings.Global.putInt(
+                cr, android.provider.Settings.Global.EUICC_PROVISIONED, isEuiccProvisioned ? 1 : 0);
+        Settings.Global.putInt(
+                cr, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED,
+                isDevelopmentSettingsEnabled ? 1 : 0);
+    }
+
+    @Test
+    public void testShowFinalConfirmation_EraseEsimChecked() {
+        ActivityForTest testActivity = new ActivityForTest();
+        when(mMasterClear.getActivity()).thenReturn(testActivity);
+
+        mMasterClear.mEsimStorage = (CheckBox) mContentView.findViewById(R.id.erase_esim);
+        mMasterClear.mExternalStorage = (CheckBox) mContentView.findViewById(R.id.erase_external);
+        mMasterClear.mEsimStorage.setChecked(true);
+        mMasterClear.showFinalConfirmation();
+        assertThat(testActivity.getArgs().getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false))
+                .isTrue();
+    }
+
+    @Test
+    public void testShowFinalConfirmation_EraseEsimUnchecked() {
+        ActivityForTest testActivity = new ActivityForTest();
+        when(mMasterClear.getActivity()).thenReturn(testActivity);
+
+        mMasterClear.mEsimStorage = (CheckBox) mContentView.findViewById(R.id.erase_esim);
+        mMasterClear.mExternalStorage = (CheckBox) mContentView.findViewById(R.id.erase_external);
+        mMasterClear.mEsimStorage.setChecked(false);
+        mMasterClear.showFinalConfirmation();
+        assertThat(testActivity.getArgs().getBoolean(MasterClear.ERASE_ESIMS_EXTRA, true))
+                .isFalse();
+    }
+
+    @Test
     public void testHasReachedBottom_NotScrollDown_returnFalse() {
         initScrollView(100, 0, 200);
 
diff --git a/tests/robotests/src/com/android/settings/PrivacySettingsTest.java b/tests/robotests/src/com/android/settings/PrivacySettingsTest.java
index 4aac314..c52204d 100644
--- a/tests/robotests/src/com/android/settings/PrivacySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/PrivacySettingsTest.java
@@ -30,6 +30,8 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class PrivacySettingsTest {
diff --git a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java b/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
index e28a594..5838642 100644
--- a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
@@ -30,6 +30,7 @@
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.notification.LockScreenNotificationPreferenceController;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
 import com.android.settingslib.drawer.DashboardCategory;
diff --git a/tests/robotests/src/com/android/settings/SettingsActivityTest.java b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
index 65e9708..28babc2 100644
--- a/tests/robotests/src/com/android/settings/SettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
@@ -16,17 +16,31 @@
 
 package com.android.settings;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+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.verify;
+import static org.mockito.Mockito.when;
+
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
-
 import android.os.Bundle;
 import android.view.Menu;
+
+import com.android.settings.search.SearchActivity;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -35,17 +49,9 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.util.ReflectionHelpers;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-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.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SettingsActivityTest {
@@ -89,7 +95,7 @@
     public void testSetTaskDescription_IconChanged() {
         mActivity.setTaskDescription(mTaskDescription);
 
-        verify(mTaskDescription).setIcon(any());
+        verify(mTaskDescription).setIcon(nullable(Bitmap.class));
     }
 
     @Test
@@ -99,8 +105,8 @@
         mActivity.mDisplaySearch = true;
         mActivity.onCreateOptionsMenu(null);
 
-        verify(mFeatureFactory.getSearchFeatureProvider()).setUpSearchMenu(any(Menu.class),
-                any(Activity.class));
+        verify(mFeatureFactory.getSearchFeatureProvider()).setUpSearchMenu(nullable(Menu.class),
+                nullable(Activity.class));
     }
 
     @Test
@@ -138,4 +144,15 @@
 
         assertThat(mActivity.mDisplaySearch).isTrue();
     }
+
+    @Test
+    public void testOnClick() {
+        doReturn("com.android.settings").when(mActivity).getPackageName();
+
+        mActivity.onClick(null);
+
+        Intent intent = ShadowApplication.getInstance().getNextStartedActivity();
+        assertThat(intent.getComponent()).isEqualTo(
+                new ComponentName("com.android.settings", SearchActivity.class.getName()));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
index 9bf168d..942634a 100644
--- a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
@@ -30,6 +30,8 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SettingsDialogFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java
index 043b0fe..0d0f22c 100644
--- a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java
@@ -34,6 +34,8 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SettingsDumpServiceTest {
diff --git a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
index 3e28a2a..dd17d9c 100644
--- a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
@@ -22,33 +22,25 @@
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
 
 import android.app.Application;
-import android.os.Bundle;
 import android.os.SystemProperties;
-import android.content.Context;
 import android.content.Intent;
-import android.content.Loader;
 import android.net.Uri;
-import android.os.Bundle;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.res.builder.RobolectricPackageManager;
 import org.robolectric.util.ActivityController;
-import org.robolectric.shadows.ShadowActivity;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
diff --git a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
index cd48da3..dc4166d 100644
--- a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
@@ -17,11 +17,13 @@
 package com.android.settings;
 
 
+import android.app.Activity;
 import android.content.Context;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
+import android.view.View;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -30,26 +32,46 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
 
 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.when;
 
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SettingsPreferenceFragmentTest {
 
+    private static final int ITEM_COUNT = 5;
+
     @Mock
     private PreferenceManager mPreferenceManager;
+    @Mock
+    private Activity mActivity;
+    @Mock
+    private View mListContainer;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
     private Context mContext;
     private TestFragment mFragment;
+    private View mEmptyView;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
-        mFragment = new TestFragment();
+        mFragment = spy(new TestFragment());
+        doReturn(mActivity).when(mFragment).getActivity();
+
+        mEmptyView = new View(mContext);
+        ReflectionHelpers.setField(mFragment, "mEmptyView", mEmptyView);
+
+        doReturn(ITEM_COUNT).when(mPreferenceScreen).getPreferenceCount();
     }
 
     @Test
@@ -100,7 +122,27 @@
         assertThat(mScreen.getPreferenceCount()).isEqualTo(1);
     }
 
-    public static final class TestFragment extends SettingsPreferenceFragment {
+    @Test
+    public void testUpdateEmptyView_containerInvisible_emptyViewVisible() {
+        doReturn(View.INVISIBLE).when(mListContainer).getVisibility();
+        doReturn(mListContainer).when(mActivity).findViewById(android.R.id.list_container);
+        doReturn(mPreferenceScreen).when(mFragment).getPreferenceScreen();
+
+        mFragment.updateEmptyView();
+
+        assertThat(mEmptyView.getVisibility()).isEqualTo(View.VISIBLE);
+    }
+
+    @Test
+    public void testUpdateEmptyView_containerNull_emptyViewGone() {
+        doReturn(mPreferenceScreen).when(mFragment).getPreferenceScreen();
+
+        mFragment.updateEmptyView();
+
+        assertThat(mEmptyView.getVisibility()).isEqualTo(View.GONE);
+    }
+
+    public static class TestFragment extends SettingsPreferenceFragment {
 
         @Override
         public int getMetricsCategory() {
diff --git a/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
index 4b78ee7..78bc7d1 100644
--- a/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
@@ -25,7 +25,10 @@
 import android.content.pm.PackageManager;
 import android.os.UserHandle;
 
-import com.android.settings.ChooseLockPattern.ChooseLockPatternFragment;
+import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment;
+import com.android.settings.password.ChooseLockPattern.IntentBuilder;
+import com.android.settings.password.SetupChooseLockPattern;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
@@ -63,11 +66,11 @@
 
         mActivity =  Robolectric.buildActivity(
                 SetupChooseLockPattern.class,
-                SetupChooseLockPattern.createIntent(
+                SetupChooseLockPattern.modifyIntentForSetup(
                         application,
-                        false, /* requirePassword */
-                        false, /* confirmCredentials */
-                        UserHandle.myUserId()))
+                        new IntentBuilder(application)
+                                .setUserId(UserHandle.myUserId())
+                                .build()))
                 .setup().get();
     }
 
diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
index 1c83a1a..115bc8a 100644
--- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
@@ -18,8 +18,7 @@
 
 import android.content.Intent;
 
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.setupwizardlib.util.WizardManagerHelper;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
index 4cf7e69..59a5867 100644
--- a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
@@ -31,8 +31,15 @@
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
 
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class
+})
 public class SummaryPreferenceTest {
 
     private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/TetherServiceTest.java b/tests/robotests/src/com/android/settings/TetherServiceTest.java
index 2d5a2fb..0275c15 100644
--- a/tests/robotests/src/com/android/settings/TetherServiceTest.java
+++ b/tests/robotests/src/com/android/settings/TetherServiceTest.java
@@ -23,6 +23,9 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.wifi.WifiManager;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import java.util.ArrayList;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java
index 8dfd32a..93ab406 100644
--- a/tests/robotests/src/com/android/settings/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/UtilsTest.java
@@ -19,11 +19,12 @@
 import android.os.storage.DiskInfo;
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeInfo;
-import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.format.DateUtils;
 import android.text.style.TtsSpan;
 
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/ZonePickerTest.java b/tests/robotests/src/com/android/settings/ZonePickerTest.java
index 6ab0c2d..31606f1 100644
--- a/tests/robotests/src/com/android/settings/ZonePickerTest.java
+++ b/tests/robotests/src/com/android/settings/ZonePickerTest.java
@@ -26,6 +26,7 @@
 import android.widget.TextView;
 
 import com.android.settings.datetime.ZonePicker;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowLibcoreTimeZoneNames;
 import com.android.settings.testutils.shadow.ShadowTimeZoneNames;
 
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index 4da06c0..01afdf8 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.XmlTestUtils;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
index 9161f06..f2d1e65 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
@@ -21,7 +21,7 @@
 import android.os.UserManager;
 
 import android.test.mock.MockContentResolver;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.testutils.FakeFeatureFactory;
@@ -33,7 +33,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
index 90728e8..81b563f 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
@@ -17,17 +17,14 @@
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
-import android.accounts.AuthenticatorDescription;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowAccountManager;
-import com.android.settings.testutils.shadow.ShadowContentResolver;
 import com.android.settingslib.drawer.CategoryKey;
 import com.android.settingslib.drawer.Tile;
 
@@ -41,11 +38,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -54,7 +47,6 @@
     private static final String METADATA_CATEGORY = "com.android.settings.category";
     private static final String METADATA_ACCOUNT_TYPE = "com.android.settings.ia.account";
     private static final String METADATA_USER_HANDLE = "user_handle";
-    private static final String PREF_ACCOUNT_HEADER = "account_header";
 
     @Mock(answer = RETURNS_DEEP_STUBS)
     private AccountManager mAccountManager;
@@ -118,20 +110,4 @@
 
         assertThat(mFragment.displayTile(tile)).isFalse();
     }
-
-    @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
-    public void updateAccountHeader_shouldShowAccountName() throws Exception {
-        when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(
-            new AuthenticatorDescription[0]);
-        when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(new Account[0]);
-        when(mFragment.getContext()).thenReturn(mContext);
-        doReturn(mScreen).when(mFragment).getPreferenceScreen();
-        doReturn(mPreference).when(mFragment).findPreference(PREF_ACCOUNT_HEADER);
-
-        mFragment.updateUi();
-
-        verify(mPreference).setTitle("name1@abc.com");
-    }
-
 }
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
new file mode 100644
index 0000000..008c0bc
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
@@ -0,0 +1,115 @@
+/*
+ * 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.accounts;
+
+import android.accounts.Account;
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.PreferenceScreen;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.accounts.AuthenticatorHelper;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.when;
+
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AccountHeaderPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private Activity mActivity;
+    @Mock
+    private PreferenceFragment mFragment;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    private LayoutPreference mHeaderPreference;
+
+    private AccountHeaderPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
+        mHeaderPreference = new LayoutPreference(
+                RuntimeEnvironment.application, R.layout.settings_entity_header);
+    }
+
+    @Test
+    public void isAvailable_noArgs_shouldReturnNull() {
+        mController = new AccountHeaderPreferenceController(RuntimeEnvironment.application,
+                new Lifecycle(), mActivity, mFragment, null /* args */);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    @Config(shadows = ShadowAuthenticatorHelper.class)
+    public void displayPreference_shouldDisplayAccountInEntityHeader() {
+        final Account account = new Account("name1@abc.com", "com.abc");
+        Bundle args = new Bundle();
+        args.putParcelable(AccountDetailDashboardFragment.KEY_ACCOUNT, account);
+        args.putParcelable(AccountDetailDashboardFragment.KEY_USER_HANDLE, UserHandle.CURRENT);
+        mController = new AccountHeaderPreferenceController(RuntimeEnvironment.application,
+                new Lifecycle(), mActivity, mFragment, args);
+
+        assertThat(mController.isAvailable()).isTrue();
+
+        when(mScreen.findPreference(anyString())).thenReturn(mHeaderPreference);
+
+        mController.displayPreference(mScreen);
+
+        final CharSequence label =
+                ((TextView) mHeaderPreference.findViewById(R.id.entity_header_title)).getText();
+
+        assertThat(label).isEqualTo(account.name);
+
+    }
+
+    @Implements(AuthenticatorHelper.class)
+    public static class ShadowAuthenticatorHelper {
+        @Implementation
+        public void onAccountsUpdated(Account[] accounts) {
+
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
index f1ad142..f4f093a 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
@@ -20,6 +20,8 @@
 import android.accounts.AuthenticatorDescription;
 import android.content.Context;
 import android.content.pm.UserInfo;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
@@ -31,11 +33,12 @@
 import com.android.settings.AccessiblePreferenceCategory;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.testutils.shadow.ShadowAccountManager;
 import com.android.settings.testutils.shadow.ShadowContentResolver;
+import com.android.settingslib.accounts.AuthenticatorHelper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -44,6 +47,8 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
 import org.robolectric.shadows.ShadowApplication;
 
 import java.util.ArrayList;
@@ -211,12 +216,12 @@
         when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
         AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
         when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-            preferenceGroup);
+                preferenceGroup);
 
         mController.onResume();
 
         verify(preferenceGroup).setTitle(
-            mContext.getString(R.string.account_for_section_header, "user 1"));
+                mContext.getString(R.string.account_for_section_header, "user 1"));
 
     }
 
@@ -309,7 +314,7 @@
         when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
         when(mAccountHelper.hasBaseUserRestriction(
                 eq(UserManager.DISALLOW_REMOVE_MANAGED_PROFILE), anyInt()))
-            .thenReturn(true);
+                .thenReturn(true);
 
         mController.updateRawDataToIndex(data);
 
@@ -324,7 +329,7 @@
         when(mUserManager.isManagedProfile()).thenReturn(false);
         when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
         when(mAccountHelper.hasBaseUserRestriction(
-            eq(UserManager.DISALLOW_MODIFY_ACCOUNTS), anyInt())).thenReturn(true);
+                eq(UserManager.DISALLOW_MODIFY_ACCOUNTS), anyInt())).thenReturn(true);
 
         mController.updateRawDataToIndex(data);
 
@@ -346,18 +351,18 @@
         accountType1[0] = new Account("Account11", "com.acct1");
         accountType1[1] = new Account("Account12", "com.acct1");
         when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-            .thenReturn(accountType1);
+                .thenReturn(accountType1);
 
         AuthenticatorDescription[] authDescs = {
-            new AuthenticatorDescription("com.acct1", "com.android.settings",
-                R.string.account_settings_title, 0, 0, 0, false)
+                new AuthenticatorDescription("com.acct1", "com.android.settings",
+                        R.string.account_settings_title, 0, 0, 0, false)
         };
         when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(authDescs);
 
         AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
         when(preferenceGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
         when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-            preferenceGroup);
+                preferenceGroup);
 
         mController.onResume();
 
@@ -366,7 +371,8 @@
     }
 
     @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
+    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class,
+            ShadowAuthenticatorHelper.class})
     public void onResume_twoAccountsOfSameName_shouldAddFivePreferences() {
         final List<UserInfo> infos = new ArrayList<>();
         infos.add(new UserInfo(1, "user 1", 0));
@@ -425,25 +431,25 @@
         accountType1[0] = new Account("Acct11", "com.acct1");
         accountType1[1] = new Account("Acct12", "com.acct1");
         when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-            .thenReturn(accountType1);
+                .thenReturn(accountType1);
 
         AuthenticatorDescription[] authDescs = {
-            new AuthenticatorDescription("com.acct1", "com.android.settings",
-                R.string.account_settings_title, 0, 0, 0, false)
+                new AuthenticatorDescription("com.acct1", "com.android.settings",
+                        R.string.account_settings_title, 0, 0, 0, false)
         };
         when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(authDescs);
 
         AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
         when(preferenceGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
         when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-            preferenceGroup);
+                preferenceGroup);
         mController.onResume();
 
         mController.onResume();
 
         // each account should be added only once
-        verify(preferenceGroup).addPreference(argThat(new PreferenceMatcher("Acct11")));
-        verify(preferenceGroup).addPreference(argThat(new PreferenceMatcher("Acct12")));
+        verify(preferenceGroup).addPreference(argThat(titleMatches("Acct11")));
+        verify(preferenceGroup).addPreference(argThat(titleMatches("Acct12")));
     }
 
     @Test
@@ -460,18 +466,18 @@
         accountType1[0] = new Account("Acct11", "com.acct1");
         accountType1[1] = new Account("Acct12", "com.acct1");
         when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-            .thenReturn(accountType1);
+                .thenReturn(accountType1);
 
         AuthenticatorDescription[] authDescs = {
-            new AuthenticatorDescription("com.acct1", "com.android.settings",
-                R.string.account_settings_title, 0, 0, 0, false)
+                new AuthenticatorDescription("com.acct1", "com.android.settings",
+                        R.string.account_settings_title, 0, 0, 0, false)
         };
         when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(authDescs);
 
         AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
         when(preferenceGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
         when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-            preferenceGroup);
+                preferenceGroup);
 
         mController.onResume();
 
@@ -481,14 +487,14 @@
         accountType1[1] = new Account("Acct12", "com.acct1");
         accountType1[2] = new Account("Acct13", "com.acct1");
         when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-            .thenReturn(accountType1);
+                .thenReturn(accountType1);
 
         mController.onResume();
 
         // each account should be added only once
-        verify(preferenceGroup, times(1)).addPreference(argThat(new PreferenceMatcher("Acct11")));
-        verify(preferenceGroup, times(1)).addPreference(argThat(new PreferenceMatcher("Acct12")));
-        verify(preferenceGroup, times(1)).addPreference(argThat(new PreferenceMatcher("Acct13")));
+        verify(preferenceGroup, times(1)).addPreference(argThat(titleMatches("Acct11")));
+        verify(preferenceGroup, times(1)).addPreference(argThat(titleMatches("Acct12")));
+        verify(preferenceGroup, times(1)).addPreference(argThat(titleMatches("Acct13")));
     }
 
     @Test
@@ -504,7 +510,7 @@
         AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
         when(preferenceGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
         when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-            preferenceGroup);
+                preferenceGroup);
 
         // First time resume will build the UI with no account
         mController.onResume();
@@ -513,18 +519,18 @@
         Account[] accounts = {new Account("Acct1", "com.acct1")};
         when(mAccountManager.getAccountsAsUser(2)).thenReturn(accounts);
         when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-            .thenReturn(accounts);
+                .thenReturn(accounts);
 
         AuthenticatorDescription[] authDescs = {
-            new AuthenticatorDescription("com.acct1", "com.android.settings",
-                R.string.account_settings_title, 0, 0, 0, false)
+                new AuthenticatorDescription("com.acct1", "com.android.settings",
+                        R.string.account_settings_title, 0, 0, 0, false)
         };
         when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(authDescs);
 
         // Resume should show the newly added account
         mController.onResume();
 
-        verify(preferenceGroup).addPreference(argThat(new PreferenceMatcher("Acct1")));
+        verify(preferenceGroup).addPreference(argThat(titleMatches("Acct1")));
     }
 
     @Test
@@ -542,18 +548,18 @@
         accountType1[0] = new Account("Acct11", "com.acct1");
         accountType1[1] = new Account("Acct12", "com.acct1");
         when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-            .thenReturn(accountType1);
+                .thenReturn(accountType1);
 
         AuthenticatorDescription[] authDescs = {
-            new AuthenticatorDescription("com.acct1", "com.android.settings",
-                R.string.account_settings_title, 0, 0, 0, false)
+                new AuthenticatorDescription("com.acct1", "com.android.settings",
+                        R.string.account_settings_title, 0, 0, 0, false)
         };
         when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(authDescs);
 
         AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
         when(preferenceGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
         when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-            preferenceGroup);
+                preferenceGroup);
 
         mController.onResume();
 
@@ -561,29 +567,24 @@
         accountType1 = new Account[1];
         accountType1[0] = new Account("Acct11", "com.acct1");
         when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-            .thenReturn(accountType1);
+                .thenReturn(accountType1);
 
         mController.onResume();
 
-        verify(preferenceGroup, times(1)).addPreference(argThat(new PreferenceMatcher("Acct11")));
-        verify(preferenceGroup, times(1)).addPreference(argThat(new PreferenceMatcher("Acct12")));
-        verify(preferenceGroup, times(1)).removePreference(
-            argThat(new PreferenceMatcher("Acct12")));
+        verify(preferenceGroup, times(1)).addPreference(argThat(titleMatches("Acct11")));
+        verify(preferenceGroup, times(1)).addPreference(argThat(titleMatches("Acct12")));
+        verify(preferenceGroup, times(1)).removePreference(argThat(titleMatches("Acct12")));
     }
 
-    private static class PreferenceMatcher extends ArgumentMatcher<Preference> {
-
-        private final String mExpectedTitle;
-
-        public PreferenceMatcher(String title) {
-            mExpectedTitle = title;
-        }
-
-        @Override
-        public boolean matches(Object arg) {
-            final Preference preference = (Preference) arg;
-            return TextUtils.equals(mExpectedTitle, preference.getTitle());
-        }
+    private static ArgumentMatcher<Preference> titleMatches(String expected) {
+        return preference -> TextUtils.equals(expected, preference.getTitle());
     }
 
+    @Implements(AuthenticatorHelper.class)
+    public static class ShadowAuthenticatorHelper {
+        @Implementation
+        public Drawable getDrawableForType(Context context, final String accountType) {
+            return new ColorDrawable();
+        }
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java
index eeca90b..0778043 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java
@@ -20,7 +20,7 @@
 import android.content.Context;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
index c159a24..edb5d89 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
@@ -26,7 +26,7 @@
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
index 29f254d..fff73b7 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
@@ -28,7 +28,7 @@
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowAccountManager;
 import com.android.settings.testutils.shadow.ShadowContentResolver;
diff --git a/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java
index 755212d..38f6988 100644
--- a/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import com.android.settingslib.RestrictedSwitchPreference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java
index f7dd7a3..b8ad837 100644
--- a/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java
@@ -18,13 +18,12 @@
 import android.app.Fragment;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.content.pm.UserInfo;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v14.preference.SwitchPreference;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import java.util.ArrayList;
diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java
index 6ac0eab..ab462c0 100644
--- a/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java
@@ -21,9 +21,8 @@
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search.SearchIndexableRaw;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
index cd66d5e..a25aa28 100644
--- a/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
@@ -17,10 +17,8 @@
 package com.android.settings.accounts;
 
 
-import static android.content.pm.UserInfo.FLAG_MANAGED_PROFILE;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.when;
 
@@ -30,7 +28,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
index 10bb283..0f7de46 100644
--- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
@@ -24,7 +24,7 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.testutils.shadow.ShadowAccountManager;
@@ -149,6 +149,6 @@
         mController.handlePreferenceTreeClick(preference);
 
         assertThat(application.getNextStartedActivity().getAction())
-                .isEqualTo("android.settings.EDIT_EMERGENGY_INFO");
+                .isEqualTo("android.settings.EDIT_EMERGENCY_INFO");
     }
 }
diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
index 033465b..93b5253 100644
--- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
@@ -15,6 +15,16 @@
  */
 package com.android.settings.accounts;
 
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;
@@ -26,17 +36,14 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.UserHandle;
-import android.support.v7.preference.PreferenceScreen;
 import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.PreferenceScreen;
 import android.widget.Button;
 
-import com.android.settings.AccessiblePreferenceCategory;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.LayoutPreference;
-import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowAccountManager;
 import com.android.settings.testutils.shadow.ShadowContentResolver;
 
@@ -48,16 +55,6 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class RemoveAccountPreferenceControllerTest {
@@ -134,7 +131,7 @@
                     mFragment, account, userHandle);
         dialog.onCreate(new Bundle());
         dialog.onClick(null, 0);
-        verify(mAccountManager).removeAccountAsUser(eq(account), any(Activity.class),
-            any(AccountManagerCallback.class), any(Handler.class), eq(userHandle));
+        verify(mAccountManager).removeAccountAsUser(eq(account), nullable(Activity.class),
+            nullable(AccountManagerCallback.class), nullable(Handler.class), eq(userHandle));
     }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java
index 965b6dc..cd73068 100644
--- a/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.accounts;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/applications/AdvancedAppSettingsTest.java b/tests/robotests/src/com/android/settings/applications/AdvancedAppSettingsTest.java
index 0c3c160..968421b 100644
--- a/tests/robotests/src/com/android/settings/applications/AdvancedAppSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AdvancedAppSettingsTest.java
@@ -17,16 +17,19 @@
 package com.android.settings.applications;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.UserManager;
+import android.telephony.TelephonyManager;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-
 import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultPhonePreferenceController;
 import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.testutils.XmlTestUtils;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -38,8 +41,10 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -73,18 +78,18 @@
     public void setListening_shouldUpdateSummary() {
         final SummaryLoader summaryLoader = mock(SummaryLoader.class);
         final AdvancedAppSettings.SummaryProvider summaryProvider =
-            new AdvancedAppSettings.SummaryProvider(mContext, summaryLoader);
+                new AdvancedAppSettings.SummaryProvider(mContext, summaryLoader);
         final DefaultSmsPreferenceController defaultSms =
-            mock(DefaultSmsPreferenceController.class);
+                mock(DefaultSmsPreferenceController.class);
         final DefaultBrowserPreferenceController defaultBrowser =
-            mock(DefaultBrowserPreferenceController.class);
+                mock(DefaultBrowserPreferenceController.class);
         final DefaultPhonePreferenceController defaultPhone =
-            mock(DefaultPhonePreferenceController.class);
+                mock(DefaultPhonePreferenceController.class);
         ReflectionHelpers.setField(summaryProvider, "mDefaultSmsPreferenceController", defaultSms);
         ReflectionHelpers.setField(
-            summaryProvider, "mDefaultBrowserPreferenceController", defaultBrowser);
+                summaryProvider, "mDefaultBrowserPreferenceController", defaultBrowser);
         ReflectionHelpers.setField(
-            summaryProvider, "mDefaultPhonePreferenceController", defaultPhone);
+                summaryProvider, "mDefaultPhonePreferenceController", defaultPhone);
 
         // all available
         when(defaultSms.getDefaultAppLabel()).thenReturn("Sms1");
@@ -140,12 +145,23 @@
 
     }
 
-
     @Test
     public void testNonIndexableKeys_existInXmlLayout() {
         final Context context = spy(RuntimeEnvironment.application);
+        final Context mockContext = mock(Context.class);
+        final UserManager userManager = mock(UserManager.class, RETURNS_DEEP_STUBS);
+
+        when(mockContext.getSystemService(Context.USER_SERVICE))
+                .thenReturn(userManager);
+        when(userManager.getUserInfo(anyInt()).isRestricted()).thenReturn(true);
+
+        when(mockContext.getSystemService(Context.TELEPHONY_SERVICE))
+                .thenReturn(mock(TelephonyManager.class));
+        when(mockContext.getPackageManager())
+                .thenReturn(mock(PackageManager.class));
         final List<String> niks = AdvancedAppSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(context);
+                .getNonIndexableKeys(mockContext);
+
         final int xmlId = (new AdvancedAppSettings()).getPreferenceScreenResId();
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
diff --git a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java
index 32b447a..697d04f 100644
--- a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 
 import android.os.UserManager;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.XmlTestUtils;
 
diff --git a/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
deleted file mode 100644
index 8b9b4b4..0000000
--- a/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Copyright (C) 2016 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 com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.ResolveInfo;
-import android.graphics.drawable.ColorDrawable;
-import android.os.UserHandle;
-import android.support.v7.preference.Preference;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-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.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AppHeaderControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private Fragment mFragment;
-
-    private Context mShadowContext;
-    private LayoutInflater mLayoutInflater;
-    private PackageInfo mInfo;
-    private AppHeaderController mController;
-
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mShadowContext = RuntimeEnvironment.application;
-        when(mFragment.getContext()).thenReturn(mShadowContext);
-        mLayoutInflater = LayoutInflater.from(mShadowContext);
-        mInfo = new PackageInfo();
-        mInfo.versionName = "1234";
-    }
-
-    @Test
-    public void testBuildView_constructedWithoutView_shouldCreateNewView() {
-        mController = new AppHeaderController(mShadowContext, mFragment, null);
-        View view = mController.done(mActivity);
-
-        assertThat(view).isNotNull();
-    }
-
-    @Test
-    public void testBuildView_withContext_shouldBuildPreference() {
-        mController = new AppHeaderController(mShadowContext, mFragment, null);
-        Preference preference = mController.done(mActivity, mShadowContext);
-
-        assertThat(preference instanceof LayoutPreference).isTrue();
-    }
-
-    @Test
-    public void testBuildView_constructedWithView_shouldReturnSameView() {
-        View inputView = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
-        mController = new AppHeaderController(mShadowContext, mFragment, inputView);
-        View view = mController.done(mActivity);
-
-        assertThat(view).isSameAs(inputView);
-    }
-
-    @Test
-    public void bindViews_shouldBindAllData() {
-        final String testString = "test";
-        final View appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
-        final TextView label = appHeader.findViewById(R.id.app_detail_title);
-        final TextView version = appHeader.findViewById(R.id.app_detail_summary);
-
-        mController = new AppHeaderController(mShadowContext, mFragment, appHeader);
-        mController.setLabel(testString);
-        mController.setSummary(testString);
-        mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add));
-        mController.done(mActivity);
-
-        assertThat(label.getText()).isEqualTo(testString);
-        assertThat(version.getText()).isEqualTo(testString);
-    }
-
-    @Test
-    public void bindButton_hasAppPref_shouldShowButton() {
-        final ResolveInfo info = new ResolveInfo();
-        info.activityInfo = new ActivityInfo();
-        info.activityInfo.packageName = "123";
-        info.activityInfo.name = "321";
-        final View appLinks = mLayoutInflater
-                .inflate(R.layout.app_details, null /* root */);
-        when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
-                .thenReturn(info);
-
-        mController = new AppHeaderController(mContext, mFragment, appLinks);
-        mController.setButtonActions(
-                AppHeaderController.ActionType.ACTION_APP_PREFERENCE,
-                AppHeaderController.ActionType.ACTION_NONE);
-        mController.done(mActivity);
-
-        assertThat(appLinks.findViewById(R.id.left_button).getVisibility())
-                .isEqualTo(View.VISIBLE);
-        assertThat(appLinks.findViewById(R.id.right_button).getVisibility())
-                .isEqualTo(View.GONE);
-        try {
-            appLinks.findViewById(R.id.left_button).performClick();
-        } catch (Exception e) {
-            // Ignore exception because the launching intent is fake.
-        }
-        verify(mFragment).startActivity(any(Intent.class));
-    }
-
-    @Test
-    public void bindButton_noAppPref_shouldNotShowButton() {
-        final View appLinks = mLayoutInflater
-                .inflate(R.layout.app_details, null /* root */);
-        when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
-                .thenReturn(null);
-
-        mController = new AppHeaderController(mContext, mFragment, appLinks);
-        mController.setButtonActions(
-                AppHeaderController.ActionType.ACTION_APP_PREFERENCE,
-                AppHeaderController.ActionType.ACTION_NONE);
-        mController.done(mActivity);
-
-        assertThat(appLinks.findViewById(R.id.left_button).getVisibility())
-                .isEqualTo(View.GONE);
-        assertThat(appLinks.findViewById(R.id.right_button).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void bindButton_noAppInfo_shouldNotShowButton() {
-        final View appLinks = mLayoutInflater
-                .inflate(R.layout.app_details, null /* root */);
-
-        mController = new AppHeaderController(mContext, mFragment, appLinks);
-        mController.setPackageName(null)
-                .setButtonActions(
-                        AppHeaderController.ActionType.ACTION_APP_INFO,
-                        AppHeaderController.ActionType.ACTION_NONE);
-        mController.done(mActivity);
-
-        assertThat(appLinks.findViewById(R.id.left_button).getVisibility())
-                .isEqualTo(View.GONE);
-        assertThat(appLinks.findViewById(R.id.right_button).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void bindButton_hasAppInfo_shouldShowButton() {
-        final View appLinks = mLayoutInflater
-                .inflate(R.layout.app_details, null /* root */);
-        when(mFragment.getActivity()).thenReturn(mock(Activity.class));
-
-        mController = new AppHeaderController(mContext, mFragment, appLinks);
-        mController.setPackageName("123")
-                .setUid(UserHandle.USER_SYSTEM)
-                .setButtonActions(
-                        AppHeaderController.ActionType.ACTION_APP_INFO,
-                        AppHeaderController.ActionType.ACTION_NOTIF_PREFERENCE);
-        mController.done(mActivity);
-
-        assertThat(appLinks.findViewById(R.id.left_button).getVisibility())
-                .isEqualTo(View.VISIBLE);
-        assertThat(appLinks.findViewById(R.id.right_button).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void bindButton_hasAppInfo_shouldHaveContentDescription() {
-        final View appLinks = mLayoutInflater
-                .inflate(R.layout.app_details, null /* root */);
-        when(mFragment.getActivity()).thenReturn(mock(Activity.class));
-        when(mContext.getString(eq(R.string.application_info_label))).thenReturn("App Info");
-
-        mController = new AppHeaderController(mContext, mFragment, appLinks);
-        mController.setPackageName("123")
-                .setUid(UserHandle.USER_SYSTEM)
-                .setButtonActions(
-                        AppHeaderController.ActionType.ACTION_APP_INFO,
-                        AppHeaderController.ActionType.ACTION_NOTIF_PREFERENCE);
-        mController.done(mActivity);
-
-        assertThat(appLinks.findViewById(R.id.left_button).getContentDescription())
-                .isEqualTo("App Info");
-    }
-
-    @Test
-    public void bindButton_hasAppNotifIntent_shouldShowButton() {
-        final View appLinks = mLayoutInflater
-                .inflate(R.layout.app_details, null /* root */);
-
-        mController = new AppHeaderController(mContext, mFragment, appLinks);
-        mController.setAppNotifPrefIntent(new Intent())
-                .setButtonActions(
-                        AppHeaderController.ActionType.ACTION_NOTIF_PREFERENCE,
-                        AppHeaderController.ActionType.ACTION_NONE);
-        mController.done(mActivity);
-
-        assertThat(appLinks.findViewById(R.id.left_button).getVisibility())
-                .isEqualTo(View.VISIBLE);
-        assertThat(appLinks.findViewById(R.id.right_button).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-
-    // Ensure that the instant app label does not show up when we haven't told the controller the
-    // app is instant.
-    @Test
-    public void instantApps_normalAppsDontGetLabel() {
-        final View appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
-        mController = new AppHeaderController(mContext, mFragment, appHeader);
-        mController.done(mActivity);
-        assertThat(appHeader.findViewById(R.id.install_type).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-
-    // Test that the "instant apps" label is present in the header when we have an instant app.
-    @Test
-    public void instantApps_expectedHeaderItem() {
-        final View appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
-        mController = new AppHeaderController(mContext, mFragment, appHeader);
-        mController.setIsInstantApp(true);
-        mController.done(mActivity);
-        TextView label = appHeader.findViewById(R.id.install_type);
-        assertThat(label.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(label.getText()).isEqualTo(
-                appHeader.getResources().getString(R.string.install_type_instant));
-        assertThat(appHeader.findViewById(R.id.app_detail_summary).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void styleActionBar_invalidObjects_shouldNotCrash() {
-        mController = new AppHeaderController(mShadowContext, mFragment, null);
-        mController.styleActionBar(null);
-
-        when(mActivity.getActionBar()).thenReturn(null);
-        mController.styleActionBar(mActivity);
-
-        verify(mActivity).getActionBar();
-    }
-
-    @Test
-    public void styleActionBar_setElevationAndBackground() {
-        final ActionBar actionBar = mActivity.getActionBar();
-
-        mController = new AppHeaderController(mShadowContext, mFragment, null);
-        mController.styleActionBar(mActivity);
-
-        verify(actionBar).setElevation(0);
-        // Enforce a color drawable as background here, as image based drawables might not be
-        // wide enough to cover entire action bar.
-        verify(actionBar).setBackgroundDrawable(any(ColorDrawable.class));
-    }
-
-    @Test
-    public void initAppHeaderController_appHeaderNull_useFragmentContext() {
-        mController = new AppHeaderController(mContext, mFragment, null);
-
-        // Fragment.getContext() is invoked to inflate the view
-        verify(mFragment).getContext();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
index 68c153c..735c12f 100644
--- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
@@ -25,12 +25,15 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
+import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -47,10 +50,13 @@
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = ShadowEntityHeaderController.class)
 public class AppInfoWithHeaderTest {
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private EntityHeaderController mHeaderController;
 
     private FakeFeatureFactory mFactory;
     private TestFragment mAppInfoWithHeader;
@@ -64,16 +70,16 @@
         when(mFactory.metricsFeatureProvider.getMetricsCategory(any(Object.class)))
                 .thenReturn(MetricsProto.MetricsEvent.SETTINGS_APP_NOTIF_CATEGORY);
         mAppInfoWithHeader = new TestFragment();
+        ShadowEntityHeaderController.setUseMock(mHeaderController);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowEntityHeaderController.reset();
     }
 
     @Test
     public void testAppHeaderIsAdded() {
-        final AppHeaderController appHeaderController = new AppHeaderController(
-                ShadowApplication.getInstance().getApplicationContext(),
-                mAppInfoWithHeader,
-                null);
-        when(mFactory.applicationFeatureProvider.newAppHeaderController(mAppInfoWithHeader, null))
-                .thenReturn(appHeaderController);
         mAppInfoWithHeader.onActivityCreated(null);
 
         verify(mAppInfoWithHeader.mScreen).addPreference(any(LayoutPreference.class));
@@ -93,7 +99,7 @@
             mPackageInfo.applicationInfo = new ApplicationInfo();
             mShadowContext = ShadowApplication.getInstance().getApplicationContext();
             ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-                                             (InstantAppDataProvider) (info -> false));
+                    (InstantAppDataProvider) (info -> false));
             when(mManager.getContext()).thenReturn(mShadowContext);
         }
 
diff --git a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java
new file mode 100644
index 0000000..e19c52f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java
@@ -0,0 +1,210 @@
+/*
+ * 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.applications;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.PermissionGroupInfo;
+import android.content.pm.PermissionInfo;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AppPermissionsPreferenceControllerTest {
+
+    private static final String PERM_LOCATION = "android.permission-group.LOCATION";
+    private static final String PERM_MICROPHONE = "android.permission-group.MICROPHONE";
+    private static final String PERM_CAMERA = "android.permission-group.CAMERA";
+    private static final String PERM_SMS = "android.permission-group.SMS";
+    private static final String PERM_CONTACTS = "android.permission-group.CONTACTS";
+    private static final String PERM_PHONE = "android.permission-group.PHONE";
+    private static final String LABEL_LOCATION = "Location";
+    private static final String LABEL_MICROPHONE = "Microphone";
+    private static final String LABEL_CAMERA = "Camera";
+    private static final String LABEL_SMS = "Sms";
+    private static final String LABEL_CONTACTS = "Contacts";
+    private static final String LABEL_PHONE = "Phone";
+
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private PermissionGroupInfo mGroupLocation;
+    @Mock
+    private PermissionGroupInfo mGroupMic;
+    @Mock
+    private PermissionGroupInfo mGroupCamera;
+    @Mock
+    private PermissionGroupInfo mGroupSms;
+    @Mock
+    private PermissionGroupInfo mGroupContacts;
+    @Mock
+    private PermissionGroupInfo mGroupPhone;
+
+    private Context mContext;
+    private AppPermissionsPreferenceController mController;
+    private PermissionInfo mPermLocation;
+    private PermissionInfo mPermMic;
+    private PermissionInfo mPermCamera;
+    private PermissionInfo mPermSms;
+    private PermissionInfo mPermContacts;
+    private PermissionInfo mPermPhone;
+
+    @Before
+    public void setUp() throws NameNotFoundException {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+
+        // create permission groups
+        when(mPackageManager.getPermissionGroupInfo(eq(PERM_LOCATION), anyInt()))
+            .thenReturn(mGroupLocation);
+        when(mGroupLocation.loadLabel(mPackageManager)).thenReturn(LABEL_LOCATION);
+        when(mPackageManager.getPermissionGroupInfo(eq(PERM_MICROPHONE), anyInt()))
+            .thenReturn(mGroupMic);
+        when(mGroupMic.loadLabel(mPackageManager)).thenReturn(LABEL_MICROPHONE);
+        when(mPackageManager.getPermissionGroupInfo(eq(PERM_CAMERA), anyInt()))
+            .thenReturn(mGroupCamera);
+        when(mGroupCamera.loadLabel(mPackageManager)).thenReturn(LABEL_CAMERA);
+        when(mPackageManager.getPermissionGroupInfo(eq(PERM_SMS), anyInt())).thenReturn(mGroupSms);
+        when(mGroupSms.loadLabel(mPackageManager)).thenReturn(LABEL_SMS);
+        when(mPackageManager.getPermissionGroupInfo(eq(PERM_CONTACTS), anyInt()))
+            .thenReturn(mGroupContacts);
+        when(mGroupContacts.loadLabel(mPackageManager)).thenReturn(LABEL_CONTACTS);
+        when(mPackageManager.getPermissionGroupInfo(eq(PERM_PHONE), anyInt()))
+            .thenReturn(mGroupPhone);
+        when(mGroupPhone.loadLabel(mPackageManager)).thenReturn(LABEL_PHONE);
+
+        // create permissions
+        mPermLocation = new PermissionInfo();
+        mPermLocation.name = "Permission1";
+        mPermLocation.group = PERM_LOCATION;
+        mPermMic = new PermissionInfo();
+        mPermMic.name = "Permission2";
+        mPermMic.group = PERM_MICROPHONE;
+        mPermCamera = new PermissionInfo();
+        mPermCamera.name = "Permission3";
+        mPermCamera.group = PERM_CAMERA;
+        mPermSms = new PermissionInfo();
+        mPermSms.name = "Permission4";
+        mPermSms.group = PERM_SMS;
+        mPermContacts = new PermissionInfo();
+        mPermContacts.name = "Permission4";
+        mPermContacts.group = PERM_CONTACTS;
+        mPermPhone = new PermissionInfo();
+        mPermPhone.name = "Permission4";
+        mPermPhone.group = PERM_PHONE;
+        final List<PermissionInfo> permissions = new ArrayList<>();
+        permissions.add(mPermLocation);
+        permissions.add(mPermMic);
+        permissions.add(mPermCamera);
+        permissions.add(mPermSms);
+        permissions.add(mPermContacts);
+        permissions.add(mPermPhone);
+        when(mPackageManager.queryPermissionsByGroup(anyString(), anyInt()))
+            .thenReturn(permissions);
+
+        mController = spy(new AppPermissionsPreferenceController(mContext));
+    }
+
+    @Test
+    public void isAvailable_shouldAlwaysReturnTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void updateState_noGrantedPermissions_shouldNotSetSummary() {
+        final List<PackageInfo> installedPackages = new ArrayList<>();
+        final PackageInfo info = new PackageInfo();
+        installedPackages.add(info);
+        when(mPackageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS))
+            .thenReturn(installedPackages);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference, never()).setSummary(anyString());
+    }
+
+    @Test
+    public void updateState_hasPermissions_shouldSetSummary() {
+        final List<PackageInfo> installedPackages = new ArrayList<>();
+        final PackageInfo info = new PackageInfo();
+        installedPackages.add(info);
+        when(mPackageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS))
+            .thenReturn(installedPackages);
+        PermissionInfo[] permissions = new PermissionInfo[4];
+        info.permissions = permissions;
+
+        permissions[0] = mPermLocation;
+        permissions[1] = mPermMic;
+        permissions[2] = mPermCamera;
+        permissions[3] = mPermSms;
+        mController.updateState(mPreference);
+        verify(mPreference).setSummary("Apps using Location, Microphone, Camera");
+
+        permissions[0] = mPermPhone;
+        permissions[1] = mPermMic;
+        permissions[2] = mPermCamera;
+        permissions[3] = mPermSms;
+        mController.updateState(mPreference);
+        verify(mPreference).setSummary("Apps using Microphone, Camera, Sms");
+
+        permissions[0] = mPermPhone;
+        permissions[1] = mPermMic;
+        permissions[2] = mPermContacts;
+        permissions[3] = mPermSms;
+        mController.updateState(mPreference);
+        verify(mPreference).setSummary("Apps using Microphone, Sms, Contacts");
+
+        permissions = new PermissionInfo[2];
+        info.permissions = permissions;
+        permissions[0] = mPermLocation;
+        permissions[1] = mPermCamera;
+        mController.updateState(mPreference);
+        verify(mPreference).setSummary("Apps using Location, Camera");
+
+        permissions = new PermissionInfo[1];
+        info.permissions = permissions;
+        permissions[0] = mPermCamera;
+        mController.updateState(mPreference);
+        verify(mPreference).setSummary("Apps using Camera");
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
index f17509a..df226a8 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
@@ -25,7 +25,7 @@
 import android.content.Context;
 import android.os.RemoteException;
 import android.os.UserManager;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
index 3076080..62623e5 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
@@ -20,8 +20,7 @@
 
 import android.app.AppOpsManager;
 
-import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
index e302edd..8145b40 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
@@ -8,7 +8,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
index 4a7dc8f..11401a8 100644
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
@@ -26,7 +26,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
index 73bba04..c3c1bb3 100644
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
@@ -23,7 +23,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
index 672c5b7..2b1c296 100644
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -28,7 +28,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.testutils.ApplicationTestUtils;
diff --git a/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java b/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java
index ef6351a..6122576 100644
--- a/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java
@@ -16,10 +16,14 @@
 
 package com.android.settings.applications;
 
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.nullable;
+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.TouchOverlayManager;
 import com.android.settings.testutils.FakeFeatureFactory;
@@ -35,10 +39,6 @@
 import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.util.ReflectionHelpers;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DrawOverlayDetailsTest {
@@ -66,11 +66,11 @@
     public void logSpecialPermissionChange() {
         mFragment.onAttach(ShadowApplication.getInstance().getApplicationContext());
         mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_APPDRAW_ALLOW), eq("app"));
 
         mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_APPDRAW_DENY), eq("app"));
     }
 
diff --git a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
index ad05c27..10caf13 100644
--- a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
@@ -17,7 +17,7 @@
 package com.android.settings.applications;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
index 36116c0..3269acb 100644
--- a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
@@ -27,7 +28,7 @@
 import android.content.pm.ApplicationInfo;
 import android.os.UserHandle;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.applications.StorageStatsSource;
 import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
@@ -63,7 +64,8 @@
         when(stats.getCodeBytes()).thenReturn(1L);
         when(stats.getDataBytes()).thenReturn(2L);
         when(stats.getCacheBytes()).thenReturn(3L);
-        when(mSource.getStatsForPackage(anyString(), anyString(), any(UserHandle.class)))
+        when(mSource.getStatsForPackage(nullable(String.class), nullable(String.class),
+                any(UserHandle.class)))
                 .thenReturn(stats);
         ApplicationInfo info = new ApplicationInfo();
         info.packageName = PACKAGE_NAME;
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
index 37fa9d7..56df10e 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
@@ -16,17 +16,29 @@
 
 package com.android.settings.applications;
 
+import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.UserInfo;
-import android.os.Build;
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 
@@ -41,20 +53,9 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
+import java.util.Collections;
 import java.util.Set;
 
-import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
 /**
  * Tests for {@link InstalledAppCounter}.
  */
@@ -113,11 +114,12 @@
 
     private void expectQueryIntentActivities(int userId, String packageName, boolean launchable) {
         when(mPackageManager.queryIntentActivitiesAsUser(
-                argThat(new IsLaunchIntentFor(packageName)),
+                argThat(isLaunchIntentFor(packageName)),
                 eq(PackageManager.GET_DISABLED_COMPONENTS | PackageManager.MATCH_DIRECT_BOOT_AWARE
                         | PackageManager.MATCH_DIRECT_BOOT_UNAWARE),
-                eq(userId))).thenReturn(launchable ? Arrays.asList(new ResolveInfo())
-                : new ArrayList<ResolveInfo>());
+                eq(userId))).thenReturn(launchable
+                        ? Collections.singletonList(new ResolveInfo())
+                        : new ArrayList<>());
     }
 
     private void testCountInstalledAppsAcrossAllUsers(boolean async) {
@@ -136,7 +138,7 @@
         verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID));
         verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(),
                 eq(MANAGED_PROFILE_ID));
-        verify(mPackageManager, atLeast(0)).queryIntentActivitiesAsUser(anyObject(), anyInt(),
+        verify(mPackageManager, atLeast(0)).queryIntentActivitiesAsUser(any(Intent.class), anyInt(),
                 anyInt());
         verifyNoMoreInteractions(mPackageManager);
 
@@ -251,16 +253,8 @@
         }
     }
 
-    private static class IsLaunchIntentFor extends ArgumentMatcher<Intent> {
-        private final String mPackageName;
-
-        IsLaunchIntentFor(String packageName) {
-            mPackageName = packageName;
-        }
-
-        @Override
-        public boolean matches(Object i) {
-            final Intent intent = (Intent) i;
+    private ArgumentMatcher<Intent> isLaunchIntentFor(String packageName) {
+        return intent -> {
             if (intent == null) {
                 return false;
             }
@@ -272,10 +266,10 @@
                     !categories.contains(Intent.CATEGORY_LAUNCHER)) {
                 return false;
             }
-            if (!mPackageName.equals(intent.getPackage())) {
+            if (!packageName.equals(intent.getPackage())) {
                 return false;
             }
             return true;
-        }
+        };
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
index 2fbad13..a570361 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
@@ -16,7 +16,9 @@
 
 package com.android.settings.applications;
 
+
 import android.app.AlertDialog;
+import android.app.Fragment;
 import android.app.LoaderManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
@@ -38,9 +40,10 @@
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.instantapps.InstantAppButtonsController;
+import com.android.settings.applications.instantapps.InstantAppButtonsController.ShowDialogDelegate;
 import com.android.settings.fuelgauge.BatteryUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.Utils;
@@ -66,10 +69,9 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.anyDouble;
 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.never;
@@ -121,8 +123,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+        mFeatureFactory = FakeFeatureFactory.setupForTest(mContext);
         mShadowContext = RuntimeEnvironment.application;
         mAppDetail = spy(new InstalledAppDetails());
         mAppDetail.mBatteryUtils = mBatteryUtils;
@@ -145,7 +146,7 @@
 
     @Test
     public void shouldShowUninstallForAll_installForOneOtherUserOnly_shouldReturnTrue() {
-        when(mDevicePolicyManager.packageHasActiveAdmins(anyString())).thenReturn(false);
+        when(mDevicePolicyManager.packageHasActiveAdmins(nullable(String.class))).thenReturn(false);
         when(mUserManager.getUsers().size()).thenReturn(2);
         ReflectionHelpers.setField(mAppDetail, "mDpm", mDevicePolicyManager);
         ReflectionHelpers.setField(mAppDetail, "mUserManager", mUserManager);
@@ -161,7 +162,7 @@
 
     @Test
     public void shouldShowUninstallForAll_installForSelfOnly_shouldReturnFalse() {
-        when(mDevicePolicyManager.packageHasActiveAdmins(anyString())).thenReturn(false);
+        when(mDevicePolicyManager.packageHasActiveAdmins(nullable(String.class))).thenReturn(false);
         when(mUserManager.getUsers().size()).thenReturn(2);
         ReflectionHelpers.setField(mAppDetail, "mDpm", mDevicePolicyManager);
         ReflectionHelpers.setField(mAppDetail, "mUserManager", mUserManager);
@@ -247,7 +248,7 @@
         // Make this app appear to be instant.
         ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
                 (InstantAppDataProvider) (i -> true));
-        when(mDevicePolicyManager.packageHasActiveAdmins(anyString())).thenReturn(false);
+        when(mDevicePolicyManager.packageHasActiveAdmins(nullable(String.class))).thenReturn(false);
         when(mUserManager.getUsers().size()).thenReturn(2);
 
         final ApplicationInfo info = new ApplicationInfo();
@@ -359,13 +360,14 @@
 
         final InstantAppButtonsController buttonsController =
                 mock(InstantAppButtonsController.class);
-        when(buttonsController.setPackageName(anyString())).thenReturn(buttonsController);
-
+        when(buttonsController.setPackageName(nullable(String.class)))
+                .thenReturn(buttonsController);
         when(mFeatureFactory.applicationFeatureProvider.newInstantAppButtonsController(
-                any(), any(), any())).thenReturn(buttonsController);
+                nullable(Fragment.class), nullable(View.class), nullable(ShowDialogDelegate.class)))
+                .thenReturn(buttonsController);
 
         fragment.maybeAddInstantAppButtons();
-        verify(buttonsController).setPackageName(anyString());
+        verify(buttonsController).setPackageName(nullable(String.class));
         verify(buttonsController).show();
     }
 
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
index 76421c2..c4c3259 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
@@ -24,7 +24,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -36,7 +36,6 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -51,7 +50,6 @@
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 /**
@@ -87,11 +85,12 @@
 
     private void expectQueryIntentActivities(int userId, String packageName, boolean launchable) {
         when(mPackageManager.queryIntentActivitiesAsUser(
-                argThat(new IsLaunchIntentFor(packageName)),
+                argThat(isLaunchIntentFor(packageName)),
                 eq(PackageManager.GET_DISABLED_COMPONENTS | PackageManager.MATCH_DIRECT_BOOT_AWARE
                         | PackageManager.MATCH_DIRECT_BOOT_UNAWARE),
-                eq(userId))).thenReturn(launchable ? Arrays.asList(new ResolveInfo())
-                        : new ArrayList<ResolveInfo>());
+                eq(userId))).thenReturn(launchable
+                        ? Collections.singletonList(new ResolveInfo())
+                        : Collections.emptyList());
     }
 
     @Test
@@ -203,16 +202,8 @@
         }
     }
 
-    private static class IsLaunchIntentFor extends ArgumentMatcher<Intent> {
-        private final String mPackageName;
-
-        IsLaunchIntentFor(String packageName) {
-            mPackageName = packageName;
-        }
-
-        @Override
-        public boolean matches(Object i) {
-            final Intent intent = (Intent) i;
+    private static ArgumentMatcher<Intent> isLaunchIntentFor(String packageName) {
+        return intent -> {
             if (intent == null) {
                 return false;
             }
@@ -224,10 +215,10 @@
                     !categories.contains(Intent.CATEGORY_LAUNCHER)) {
                 return false;
             }
-            if (!mPackageName.equals(intent.getPackage())) {
+            if (!packageName.equals(intent.getPackage())) {
                 return false;
             }
             return true;
-        }
+        };
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java
index 04d4342..699c0db 100644
--- a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java
@@ -27,7 +27,7 @@
 import android.view.View;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java
index 871b5a0..ea1d2c3 100644
--- a/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java
@@ -20,26 +20,33 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Looper;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.widget.TextView;
+
 import com.android.settings.R;
 import com.android.settings.Settings;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsShadowTheme;
+import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
 import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
+import org.robolectric.fakes.RoboMenuItem;
 import org.robolectric.util.ReflectionHelpers;
 
+import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -59,16 +66,20 @@
         })
 public class ManageApplicationsTest {
 
-    @Mock private ApplicationsState mState;
-    @Mock private ApplicationsState.Session mSession;
-
+    @Mock
+    private ApplicationsState mState;
+    @Mock
+    private ApplicationsState.Session mSession;
+    @Mock
+    private Menu mMenu;
+    private MenuItem mAppReset;
     private Looper mBgLooper;
     private ManageApplications mFragment;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-
+        mAppReset = new RoboMenuItem(R.id.reset_app_preferences);
         ReflectionHelpers.setStaticField(ApplicationsState.class, "sInstance", mState);
         when(mState.newSession(any())).thenReturn(mSession);
         mBgLooper = Looper.myLooper();
@@ -94,10 +105,41 @@
         ManageApplications fragment = mock(ManageApplications.class);
         when(fragment.getActivity()).thenReturn(mock(Activity.class));
         final ManageApplications.ApplicationsAdapter adapter =
-            new ManageApplications.ApplicationsAdapter(mState, fragment, 0);
+                new ManageApplications.ApplicationsAdapter(mState, fragment, 0);
 
         adapter.updateDisableView(view, info);
 
         verify(view).setText(R.string.disabled);
     }
+
+    @Test
+    public void updateMenu_mainListType_showAppReset() {
+        setUpOptionMenus();
+        ReflectionHelpers.setField(mFragment, "mListType", ManageApplications.LIST_TYPE_MAIN);
+        ReflectionHelpers.setField(mFragment, "mOptionsMenu", mMenu);
+
+        mFragment.updateOptionsMenu();
+        assertThat(mMenu.findItem(R.id.reset_app_preferences).isVisible()).isTrue();
+    }
+
+    @Test
+    public void updateMenu_batteryListType_hideAppReset() {
+        setUpOptionMenus();
+        ReflectionHelpers.setField(mFragment, "mListType", ManageApplications.LIST_TYPE_HIGH_POWER);
+        ReflectionHelpers.setField(mFragment, "mOptionsMenu", mMenu);
+
+        mFragment.updateOptionsMenu();
+        assertThat(mMenu.findItem(R.id.reset_app_preferences).isVisible()).isFalse();
+    }
+
+    private void setUpOptionMenus() {
+        when(mMenu.findItem(anyInt())).thenAnswer(invocation -> {
+            final Object[] args = invocation.getArguments();
+            final int id = (int) args[0];
+            if (id == mAppReset.getItemId()) {
+                return mAppReset;
+            }
+            return new RoboMenuItem(id);
+        });
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java
index 779e0b6..5df5bed 100644
--- a/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.nullable;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -30,10 +30,10 @@
 import android.provider.DocumentsContract;
 import android.view.LayoutInflater;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settingslib.deviceinfo.StorageVolumeProvider;
 import com.android.settingslib.applications.StorageStatsSource;
+import com.android.settingslib.deviceinfo.StorageVolumeProvider;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -82,7 +82,7 @@
 
     @Test
     public void storageShouldRepresentStorageStatsQuery() throws Exception {
-        when(mSource.getExternalStorageStats(any(String.class), any(UserHandle.class))).thenReturn(
+        when(mSource.getExternalStorageStats(nullable(String.class), nullable(UserHandle.class))).thenReturn(
                 new StorageStatsSource.ExternalStorageStats(1, 1, 0, 0, 0));
 
         mController.queryStats();
diff --git a/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java b/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java
new file mode 100644
index 0000000..1635576
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java
@@ -0,0 +1,113 @@
+/*
+ * 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.applications;
+
+import android.content.Context;
+
+import android.content.pm.ApplicationInfo;
+import android.content.pm.UserInfo;
+import android.os.UserManager;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.notification.NotificationBackend;
+
+import java.util.List;
+import java.util.ArrayList;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.util.ReflectionHelpers;
+
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class NotificationAppsTest {
+
+    @Mock
+    private PackageManagerWrapper mPackageManager;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private SummaryLoader mSummaryLoader;
+    @Mock
+    private NotificationBackend mBackend;
+
+    private Context mContext;
+    private NotificationApps.SummaryProvider mSummaryProvider;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.USER_SERVICE, mUserManager);
+        mContext = shadowApplication.getApplicationContext();
+        mSummaryProvider = spy(new NotificationApps.SummaryProvider(mContext, mSummaryLoader));
+        ReflectionHelpers.setField(mSummaryProvider, "mNotificationBackend", mBackend);
+        ReflectionHelpers.setField(mSummaryProvider, "mPackageManager", mPackageManager);
+    }
+
+    @Test
+    public void setListening_shouldSetSummary() {
+        List<UserInfo> userInfos = new ArrayList<>();
+        userInfos.add(new UserInfo(1, "user1", 0));
+        when(mUserManager.getProfiles(anyInt())).thenReturn(userInfos);
+        List<ApplicationInfo> appInfos = new ArrayList<>();
+        ApplicationInfo info1 = new ApplicationInfo();
+        info1.packageName = "package1";
+        appInfos.add(info1);
+        ApplicationInfo info2 = new ApplicationInfo();
+        info2.packageName = "package2";
+        appInfos.add(info2);
+        when(mPackageManager.getInstalledApplicationsAsUser(anyInt(), anyInt()))
+            .thenReturn(appInfos);
+
+        // no notification off
+        when(mBackend.getNotificationsBanned(anyString(), anyInt())).thenReturn(false);
+        mSummaryProvider.setListening(true);
+        ShadowApplication.runBackgroundTasks();
+        verify(mSummaryLoader).setSummary(mSummaryProvider,
+            mContext.getString(R.string.notification_summary_none));
+
+        // some notification off
+        when(mBackend.getNotificationsBanned(eq("package1"), anyInt())).thenReturn(true);
+        mSummaryProvider.setListening(true);
+        ShadowApplication.runBackgroundTasks();
+        verify(mSummaryLoader).setSummary(mSummaryProvider,
+            mContext.getResources().getQuantityString(R.plurals.notification_summary, 1, 1));
+
+        when(mBackend.getNotificationsBanned(eq("package2"), anyInt())).thenReturn(true);
+        mSummaryProvider.setListening(true);
+        ShadowApplication.runBackgroundTasks();
+        verify(mSummaryLoader).setSummary(mSummaryProvider,
+            mContext.getResources().getQuantityString(R.plurals.notification_summary, 2, 2));
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java b/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java
index 96a10f1..6bac9a3 100644
--- a/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java
@@ -16,10 +16,16 @@
 
 package com.android.settings.applications;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -30,12 +36,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -83,11 +83,11 @@
     @Test
     public void logSpecialPermissionChange() {
         mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_PICTURE_IN_PICTURE_ALLOW), eq("app"));
 
         mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_PICTURE_IN_PICTURE_DENY), eq("app"));
     }
 
diff --git a/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java b/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java
index d9c88ff..30ebcde 100644
--- a/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java
+++ b/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java
@@ -16,11 +16,15 @@
 
 package com.android.settings.applications;
 
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.telephony.SmsUsageMonitor;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -33,10 +37,6 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class PremiumSmsAccessTest {
@@ -60,17 +60,17 @@
     public void logSpecialPermissionChange() {
         mFragment.logSpecialPermissionChange(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ASK_USER,
                 "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_PREMIUM_SMS_ASK), eq("app"));
 
         mFragment.logSpecialPermissionChange(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_NEVER_ALLOW,
                 "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_PREMIUM_SMS_DENY), eq("app"));
 
         mFragment.logSpecialPermissionChange(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ALWAYS_ALLOW,
                 "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_PREMIUM_SMS_ALWAYS_ALLOW),
                 eq("app"));
     }
diff --git a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
new file mode 100644
index 0000000..bfc5cd3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
@@ -0,0 +1,218 @@
+/*
+ * 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.applications;
+
+import android.app.Application;
+import android.app.usage.UsageStats;
+import android.app.usage.UsageStatsManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settingslib.applications.ApplicationsState;
+
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class RecentAppsPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private PreferenceCategory mCategory;
+    @Mock
+    private Preference mSeeAllPref;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mMockContext;
+    @Mock
+    private UsageStatsManager mUsageStatsManager;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private ApplicationsState mAppState;
+
+    private Context mContext;
+    private RecentAppsPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mMockContext.getSystemService(Context.USAGE_STATS_SERVICE))
+                .thenReturn(mUsageStatsManager);
+        when(mMockContext.getSystemService(Context.USER_SERVICE))
+                .thenReturn(mUserManager);
+
+        mContext = RuntimeEnvironment.application;
+        mController = new RecentAppsPreferenceController(mContext, mAppState, null);
+        when(mScreen.findPreference(anyString())).thenReturn(mCategory);
+
+        when(mScreen.findPreference(RecentAppsPreferenceController.KEY_SEE_ALL))
+                .thenReturn(mSeeAllPref);
+        when(mCategory.getContext()).thenReturn(mContext);
+    }
+
+    @Test
+    public void isAlwaysAvailable() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void doNotIndexCategory() {
+        final List<String> nonIndexable = new ArrayList<>();
+
+        mController.updateNonIndexableKeys(nonIndexable);
+
+        assertThat(nonIndexable).containsExactly(mController.getPreferenceKey());
+    }
+
+    @Test
+    public void onDisplayAndUpdateState_shouldRefreshUi() {
+        mController = spy(
+                new RecentAppsPreferenceController(mMockContext, (Application) null, null));
+
+        doNothing().when(mController).refreshUi(mContext);
+
+        mController.displayPreference(mScreen);
+        mController.updateState(mCategory);
+
+        verify(mController, times(2)).refreshUi(mContext);
+    }
+
+    @Test
+    public void display_shouldNotShowRecents_showAppInfoPreference() {
+        mController = new RecentAppsPreferenceController(mMockContext, mAppState, null);
+        when(mMockContext.getResources().getBoolean(R.bool.config_display_recent_apps))
+                .thenReturn(false);
+
+        mController.displayPreference(mScreen);
+
+        verify(mCategory, never()).addPreference(any(Preference.class));
+        verify(mCategory).setTitle(null);
+        verify(mSeeAllPref).setTitle(R.string.applications_settings);
+        verify(mSeeAllPref).setIcon(null);
+    }
+
+    @Test
+    public void display_showRecents() {
+        when(mMockContext.getResources().getBoolean(R.bool.config_display_recent_apps))
+                .thenReturn(true);
+        final List<UsageStats> stats = new ArrayList<>();
+        final UsageStats stat1 = new UsageStats();
+        final UsageStats stat2 = new UsageStats();
+        final UsageStats stat3 = new UsageStats();
+        stat1.mLastTimeUsed = System.currentTimeMillis();
+        stat1.mPackageName = "pkg.class";
+        stats.add(stat1);
+
+        stat2.mLastTimeUsed = System.currentTimeMillis();
+        stat2.mPackageName = "com.android.settings";
+        stats.add(stat2);
+
+        stat3.mLastTimeUsed = System.currentTimeMillis();
+        stat3.mPackageName = "pkg.class2";
+        stats.add(stat3);
+
+        // stat1, stat2 are valid apps. stat3 is invalid.
+        when(mAppState.getEntry(stat1.mPackageName, UserHandle.myUserId()))
+                .thenReturn(mock(ApplicationsState.AppEntry.class));
+        when(mAppState.getEntry(stat2.mPackageName, UserHandle.myUserId()))
+                .thenReturn(mock(ApplicationsState.AppEntry.class));
+        when(mAppState.getEntry(stat3.mPackageName, UserHandle.myUserId()))
+                .thenReturn(null);
+        when(mMockContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
+                .thenReturn(new ResolveInfo());
+        when(mUsageStatsManager.queryUsageStats(anyInt(), anyLong(), anyLong()))
+                .thenReturn(stats);
+
+        mController = new RecentAppsPreferenceController(mMockContext, mAppState, null);
+        mController.displayPreference(mScreen);
+
+        verify(mCategory).setTitle(R.string.recent_app_category_title);
+        // Only add stat1. stat2 is skipped because of the package name, stat3 skipped because
+        // it's invalid app.
+        verify(mCategory, times(1)).addPreference(any(Preference.class));
+
+        verify(mSeeAllPref).setSummary(null);
+        verify(mSeeAllPref).setIcon(R.drawable.ic_chevron_right_24dp);
+    }
+
+    @Test
+    public void display_hasRecentButNoneDisplayable_showAppInfo() {
+        when(mMockContext.getResources().getBoolean(R.bool.config_display_recent_apps))
+                .thenReturn(true);
+        final List<UsageStats> stats = new ArrayList<>();
+        final UsageStats stat1 = new UsageStats();
+        final UsageStats stat2 = new UsageStats();
+        stat1.mLastTimeUsed = System.currentTimeMillis();
+        stat1.mPackageName = "com.android.phone";
+        stats.add(stat1);
+
+        stat2.mLastTimeUsed = System.currentTimeMillis();
+        stat2.mPackageName = "com.android.settings";
+        stats.add(stat2);
+
+        // stat1, stat2 are not displayable
+        when(mAppState.getEntry(stat1.mPackageName, UserHandle.myUserId()))
+                .thenReturn(mock(ApplicationsState.AppEntry.class));
+        when(mAppState.getEntry(stat2.mPackageName, UserHandle.myUserId()))
+                .thenReturn(mock(ApplicationsState.AppEntry.class));
+        when(mMockContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
+                .thenReturn(new ResolveInfo());
+        when(mUsageStatsManager.queryUsageStats(anyInt(), anyLong(), anyLong()))
+                .thenReturn(stats);
+
+        mController = new RecentAppsPreferenceController(mMockContext, mAppState, null);
+        mController.displayPreference(mScreen);
+
+        verify(mCategory, never()).addPreference(any(Preference.class));
+        verify(mCategory).setTitle(null);
+        verify(mSeeAllPref).setTitle(R.string.applications_settings);
+        verify(mSeeAllPref).setIcon(null);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
index 44ca9f7..f17addd 100644
--- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.datausage.DataSaverBackend;
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
index 532a923..229057f 100644
--- a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
@@ -16,10 +16,14 @@
 
 package com.android.settings.applications;
 
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -32,10 +36,6 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class UsageAccessDetailsTest {
@@ -58,11 +58,11 @@
     @Test
     public void logSpecialPermissionChange() {
         mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_USAGE_VIEW_ALLOW), eq("app"));
 
         mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_USAGE_VIEW_DENY), eq("app"));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java b/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java
index 3abe3f4..d2f1bbd 100644
--- a/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java
@@ -16,10 +16,14 @@
 
 package com.android.settings.applications;
 
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -31,10 +35,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class VrListenerSettingsTest {
@@ -56,11 +56,11 @@
     @Test
     public void logSpecialPermissionChange() {
         mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_VRHELPER_ALLOW), eq("app"));
 
         mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_VRHELPER_DENY), eq("app"));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java b/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java
index a632118..a995394 100644
--- a/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java
@@ -16,10 +16,14 @@
 
 package com.android.settings.applications;
 
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -31,10 +35,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class WriteSettingsDetailsTest {
@@ -56,12 +56,12 @@
     @Test
     public void logSpecialPermissionChange() {
         mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_ALLOW),
                 eq("app"));
 
         mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_DENY),
                 eq("app"));
     }
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
index da8473f..6c8ad9b 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
@@ -22,9 +22,9 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.preference.TwoStatePreference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
index 0b2378c..7fa11cf 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
@@ -23,10 +23,10 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.preference.TwoStatePreference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java
index abc030b..f0956c7 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java
@@ -19,7 +19,7 @@
 
 import android.net.Uri;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java
index aca11a6..52916f5 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java
@@ -21,7 +21,7 @@
 import android.content.Context;
 import android.provider.Settings;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
index 728a8a5..037bd10 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
@@ -28,7 +28,7 @@
 import android.content.pm.ServiceInfo;
 import android.provider.Settings;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.defaultapps.DefaultAppInfo;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
diff --git a/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java b/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java
index 91d4b51..1b4fb09 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java
@@ -18,7 +18,7 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java
index 4501a98..281e70a 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java
@@ -25,7 +25,7 @@
 import android.content.pm.PackageItemInfo;
 import android.content.pm.PackageManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
index 2d9ae9b..66ec80a 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
@@ -17,18 +17,16 @@
 package com.android.settings.applications.defaultapps;
 
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
 import android.app.Activity;
 import android.content.Context;
 import android.os.UserManager;
 import android.support.v7.preference.PreferenceScreen;
+import android.util.Pair;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.widget.RadioButtonPreference;
 
 import org.junit.Before;
@@ -43,6 +41,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.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;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DefaultAppPickerFragmentTest {
@@ -54,11 +59,13 @@
     @Mock
     private UserManager mUserManager;
 
+    private FakeFeatureFactory mFeatureFactory;
     private TestFragment mFragment;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mFeatureFactory = FakeFeatureFactory.setupForTest(mActivity);
         mFragment = spy(new TestFragment());
 
         when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
@@ -68,6 +75,7 @@
 
     @Test
     public void clickPreference_hasConfirmation_shouldShowConfirmation() {
+        mFragment.onAttach((Context) mActivity);
         final RadioButtonPreference pref =
                 new RadioButtonPreference(RuntimeEnvironment.application);
         pref.setKey("TEST");
@@ -78,6 +86,17 @@
         mFragment.onRadioButtonClicked(pref);
     }
 
+    @Test
+    public void onRadioButtonConfirmed_shouldLog() {
+        mFragment.onAttach((Context) mActivity);
+        mFragment.onRadioButtonConfirmed("test_pkg");
+
+        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+                eq(MetricsProto.MetricsEvent.ACTION_SETTINGS_UPDATE_DEFAULT_APP),
+                eq("test_pkg"),
+                any(Pair.class));
+    }
+
     public static class TestFragment extends DefaultAppPickerFragment {
 
         boolean setDefaultAppKeyCalled;
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 fc000c9..120f3ae 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
@@ -26,7 +26,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
index f564755..655f693 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
@@ -27,7 +27,7 @@
 import android.content.Context;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
index a7912c4..d6f1122 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
@@ -25,7 +25,7 @@
 import android.view.autofill.AutofillManager;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.AutofillManagerWrapper;
 import com.android.settings.applications.PackageManagerWrapper;
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java
index 63d8c6d..f5dc72d 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java
@@ -21,7 +21,7 @@
 import android.content.Context;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
index ee2cd1d..e918ee2 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
@@ -24,7 +24,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java
index 6ee9e86..04972ae 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java
@@ -21,7 +21,7 @@
 import android.os.UserManager;
 import android.provider.Settings;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
index f425d2f..b500637 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
@@ -29,7 +29,7 @@
 import android.os.Build;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
index 6d6e2f8..d7e5192 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
@@ -17,11 +17,12 @@
 package com.android.settings.applications.defaultapps;
 
 
+import android.content.ComponentName;
 import android.content.Context;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 
@@ -84,4 +85,33 @@
 
         verify(mPackageManager).getHomeActivities(anyList());
     }
+
+    @Test
+    public void testIsHomeDefault_noDefaultSet_shouldReturnTrue() {
+        when(mPackageManager.getHomeActivities(anyList())).thenReturn(null);
+        assertThat(DefaultHomePreferenceController.isHomeDefault("test.pkg", mPackageManager))
+                .isTrue();
+    }
+
+    @Test
+    public void testIsHomeDefault_defaultSetToPkg_shouldReturnTrue() {
+        final String pkgName = "test.pkg";
+        final ComponentName defaultHome = new ComponentName(pkgName, "class");
+
+        when(mPackageManager.getHomeActivities(anyList())).thenReturn(defaultHome);
+
+        assertThat(DefaultHomePreferenceController.isHomeDefault(pkgName, mPackageManager))
+                .isTrue();
+    }
+
+    @Test
+    public void testIsHomeDefault_defaultSetToOtherPkg_shouldReturnFalse() {
+        final String pkgName = "test.pkg";
+        final ComponentName defaultHome = new ComponentName("not" + pkgName, "class");
+
+        when(mPackageManager.getHomeActivities(anyList())).thenReturn(defaultHome);
+
+        assertThat(DefaultHomePreferenceController.isHomeDefault(pkgName, mPackageManager))
+                .isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPickerTest.java
index acf90d5..a60b43c 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPickerTest.java
@@ -22,7 +22,7 @@
 import android.os.UserManager;
 import android.provider.Settings;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java
index 0318a97..600acb4 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java
@@ -21,7 +21,7 @@
 import android.content.Context;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java
index ba19d83..da0c325 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java
@@ -21,7 +21,7 @@
 import android.content.Context;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java b/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java
index 13040a2..9e190b5 100644
--- a/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java
@@ -44,10 +44,9 @@
 import android.widget.Button;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.backup.BackupSettingsActivityTest;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -58,7 +57,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowUserManager;
 import org.robolectric.util.ReflectionHelpers;
 
 /** Tests for the InstantAppButtonsController. */
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
index a58b67d..5fc3ebc 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
@@ -23,17 +23,15 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.accounts.AccountManager;
 import android.app.backup.BackupManager;
 import android.content.Context;
-import android.content.Intent;
 import android.os.RemoteException;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
index ae67b04..69c8a03 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
@@ -32,7 +32,7 @@
 import android.content.pm.PackageManager;
 import android.os.UserHandle;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.search.SearchIndexableRaw;
 
@@ -50,7 +50,6 @@
 import org.robolectric.annotation.Resetter;
 import org.robolectric.res.builder.RobolectricPackageManager;
 import org.robolectric.util.ActivityController;
-import org.robolectric.shadows.ShadowActivity;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
index 0205124..9de0c6a 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
@@ -45,7 +45,7 @@
 import static org.mockito.Mockito.when;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.drawer.SettingsDrawerActivity;
 
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java
index 7157862..3ad49e7 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.backup;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
new file mode 100644
index 0000000..f2dc851
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
@@ -0,0 +1,160 @@
+/*
+ * 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.bluetooth;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.widget.Button;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows=SettingsShadowBluetoothDevice.class)
+public class BluetoothDetailsButtonsControllerTest extends BluetoothDetailsControllerTestBase {
+    private BluetoothDetailsButtonsController mController;
+    private LayoutPreference mLayoutPreference;
+    private Button mLeftButton;
+    private Button mRightButton;
+
+    @Override
+    public void setUp() {
+        super.setUp();
+        mController = new BluetoothDetailsButtonsController(mContext, mFragment, mCachedDevice,
+                mLifecycle);
+        mLeftButton = new Button(mContext);
+        mRightButton = new Button(mContext);
+        mLayoutPreference = new LayoutPreference(mContext, R.layout.app_action_buttons);
+        mLayoutPreference.setKey(mController.getPreferenceKey());
+        mScreen.addPreference(mLayoutPreference);
+        mLeftButton = (Button) mLayoutPreference.findViewById(R.id.left_button);
+        mRightButton = (Button) mLayoutPreference.findViewById(R.id.right_button);
+        setupDevice(mDeviceConfig);
+        when(mCachedDevice.isBusy()).thenReturn(false);
+    }
+
+    @Test
+    public void connected() {
+        showScreen(mController);
+        assertThat(mLeftButton.getText()).isEqualTo(
+                mContext.getString(R.string.bluetooth_device_context_disconnect));
+        assertThat(mRightButton.getText()).isEqualTo(mContext.getString(R.string.forget));
+    }
+
+    @Test
+    public void clickOnDisconnect() {
+        showScreen(mController);
+        mLeftButton.callOnClick();
+        verify(mCachedDevice).disconnect();
+    }
+
+    @Test
+    public void clickOnConnect() {
+        when(mCachedDevice.isConnected()).thenReturn(false);
+        showScreen(mController);
+
+        assertThat(mLeftButton.getText()).isEqualTo(
+                mContext.getString(R.string.bluetooth_device_context_connect));
+
+        mLeftButton.callOnClick();
+        verify(mCachedDevice).connect(eq(true));
+    }
+
+    @Test
+    public void becomeDisconnected() {
+        showScreen(mController);
+        // By default we start out with the device connected.
+        assertThat(mLeftButton.getText()).isEqualTo(
+                mContext.getString(R.string.bluetooth_device_context_disconnect));
+
+        // Now make the device appear to have changed to disconnected.
+        when(mCachedDevice.isConnected()).thenReturn(false);
+        mController.onDeviceAttributesChanged();
+        assertThat(mLeftButton.getText()).isEqualTo(
+                mContext.getString(R.string.bluetooth_device_context_connect));
+
+        // Click the button and make sure that connect (not disconnect) gets called.
+        mLeftButton.callOnClick();
+        verify(mCachedDevice).connect(eq(true));
+    }
+
+    @Test
+    public void becomeConnected() {
+        // Start out with the device disconnected.
+        when(mCachedDevice.isConnected()).thenReturn(false);
+        showScreen(mController);
+
+        assertThat(mLeftButton.getText()).isEqualTo(
+                mContext.getString(R.string.bluetooth_device_context_connect));
+
+        // Now make the device appear to have changed to connected.
+        when(mCachedDevice.isConnected()).thenReturn(true);
+        mController.onDeviceAttributesChanged();
+        assertThat(mLeftButton.getText()).isEqualTo(
+                mContext.getString(R.string.bluetooth_device_context_disconnect));
+
+        // Click the button and make sure that disconnnect (not connect) gets called.
+        mLeftButton.callOnClick();
+        verify(mCachedDevice).disconnect();
+    }
+
+    @Test
+    public void forget() {
+        showScreen(mController);
+        mRightButton.callOnClick();
+        verify(mCachedDevice).unpair();
+        verify(mActivity).finish();
+    }
+
+
+    @Test
+    public void startsOutBusy() {
+        when(mCachedDevice.isBusy()).thenReturn(true);
+        showScreen(mController);
+        assertThat(mLeftButton.getText()).isEqualTo(
+                mContext.getString(R.string.bluetooth_device_context_disconnect));
+        assertThat(mRightButton.getText()).isEqualTo(mContext.getString(R.string.forget));
+        assertThat(mLeftButton.isEnabled()).isFalse();
+
+        // Now pretend the device became non-busy.
+        when(mCachedDevice.isBusy()).thenReturn(false);
+        mController.onDeviceAttributesChanged();
+        assertThat(mLeftButton.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void becomesBusy() {
+        showScreen(mController);
+        assertThat(mLeftButton.isEnabled()).isTrue();
+
+        when(mCachedDevice.isBusy()).thenReturn(true);
+        mController.onDeviceAttributesChanged();
+        assertThat(mLeftButton.isEnabled()).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java
new file mode 100644
index 0000000..240ece1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java
@@ -0,0 +1,84 @@
+/*
+ * 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.bluetooth;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows=SettingsShadowBluetoothDevice.class)
+public class BluetoothDetailsControllerEventsTest extends BluetoothDetailsControllerTestBase {
+
+    static class TestController extends BluetoothDetailsController {
+        public TestController(Context context, PreferenceFragment fragment,
+                CachedBluetoothDevice device,
+                Lifecycle lifecycle) {
+            super(context, fragment, device, lifecycle);
+        }
+
+        @Override
+        public String getPreferenceKey() {
+            return null;
+        }
+
+        @Override
+        protected void init(PreferenceScreen screen) {}
+
+        @Override
+        protected void refresh() {}
+    }
+
+    @Test
+    public void pauseResumeEvents() {
+
+        TestController controller = spy(new TestController(mContext, mFragment, mCachedDevice,
+                mLifecycle));
+        verify(mLifecycle).addObserver(any(BluetoothDetailsController.class));
+
+        showScreen(controller);
+        verify(mCachedDevice, times(1)).registerCallback(controller);
+        verify(controller, times(1)).refresh();
+
+        controller.onPause();
+        verify(controller, times(1)).refresh();
+        verify(mCachedDevice).unregisterCallback(controller);
+
+        controller.onResume();
+        verify(controller, times(2)).refresh();
+        verify(mCachedDevice, times(2)).registerCallback(controller);
+
+        // The init function should only have been called once
+        verify(controller, times(1)).init(mScreen);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
new file mode 100644
index 0000000..95befa9
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
@@ -0,0 +1,157 @@
+/*
+ * 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.bluetooth;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothManager;
+import android.content.Context;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+public class BluetoothDetailsControllerTestBase {
+    protected Context mContext = RuntimeEnvironment.application;
+    protected Lifecycle mLifecycle;
+    protected DeviceConfig mDeviceConfig;
+    protected BluetoothDevice mDevice;
+    protected BluetoothManager mBluetoothManager;
+    protected BluetoothAdapter mBluetoothAdapter;
+    protected PreferenceScreen mScreen;
+    protected PreferenceManager mPreferenceManager;
+
+    @Mock
+    protected BluetoothDeviceDetailsFragment mFragment;
+    @Mock
+    protected CachedBluetoothDevice mCachedDevice;
+    @Mock
+    protected Activity mActivity;
+    @Mock
+    protected BluetoothClass mBluetoothDeviceClass;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mPreferenceManager = new PreferenceManager(mContext);
+        mScreen = mPreferenceManager.createPreferenceScreen(mContext);
+        mDeviceConfig = makeDefaultDeviceConfig();
+        when(mFragment.getActivity()).thenReturn(mActivity);
+        when(mActivity.getApplicationContext()).thenReturn(mContext);
+        when(mFragment.getContext()).thenReturn(mContext);
+        when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
+        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
+        mLifecycle = spy(new Lifecycle());
+        mBluetoothManager = new BluetoothManager(mContext);
+        mBluetoothAdapter = mBluetoothManager.getAdapter();
+    }
+
+    protected static class DeviceConfig {
+        private String name;
+        private String address;
+        private int majorDeviceClass;
+        private boolean connected;
+        private int connectionSummary;
+
+        public DeviceConfig setName(String newValue) {
+            this.name = newValue;
+            return this;
+        }
+
+        public DeviceConfig setAddress(String newValue) {
+            this.address = newValue;
+            return this;
+        }
+
+        public DeviceConfig setMajorDeviceClass(int newValue) {
+            this.majorDeviceClass = newValue;
+            return this;
+        }
+
+        public DeviceConfig setConnected(boolean newValue) {
+            this.connected = newValue;
+            return this;
+        }
+        public DeviceConfig setConnectionSummary(int newValue) {
+            this.connectionSummary = newValue;
+            return this;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getAddress() {
+            return address;
+        }
+
+        public int getMajorDeviceClass() {
+            return majorDeviceClass;
+        }
+
+        public boolean isConnected() {
+            return connected;
+        }
+
+        public int getConnectionSummary() {
+            return connectionSummary;
+        }
+    }
+
+    protected static DeviceConfig makeDefaultDeviceConfig() {
+        return new DeviceConfig()
+                .setName("Mock Device")
+                .setAddress("B4:B0:34:B5:3B:1B")
+                .setMajorDeviceClass(BluetoothClass.Device.Major.AUDIO_VIDEO)
+                .setConnected(true)
+                .setConnectionSummary(R.string.bluetooth_connected);
+    }
+
+    /**
+     * Sets up the device mock to return various state based on a test config.
+     * @param config
+     */
+    protected void setupDevice(DeviceConfig config) {
+        when(mCachedDevice.getName()).thenReturn(config.getName());
+        when(mBluetoothDeviceClass.getMajorDeviceClass()).thenReturn(config.getMajorDeviceClass());
+        when(mCachedDevice.isConnected()).thenReturn(config.isConnected());
+        when(mCachedDevice.getConnectionSummary()).thenReturn(config.getConnectionSummary());
+
+        mDevice = mBluetoothAdapter.getRemoteDevice(mDeviceConfig.getAddress());
+        when(mCachedDevice.getDevice()).thenReturn(mDevice);
+    }
+
+    /**
+     * Convenience method to call displayPreference and onResume.
+     */
+    protected void showScreen(BluetoothDetailsController controller) {
+        controller.displayPreference(mScreen);
+        controller.onResume();
+    }
+}
+
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
new file mode 100644
index 0000000..aa74819
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
@@ -0,0 +1,104 @@
+/*
+ * 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.bluetooth;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.graphics.drawable.Drawable;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
+import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
+import com.android.settings.widget.EntityHeaderController;
+import com.android.settingslib.R;
+import com.android.settingslib.bluetooth.LocalBluetoothProfile;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.InOrder;
+import org.mockito.Mock;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows={SettingsShadowBluetoothDevice.class, ShadowEntityHeaderController.class})
+public class BluetoothDetailsHeaderControllerTest extends BluetoothDetailsControllerTestBase {
+    private BluetoothDetailsHeaderController mController;
+    private Preference mPreference;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private EntityHeaderController mHeaderController;
+
+    @Override
+    public void setUp() {
+        super.setUp();
+        FakeFeatureFactory.setupForTest(spy(mContext));
+        ShadowEntityHeaderController.setUseMock(mHeaderController);
+        mController = new BluetoothDetailsHeaderController(mContext, mFragment, mCachedDevice,
+                mLifecycle);
+        mPreference = new Preference(mContext);
+        mPreference.setKey(mController.getPreferenceKey());
+        mScreen.addPreference(mPreference);
+        setupDevice(mDeviceConfig);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowEntityHeaderController.reset();
+    }
+
+    @Test
+    public void header() {
+        showScreen(mController);
+
+        verify(mHeaderController).setLabel(mDeviceConfig.getName());
+        verify(mHeaderController).setIcon(any(Drawable.class));
+        verify(mHeaderController).setIconContentDescription(any(String.class));
+        verify(mHeaderController).setSummary(any(String.class));
+        verify(mHeaderController).done(mActivity, mContext);
+        verify(mHeaderController).done(mActivity, false);
+    }
+
+    @Test
+    public void connectionStatusChangesWhileScreenOpen() {
+        ArrayList<LocalBluetoothProfile> profiles = new ArrayList<>();
+        InOrder inOrder = inOrder(mHeaderController);
+        when(mCachedDevice.getConnectionSummary()).thenReturn(R.string.bluetooth_connected);
+        showScreen(mController);
+        inOrder.verify(mHeaderController).setSummary(mContext.getString(R.string.bluetooth_connected));
+
+        when(mCachedDevice.getConnectionSummary()).thenReturn(0);
+        mController.onDeviceAttributesChanged();
+        inOrder.verify(mHeaderController).setSummary((CharSequence) null);
+
+        when(mCachedDevice.getConnectionSummary()).thenReturn(R.string.bluetooth_connecting);
+        mController.onDeviceAttributesChanged();
+        inOrder.verify(mHeaderController).setSummary(
+                mContext.getString(R.string.bluetooth_connecting));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java
new file mode 100644
index 0000000..24b28a1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java
@@ -0,0 +1,50 @@
+/*
+ * 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.bluetooth;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
+import com.android.settingslib.widget.FooterPreference;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows=SettingsShadowBluetoothDevice.class)
+public class BluetoothDetailsMacAddressControllerTest extends BluetoothDetailsControllerTestBase {
+    private BluetoothDetailsMacAddressController mController;
+
+    @Override
+    public void setUp() {
+        super.setUp();
+        mController = new BluetoothDetailsMacAddressController(mContext, mFragment, mCachedDevice,
+                mLifecycle);
+        setupDevice(mDeviceConfig);
+    }
+
+    @Test
+    public void macAddress() {
+        showScreen(mController);
+        FooterPreference footer = (FooterPreference) mScreen.findPreference(
+                mController.getPreferenceKey());
+        assertThat(footer.getTitle().toString()).endsWith(mDeviceConfig.getAddress());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
new file mode 100644
index 0000000..e888d05
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
@@ -0,0 +1,449 @@
+/*
+ * 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.bluetooth;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.bluetooth.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
+import android.content.Context;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceCategory;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
+import com.android.settingslib.bluetooth.A2dpProfile;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.bluetooth.LocalBluetoothProfile;
+import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
+import com.android.settingslib.bluetooth.MapProfile;
+import com.android.settingslib.bluetooth.PbapServerProfile;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows=SettingsShadowBluetoothDevice.class)
+public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsControllerTestBase {
+    private BluetoothDetailsProfilesController mController;
+    private List<LocalBluetoothProfile> mConnectableProfiles;
+    private PreferenceCategory mProfiles;
+
+    @Mock
+    private LocalBluetoothManager mLocalManager;
+    @Mock
+    private LocalBluetoothProfileManager mProfileManager;
+
+    @Override
+    public void setUp() {
+        super.setUp();
+
+        mProfiles = spy(new PreferenceCategory(mContext));
+        when(mProfiles.getPreferenceManager()).thenReturn(mPreferenceManager);
+
+        mConnectableProfiles = new ArrayList<>();
+        when(mLocalManager.getProfileManager()).thenReturn(mProfileManager);
+        when(mCachedDevice.getConnectableProfiles()).thenAnswer(invocation ->
+            new ArrayList<>(mConnectableProfiles)
+        );
+
+        setupDevice(mDeviceConfig);
+        mController = new BluetoothDetailsProfilesController(mContext, mFragment, mLocalManager,
+                mCachedDevice, mLifecycle);
+        mProfiles.setKey(mController.getPreferenceKey());
+        mScreen.addPreference(mProfiles);
+    }
+
+    static class FakeBluetoothProfile implements LocalBluetoothProfile {
+        protected HashSet<BluetoothDevice> mConnectedDevices;
+        protected HashMap<BluetoothDevice, Boolean> mPreferred;
+        protected Context mContext;
+        protected int mNameResourceId;
+
+        public FakeBluetoothProfile(Context context, int nameResourceId) {
+            mConnectedDevices = new HashSet<>();
+            mPreferred = new HashMap<>();
+            mContext = context;
+            mNameResourceId = nameResourceId;
+        }
+
+        @Override
+        public String toString() {
+            return mContext.getString(mNameResourceId);
+        }
+
+        @Override
+        public boolean isConnectable() {
+            return true;
+        }
+
+        @Override
+        public boolean isAutoConnectable() {
+            return true;
+        }
+
+        @Override
+        public boolean connect(BluetoothDevice device) {
+            mConnectedDevices.add(device);
+            return true;
+        }
+
+        @Override
+        public boolean disconnect(BluetoothDevice device) {
+            mConnectedDevices.remove(device);
+            return false;
+        }
+
+        @Override
+        public int getConnectionStatus(BluetoothDevice device) {
+            if (mConnectedDevices.contains(device)) {
+                return BluetoothProfile.STATE_CONNECTED;
+            } else {
+                return BluetoothProfile.STATE_DISCONNECTED;
+            }
+        }
+
+        @Override
+        public boolean isPreferred(BluetoothDevice device) {
+            return mPreferred.getOrDefault(device, false);
+        }
+
+        @Override
+        public int getPreferred(BluetoothDevice device) {
+            return isPreferred(device) ?
+                    BluetoothProfile.PRIORITY_ON : BluetoothProfile.PRIORITY_OFF;
+        }
+
+        @Override
+        public void setPreferred(BluetoothDevice device, boolean preferred) {
+            mPreferred.put(device, preferred);
+        }
+
+        @Override
+        public boolean isProfileReady() {
+            return true;
+        }
+
+        @Override
+        public int getOrdinal() {
+            return 0;
+        }
+
+        @Override
+        public int getNameResource(BluetoothDevice device) {
+            return mNameResourceId;
+        }
+
+        @Override
+        public int getSummaryResourceForDevice(BluetoothDevice device) {
+            return Utils.getConnectionStateSummary(getConnectionStatus(device));
+        }
+
+        @Override
+        public int getDrawableResource(BluetoothClass btClass) {
+            return 0;
+        }
+    }
+
+    /**
+     * Creates and adds a mock LocalBluetoothProfile to the list of connectable profiles for the
+     * device.
+     @param profileNameResId  the resource id for the name used by this profile
+     @param deviceIsPreferred  whether this profile should start out as enabled for the device
+     */
+    private LocalBluetoothProfile addFakeProfile(int profileNameResId,
+            boolean deviceIsPreferred) {
+        LocalBluetoothProfile profile = new FakeBluetoothProfile(mContext, profileNameResId);
+        profile.setPreferred(mDevice, deviceIsPreferred);
+        mConnectableProfiles.add(profile);
+        when(mProfileManager.getProfileByName(eq(profile.toString()))).thenReturn(profile);
+        return profile;
+    }
+
+    /** Returns the list of SwitchPreference objects added to the screen - there should be one per
+     *  Bluetooth profile.
+     */
+    private List<SwitchPreference> getProfileSwitches(boolean expectOnlyMConnectable) {
+        if (expectOnlyMConnectable) {
+            assertThat(mConnectableProfiles).isNotEmpty();
+            assertThat(mProfiles.getPreferenceCount()).isEqualTo(mConnectableProfiles.size());
+        }
+        ArrayList<SwitchPreference> result = new ArrayList<>();
+        for (int i = 0; i < mProfiles.getPreferenceCount(); i++) {
+            result.add((SwitchPreference)mProfiles.getPreference(i));
+        }
+        return result;
+    }
+
+     private void verifyProfileSwitchTitles(List<SwitchPreference> switches) {
+        for (int i = 0; i < switches.size(); i++) {
+            String expectedTitle = mContext.getString(
+                    mConnectableProfiles.get(i).getNameResource(mDevice));
+            assertThat(switches.get(i).getTitle()).isEqualTo(expectedTitle);
+        }
+    }
+
+    @Test
+    public void oneProfile() {
+        addFakeProfile(R.string.bluetooth_profile_a2dp, true);
+        showScreen(mController);
+        verifyProfileSwitchTitles(getProfileSwitches(true));
+    }
+
+    @Test
+    public void multipleProfiles() {
+        addFakeProfile(R.string.bluetooth_profile_a2dp, true);
+        addFakeProfile(R.string.bluetooth_profile_headset, false);
+        showScreen(mController);
+        List<SwitchPreference> switches = getProfileSwitches(true);
+        verifyProfileSwitchTitles(switches);
+        assertThat(switches.get(0).isChecked()).isTrue();
+        assertThat(switches.get(1).isChecked()).isFalse();
+
+        // Both switches should be enabled.
+        assertThat(switches.get(0).isEnabled()).isTrue();
+        assertThat(switches.get(1).isEnabled()).isTrue();
+
+        // Make device busy.
+        when(mCachedDevice.isBusy()).thenReturn(true);
+        mController.onDeviceAttributesChanged();
+
+        // There should have been no new switches added.
+        assertThat(mProfiles.getPreferenceCount()).isEqualTo(2);
+
+        // Make sure both switches got disabled.
+        assertThat(switches.get(0).isEnabled()).isFalse();
+        assertThat(switches.get(1).isEnabled()).isFalse();
+    }
+
+    @Test
+    public void disableThenReenableOneProfile() {
+        addFakeProfile(R.string.bluetooth_profile_a2dp, true);
+        addFakeProfile(R.string.bluetooth_profile_headset, true);
+        showScreen(mController);
+        List<SwitchPreference> switches = getProfileSwitches(true);
+        SwitchPreference pref = switches.get(0);
+
+        // Clicking the pref should cause the profile to become not-preferred.
+        assertThat(pref.isChecked()).isTrue();
+        pref.performClick();
+        assertThat(pref.isChecked()).isFalse();
+        assertThat(mConnectableProfiles.get(0).isPreferred(mDevice)).isFalse();
+
+        // Make sure no new preferences were added.
+        assertThat(mProfiles.getPreferenceCount()).isEqualTo(2);
+
+        // Clicking the pref again should make the profile once again preferred.
+        pref.performClick();
+        assertThat(pref.isChecked()).isTrue();
+        assertThat(mConnectableProfiles.get(0).isPreferred(mDevice)).isTrue();
+
+        // Make sure we still haven't gotten any new preferences added.
+        assertThat(mProfiles.getPreferenceCount()).isEqualTo(2);
+    }
+
+    @Test
+    public void disconnectedDeviceOneProfile() {
+        setupDevice(makeDefaultDeviceConfig().setConnected(false).setConnectionSummary(0));
+        addFakeProfile(R.string.bluetooth_profile_a2dp, true);
+        showScreen(mController);
+        verifyProfileSwitchTitles(getProfileSwitches(true));
+    }
+
+    @Test
+    public void pbapProfileStartsEnabled() {
+        setupDevice(makeDefaultDeviceConfig());
+        when(mCachedDevice.getPhonebookPermissionChoice()).thenReturn(
+                CachedBluetoothDevice.ACCESS_ALLOWED);
+        PbapServerProfile psp = mock(PbapServerProfile.class);
+        when(psp.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_pbap);
+        when(psp.toString()).thenReturn(PbapServerProfile.NAME);
+        when(mProfileManager.getPbapProfile()).thenReturn(psp);
+
+        showScreen(mController);
+        List<SwitchPreference> switches = getProfileSwitches(false);
+        assertThat(switches.size()).isEqualTo(1);
+        SwitchPreference pref = switches.get(0);
+        assertThat(pref.getTitle()).isEqualTo(mContext.getString(R.string.bluetooth_profile_pbap));
+        assertThat(pref.isChecked()).isTrue();
+
+        pref.performClick();
+        assertThat(mProfiles.getPreferenceCount()).isEqualTo(1);
+        verify(mCachedDevice).setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);
+    }
+
+    @Test
+    public void pbapProfileStartsDisabled() {
+        setupDevice(makeDefaultDeviceConfig());
+        when(mCachedDevice.getPhonebookPermissionChoice()).thenReturn(
+                CachedBluetoothDevice.ACCESS_REJECTED);
+        PbapServerProfile psp = mock(PbapServerProfile.class);
+        when(psp.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_pbap);
+        when(psp.toString()).thenReturn(PbapServerProfile.NAME);
+        when(mProfileManager.getPbapProfile()).thenReturn(psp);
+
+        showScreen(mController);
+        List<SwitchPreference> switches = getProfileSwitches(false);
+        assertThat(switches.size()).isEqualTo(1);
+        SwitchPreference pref = switches.get(0);
+        assertThat(pref.getTitle()).isEqualTo(mContext.getString(R.string.bluetooth_profile_pbap));
+        assertThat(pref.isChecked()).isFalse();
+
+        pref.performClick();
+        assertThat(mProfiles.getPreferenceCount()).isEqualTo(1);
+        verify(mCachedDevice).setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);
+    }
+
+    @Test
+    public void mapProfile() {
+        setupDevice(makeDefaultDeviceConfig());
+        MapProfile mapProfile = mock(MapProfile.class);
+        when(mapProfile.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_map);
+        when(mProfileManager.getMapProfile()).thenReturn(mapProfile);
+        when(mProfileManager.getProfileByName(eq(mapProfile.toString()))).thenReturn(mapProfile);
+        when(mCachedDevice.getMessagePermissionChoice()).thenReturn(
+                CachedBluetoothDevice.ACCESS_REJECTED);
+        showScreen(mController);
+        List<SwitchPreference> switches = getProfileSwitches(false);
+        assertThat(switches.size()).isEqualTo(1);
+        SwitchPreference pref = switches.get(0);
+        assertThat(pref.getTitle()).isEqualTo(mContext.getString(R.string.bluetooth_profile_map));
+        assertThat(pref.isChecked()).isFalse();
+
+        pref.performClick();
+        assertThat(mProfiles.getPreferenceCount()).isEqualTo(1);
+        verify(mCachedDevice).setMessagePermissionChoice(BluetoothDevice.ACCESS_ALLOWED);
+    }
+
+    private A2dpProfile addMockA2dpProfile(boolean preferred, boolean supportsHighQualityAudio,
+            boolean highQualityAudioEnabled) {
+        A2dpProfile profile = mock(A2dpProfile.class);
+        when(mProfileManager.getProfileByName(eq(profile.toString()))).thenReturn(profile);
+        when(profile.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_a2dp);
+        when(profile.getHighQualityAudioOptionLabel(mDevice)).thenReturn(mContext.getString(
+                R.string.bluetooth_profile_a2dp_high_quality_unknown_codec));
+        when(profile.supportsHighQualityAudio(mDevice)).thenReturn(supportsHighQualityAudio);
+        when(profile.isHighQualityAudioEnabled(mDevice)).thenReturn(highQualityAudioEnabled);
+        when(profile.isPreferred(mDevice)).thenReturn(preferred);
+        mConnectableProfiles.add(profile);
+        return profile;
+    }
+
+    private SwitchPreference getHighQualityAudioPref() {
+        return (SwitchPreference) mScreen.findPreference(
+                BluetoothDetailsProfilesController.HIGH_QUALITY_AUDIO_PREF_TAG);
+    }
+
+    @Test
+    public void highQualityAudio_prefIsPresentWhenSupported() {
+        setupDevice(makeDefaultDeviceConfig());
+        addMockA2dpProfile(true, true, true);
+        showScreen(mController);
+        SwitchPreference pref = getHighQualityAudioPref();
+        assertThat(pref.getKey()).isEqualTo(
+                BluetoothDetailsProfilesController.HIGH_QUALITY_AUDIO_PREF_TAG);
+
+        // Make sure the preference works when clicked on.
+        pref.performClick();
+        A2dpProfile profile = (A2dpProfile) mConnectableProfiles.get(0);
+        verify(profile).setHighQualityAudioEnabled(mDevice, false);
+        pref.performClick();
+        verify(profile).setHighQualityAudioEnabled(mDevice, true);
+    }
+
+    @Test
+    public void highQualityAudio_prefIsAbsentWhenNotSupported() {
+        setupDevice(makeDefaultDeviceConfig());
+        addMockA2dpProfile(true, false, false);
+        showScreen(mController);
+        assertThat(mProfiles.getPreferenceCount()).isEqualTo(1);
+        SwitchPreference pref = (SwitchPreference) mProfiles.getPreference(0);
+        assertThat(pref.getKey()).isNotEqualTo(
+                BluetoothDetailsProfilesController.HIGH_QUALITY_AUDIO_PREF_TAG);
+        assertThat(pref.getTitle()).isEqualTo(mContext.getString(R.string.bluetooth_profile_a2dp));
+    }
+
+    @Test
+    public void highQualityAudio_busyDeviceDisablesSwitch() {
+        setupDevice(makeDefaultDeviceConfig());
+        addMockA2dpProfile(true, true, true);
+        when(mCachedDevice.isBusy()).thenReturn(true);
+        showScreen(mController);
+        SwitchPreference pref = getHighQualityAudioPref();
+        assertThat(pref.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void highQualityAudio_mediaAudioDisabledAndReEnabled() {
+        setupDevice(makeDefaultDeviceConfig());
+        A2dpProfile audioProfile = addMockA2dpProfile(true, true, true);
+        showScreen(mController);
+        assertThat(mProfiles.getPreferenceCount()).isEqualTo(2);
+
+        // Disabling media audio should cause the high quality audio switch to disappear, but not
+        // the regular audio one.
+        SwitchPreference audioPref = (SwitchPreference) mScreen.findPreference(
+                audioProfile.toString());
+        audioPref.performClick();
+        verify(audioProfile).setPreferred(mDevice, false);
+        when(audioProfile.isPreferred(mDevice)).thenReturn(false);
+        mController.onDeviceAttributesChanged();
+        assertThat(audioPref.isVisible()).isTrue();
+        SwitchPreference highQualityAudioPref = getHighQualityAudioPref();
+        assertThat(highQualityAudioPref.isVisible()).isFalse();
+
+        // And re-enabling media audio should make high quality switch to reappear.
+        audioPref.performClick();
+        verify(audioProfile).setPreferred(mDevice, true);
+        when(audioProfile.isPreferred(mDevice)).thenReturn(true);
+        mController.onDeviceAttributesChanged();
+        highQualityAudioPref = getHighQualityAudioPref();
+        assertThat(highQualityAudioPref.isVisible()).isTrue();
+    }
+
+    @Test
+    public void highQualityAudio_mediaAudioStartsDisabled() {
+        setupDevice(makeDefaultDeviceConfig());
+        A2dpProfile audioProfile = addMockA2dpProfile(false, true, true);
+        showScreen(mController);
+        SwitchPreference audioPref = (SwitchPreference) mScreen.findPreference(
+                audioProfile.toString());
+        SwitchPreference highQualityAudioPref = getHighQualityAudioPref();
+        assertThat(audioPref).isNotNull();
+        assertThat(audioPref.isChecked()).isFalse();
+        assertThat(highQualityAudioPref).isNotNull();
+        assertThat(highQualityAudioPref.isVisible()).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
new file mode 100644
index 0000000..84bdfcf
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
@@ -0,0 +1,138 @@
+/*
+ * 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.bluetooth;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.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.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.SpannableStringBuilder;
+import android.text.style.ForegroundColorSpan;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BluetoothDeviceNamePreferenceControllerTest {
+    private static final String DEVICE_NAME = "Nightshade";
+    private static final int ORDER = 1;
+
+    private Context mContext;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Fragment mFragment;
+    @Mock
+    private Lifecycle mLifecycle;
+    @Mock
+    private LocalBluetoothAdapter mLocalAdapter;
+    @Mock
+    private FragmentManager mFragmentManager;
+    @Mock
+    private FragmentTransaction mFragmentTransaction;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    private Preference mPreference;
+
+    private BluetoothDeviceNamePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(RuntimeEnvironment.application);
+
+        doReturn(mContext).when(mPreferenceScreen).getContext();
+        mPreference = new Preference(mContext);
+        mPreference.setKey(BluetoothDeviceNamePreferenceController.KEY_DEVICE_NAME);
+        mController = new BluetoothDeviceNamePreferenceController(
+                mContext, mFragment, mLocalAdapter);
+    }
+
+    @Test
+    public void testUpdateDeviceName_showSummaryWithDeviceName() {
+        mController.updateDeviceName(mPreference, DEVICE_NAME);
+
+        final CharSequence summary = mPreference.getSummary();
+        final Object[] spans = ((SpannableStringBuilder) summary).getSpans(0, summary.length(),
+                Object.class);
+        assertThat(summary.toString())
+                .isEqualTo("Visible as 'Nightshade' to other devices");
+
+        // Test summary only has one color span
+        assertThat(spans).asList().hasSize(1);
+        assertThat(spans[0]).isInstanceOf(ForegroundColorSpan.class);
+    }
+
+    @Test
+    public void testCreateBluetoothDeviceNamePreference() {
+        Preference preference = mController.createBluetoothDeviceNamePreference(mPreferenceScreen,
+                ORDER);
+
+        assertThat(preference.getKey()).isEqualTo(mController.KEY_DEVICE_NAME);
+        assertThat(preference.getOrder()).isEqualTo(ORDER);
+        verify(mPreferenceScreen).addPreference(preference);
+    }
+
+    @Test
+    public void testOnStart_receiverRegistered() {
+        mController.onStart();
+        verify(mContext).registerReceiver(eq(mController.mReceiver), any());
+    }
+
+    @Test
+    public void testOnStop_receiverUnregistered() {
+        // register it first
+        mContext.registerReceiver(mController.mReceiver, null);
+
+        mController.onStop();
+        verify(mContext).unregisterReceiver(mController.mReceiver);
+    }
+
+    @Test
+    public void testHandlePreferenceTreeClick_startDialogFragment() {
+        when(mFragment.getFragmentManager().beginTransaction()).thenReturn(mFragmentTransaction);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mFragmentTransaction).add(any(), anyString());
+        verify(mFragmentTransaction).commit();
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
index c4c1f8a..8a651a7 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
@@ -21,7 +21,7 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
index 074bef2..2d64396 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.widget.MasterSwitchController;
@@ -41,7 +41,6 @@
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java
index 177130e..ce78165 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java
@@ -16,14 +16,16 @@
 
 package com.android.settings.bluetooth;
 
+import android.app.Fragment;
 import android.content.Context;
-import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.SettingsActivity;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settingslib.bluetooth.BluetoothCallback;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
@@ -38,7 +40,10 @@
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -54,17 +59,26 @@
     private MasterSwitchPreference mPreference;
     @Mock
     private RestrictionUtils mRestrictionUtils;
+    @Mock
+    private Fragment mFragment;
+    @Mock
+    private SettingsActivity mActivity;
 
     private Context mContext;
     private BluetoothMasterSwitchPreferenceController mController;
+    private FakeFeatureFactory mFeatureFactory;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application.getApplicationContext();
+        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
+        FakeFeatureFactory.setupForTest(mContext);
+        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+
         mController = new BluetoothMasterSwitchPreferenceController(
-                mContext, mBluetoothManager, mRestrictionUtils);
+                mContext, mBluetoothManager, mRestrictionUtils, mFragment, mActivity);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
     }
 
     @Test
@@ -84,7 +98,7 @@
         mController.onPause();
 
         verify(mBluetoothManager.getEventManager()).unregisterCallback(
-            any(BluetoothCallback.class));
+                any(BluetoothCallback.class));
     }
 
     @Test
@@ -114,4 +128,22 @@
         verify(mPreference).setSummary("test summary");
     }
 
+    @Test
+    public void testHandlePreferenceTreeClick_pairPageEnabled_showNewPage() {
+        when(mFeatureFactory.bluetoothFeatureProvider.isPairingPageEnabled()).thenReturn(true);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mActivity).startPreferencePanelAsUser(eq(mFragment),
+                eq(BluetoothSettings.class.getName()), any(), eq(R.string.bluetooth), any(), any());
+    }
+
+    @Test
+    public void testHandlePreferenceTreeClick_pairPageDisabled_showOldPage() {
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mActivity).startPreferencePanelAsUser(eq(mFragment),
+                eq(BluetoothSettingsObsolete.class.getName()), any(), eq(R.string.bluetooth), any(),
+                any());
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
new file mode 100644
index 0000000..c4772e5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
@@ -0,0 +1,185 @@
+/*
+ * 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.bluetooth;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.bluetooth.BluetoothAdapter;
+import android.content.Context;
+import android.content.res.Resources;
+import android.os.UserManager;
+import android.support.v7.preference.PreferenceGroup;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.widget.FooterPreference;
+
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BluetoothPairingDetailTest {
+
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private Resources mResource;
+    @Mock
+    private LocalBluetoothAdapter mLocalAdapter;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private LocalBluetoothManager mLocalManager;
+    @Mock
+    private PreferenceGroup mPreferenceGroup;
+    private BluetoothPairingDetail mFragment;
+    private Context mContext;
+    private BluetoothProgressCategory mAvailableDevicesCategory;
+    private FooterPreference mFooterPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mFragment = spy(new BluetoothPairingDetail());
+        doReturn(mContext).when(mFragment).getContext();
+        doReturn(mResource).when(mFragment).getResources();
+
+        mAvailableDevicesCategory = spy(new BluetoothProgressCategory(mContext));
+        mFooterPreference = new FooterPreference(mContext);
+
+        mFragment.mLocalAdapter = mLocalAdapter;
+        mFragment.mLocalManager = mLocalManager;
+        mFragment.mDeviceListGroup = mPreferenceGroup;
+    }
+
+    @Test
+    public void testInitPreferencesFromPreferenceScreen_findPreferences() {
+        doReturn(mAvailableDevicesCategory).when(mFragment).findPreference(
+                BluetoothPairingDetail.KEY_AVAIL_DEVICES);
+        doReturn(mFooterPreference).when(mFragment).findPreference(
+                BluetoothPairingDetail.KEY_FOOTER_PREF);
+
+        mFragment.initPreferencesFromPreferenceScreen();
+
+        assertThat(mFragment.mAvailableDevicesCategory).isEqualTo(mAvailableDevicesCategory);
+        assertThat(mFragment.mFooterPreference).isEqualTo(mFooterPreference);
+    }
+
+    @Test
+    public void testStartScanning_startScanAndRemoveDevices() {
+        mFragment.mAvailableDevicesCategory = mAvailableDevicesCategory;
+        mFragment.mDeviceListGroup = mAvailableDevicesCategory;
+
+        mFragment.enableScanning();
+
+        verify(mLocalAdapter).startScanning(true);
+        verify(mAvailableDevicesCategory).removeAll();
+    }
+
+    @Test
+    public void testUpdateContent_stateOn_addDevices() {
+        mFragment.mAvailableDevicesCategory = mAvailableDevicesCategory;
+        mFragment.mFooterPreference = mFooterPreference;
+        doNothing().when(mFragment).addDeviceCategory(any(), anyInt(), any(), anyBoolean());
+
+        mFragment.updateContent(BluetoothAdapter.STATE_ON);
+
+        verify(mFragment).addDeviceCategory(mAvailableDevicesCategory,
+                R.string.bluetooth_preference_found_devices,
+                BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER, false);
+        verify(mLocalAdapter).setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
+    }
+
+    @Test
+    public void testUpdateContent_stateOff_finish() {
+        mFragment.updateContent(BluetoothAdapter.STATE_OFF);
+
+        verify(mFragment).finish();
+    }
+
+    @Test
+    public void testOnScanningStateChanged_restartScanAfterInitialScanning() {
+        mFragment.mAvailableDevicesCategory = mAvailableDevicesCategory;
+        mFragment.mFooterPreference = mFooterPreference;
+        mFragment.mDeviceListGroup = mAvailableDevicesCategory;
+        doNothing().when(mFragment).addDeviceCategory(any(), anyInt(), any(), anyBoolean());
+
+        // Initial Bluetooth ON will trigger scan enable, list clear and scan start
+        mFragment.updateContent(BluetoothAdapter.STATE_ON);
+        verify(mFragment).enableScanning();
+        assertThat(mAvailableDevicesCategory.getPreferenceCount()).isEqualTo(0);
+        verify(mLocalAdapter).startScanning(true);
+
+        // Subsequent scan started event will not trigger start/stop nor list clear
+        mFragment.onScanningStateChanged(true);
+        verify(mLocalAdapter, times(1)).startScanning(anyBoolean());
+        verify(mAvailableDevicesCategory, times(1)).setProgress(true);
+
+        // Subsequent scan finished event will trigger scan start without list clean
+        mFragment.onScanningStateChanged(false);
+        verify(mLocalAdapter, times(2)).startScanning(true);
+        verify(mAvailableDevicesCategory, times(2)).setProgress(true);
+
+        // Subsequent scan started event will not trigger any change
+        mFragment.onScanningStateChanged(true);
+        verify(mLocalAdapter, times(2)).startScanning(anyBoolean());
+        verify(mAvailableDevicesCategory, times(3)).setProgress(true);
+        verify(mLocalAdapter, never()).stopScanning();
+
+        // Disable scanning will trigger scan stop
+        mFragment.disableScanning();
+        verify(mLocalAdapter, times(1)).stopScanning();
+
+        // Subsequent scan start event will not trigger any change besides progress circle
+        mFragment.onScanningStateChanged(true);
+        verify(mAvailableDevicesCategory, times(4)).setProgress(true);
+
+        // However, subsequent scan finished event won't trigger new scan start and will stop
+        // progress circle from spinning
+        mFragment.onScanningStateChanged(false);
+        verify(mAvailableDevicesCategory, times(1)).setProgress(false);
+        verify(mLocalAdapter, times(2)).startScanning(anyBoolean());
+        verify(mLocalAdapter, times(1)).stopScanning();
+
+        // Verify that clean up only happen once at initialization
+        verify(mAvailableDevicesCategory, times(1)).removeAll();
+    }
+
+
+
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
index 73f6b84..243f1db 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
@@ -24,7 +24,7 @@
 import android.widget.TextView;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
new file mode 100644
index 0000000..4459f61
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
@@ -0,0 +1,106 @@
+/*
+ * 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.bluetooth;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.content.Context;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.SettingsActivity;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.R;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BluetoothPairingPreferenceControllerTest {
+    private static final int ORDER = 1;
+    private Context mContext;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private PreferenceFragment mFragment;
+    @Mock
+    private Lifecycle mLifecycle;
+    @Mock
+    private LocalBluetoothAdapter mLocalAdapter;
+    @Mock
+    private FragmentManager mFragmentManager;
+    @Mock
+    private FragmentTransaction mFragmentTransaction;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private SettingsActivity mSettingsActivity;
+    private Preference mPreference;
+
+    private BluetoothPairingPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        when(mFragment.getPreferenceScreen().getContext()).thenReturn(mContext);
+
+        mPreference = new Preference(mContext);
+        mPreference.setKey(BluetoothPairingPreferenceController.KEY_PAIRING);
+
+        mController = new BluetoothPairingPreferenceController(mContext, mFragment,
+                mSettingsActivity);
+    }
+
+    @Test
+    public void testCreateBluetoothPairingPreference() {
+        Preference pref = mController.createBluetoothPairingPreference(ORDER);
+
+        assertThat(pref.getKey()).isEqualTo(BluetoothPairingPreferenceController.KEY_PAIRING);
+        assertThat(pref.getIcon()).isEqualTo(mContext.getDrawable(R.drawable.ic_add));
+        assertThat(pref.getOrder()).isEqualTo(ORDER);
+        assertThat(pref.getTitle()).isEqualTo(
+                mContext.getString(R.string.bluetooth_pairing_pref_title));
+    }
+
+    @Test
+    public void testHandlePreferenceTreeClick_startFragment() {
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mSettingsActivity).startPreferencePanelAsUser(eq(mFragment), anyString(), any(),
+                anyInt(), any(), any());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsObsoleteTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsObsoleteTest.java
new file mode 100644
index 0000000..51c8b15
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsObsoleteTest.java
@@ -0,0 +1,76 @@
+/*
+ * 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.bluetooth;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+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.annotation.Config;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BluetoothSettingsObsoleteTest {
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    private BluetoothSettingsObsolete mFragment;
+    private FakeFeatureFactory mFeatureFactory;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        FakeFeatureFactory.setupForTest(mContext);
+        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+
+        mFragment = spy(new BluetoothSettingsObsolete());
+        doReturn(mContext).when(mFragment).getContext();
+    }
+
+    @Test
+    public void testSearchIndexProvider_pairPageEnabled_keyAdded() {
+        doReturn(true).when(mFeatureFactory.bluetoothFeatureProvider).isPairingPageEnabled();
+
+        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                mContext);
+
+        assertThat(keys).contains(BluetoothSettingsObsolete.DATA_KEY_REFERENCE);
+    }
+
+    @Test
+    public void testSearchIndexProvider_pairPageDisabled_keyNotAdded() {
+        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                mContext);
+
+        assertThat(keys).doesNotContain(BluetoothSettingsObsolete.DATA_KEY_REFERENCE);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java
index 8272dbf..0061ee5 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
@@ -32,11 +32,7 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java
index 9e90fdf..c772560 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java
@@ -16,22 +16,148 @@
 
 package com.android.settings.bluetooth;
 
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
+import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.res.Resources;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroup;
+import android.view.View;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.widget.FooterPreference;
+
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import java.util.List;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class BluetoothSettingsTest {
+    private static final String FOOTAGE_MAC_STRING = "Bluetooth mac: xxxx";
+
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private Resources mResource;
+    @Mock
+    private LocalBluetoothAdapter mLocalAdapter;
+    @Mock
+    private Activity mActivity;
+    @Mock
+    private PreferenceGroup mPairedDevicesCategory;
+    @Mock
+    private BluetoothPairingPreferenceController mPairingPreferenceController;
+    private Context mContext;
+    private BluetoothSettings mFragment;
+    private FakeFeatureFactory mFeatureFactory;
+    private Preference mFooterPreference;
+    private TextView mEmptyMessage;
+    private View mContainer;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(RuntimeEnvironment.application);
+        FakeFeatureFactory.setupForTest(mContext);
+        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+
+        mFragment = spy(new BluetoothSettings());
+
+        doReturn(mContext).when(mFragment).getContext();
+        doReturn(mResource).when(mFragment).getResources();
+        doReturn(mActivity).when(mFragment).getActivity();
+
+        mContainer = new View(mContext);
+        mEmptyMessage = new TextView(mContext);
+        doReturn(mContainer).when(mActivity).findViewById(android.R.id.list_container);
+        doReturn(mEmptyMessage).when(mActivity).findViewById(android.R.id.empty);
+
+        mFooterPreference = new FooterPreference(RuntimeEnvironment.application);
+        mFragment.setLocalBluetoothAdapter(mLocalAdapter);
+        mFragment.mPairingPrefController = mPairingPreferenceController;
+    }
 
     @Test
     public void setTextSpan_notSpannable_shouldNotCrash() {
         final String str = "test";
-        final BluetoothSettings settings = new BluetoothSettings();
-        settings.setTextSpan(str, "hello");
+        mFragment.setTextSpan(str, "hello");
+    }
+
+    @Test
+    public void setUpdateMyDevicePreference_setTitleCorrectly() {
+        doReturn(FOOTAGE_MAC_STRING).when(mFragment).getString(
+                eq(R.string.bluetooth_footer_mac_message), any());
+
+        mFragment.updateFooterPreference(mFooterPreference);
+
+        assertThat(mFooterPreference.getTitle()).isEqualTo(FOOTAGE_MAC_STRING);
+    }
+
+    @Test
+    public void testDisplayEmptyMessage_showEmptyMessage() {
+        mFragment.displayEmptyMessage(true);
+
+        assertThat(mContainer.getVisibility()).isEqualTo(View.INVISIBLE);
+        assertThat(mEmptyMessage.getVisibility()).isEqualTo(View.VISIBLE);
+    }
+
+    @Test
+    public void testDisplayEmptyMessage_hideEmptyMessage() {
+        mFragment.displayEmptyMessage(false);
+
+        assertThat(mContainer.getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(mEmptyMessage.getVisibility()).isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void testInitPreferencesFromPreferenceScreen() {
+        doReturn(mPairedDevicesCategory).when(mFragment).findPreference(
+                BluetoothSettings.KEY_PAIRED_DEVICES);
+        doReturn(mFooterPreference).when(mFragment).findPreference(
+                BluetoothSettings.KEY_FOOTER_PREF);
+
+        mFragment.initPreferencesFromPreferenceScreen();
+
+        assertThat(mFragment.mPairedDevicesCategory).isEqualTo(mPairedDevicesCategory);
+        assertThat(mFragment.mFooterPreference).isEqualTo(mFooterPreference);
+    }
+
+    @Test
+    public void testSearchIndexProvider_pairPageEnabled_keyNotAdded() {
+        doReturn(true).when(mFeatureFactory.bluetoothFeatureProvider).isPairingPageEnabled();
+
+        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                mContext);
+
+        assertThat(keys).doesNotContain(BluetoothSettings.DATA_KEY_REFERENCE);
+    }
+
+    @Test
+    public void testSearchIndexProvider_pairPageDisabled_keyAdded() {
+        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                mContext);
+
+        assertThat(keys).contains(BluetoothSettings.DATA_KEY_REFERENCE);
     }
 
 }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
index 79daa0e..4f57ecc 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
@@ -23,7 +23,7 @@
 import android.content.Context;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -46,7 +46,6 @@
 
 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 static org.mockito.Mockito.when;
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java
new file mode 100644
index 0000000..c205c50
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java
@@ -0,0 +1,216 @@
+/*
+ * 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.bluetooth;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.eq;
+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 android.content.Context;
+import android.content.res.Resources;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class DeviceListPreferenceFragmentTest {
+    private static final String FOOTAGE_MAC_STRING = "Bluetooth mac: xxxx";
+
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private Resources mResource;
+    @Mock
+    private Context mContext;
+    @Mock
+    private LocalBluetoothAdapter mLocalAdapter;
+    private TestFragment mFragment;
+    private Preference mMyDevicePreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mFragment = spy(new TestFragment());
+        doReturn(mContext).when(mFragment).getContext();
+        doReturn(mResource).when(mFragment).getResources();
+        mFragment.mLocalAdapter = mLocalAdapter;
+
+        mMyDevicePreference = new Preference(RuntimeEnvironment.application);
+    }
+
+    @Test
+    public void setUpdateMyDevicePreference_setTitleCorrectly() {
+        doReturn(FOOTAGE_MAC_STRING).when(mFragment).getString(
+                eq(R.string.bluetooth_footer_mac_message), any());
+
+        mFragment.updateFooterPreference(mMyDevicePreference);
+
+        assertThat(mMyDevicePreference.getTitle()).isEqualTo(FOOTAGE_MAC_STRING);
+    }
+
+    @Test
+    public void testEnableDisableScanning_testStateAfterEanbleDisable() {
+        mFragment.enableScanning();
+        verify(mLocalAdapter).startScanning(true);
+        assertThat(mFragment.mScanEnabled).isTrue();
+
+        mFragment.disableScanning();
+        verify(mLocalAdapter).stopScanning();
+        assertThat(mFragment.mScanEnabled).isFalse();
+    }
+
+    @Test
+    public void testScanningStateChanged_testScanStarted() {
+        mFragment.enableScanning();
+        assertThat(mFragment.mScanEnabled).isTrue();
+        verify(mLocalAdapter).startScanning(true);
+
+        mFragment.onScanningStateChanged(true);
+        verify(mLocalAdapter, times(1)).startScanning(anyBoolean());
+    }
+
+    @Test
+    public void testScanningStateChanged_testScanFinished() {
+        // Could happen when last scanning not done while current scan gets enabled
+        mFragment.enableScanning();
+        verify(mLocalAdapter).startScanning(true);
+        assertThat(mFragment.mScanEnabled).isTrue();
+
+        mFragment.onScanningStateChanged(false);
+        verify(mLocalAdapter, times(2)).startScanning(true);
+    }
+
+    @Test
+    public void testScanningStateChanged_testScanStateMultiple() {
+        // Could happen when last scanning not done while current scan gets enabled
+        mFragment.enableScanning();
+        assertThat(mFragment.mScanEnabled).isTrue();
+        verify(mLocalAdapter).startScanning(true);
+
+        mFragment.onScanningStateChanged(true);
+        verify(mLocalAdapter, times(1)).startScanning(anyBoolean());
+
+        mFragment.onScanningStateChanged(false);
+        verify(mLocalAdapter, times(2)).startScanning(true);
+
+        mFragment.onScanningStateChanged(true);
+        verify(mLocalAdapter, times(2)).startScanning(anyBoolean());
+
+        mFragment.disableScanning();
+        verify(mLocalAdapter).stopScanning();
+
+        mFragment.onScanningStateChanged(false);
+        verify(mLocalAdapter, times(2)).startScanning(anyBoolean());
+
+        mFragment.onScanningStateChanged(true);
+        verify(mLocalAdapter, times(2)).startScanning(anyBoolean());
+    }
+
+    @Test
+    public void testScanningStateChanged_testScanFinishedAfterDisable() {
+        mFragment.enableScanning();
+        verify(mLocalAdapter).startScanning(true);
+        assertThat(mFragment.mScanEnabled).isTrue();
+
+        mFragment.disableScanning();
+        verify(mLocalAdapter).stopScanning();
+        assertThat(mFragment.mScanEnabled).isFalse();
+
+        mFragment.onScanningStateChanged(false);
+        verify(mLocalAdapter, times(1)).startScanning(anyBoolean());
+    }
+
+    @Test
+    public void testScanningStateChanged_testScanStartedAfterDisable() {
+        mFragment.enableScanning();
+        verify(mLocalAdapter).startScanning(true);
+        assertThat(mFragment.mScanEnabled).isTrue();
+
+        mFragment.disableScanning();
+        verify(mLocalAdapter).stopScanning();
+        assertThat(mFragment.mScanEnabled).isFalse();
+
+        mFragment.onScanningStateChanged(true);
+        verify(mLocalAdapter, times(1)).startScanning(anyBoolean());
+    }
+
+    /**
+     * Fragment to test since {@code DeviceListPreferenceFragment} is abstract
+     */
+    public static class TestFragment extends DeviceListPreferenceFragment {
+
+        public TestFragment() {
+            super("");
+        }
+
+        @Override
+        public int getMetricsCategory() {
+            return 0;
+        }
+
+        @Override
+        public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {}
+
+        @Override
+        void initPreferencesFromPreferenceScreen() {}
+
+        @Override
+        public String getDeviceListKey() {
+            return null;
+        }
+
+        @Override
+        protected String getLogTag() {
+            return null;
+        }
+
+        @Override
+        protected int getPreferenceScreenResId() {
+            return 0;
+        }
+
+        @Override
+        protected List<PreferenceController> getPreferenceControllers(Context context) {
+            return null;
+        }
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java
index c61823c..a6793bb 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java
@@ -23,7 +23,7 @@
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
 import com.android.settingslib.R;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
index 5f4b101..4667dac 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
@@ -18,7 +18,7 @@
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/conditional/ConditionAdapterUtilsTest.java b/tests/robotests/src/com/android/settings/conditional/ConditionAdapterUtilsTest.java
index dde291d..83883b2 100644
--- a/tests/robotests/src/com/android/settings/conditional/ConditionAdapterUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/conditional/ConditionAdapterUtilsTest.java
@@ -19,7 +19,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.DashboardAdapter;
 import com.android.settings.dashboard.conditional.Condition;
@@ -36,6 +36,8 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
+// Not needed in new UI as the view is always expanded
+@Deprecated
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class ConditionAdapterUtilsTest{
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
index e792845..dbeecaa 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
@@ -17,12 +17,15 @@
 
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.nfc.NfcAdapter;
+import android.nfc.NfcManager;
 import android.provider.SearchIndexableResource;
 
-import com.android.settings.bluetooth.BluetoothMasterSwitchPreferenceController;
+import com.android.settings.R;
 import com.android.settings.nfc.NfcPreferenceController;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settingslib.drawer.CategoryKey;
 
@@ -36,12 +39,17 @@
 
 import java.util.List;
 
+import static android.content.Context.NFC_SERVICE;
 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.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class ConnectedDeviceDashboardFragmentTest {
+
     @Mock
     Context mContext;
 
@@ -65,7 +73,8 @@
     @Test
     public void testSearchIndexProvider_shouldIndexResource() {
         final List<SearchIndexableResource> indexRes =
-                mFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(mContext, true /* enabled */);
+                mFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(mContext,
+                        true /* enabled */);
 
         assertThat(indexRes).isNotNull();
         assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
@@ -74,7 +83,8 @@
     @Test
     public void testSearchIndexProvider_NoNfc_KeyAdded() {
         when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(false);
-        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                mContext);
 
         assertThat(keys).isNotNull();
         assertThat(keys).contains(NfcPreferenceController.KEY_TOGGLE_NFC);
@@ -84,7 +94,8 @@
     @Test
     public void testSearchIndexProvider_NFC_KeyNotAdded() {
         when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true);
-        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                mContext);
 
         assertThat(keys).isNotNull();
         assertThat(keys).doesNotContain(NfcPreferenceController.KEY_TOGGLE_NFC);
@@ -103,4 +114,43 @@
 
         assertThat(keys).containsAllIn(niks);
     }
+
+    @Test
+    public void testSummaryProvider_hasNfc_shouldReturnNfcSummary() {
+        final NfcManager nfcManager = mock(NfcManager.class);
+        final SummaryLoader summaryLoader = mock(SummaryLoader.class);
+
+        when(mContext.getApplicationContext()).thenReturn(mContext);
+        when(mContext.getSystemService(NFC_SERVICE)).thenReturn(nfcManager);
+        when(nfcManager.getDefaultAdapter()).thenReturn(mock(NfcAdapter.class));
+
+        SummaryLoader.SummaryProvider provider =
+                new ConnectedDeviceDashboardFragment.SummaryProvider(mContext, summaryLoader);
+
+        provider.setListening(false);
+
+        verifyZeroInteractions(summaryLoader);
+
+        provider.setListening(true);
+
+        verify(mContext).getString(R.string.connected_devices_dashboard_summary);
+    }
+
+    @Test
+    public void testSummaryProvider_noNfc_shouldReturnNoNfcSummary() {
+        final SummaryLoader summaryLoader = mock(SummaryLoader.class);
+
+        when(mContext.getApplicationContext()).thenReturn(mContext);
+
+        SummaryLoader.SummaryProvider provider =
+                new ConnectedDeviceDashboardFragment.SummaryProvider(mContext, summaryLoader);
+
+        provider.setListening(false);
+
+        verifyZeroInteractions(summaryLoader);
+
+        provider.setListening(true);
+
+        verify(mContext).getString(R.string.connected_devices_dashboard_no_nfc_summary);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java
index 4b84b0f..7edde6e 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java
@@ -7,7 +7,7 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.deviceinfo.UsbBackend;
 import com.android.settings.deviceinfo.UsbModeChooserActivity;
@@ -23,8 +23,6 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
diff --git a/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java
index 399c753..9bf73ce 100644
--- a/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java
@@ -20,10 +20,9 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceAvailabilityObserver;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
index 4aa576f..23e1e2e 100644
--- a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
+++ b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.core.codeinspection;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.InstrumentableFragmentCodeInspector;
 import com.android.settings.search.SearchIndexProviderCodeInspector;
diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
index 2f786f8..91046fe 100644
--- a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
+++ b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
@@ -16,9 +16,6 @@
 
 package com.android.settings.core.codeinspection;
 
-import com.google.common.truth.Truth;
-
-import org.junit.Assert;
 import org.robolectric.shadows.ShadowApplication;
 
 import java.io.BufferedReader;
@@ -27,6 +24,8 @@
 import java.lang.reflect.Modifier;
 import java.util.List;
 
+import static com.google.common.truth.Truth.assertWithMessage;
+
 /**
  * Inspector takes a list of class objects and perform static code analysis in its {@link #run()}
  * method.
@@ -49,6 +48,17 @@
      */
     public abstract void run();
 
+    protected void assertNoObsoleteInGrandfatherList(String listName, List<String> list) {
+        final StringBuilder obsoleteGrandfatherItems = new StringBuilder(
+                listName + " contains item that should not be grandfathered.\n");
+        for (String c : list) {
+            obsoleteGrandfatherItems.append(c).append("\n");
+        }
+        assertWithMessage(obsoleteGrandfatherItems.toString())
+                .that(list)
+                .isEmpty();
+    }
+
     protected boolean isConcreteSettingsClass(Class clazz) {
         // Abstract classes
         if (Modifier.isAbstract(clazz.getModifiers())) {
@@ -56,7 +66,7 @@
         }
         final String packageName = clazz.getPackage().getName();
         // Classes that are not in Settings
-        if (!packageName.contains(PACKAGE_NAME + ".")) {
+        if (!packageName.contains(PACKAGE_NAME + ".") && !packageName.endsWith(PACKAGE_NAME)) {
             return false;
         }
         final String className = clazz.getName();
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
index ed4e50c..4455549 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
@@ -51,9 +51,11 @@
             }
             final String className = clazz.getName();
             // If it's a fragment, it must also be instrumentable.
+            final boolean whitelisted =
+                    grandfather_notImplementingInstrumentable.remove(className);
             if (Fragment.class.isAssignableFrom(clazz)
                     && !Instrumentable.class.isAssignableFrom(clazz)
-                    && !grandfather_notImplementingInstrumentable.contains(className)) {
+                    && !whitelisted) {
                 broken.add(className);
             }
         }
@@ -65,5 +67,7 @@
         assertWithMessage(sb.toString())
                 .that(broken.isEmpty())
                 .isTrue();
+        assertNoObsoleteInGrandfatherList("grandfather_not_implementing_instrumentable",
+                grandfather_notImplementingInstrumentable);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
index 0abac1d..a927306 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
@@ -16,7 +16,7 @@
 package com.android.settings.core.instrumentation;
 
 import android.os.Bundle;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
index eb6e392..ea33c83 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
@@ -21,7 +21,7 @@
 import android.util.Pair;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.overlay.FeatureFactory;
 
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
index 763d6e3..ec644a6 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
@@ -19,20 +19,33 @@
 import android.content.SharedPreferences;
 import android.util.Pair;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
+import com.google.common.truth.Platform;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
+import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
+        .ACTION_SETTINGS_PREFERENCE_CHANGE;
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
+        .FIELD_SETTINGS_PREFERENCE_CHANGE_FLOAT_VALUE;
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
+        .FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE;
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
+        .FIELD_SETTINGS_PREFERENCE_CHANGE_NAME;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -46,6 +59,7 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
 
+    private ArgumentMatcher<Pair<Integer, Object>> mNamePairMatcher;
     private FakeFeatureFactory mFactory;
     private MetricsFeatureProvider mMetricsFeature;
     private SharedPreferencesLogger mSharedPrefLogger;
@@ -58,6 +72,7 @@
         mMetricsFeature = mFactory.metricsFeatureProvider;
 
         mSharedPrefLogger = new SharedPreferencesLogger(mContext, TEST_TAG);
+        mNamePairMatcher = pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_NAME, String.class);
     }
 
     @Test
@@ -72,7 +87,8 @@
         editor.putInt(TEST_KEY, 2);
 
         verify(mMetricsFeature, times(6)).action(any(Context.class), anyInt(),
-                any(Pair.class), any(Pair.class));
+                argThat(mNamePairMatcher),
+                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE, Long.class)));
     }
 
     @Test
@@ -84,8 +100,13 @@
         editor.putBoolean(TEST_KEY, false);
         editor.putBoolean(TEST_KEY, false);
 
-        verify(mMetricsFeature, times(4)).action(any(Context.class), anyInt(),
-                any(Pair.class), any(Pair.class));
+
+        verify(mMetricsFeature).action(any(Context.class), anyInt(),
+                argThat(mNamePairMatcher),
+                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE, true)));
+        verify(mMetricsFeature, times(3)).action(any(Context.class), anyInt(),
+                argThat(mNamePairMatcher),
+                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE, false)));
     }
 
     @Test
@@ -98,7 +119,8 @@
         editor.putLong(TEST_KEY, 2);
 
         verify(mMetricsFeature, times(4)).action(any(Context.class), anyInt(),
-                any(Pair.class), any(Pair.class));
+                argThat(mNamePairMatcher),
+                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE, Long.class)));
     }
 
     @Test
@@ -111,7 +133,26 @@
         editor.putFloat(TEST_KEY, 2);
 
         verify(mMetricsFeature, times(4)).action(any(Context.class), anyInt(),
-                any(Pair.class), any(Pair.class));
+                argThat(mNamePairMatcher),
+                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_FLOAT_VALUE, Float.class)));
     }
 
+    @Test
+    public void logPackage_shouldUseLogPackageApi() {
+        mSharedPrefLogger.logPackageName("key", "com.android.settings");
+        verify(mMetricsFeature).action(any(Context.class),
+                eq(ACTION_SETTINGS_PREFERENCE_CHANGE),
+                eq("com.android.settings"),
+                any(Pair.class));
+    }
+
+    private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag, Class clazz) {
+        return pair -> pair.first == tag && Platform.isInstanceOfType(pair.second, clazz);
+    }
+
+    private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag, boolean bool) {
+        return pair -> pair.first == tag
+                && Platform.isInstanceOfType(pair.second, Long.class)
+                && pair.second.equals((bool ? 1L : 0L));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java
index 8a555a8..1a47a66 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java
@@ -15,13 +15,24 @@
  */
 package com.android.settings.core.instrumentation;
 
+import static com.android.settings.core.instrumentation.Instrumentable.METRICS_CATEGORY_UNKNOWN;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -31,16 +42,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static com.android.settings.core.instrumentation.Instrumentable.METRICS_CATEGORY_UNKNOWN;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -62,7 +63,7 @@
         mMixin.onResume();
 
         verify(mMetricsFeature, times(1))
-                .visible(any(Context.class), eq(MetricsProto.MetricsEvent.VIEW_UNKNOWN),
+                .visible(nullable(Context.class), eq(MetricsProto.MetricsEvent.VIEW_UNKNOWN),
                         eq(TestInstrumentable.TEST_METRIC));
     }
 
@@ -77,7 +78,7 @@
         mMixin.onResume();
 
         verify(mMetricsFeature, times(1))
-                .visible(any(Context.class), eq(MetricsProto.MetricsEvent.SETTINGS_GESTURES),
+                .visible(nullable(Context.class), eq(MetricsProto.MetricsEvent.SETTINGS_GESTURES),
                         eq(TestInstrumentable.TEST_METRIC));
     }
 
@@ -86,7 +87,7 @@
         mMixin.onPause();
 
         verify(mMetricsFeature, times(1))
-                .hidden(any(Context.class), eq(TestInstrumentable.TEST_METRIC));
+                .hidden(nullable(Context.class), eq(TestInstrumentable.TEST_METRIC));
     }
 
     @Test
@@ -96,7 +97,7 @@
         mMixin.onPause();
 
         verify(mMetricsFeature, never())
-                .hidden(any(Context.class), anyInt());
+                .hidden(nullable(Context.class), anyInt());
     }
 
     @Test
@@ -107,7 +108,7 @@
         mMixin.onPause();
 
         verify(mMetricsFeature, never())
-                .hidden(any(Context.class), anyInt());
+                .hidden(nullable(Context.class), anyInt());
     }
 
     private final class TestInstrumentable implements Instrumentable {
diff --git a/tests/robotests/src/com/android/settings/core/lifecycle/LifecycleTest.java b/tests/robotests/src/com/android/settings/core/lifecycle/LifecycleTest.java
deleted file mode 100644
index d863143..0000000
--- a/tests/robotests/src/com/android/settings/core/lifecycle/LifecycleTest.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright (C) 2016 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.core.lifecycle;
-
-import android.content.Context;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.events.OnAttach;
-import com.android.settings.core.lifecycle.events.OnCreateOptionsMenu;
-import com.android.settings.core.lifecycle.events.OnDestroy;
-import com.android.settings.core.lifecycle.events.OnOptionsItemSelected;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnPrepareOptionsMenu;
-import com.android.settings.core.lifecycle.events.OnResume;
-import com.android.settings.core.lifecycle.events.OnStart;
-import com.android.settings.core.lifecycle.events.OnStop;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ActivityController;
-import org.robolectric.util.FragmentController;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class LifecycleTest {
-
-    public static class TestDialogFragment extends ObservableDialogFragment {
-
-        final TestObserver mFragObserver;
-
-        public TestDialogFragment() {
-            mFragObserver = new TestObserver();
-            mLifecycle.addObserver(mFragObserver);
-        }
-    }
-
-    public static class TestFragment extends ObservableFragment {
-
-        final TestObserver mFragObserver;
-
-        public TestFragment() {
-            mFragObserver = new TestObserver();
-            getLifecycle().addObserver(mFragObserver);
-        }
-    }
-
-    public static class TestActivity extends ObservableActivity {
-
-        final TestObserver mActObserver;
-
-        public TestActivity() {
-            mActObserver = new TestObserver();
-            getLifecycle().addObserver(mActObserver);
-        }
-
-    }
-
-    public static class TestObserver implements LifecycleObserver, OnAttach, OnStart, OnResume,
-            OnPause, OnStop, OnDestroy, OnCreateOptionsMenu, OnPrepareOptionsMenu,
-            OnOptionsItemSelected {
-
-        boolean mOnAttachObserved;
-        boolean mOnAttachHasContext;
-        boolean mOnStartObserved;
-        boolean mOnResumeObserved;
-        boolean mOnPauseObserved;
-        boolean mOnStopObserved;
-        boolean mOnDestroyObserved;
-        boolean mOnCreateOptionsMenuObserved;
-        boolean mOnPrepareOptionsMenuObserved;
-        boolean mOnOptionsItemSelectedObserved;
-
-        @Override
-        public void onAttach(Context context) {
-            mOnAttachObserved = true;
-            mOnAttachHasContext = context != null;
-        }
-
-        @Override
-        public void onStart() {
-            mOnStartObserved = true;
-        }
-
-        @Override
-        public void onPause() {
-            mOnPauseObserved = true;
-        }
-
-        @Override
-        public void onResume() {
-            mOnResumeObserved = true;
-        }
-
-        @Override
-        public void onStop() {
-            mOnStopObserved = true;
-        }
-
-        @Override
-        public void onDestroy() {
-            mOnDestroyObserved = true;
-        }
-
-        @Override
-        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-            mOnCreateOptionsMenuObserved = true;
-        }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem menuItem) {
-            mOnOptionsItemSelectedObserved = true;
-            return true;
-        }
-
-        @Override
-        public void onPrepareOptionsMenu(Menu menu) {
-            mOnPrepareOptionsMenuObserved = true;
-        }
-    }
-
-    @Test
-    public void runThroughActivityLifecycles_shouldObserveEverything() {
-        ActivityController<TestActivity> ac = Robolectric.buildActivity(TestActivity.class);
-        TestActivity activity = ac.get();
-
-        ac.start();
-        assertThat(activity.mActObserver.mOnStartObserved).isTrue();
-        ac.resume();
-        assertThat(activity.mActObserver.mOnResumeObserved).isTrue();
-        activity.onCreateOptionsMenu(null);
-        assertThat(activity.mActObserver.mOnCreateOptionsMenuObserved).isTrue();
-        activity.onPrepareOptionsMenu(null);
-        assertThat(activity.mActObserver.mOnPrepareOptionsMenuObserved).isTrue();
-        activity.onOptionsItemSelected(null);
-        assertThat(activity.mActObserver.mOnOptionsItemSelectedObserved).isTrue();
-        ac.pause();
-        assertThat(activity.mActObserver.mOnPauseObserved).isTrue();
-        ac.stop();
-        assertThat(activity.mActObserver.mOnStopObserved).isTrue();
-        ac.destroy();
-        assertThat(activity.mActObserver.mOnDestroyObserved).isTrue();
-    }
-
-    @Test
-    public void runThroughDialogFragmentLifecycles_shouldObserveEverything() {
-        FragmentController<TestDialogFragment> fragmentController =
-                Robolectric.buildFragment(TestDialogFragment.class);
-        TestDialogFragment fragment = fragmentController.get();
-
-        fragmentController.attach().create().start().resume();
-        fragment.onCreateOptionsMenu(null, null);
-        fragment.onPrepareOptionsMenu(null);
-        fragment.onOptionsItemSelected(null);
-        fragmentController.pause().stop().destroy();
-
-        assertThat(fragment.mFragObserver.mOnAttachObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnAttachHasContext).isTrue();
-        assertThat(fragment.mFragObserver.mOnStartObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnResumeObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnPauseObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnStopObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnDestroyObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnCreateOptionsMenuObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnPrepareOptionsMenuObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnOptionsItemSelectedObserved).isTrue();
-    }
-
-    @Test
-    public void runThroughFragmentLifecycles_shouldObserveEverything() {
-        FragmentController<TestFragment> fragmentController =
-                Robolectric.buildFragment(TestFragment.class);
-        TestFragment fragment = fragmentController.get();
-
-        fragmentController.attach().create().start().resume();
-        fragment.onCreateOptionsMenu(null, null);
-        fragment.onPrepareOptionsMenu(null);
-        fragment.onOptionsItemSelected(null);
-        fragmentController.pause().stop().destroy();
-
-        assertThat(fragment.mFragObserver.mOnAttachObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnAttachHasContext).isTrue();
-        assertThat(fragment.mFragObserver.mOnStartObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnResumeObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnPauseObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnStopObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnDestroyObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnCreateOptionsMenuObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnPrepareOptionsMenuObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnOptionsItemSelectedObserved).isTrue();
-    }
-
-    private static class OptionItemAccepter implements LifecycleObserver, OnOptionsItemSelected {
-        public boolean wasCalled = false;
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem menuItem) {
-            wasCalled = true;
-            return false;
-        }
-    }
-
-    @Test
-    public void onOptionItemSelectedShortCircuitsIfAnObserverHandlesTheMenuItem() {
-        FragmentController<TestFragment> fragmentController =
-                Robolectric.buildFragment(TestFragment.class);
-        TestFragment fragment = fragmentController.get();
-        OptionItemAccepter accepter = new OptionItemAccepter();
-        fragment.getLifecycle().addObserver(accepter);
-
-        fragmentController.attach().create().start().resume();
-        fragment.onCreateOptionsMenu(null, null);
-        fragment.onPrepareOptionsMenu(null);
-        fragment.onOptionsItemSelected(null);
-        fragmentController.pause().stop().destroy();
-
-        assertThat(accepter.wasCalled).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
index d7daa03..7ba38dc 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
@@ -15,20 +15,41 @@
  */
 package com.android.settings.dashboard;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.graphics.drawable.ColorDrawable;
+import android.view.ContextThemeWrapper;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.RemoteViews;
+import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.conditional.Condition;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
+import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
 
 import org.junit.Before;
@@ -39,18 +60,14 @@
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowApplication;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH,
         sdk = TestConfig.SDK_VERSION,
@@ -62,7 +79,7 @@
 public class DashboardAdapterTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
+    private SettingsActivity mContext;
     @Mock
     private View mView;
     @Mock
@@ -100,16 +117,55 @@
     }
 
     @Test
-    public void testSetConditions_AfterSetConditions_ExpandedConditionNull() {
-        mDashboardAdapter.onExpandClick(mView);
-        assertThat(mDashboardAdapter.mDashboardData.getExpandedCondition()).isEqualTo(mCondition);
-        mDashboardAdapter.setConditions(null);
-        assertThat(mDashboardAdapter.mDashboardData.getExpandedCondition()).isNull();
+    public void testOnBindViewHolder_spacer_noSuggestions_noConditions() {
+        makeCategory();
+        DashboardAdapter.DashboardItemHolder holder = setupSpacer();
+
+        mDashboardAdapter.onBindViewHolder(holder, 0);
+
+        assertThat(holder.itemView.getBackground()).isNull();
+    }
+
+    @Test
+    public void testOnBindViewHolder_spacer_suggestion_noConditions() {
+        setupSuggestions(makeSuggestions("pkg1"));
+        makeCategory();
+        DashboardAdapter.DashboardItemHolder holder = setupSpacer();
+
+        mDashboardAdapter.onBindViewHolder(holder, 0);
+
+        assertThat(holder.itemView.getBackground()).isNotNull();
+        assertThat(holder.itemView.getBackground()).isInstanceOf(ColorDrawable.class);
+    }
+
+    @Test
+    public void testOnBindViewHolder_spacer_noSuggestion_condition() {
+        makeCondition();
+        makeCategory();
+        DashboardAdapter.DashboardItemHolder holder = setupSpacer();
+
+        mDashboardAdapter.onBindViewHolder(holder, 0);
+
+        assertThat(holder.itemView.getBackground()).isNotNull();
+        assertThat(holder.itemView.getBackground()).isInstanceOf(ColorDrawable.class);
+    }
+
+    @Test
+    public void testOnBindViewHolder_spacer_suggestion_condition() {
+        setupSuggestions(makeSuggestions("pkg1"));
+        makeCondition();
+        makeCategory();
+        DashboardAdapter.DashboardItemHolder holder = setupSpacer();
+
+        mDashboardAdapter.onBindViewHolder(holder, 0);
+
+        assertThat(holder.itemView.getBackground()).isNotNull();
+        assertThat(holder.itemView.getBackground()).isInstanceOf(ColorDrawable.class);
     }
 
     @Test
     public void testSuggestionsLogs_NotExpanded() {
-        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
         verify(mFactory.metricsFeatureProvider, times(2)).action(
                 any(Context.class), mActionCategoryCaptor.capture(),
                 mActionPackageCaptor.capture());
@@ -124,7 +180,7 @@
 
     @Test
     public void testSuggestionsLogs_NotExpandedAndPaused() {
-        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
         mDashboardAdapter.onPause();
         verify(mFactory.metricsFeatureProvider, times(4)).action(
                 any(Context.class), mActionCategoryCaptor.capture(),
@@ -141,7 +197,7 @@
 
     @Test
     public void testSuggestionsLogs_Expanded() {
-        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
         mDashboardAdapter.onBindSuggestionHeader(
                 mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
@@ -160,7 +216,7 @@
 
     @Test
     public void testSuggestionsLogs_ExpandedAndPaused() {
-        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
         mDashboardAdapter.onBindSuggestionHeader(
                 mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
@@ -183,7 +239,7 @@
 
     @Test
     public void testSuggestionsLogs_ExpandedAfterPause() {
-        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
         mDashboardAdapter.onPause();
         mDashboardAdapter.onBindSuggestionHeader(
                 mSuggestionHolder, mSuggestionHeaderData);
@@ -208,7 +264,7 @@
 
     @Test
     public void testSuggestionsLogs_ExpandedAfterPauseAndPausedAgain() {
-        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
         mDashboardAdapter.onPause();
         mDashboardAdapter.onBindSuggestionHeader(
                 mSuggestionHolder, mSuggestionHeaderData);
@@ -237,7 +293,7 @@
 
     @Test
     public void testSuggestionsLogs_ExpandedWithLessThanDefaultShown() {
-        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
+        setupSuggestions(makeSuggestions("pkg1"));
         mDashboardAdapter.onBindSuggestionHeader(
                 mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
@@ -254,7 +310,7 @@
 
     @Test
     public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAndPaused() {
-        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
+        setupSuggestions(makeSuggestions("pkg1"));
         mDashboardAdapter.onBindSuggestionHeader(
                 mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
@@ -273,7 +329,7 @@
 
     @Test
     public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAfterPause() {
-        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
+        setupSuggestions(makeSuggestions("pkg1"));
         mDashboardAdapter.onPause();
         mDashboardAdapter.onBindSuggestionHeader(
                 mSuggestionHolder, mSuggestionHeaderData);
@@ -293,7 +349,7 @@
 
     @Test
     public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAfterPauseAndPausedAgain() {
-        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
+        setupSuggestions(makeSuggestions("pkg1"));
         mDashboardAdapter.onPause();
         mDashboardAdapter.onBindSuggestionHeader(
                 mSuggestionHolder, mSuggestionHeaderData);
@@ -313,7 +369,80 @@
         assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
     }
 
-    private List<Tile> makeSuggestions(String[] pkgNames) {
+    @Test
+    public void testBindViewHolder_inflateRemoteView() {
+        List<Tile> packages = makeSuggestions("pkg1");
+        RemoteViews remoteViews = mock(RemoteViews.class);
+        TextView textView = new TextView(RuntimeEnvironment.application);
+        doReturn(textView).when(remoteViews).apply(any(Context.class), any(ViewGroup.class));
+        packages.get(0).remoteViews = remoteViews;
+        mDashboardAdapter.setCategoriesAndSuggestions(Collections.emptyList(), packages);
+        mSuggestionHolder = mDashboardAdapter.onCreateViewHolder(
+                new FrameLayout(RuntimeEnvironment.application),
+                R.layout.suggestion_tile_card);
+
+        mDashboardAdapter.onBindViewHolder(mSuggestionHolder, 2);
+        assertThat(textView.getParent()).isSameAs(mSuggestionHolder.itemView);
+        mSuggestionHolder.itemView.performClick();
+
+        verify(mContext).startSuggestion(any(Intent.class));
+    }
+
+    @Test
+    public void testBindViewHolder_primaryViewHandlesClick() {
+        Context context =
+                new ContextThemeWrapper(RuntimeEnvironment.application, R.style.Theme_Settings);
+
+        List<Tile> packages = makeSuggestions("pkg1");
+        RemoteViews remoteViews = mock(RemoteViews.class);
+        FrameLayout layout = new FrameLayout(context);
+        Button primary = new Button(context);
+        primary.setId(android.R.id.primary);
+        layout.addView(primary);
+        doReturn(layout).when(remoteViews).apply(any(Context.class), any(ViewGroup.class));
+        packages.get(0).remoteViews = remoteViews;
+        mDashboardAdapter.setCategoriesAndSuggestions(Collections.emptyList(), packages);
+        mSuggestionHolder = mDashboardAdapter.onCreateViewHolder(
+                new FrameLayout(context),
+                R.layout.suggestion_tile_card);
+
+        mDashboardAdapter.onBindViewHolder(mSuggestionHolder, 2);
+
+        mSuggestionHolder.itemView.performClick();
+        assertThat(ShadowApplication.getInstance().getNextStartedActivity()).isNull();
+        verify(mContext, never()).startSuggestion(any(Intent.class));
+
+        primary.performClick();
+
+        verify(mContext).startSuggestion(any(Intent.class));
+    }
+
+    @Test
+    public void testBindViewHolder_viewsClearedOnRebind() {
+        Context context =
+                new ContextThemeWrapper(RuntimeEnvironment.application, R.style.Theme_Settings);
+
+        List<Tile> packages = makeSuggestions("pkg1");
+        RemoteViews remoteViews = mock(RemoteViews.class);
+        FrameLayout layout = new FrameLayout(context);
+        Button primary = new Button(context);
+        primary.setId(android.R.id.primary);
+        layout.addView(primary);
+        doReturn(layout).when(remoteViews).apply(any(Context.class), any(ViewGroup.class));
+        packages.get(0).remoteViews = remoteViews;
+        mDashboardAdapter.setCategoriesAndSuggestions(Collections.emptyList(), packages);
+        mSuggestionHolder = mDashboardAdapter.onCreateViewHolder(
+                new FrameLayout(context),
+                R.layout.suggestion_tile_card);
+
+        mDashboardAdapter.onBindViewHolder(mSuggestionHolder, 2);
+        mDashboardAdapter.onBindViewHolder(mSuggestionHolder, 2);
+
+        ViewGroup itemView = (ViewGroup) mSuggestionHolder.itemView;
+        assertThat(itemView.getChildCount()).isEqualTo(1);
+    }
+
+    private List<Tile> makeSuggestions(String... pkgNames) {
         final List<Tile> suggestions = new ArrayList<>();
         for (String pkgName : pkgNames) {
             Tile suggestion = new Tile();
@@ -324,11 +453,31 @@
         return suggestions;
     }
 
-    private void setUpSuggestions(List<Tile> suggestions) {
+    private void setupSuggestions(List<Tile> suggestions) {
         mDashboardAdapter.setCategoriesAndSuggestions(new ArrayList<>(), suggestions);
         mSuggestionHolder = mDashboardAdapter.onCreateViewHolder(
                 new FrameLayout(RuntimeEnvironment.application),
-                mDashboardAdapter.getItemViewType(0));
+                mDashboardAdapter.getItemViewType(1));
     }
 
+    private void makeCondition() {
+        final List<Condition> conditions = new ArrayList<>();
+        Condition condition = mock(Condition.class);
+        when(condition.shouldShow()).thenReturn(true);
+        conditions.add(condition);
+        mDashboardAdapter.setConditions(conditions);
+    }
+
+    private void makeCategory() {
+        List<DashboardCategory> categories = new ArrayList<>();
+        categories.add(new DashboardCategory());
+        mDashboardAdapter.setCategory(categories);
+    }
+
+    private DashboardAdapter.DashboardItemHolder setupSpacer() {
+        Context context = RuntimeEnvironment.application;
+        final View view = LayoutInflater.from(context)
+                .inflate(R.layout.dashboard_header_spacer, new LinearLayout(context), false);
+        return new DashboardAdapter.DashboardItemHolder(view);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
index abea565..23681bc 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
@@ -88,17 +88,21 @@
         mDashboardCategory.tiles.add(mTestCategoryTile);
         categories.add(mDashboardCategory);
 
-        // Build DashboardData 
+        // Build DashboardData
         mDashboardDataWithOneConditions = new DashboardData.Builder()
                 .setConditions(oneItemConditions)
                 .setCategories(categories)
                 .setSuggestions(suggestions)
+                .setSuggestionConditionMode(DashboardData.HEADER_MODE_FULLY_EXPANDED)
+                .setCombineSuggestionAndCondition(true)
                 .build();
 
         mDashboardDataWithTwoConditions = new DashboardData.Builder()
                 .setConditions(twoItemsConditions)
                 .setCategories(categories)
                 .setSuggestions(suggestions)
+                .setSuggestionConditionMode(DashboardData.HEADER_MODE_FULLY_EXPANDED)
+                .setCombineSuggestionAndCondition(true)
                 .build();
 
         mDashboardDataWithNoItems = new DashboardData.Builder()
@@ -110,23 +114,33 @@
 
     @Test
     public void testBuildItemsData_containsAllData() {
-        final DashboardData.SuggestionHeaderData data =
-                new DashboardData.SuggestionHeaderData(false, 1, 0);
-        final Object[] expectedObjects = {mTestCondition, null, data, mTestSuggestion,
-                mDashboardCategory, mTestCategoryTile};
+        final DashboardData.SuggestionConditionHeaderData data =
+                new DashboardData.SuggestionConditionHeaderData(
+                    mDashboardDataWithOneConditions.getConditions(), 0);
+        final Object[] expectedObjects = {null, data,
+            mDashboardDataWithOneConditions.getSuggestions(),
+            mDashboardDataWithOneConditions.getConditions(),
+            null, mDashboardCategory, mTestCategoryTile};
         final int expectedSize = expectedObjects.length;
 
         assertThat(mDashboardDataWithOneConditions.getItemList().size())
                 .isEqualTo(expectedSize);
         for (int i = 0; i < expectedSize; i++) {
-            if (mDashboardDataWithOneConditions.getItemEntityByPosition(i)
-                    instanceof DashboardData.SuggestionHeaderData) {
+            final Object item = mDashboardDataWithOneConditions.getItemEntityByPosition(i);
+            if (item instanceof DashboardData.SuggestionHeaderData
+                || item instanceof List) {
                 // SuggestionHeaderData is created inside when build, we can only use isEqualTo
-                assertThat(mDashboardDataWithOneConditions.getItemEntityByPosition(i))
-                        .isEqualTo(expectedObjects[i]);
+                assertThat(item).isEqualTo(expectedObjects[i]);
+            } else if (item instanceof DashboardData.SuggestionConditionHeaderData) {
+                DashboardData.SuggestionConditionHeaderData i1 =
+                    (DashboardData.SuggestionConditionHeaderData)item;
+                DashboardData.SuggestionConditionHeaderData i2 =
+                    (DashboardData.SuggestionConditionHeaderData)expectedObjects[i];
+                assertThat(i1.title).isEqualTo(i2.title);
+                assertThat(i1.conditionCount).isEqualTo(i2.conditionCount);
+                assertThat(i1.hiddenSuggestionCount).isEqualTo(i2.hiddenSuggestionCount);
             } else {
-                assertThat(mDashboardDataWithOneConditions.getItemEntityByPosition(i))
-                        .isSameAs(expectedObjects[i]);
+                assertThat(item).isSameAs(expectedObjects[i]);
             }
         }
     }
@@ -134,7 +148,7 @@
     @Test
     public void testGetPositionByEntity_selfInstance_returnPositionFound() {
         final int position = mDashboardDataWithOneConditions
-                .getPositionByEntity(mTestCondition);
+                .getPositionByEntity(mDashboardDataWithOneConditions.getConditions());
         assertThat(position).isNotEqualTo(DashboardData.POSITION_NOT_FOUND);
     }
 
@@ -171,16 +185,22 @@
     @Test
     public void testDiffUtil_DataEqual_noResultData() {
         List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
-        testDiffUtil(mDashboardDataWithOneConditions, 
+        testDiffUtil(mDashboardDataWithOneConditions,
                 mDashboardDataWithOneConditions, testResultData);
     }
 
     @Test
-    public void testDiffUtil_InsertOneCondition_ResultDataOneInserted() {
+    public void testDiffUtil_InsertOneCondition_ResultDataTwoChanged() {
         //Build testResultData
         final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
+        // Item in position 1 is the header, which contains the number of conditions, changed from
+        // 1 to 2
         testResultData.add(new ListUpdateResult.ResultData(
-                ListUpdateResult.ResultData.TYPE_OPERATION_INSERT, 1, 1));
+                ListUpdateResult.ResultData.TYPE_OPERATION_CHANGE, 1, 1));
+        // Item in position 3 is the condition container containing the list of conditions, which
+        // gets 1 more item
+        testResultData.add(new ListUpdateResult.ResultData(
+            ListUpdateResult.ResultData.TYPE_OPERATION_CHANGE, 3, 1));
 
         testDiffUtil(mDashboardDataWithOneConditions,
                 mDashboardDataWithTwoConditions, testResultData);
@@ -191,36 +211,11 @@
         //Build testResultData
         final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
         testResultData.add(new ListUpdateResult.ResultData(
-                ListUpdateResult.ResultData.TYPE_OPERATION_REMOVE, 0, 6));
+                ListUpdateResult.ResultData.TYPE_OPERATION_REMOVE, 1, 6));
 
         testDiffUtil(mDashboardDataWithOneConditions, mDashboardDataWithNoItems, testResultData);
     }
 
-    @Test
-    public void testPayload_ItemConditionCard_returnNotNull() {
-        final DashboardData.ItemsDataDiffCallback callback = new DashboardData
-                .ItemsDataDiffCallback(
-                mDashboardDataWithOneConditions.getItemList(),
-                mDashboardDataWithOneConditions.getItemList());
-
-        // Item in position 0 is condition card, which payload should not be null
-        assertThat(callback.getChangePayload(0, 0)).isNotEqualTo(null);
-    }
-
-    @Test
-    public void testPayload_ItemNotConditionCard_returnNull() {
-        final DashboardData.ItemsDataDiffCallback callback = new DashboardData
-                .ItemsDataDiffCallback(
-                mDashboardDataWithOneConditions.getItemList(),
-                mDashboardDataWithOneConditions.getItemList());
-
-        // Only item in position 0 is condition card, so others' payload should be null
-        for (int i = 1; i < mDashboardDataWithOneConditions.getItemList().size(); i++) {
-            assertThat(callback.getChangePayload(i, i)).isEqualTo(null);
-        }
-
-    }
-
     /**
      * Test when using the
      * {@link com.android.settings.dashboard.DashboardData.ItemsDataDiffCallback}
@@ -356,6 +351,11 @@
 
                 return arg2 - resultData.arg2;
             }
+
+            @Override
+            public String toString() {
+                return "op:" + operation + ",arg1:" + arg1 + ",arg2:" + arg2;
+            }
         }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
index e7587d5..2791da3 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
@@ -20,6 +20,7 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Icon;
 import android.os.Bundle;
@@ -30,7 +31,7 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowUserManager;
@@ -364,4 +365,16 @@
     public void testGetExtraIntentAction_shouldReturnNull() {
         assertThat(mImpl.getExtraIntentAction()).isNull();
     }
+
+    @Test
+    public void testShouldTintIcon_shouldReturnValueFromResource() {
+        final Resources res = mActivity.getApplicationContext().getResources();
+        when(res.getBoolean(R.bool.config_tintSettingIcon))
+                .thenReturn(false);
+        assertThat(mImpl.shouldTintIcon()).isFalse();
+
+        when(res.getBoolean(R.bool.config_tintSettingIcon))
+                .thenReturn(true);
+        assertThat(mImpl.shouldTintIcon()).isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
index 6b22f7b..d102ab4 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
@@ -21,7 +21,7 @@
 
 import com.android.settings.core.PreferenceController;
 import com.android.settings.search.Indexable;
-import com.android.settings.search2.DatabaseIndexingUtils;
+import com.android.settings.search.DatabaseIndexingUtils;
 
 import org.robolectric.RuntimeEnvironment;
 
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
index e35fa33..2d32949 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
@@ -15,13 +15,22 @@
  */
 package com.android.settings.dashboard;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
@@ -43,15 +52,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DashboardFragmentTest {
@@ -75,9 +75,10 @@
         mDashboardCategory.tiles.add(new Tile());
         mTestFragment = new TestFragment(ShadowApplication.getInstance().getApplicationContext());
         when(mFakeFeatureFactory.dashboardFeatureProvider.getProgressiveDisclosureMixin(
-                any(Context.class), eq(mTestFragment), any(Bundle.class)))
+                nullable(Context.class), eq(mTestFragment), nullable(Bundle.class)))
                 .thenReturn(mDisclosureMixin);
-        when(mFakeFeatureFactory.dashboardFeatureProvider.getTilesForCategory(anyString()))
+        when(mFakeFeatureFactory.dashboardFeatureProvider
+                .getTilesForCategory(nullable(String.class)))
                 .thenReturn(mDashboardCategory);
         mTestFragment.onAttach(ShadowApplication.getInstance().getApplicationContext());
         when(mContext.getPackageName()).thenReturn("TestPackage");
@@ -96,21 +97,23 @@
 
     @Test
     public void displayTilesAsPreference_shouldAddTilesWithIntent() {
-        when(mFakeFeatureFactory.dashboardFeatureProvider.getTilesForCategory(anyString()))
+        when(mFakeFeatureFactory.dashboardFeatureProvider
+                .getTilesForCategory(nullable(String.class)))
                 .thenReturn(mDashboardCategory);
-        when(mFakeFeatureFactory.dashboardFeatureProvider.getDashboardKeyForTile(any(Tile.class)))
+        when(mFakeFeatureFactory.dashboardFeatureProvider
+                .getDashboardKeyForTile(nullable(Tile.class)))
                 .thenReturn("test_key");
         mTestFragment.onCreatePreferences(new Bundle(), "rootKey");
 
-        verify(mDisclosureMixin).addPreference(any(PreferenceScreen.class),
-                any(Preference.class));
+        verify(mDisclosureMixin).addPreference(nullable(PreferenceScreen.class),
+                nullable(Preference.class));
     }
 
     @Test
     public void displayTilesAsPreference_shouldNotAddTilesWithoutIntent() {
         mTestFragment.onCreatePreferences(new Bundle(), "rootKey");
 
-        verify(mTestFragment.mScreen, never()).addPreference(any(Preference.class));
+        verify(mTestFragment.mScreen, never()).addPreference(nullable(Preference.class));
     }
 
     @Test
@@ -118,7 +121,7 @@
         mDashboardCategory.tiles = null;
         mTestFragment.onCreatePreferences(new Bundle(), "rootKey");
 
-        verify(mTestFragment.mScreen, never()).addPreference(any(Preference.class));
+        verify(mTestFragment.mScreen, never()).addPreference(nullable(Preference.class));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java
index 90ff25c..cda9a22 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 import android.widget.TextView;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SupportItemAdapter.ViewHolder;
 import com.android.settingslib.drawer.Tile;
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
index a8e294c..c6446f1 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
@@ -19,11 +19,12 @@
 import android.app.Activity;
 import android.support.v7.widget.LinearLayoutManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.conditional.ConditionManager;
 import com.android.settings.dashboard.conditional.FocusRecyclerView;
 import com.android.settingslib.drawer.CategoryKey;
+import com.android.settingslib.drawer.Tile;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -33,7 +34,6 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
-import static org.mockito.Matchers.anyList;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -109,4 +109,11 @@
         mSummary.onCategoriesChanged();
         verify(mSummary).rebuildUI();
     }
+
+    @Test
+    public void onSuggestionDismissed_categoryShouldBeRefreshed() {
+        doNothing().when(mSummary).rebuildUI();
+        mSummary.onSuggestionDismissed(mock(Tile.class));
+        verify(mSummary).rebuildUI();
+    }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java
index a7b0c54..c48f30c 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java b/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
index a3b9bf8..6fe60cf 100644
--- a/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
@@ -23,7 +23,7 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -40,9 +40,10 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -118,7 +119,7 @@
 
     @Test
     public void findPreference_prefInCollapsedList_shouldFindIt() {
-        when(mScreen.findPreference(anyString())).thenReturn(null);
+        when(mScreen.findPreference(nullable(String.class))).thenReturn(null);
         mMixin.addToCollapsedList(mPreference);
 
         Preference pref = mMixin.findPreference(mScreen, mPreference.getKey());
@@ -139,7 +140,7 @@
 
     @Test
     public void findPreference_prefNotInCollapsedListOrScreen_shouldNotFindIt() {
-        when(mScreen.findPreference(anyString())).thenReturn(null);
+        when(mScreen.findPreference(nullable(String.class))).thenReturn(null);
         Preference pref = mMixin.findPreference(mScreen, mPreference.getKey());
 
         assertThat(pref).isNull();
@@ -147,7 +148,7 @@
 
     @Test
     public void findPreference_prefRemovedFromCollapsedList_shouldNotFindIt() {
-        when(mScreen.findPreference(anyString())).thenReturn(null);
+        when(mScreen.findPreference(nullable(String.class))).thenReturn(null);
         mMixin.addToCollapsedList(mPreference);
         mMixin.removePreference(mPreferenceFragment.getPreferenceScreen(), mPreference.getKey());
 
@@ -158,7 +159,7 @@
 
     @Test
     public void findPreference_nestedPrefInCollapsedList_shouldFindIt() {
-        when(mScreen.findPreference(anyString())).thenReturn(null);
+        when(mScreen.findPreference(nullable(String.class))).thenReturn(null);
         final PreferenceScreen prefGroup = spy(new PreferenceScreen(mAppContext, null));
         when(prefGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
         final Preference preference = mock(Preference.class);
@@ -183,7 +184,7 @@
 
     @Test
     public void removeLastPreference_shouldRemoveExpandButtonToo() {
-        when(mScreen.findPreference(anyString())).thenReturn(null);
+        when(mScreen.findPreference(nullable(String.class))).thenReturn(null);
         mMixin.addToCollapsedList(mPreference);
         // Collapsed
         assertThat(mMixin.isCollapsed()).isTrue();
@@ -204,7 +205,7 @@
 
         mMixin.collapse(screen);
         assertThat(mMixin.isCollapsed()).isFalse();
-        verify(mExpandButton, never()).setSummary(anyString());
+        verify(mExpandButton, never()).setSummary(nullable(String.class));
         verify(screen, never()).addPreference(any(Preference.class));
         verify(screen, never()).removePreference(any(Preference.class));
     }
@@ -219,7 +220,7 @@
         mMixin.collapse(screen);
 
         assertThat(mMixin.isCollapsed()).isTrue();
-        verify(mExpandButton, atLeastOnce()).setSummary(anyString());
+        verify(mExpandButton, atLeastOnce()).setSummary(nullable(String.class));
         verify(screen).addPreference(any(ExpandPreference.class));
         verify(screen, times(3)).removePreference(any(Preference.class));
     }
@@ -264,7 +265,7 @@
         lastPref.setOrder(100);
         // Add something to collapsed list so we are in collapsed state.
         mMixin.addToCollapsedList(new Preference(mAppContext));
-        verify(mExpandButton).setSummary(anyString());
+        verify(mExpandButton).setSummary(nullable(String.class));
         assertThat(mMixin.getCollapsedPrefs().size()).isEqualTo(1);
 
         // 3 prefs on screen, 2 are real and the last one is more button.
@@ -286,7 +287,7 @@
         lastPref.setOrder(100);
         // Add something to collapsed list so we are in collapsed state.
         mMixin.addToCollapsedList(new Preference(mAppContext));
-        verify(mExpandButton).setSummary(anyString());
+        verify(mExpandButton).setSummary(nullable(String.class));
         assertThat(mMixin.getCollapsedPrefs().size()).isEqualTo(1);
 
         // 3 prefs on screen, 2 are real and the last one is more button.
@@ -299,7 +300,7 @@
 
         verify(mScreen, never()).removePreference(any(Preference.class));
         verify(mScreen, never()).addPreference(any(Preference.class));
-        verify(mExpandButton, times(2)).setSummary(anyString());
+        verify(mExpandButton, times(2)).setSummary(nullable(String.class));
         assertThat(mMixin.getCollapsedPrefs().get(0)).isSameAs(toBeAdded);
     }
 
diff --git a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
index 547792b..b08d62e 100644
--- a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
@@ -17,7 +17,7 @@
 package com.android.settings.dashboard;
 
 import android.app.Activity;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
diff --git a/tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java
index b0dfe61..3dd5266 100644
--- a/tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java
@@ -26,7 +26,7 @@
 import android.widget.SpinnerAdapter;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.SupportItemAdapter.EscalationData;
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
new file mode 100644
index 0000000..688f078
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
@@ -0,0 +1,134 @@
+/*
+ * 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.dashboard.conditional;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.DashboardAdapter;
+import com.android.settings.dashboard.DashboardData;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import 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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ConditionAdapterTest {
+    @Mock
+    private Condition mCondition1;
+    @Mock
+    private Condition mCondition2;
+
+    private Context mContext;
+    private ConditionAdapter mConditionAdapter;
+    private List<Condition> mOneCondition;
+    private List<Condition> mTwoConditions;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        final CharSequence[] actions = new CharSequence[2];
+        when(mCondition1.getActions()).thenReturn(actions);
+        when(mCondition1.shouldShow()).thenReturn(true);
+        mOneCondition = new ArrayList<>();
+        mOneCondition.add(mCondition1);
+        mTwoConditions = new ArrayList<>();
+        mTwoConditions.add(mCondition1);
+        mTwoConditions.add(mCondition2);
+    }
+
+    @Test
+    public void getItemCount_notFullyExpanded_shouldReturn0() {
+        mConditionAdapter = new ConditionAdapter(
+            mContext, mOneCondition, DashboardData.HEADER_MODE_DEFAULT);
+        assertThat(mConditionAdapter.getItemCount()).isEqualTo(0);
+
+        mConditionAdapter = new ConditionAdapter(
+            mContext, mOneCondition, DashboardData.HEADER_MODE_SUGGESTION_EXPANDED);
+        assertThat(mConditionAdapter.getItemCount()).isEqualTo(0);
+
+        mConditionAdapter = new ConditionAdapter(
+            mContext, mOneCondition, DashboardData.HEADER_MODE_COLLAPSED);
+        assertThat(mConditionAdapter.getItemCount()).isEqualTo(0);
+    }
+
+    @Test
+    public void getItemCount_fullyExpanded_shouldReturnListSize() {
+        mConditionAdapter = new ConditionAdapter(
+            mContext, mOneCondition, DashboardData.HEADER_MODE_FULLY_EXPANDED);
+        assertThat(mConditionAdapter.getItemCount()).isEqualTo(1);
+
+        mConditionAdapter = new ConditionAdapter(
+            mContext, mTwoConditions, DashboardData.HEADER_MODE_FULLY_EXPANDED);
+        assertThat(mConditionAdapter.getItemCount()).isEqualTo(2);
+    }
+
+    @Test
+    public void getItemViewType_shouldReturnConditionTile() {
+        mConditionAdapter = new ConditionAdapter(
+            mContext, mTwoConditions, DashboardData.HEADER_MODE_FULLY_EXPANDED);
+        assertThat(mConditionAdapter.getItemViewType(0)).isEqualTo(R.layout.condition_tile_new_ui);
+    }
+
+    @Test
+    public void onBindViewHolder_shouldSetListener() {
+        final View view = LayoutInflater.from(mContext).inflate(
+            R.layout.condition_tile_new_ui, new LinearLayout(mContext), true);
+        final DashboardAdapter.DashboardItemHolder viewHolder =
+            new DashboardAdapter.DashboardItemHolder(view);
+        mConditionAdapter = new ConditionAdapter(
+            mContext, mOneCondition, DashboardData.HEADER_MODE_SUGGESTION_EXPANDED);
+
+        mConditionAdapter.onBindViewHolder(viewHolder, 0);
+        final View card = view.findViewById(R.id.content);
+        assertThat(card.hasOnClickListeners()).isTrue();
+    }
+
+    @Test
+    public void viewClick_shouldInvokeConditionPrimaryClick() {
+        final View view = LayoutInflater.from(mContext).inflate(
+            R.layout.condition_tile_new_ui, new LinearLayout(mContext), true);
+        final DashboardAdapter.DashboardItemHolder viewHolder =
+            new DashboardAdapter.DashboardItemHolder(view);
+        mConditionAdapter = new ConditionAdapter(
+            mContext, mOneCondition, DashboardData.HEADER_MODE_SUGGESTION_EXPANDED);
+
+        mConditionAdapter.onBindViewHolder(viewHolder, 0);
+        final View card = view.findViewById(R.id.content);
+        card.performClick();
+        verify(mCondition1).onPrimaryClick();
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
index 4ef7263..d077e6f 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
@@ -20,7 +20,7 @@
 import android.content.IntentFilter;
 import android.graphics.drawable.Icon;
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java
index 3344698..e46ae9e 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java
@@ -18,7 +18,7 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java
index 4b9e440..114ee2b 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.dashboard.suggestions;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
new file mode 100644
index 0000000..a29ac93
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
@@ -0,0 +1,104 @@
+/*
+ * 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.dashboard.suggestions;
+
+import android.content.Context;
+import android.graphics.drawable.Icon;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.DashboardAdapter;
+import com.android.settingslib.drawer.Tile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SuggestionAdapterTest {
+    @Mock
+    private Tile mSuggestion1;
+    @Mock
+    private Tile mSuggestion2;
+
+    private Context mContext;
+    private SuggestionAdapter mSuggestionAdapter;
+    private List<Tile> mOneSuggestion;
+    private List<Tile> mTwoSuggestions;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mSuggestion1.title = "Test Suggestion 1";
+        mSuggestion1.icon = mock(Icon.class);
+        mSuggestion2.title = "Test Suggestion 2";
+        mSuggestion2.icon = mock(Icon.class);
+        mOneSuggestion = new ArrayList<>();
+        mOneSuggestion.add(mSuggestion1);
+        mTwoSuggestions = new ArrayList<>();
+        mTwoSuggestions.add(mSuggestion1);
+        mTwoSuggestions.add(mSuggestion2);
+    }
+
+    @Test
+    public void getItemCount_shouldReturnListSize() {
+        mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
+        assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(1);
+
+        mSuggestionAdapter = new SuggestionAdapter(mContext, mTwoSuggestions, new ArrayList<>());
+        assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(2);
+    }
+
+    @Test
+    public void getItemViewType_shouldReturnSuggestionTile() {
+        mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
+        assertThat(mSuggestionAdapter.getItemViewType(0))
+            .isEqualTo(R.layout.suggestion_tile_new_ui);
+    }
+
+    @Test
+    public void onBindViewHolder_shouldSetListener() {
+        final View view = spy(LayoutInflater.from(mContext).inflate(
+            R.layout.suggestion_tile_new_ui, new LinearLayout(mContext), true));
+        final DashboardAdapter.DashboardItemHolder viewHolder =
+            new DashboardAdapter.DashboardItemHolder(view);
+        mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
+
+        mSuggestionAdapter.onBindViewHolder(viewHolder, 0);
+
+        verify(view).setOnClickListener(any(View.OnClickListener.class));
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
index 4a41ede..c20e5c4 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
@@ -16,16 +16,25 @@
 
 package com.android.settings.dashboard.suggestions;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.helper.ItemTouchHelper;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.SuggestionParser;
 import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.suggestions.SuggestionParser;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -35,14 +44,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SuggestionDismissControllerTest {
@@ -86,6 +87,15 @@
     }
 
     @Test
+    public void getSwipeDirs_isSuggestionTileCard_shouldReturnDirection() {
+        final RecyclerView.ViewHolder vh = mock(RecyclerView.ViewHolder.class);
+        when(vh.getItemViewType()).thenReturn(R.layout.suggestion_tile_card);
+
+        assertThat(mController.getSwipeDirs(mRecyclerView, vh))
+                .isEqualTo(ItemTouchHelper.START | ItemTouchHelper.END);
+    }
+
+    @Test
     public void getSwipeDirs_isNotSuggestionTile_shouldReturn0() {
         final RecyclerView.ViewHolder vh = mock(RecyclerView.ViewHolder.class);
         when(vh.getItemViewType()).thenReturn(R.layout.condition_card);
@@ -101,7 +111,7 @@
         mController.onSwiped(vh, ItemTouchHelper.START);
 
         verify(mFactory.suggestionsFeatureProvider).dismissSuggestion(
-                eq(mContext), eq(mSuggestionParser), any(Tile.class));
-        verify(mCallback).onSuggestionDismissed(any(Tile.class));
+                eq(mContext), eq(mSuggestionParser), nullable(Tile.class));
+        verify(mCallback).onSuggestionDismissed(nullable(Tile.class));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
index 3efe15a..d5d87b1 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
@@ -21,11 +21,11 @@
 import android.content.pm.PackageManager;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.SuggestionParser;
 import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.suggestions.SuggestionParser;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -36,6 +36,9 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyBoolean;
@@ -108,6 +111,15 @@
     }
 
     @Test
+    public void getSuggestionIdentifier_nullContext_shouldNotCrash() {
+        final Tile suggestion = new Tile();
+        suggestion.intent = new Intent()
+                .setClassName(RuntimeEnvironment.application.getPackageName(), "123");
+        assertThat(mProvider.getSuggestionIdentifier(null, suggestion))
+                .isNotEmpty();
+    }
+
+    @Test
     public void dismissSuggestion_hasMoreDismissCount_shouldNotDisableComponent() {
         when(mSuggestionParser.dismissSuggestion(any(Tile.class), anyBoolean()))
                 .thenReturn(false);
@@ -120,7 +132,6 @@
         verify(mContext, never()).getPackageManager();
     }
 
-
     @Test
     public void dismissSuggestion_noContext_shouldDoNothing() {
         mProvider.dismissSuggestion(null, mSuggestionParser, mSuggestion);
@@ -144,6 +155,21 @@
                 .setComponentEnabledSetting(mSuggestion.intent.getComponent(),
                         PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
                         PackageManager.DONT_KILL_APP);
-        verify(mSuggestionParser).markCategoryDone(mSuggestion.category);
+    }
+
+    @Test
+    public void filterExclusiveSuggestions_shouldOnlyKeepFirst3() {
+        final List<Tile> suggestions = new ArrayList<>();
+        suggestions.add(new Tile());
+        suggestions.add(new Tile());
+        suggestions.add(new Tile());
+        suggestions.add(new Tile());
+        suggestions.add(new Tile());
+        suggestions.add(new Tile());
+        suggestions.add(new Tile());
+
+        mProvider.filterExclusiveSuggestions(suggestions);
+
+        assertThat(suggestions).hasSize(3);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java
index cb4ce71..4d6a743 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java
@@ -19,7 +19,7 @@
 import java.util.Arrays;
 import java.util.Map;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java
index 056d959..1f32531 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.drawer.Tile;
 
@@ -35,8 +35,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import org.robolectric.RuntimeEnvironment;
-
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.same;
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java
index accca2a..5f3c0f0 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java
@@ -31,7 +31,7 @@
 import android.hardware.fingerprint.FingerprintManager;
 
 import com.android.settings.Settings;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.drawer.Tile;
 
diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
new file mode 100644
index 0000000..05efa9f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
@@ -0,0 +1,135 @@
+/*
+ * 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.datausage;
+
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceScreen;
+import android.util.ArraySet;
+import android.view.View;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.PackageManagerWrapper;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
+import com.android.settings.widget.EntityHeaderController;
+import com.android.settings.widget.EntityHeaderController.ActionType;
+import com.android.settingslib.AppItem;
+
+import org.junit.After;
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+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 static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = ShadowEntityHeaderController.class)
+public class AppDataUsageTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private EntityHeaderController mHeaderController;
+    @Mock
+    private PackageManagerWrapper mPackageManagerWrapper;
+
+    private AppDataUsage mFragment;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowEntityHeaderController.reset();
+    }
+
+    @Test
+    public void bindAppHeader_allWorkApps_shouldNotShowAppInfoLink() {
+        ShadowEntityHeaderController.setUseMock(mHeaderController);
+        when(mHeaderController.setRecyclerView(any(), any())).thenReturn(mHeaderController);
+        when(mHeaderController.setUid(anyInt())).thenReturn(mHeaderController);
+
+        mFragment = spy(new AppDataUsage());
+
+        doReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS))
+                .when(mFragment)
+                .getPreferenceManager();
+        doReturn(mock(PreferenceScreen.class)).when(mFragment).getPreferenceScreen();
+        ReflectionHelpers.setField(mFragment, "mAppItem", mock(AppItem.class));
+
+        mFragment.onViewCreated(new View(RuntimeEnvironment.application), new Bundle());
+
+        verify(mHeaderController).setButtonActions(ActionType.ACTION_NONE, ActionType.ACTION_NONE);
+    }
+
+    @Test
+    public void bindAppHeader_workApp_shouldSetWorkAppUid() throws
+            PackageManager.NameNotFoundException {
+        final int fakeUserId = 100;
+
+        mFragment = spy(new AppDataUsage());
+        final ArraySet<String> packages = new ArraySet<>();
+        packages.add("pkg");
+        final AppItem appItem = new AppItem(123456789);
+
+        ReflectionHelpers.setField(mFragment, "mPackageManagerWrapper", mPackageManagerWrapper);
+        ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
+        ReflectionHelpers.setField(mFragment, "mPackages", packages);
+
+        when(mPackageManagerWrapper.getPackageUidAsUser(anyString(), anyInt()))
+                .thenReturn(fakeUserId);
+
+        ShadowEntityHeaderController.setUseMock(mHeaderController);
+        when(mHeaderController.setRecyclerView(any(), any())).thenReturn(mHeaderController);
+        when(mHeaderController.setUid(fakeUserId)).thenReturn(mHeaderController);
+
+        doReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS))
+                .when(mFragment)
+                .getPreferenceManager();
+        doReturn(mock(PreferenceScreen.class)).when(mFragment).getPreferenceScreen();
+
+        mFragment.onViewCreated(new View(RuntimeEnvironment.application), new Bundle());
+
+        verify(mHeaderController)
+                .setButtonActions(ActionType.ACTION_APP_INFO, ActionType.ACTION_NONE);
+        verify(mHeaderController)
+                .setUid(fakeUserId);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java
index fd1c96b..ac28e1d 100644
--- a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java
@@ -30,7 +30,7 @@
 import android.support.v7.preference.Preference;
 
 import android.util.ArraySet;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
index eec4324..8b635d2 100644
--- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
@@ -20,7 +20,7 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.v7.preference.PreferenceManager;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
index 003f4d3..e60243b 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
@@ -2,7 +2,7 @@
 
 import android.net.NetworkPolicy;
 import android.net.NetworkTemplate;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.net.DataUsageController.DataUsageInfo;
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
index c5570bb..9ab88d3 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.NetworkPolicyEditor;
 
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
index 92ded0d..77e0fe9 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
@@ -23,7 +23,7 @@
 import android.net.wifi.WifiManager;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
diff --git a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java
index d674c77..f20e50c 100644
--- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java
@@ -15,14 +15,22 @@
  */
 package com.android.settings.datausage;
 
-import com.android.internal.logging.nano.MetricsProto;
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.os.Process;
-import com.android.settings.SettingsRobolectricTestRunner;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.applications.ApplicationsState;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,11 +39,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class UnrestrictedDataAccessTest {
@@ -75,11 +78,11 @@
     @Test
     public void logSpecialPermissionChange() {
         mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_UNL_DATA_ALLOW), eq("app"));
 
         mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_UNL_DATA_DENY), eq("app"));
     }
 
diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
index d0bd67b..d28cad1 100644
--- a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.provider.Settings;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.RestrictedSwitchPreference;
 
diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
index 0ac0251..41bff93 100644
--- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
@@ -21,7 +21,7 @@
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
index 4b9d3ec..e6a6dd8 100644
--- a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
index 8a8c066..843c753 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
@@ -19,11 +19,11 @@
 import android.content.Context;
 import android.content.Intent;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
index 41c5a27..58ecd62 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import java.util.List;
diff --git a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java
index 3995f37..15877e0 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java
index cab6f71..2f96d65 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java b/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
index 4acac70..92807e9 100644
--- a/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
@@ -16,12 +16,17 @@
 
 package com.android.settings.datetime;
 
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
 import com.android.settings.testutils.shadow.ShadowZoneGetter;
@@ -33,11 +38,6 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class ZonePickerTest {
@@ -64,8 +64,8 @@
 
         // Should render
         verify(mZonePicker).onCreateView(
-                any(LayoutInflater.class),
-                any(ViewGroup.class),
-                any(Bundle.class));
+                nullable(LayoutInflater.class),
+                nullable(ViewGroup.class),
+                nullable(Bundle.class));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
index be04eec..38c4ab2 100644
--- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
@@ -33,7 +33,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
@@ -71,6 +71,7 @@
         mSwitchBar = new SwitchBar(mContext);
 
         Context fakeContextForFakeProvider = mock(Context.class, RETURNS_DEEP_STUBS);
+        FakeFeatureFactory.setupForTest(fakeContextForFakeProvider);
         FeatureFactory featureFactory = FakeFeatureFactory.getFactory(fakeContextForFakeProvider);
         mMetricsFeatureProvider = featureFactory.getMetricsFeatureProvider();
         mPreference = new Preference(mContext);
diff --git a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
index 902fb15..f703b26 100644
--- a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
@@ -25,7 +25,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -39,11 +39,9 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
index 35ca5f8..3b3b482 100644
--- a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
@@ -21,14 +21,12 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settingslib.drawer.CategoryKey;
 
 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.annotation.Config;
@@ -38,7 +36,6 @@
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java
similarity index 60%
copy from tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java
copy to tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java
index daa6d5e..5927646 100644
--- a/tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java
@@ -14,27 +14,31 @@
  * limitations under the License.
  */
 
-package com.android.settings.search2;
+package com.android.settings.development;
 
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowToast;
 
 import static com.google.common.truth.Truth.assertThat;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SavedQueryPayloadTest {
-
-    private SavedQueryPayload mPayload;
+public class DevelopmentSettingsDisabledActivityTest {
 
     @Test
-    public void getType_shouldBeSavedQueryType() {
-        mPayload = new SavedQueryPayload("Test");
-        assertThat(mPayload.getType()).isEqualTo(ResultPayload.PayloadType.SAVED_QUERY);
+    public void launchActivity_shouldShowToast() {
+        Robolectric.setupActivity(DevelopmentSettingsDisabledActivity.class);
+
+        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
+                RuntimeEnvironment.application.getString(R.string.dev_settings_disabled_warning));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java
index 87905aa..c937841 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java
@@ -20,7 +20,7 @@
 import android.content.SharedPreferences;
 import android.provider.Settings;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java
index 485a539..8e4b74d 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java
@@ -18,13 +18,16 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.provider.SearchIndexableResource;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settingslib.drawer.CategoryKey;
 
 import org.junit.Before;
@@ -33,12 +36,14 @@
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doReturn;
@@ -48,7 +53,11 @@
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class
+        })
 public class DevelopmentSettingsTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -90,4 +99,38 @@
 
         verify(mScreen, times(2)).addPreference(any(Preference.class));
     }
+
+    @Test
+    public void searchIndex_shouldIndexFromPrefXml() {
+        final List<SearchIndexableResource> index =
+                DevelopmentSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                        RuntimeEnvironment.application, true);
+
+        assertThat(index.size()).isEqualTo(1);
+        assertThat(index.get(0).xmlResId).isEqualTo(R.xml.development_prefs);
+    }
+
+    @Test
+    public void searchIndex_pageDisabled_shouldAddAllKeysToNonIndexable() {
+        final Context appContext = RuntimeEnvironment.application;
+        new DevelopmentSettingsEnabler(appContext, null /* lifecycle */)
+                .disableDevelopmentSettings();
+
+        final List<String> nonIndexableKeys =
+                DevelopmentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(appContext);
+
+        assertThat(nonIndexableKeys).contains("development_prefs_screen");
+    }
+
+    @Test
+    public void searchIndex_pageEnabled_shouldNotAddKeysToNonIndexable() {
+        final Context appContext = RuntimeEnvironment.application;
+        new DevelopmentSettingsEnabler(appContext, null /* lifecycle */)
+                .enableDevelopmentSettings();
+
+        final List<String> nonIndexableKeys =
+                DevelopmentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(appContext);
+
+        assertThat(nonIndexableKeys).doesNotContain("development_prefs_screen");
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java
index 9a1a3b6..2f0f261 100644
--- a/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java
@@ -22,7 +22,7 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
 
@@ -33,8 +33,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.shadows.ShadowToast;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
index d9c17bc..45e457b 100644
--- a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
@@ -23,16 +23,14 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.os.UserManager;
 import android.provider.Settings.Global;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedSwitchPreference;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java
index b54fc53..3bba438 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java
@@ -17,10 +17,9 @@
 
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.os.SystemProperties;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
 
@@ -31,7 +30,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowSystemProperties;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
index 4475d18..7601f8a 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
@@ -27,11 +27,11 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.development.DevelopmentSettings;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.search2.DatabaseIndexingManager;
+import com.android.settings.search.DatabaseIndexingManager;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -41,7 +41,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.util.ReflectionHelpers;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
index ea60e4c..108d342 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
@@ -21,7 +21,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java
index 7b2b198..951d8c7 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
 
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
index 1cbd147..dfc1a0c 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 import android.app.Fragment;
 import android.content.Context;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java
index 732ba22..5a4d988 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java
@@ -20,9 +20,9 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
index 245d7d6..8e8da51 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
@@ -21,7 +21,7 @@
 import android.view.View;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java
index 8d47135..10e4958 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java
@@ -17,7 +17,7 @@
 
 import android.content.Context;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java
index 1196833..6151ca0 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
index 9ac9eb4..ca6a33a 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
@@ -28,10 +28,9 @@
 import android.view.MenuItem;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
index 87e8e1b..4ea33ee 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
@@ -22,7 +22,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java
index bf9c412..18ef003 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
index 0c9988b..b2d259a 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
@@ -25,7 +25,7 @@
 import android.os.storage.StorageManager;
 import android.provider.SearchIndexableResource;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.drawer.CategoryKey;
 
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
index 6cb8f58..a154c03 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
@@ -25,7 +25,7 @@
 import android.widget.ProgressBar;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
index 03f15bb..44e060f 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
@@ -23,7 +23,7 @@
 
 import android.util.SparseArray;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.deviceinfo.storage.StorageAsyncLoader;
 import com.android.settings.deviceinfo.storage.StorageItemPreferenceController;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
index 17abab1..5e95a61 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
@@ -17,6 +17,12 @@
 package com.android.settings.deviceinfo;
 
 
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.app.Activity;
 import android.app.usage.StorageStatsManager;
 import android.icu.text.NumberFormat;
@@ -24,7 +30,7 @@
 import android.text.format.Formatter;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
@@ -41,12 +47,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class StorageSettingsTest {
@@ -78,10 +78,10 @@
         when(volumeInfo.isMountedReadable()).thenReturn(true);
         when(volumeInfo.getType()).thenReturn(VolumeInfo.TYPE_PRIVATE);
         when(mStorageManagerVolumeProvider.getTotalBytes(
-                        any(StorageStatsManager.class), any(VolumeInfo.class)))
+                        nullable(StorageStatsManager.class), nullable(VolumeInfo.class)))
                 .thenReturn(500L);
         when(mStorageManagerVolumeProvider.getFreeBytes(
-                        any(StorageStatsManager.class), any(VolumeInfo.class)))
+                        nullable(StorageStatsManager.class), nullable(VolumeInfo.class)))
                 .thenReturn(0L);
 
         ReflectionHelpers.setField(
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java
index 30c6dc9..5c62220 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java
@@ -22,7 +22,7 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java b/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java
index 8529c5d..ce384a5 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java
@@ -16,28 +16,26 @@
 
 package com.android.settings.deviceinfo;
 
-import android.content.Context;
-import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.hardware.usb.UsbManager;
-
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatcher;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
 import static org.mockito.Matchers.argThat;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.hardware.usb.UsbManager;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class UsbBackendTest {
@@ -70,13 +68,7 @@
         usbBackend.getCurrentMode();
 
         verify(mContext).registerReceiver(eq(null),
-            argThat(new ArgumentMatcher<IntentFilter>() {
-                @Override
-                public boolean matches(Object i) {
-                    final IntentFilter intentFilter = (IntentFilter) i;
-                    return intentFilter != null &&
-                        UsbManager.ACTION_USB_STATE.equals(intentFilter.getAction(0));
-                }
-            }));
+            argThat(intentFilter -> intentFilter != null &&
+                UsbManager.ACTION_USB_STATE.equals(intentFilter.getAction(0))));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/UsbModeChooserActivityTest.java b/tests/robotests/src/com/android/settings/deviceinfo/UsbModeChooserActivityTest.java
index d9c474d..1817bfb 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/UsbModeChooserActivityTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/UsbModeChooserActivityTest.java
@@ -22,7 +22,7 @@
 
 import android.widget.TextView;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
index ee8e7d1..9bc1a3a 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
@@ -19,7 +19,6 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -36,7 +35,7 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.deletionhelper.ActivationWarningFragment;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
index dc1c286..9b4f30e 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
@@ -33,7 +33,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.util.SparseArray;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.UserManagerWrapper;
 import com.android.settings.core.PreferenceController;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
index 3ad3783..5c18670 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -16,11 +16,12 @@
 package com.android.settings.deviceinfo.storage;
 
 
-import static com.google.common.truth.Truth.assertThat;
 import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -43,7 +44,7 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.SubSettings;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.ManageApplications;
@@ -119,7 +120,7 @@
 
         final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
         verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
-                any(UserHandle.class));
+                nullable(UserHandle.class));
 
         Intent intent = argumentCaptor.getValue();
         assertThat(intent.getType()).isEqualTo("image/*");
@@ -134,7 +135,7 @@
 
         final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
         verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
-                any(UserHandle.class));
+                nullable(UserHandle.class));
         Intent intent = argumentCaptor.getValue();
 
         assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
@@ -161,7 +162,7 @@
 
         final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
         verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
-                any(UserHandle.class));
+                nullable(UserHandle.class));
 
         Intent intent = argumentCaptor.getValue();
         assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
@@ -182,20 +183,20 @@
 
     @Test
     public void testClickFiles() {
-        when(mSvp.findEmulatedForPrivate(any(VolumeInfo.class))).thenReturn(mVolume);
+        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
         mPreference.setKey("pref_files");
         mController.handlePreferenceTreeClick(mPreference);
 
         final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
         verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
-                any(UserHandle.class));
+                nullable(UserHandle.class));
 
         Intent intent = argumentCaptor.getValue();
         Intent browseIntent = mVolume.buildBrowseIntent();
         assertThat(intent.getAction()).isEqualTo(browseIntent.getAction());
         assertThat(intent.getData()).isEqualTo(browseIntent.getData());
         verify(mMetricsFeatureProvider, times(1)).action(
-                any(Context.class), eq(MetricsEvent.STORAGE_FILES));
+                nullable(Context.class), eq(MetricsEvent.STORAGE_FILES));
     }
 
     @Test
@@ -205,7 +206,7 @@
 
         final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
         verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
-                any(UserHandle.class));
+                nullable(UserHandle.class));
 
         Intent intent = argumentCaptor.getValue();
         assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
@@ -223,7 +224,7 @@
 
         final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
         verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
-                any(UserHandle.class));
+                nullable(UserHandle.class));
 
         Intent intent = argumentCaptor.getValue();
         assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
@@ -240,7 +241,7 @@
         assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue();
 
         verify(mFragment.getFragmentManager().beginTransaction()).add(
-                any(PrivateVolumeSettings.SystemInfoFragment.class), anyString());
+                nullable(PrivateVolumeSettings.SystemInfoFragment.class), nullable(String.class));
     }
 
     @Test
@@ -329,13 +330,13 @@
 
         mController.setUserId(new UserHandle(10));
 
-        verify(audio, times(2)).setIcon(any(Drawable.class));
-        verify(video, times(2)).setIcon(any(Drawable.class));
-        verify(image, times(2)).setIcon(any(Drawable.class));
-        verify(games, times(2)).setIcon(any(Drawable.class));
-        verify(apps, times(2)).setIcon(any(Drawable.class));
-        verify(system, times(2)).setIcon(any(Drawable.class));
-        verify(files, times(2)).setIcon(any(Drawable.class));
+        verify(audio, times(2)).setIcon(nullable(Drawable.class));
+        verify(video, times(2)).setIcon(nullable(Drawable.class));
+        verify(image, times(2)).setIcon(nullable(Drawable.class));
+        verify(games, times(2)).setIcon(nullable(Drawable.class));
+        verify(apps, times(2)).setIcon(nullable(Drawable.class));
+        verify(system, times(2)).setIcon(nullable(Drawable.class));
+        verify(files, times(2)).setIcon(nullable(Drawable.class));
     }
 
     @Test
@@ -359,7 +360,7 @@
         when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
                 .thenReturn(files);
 
-        when(mSvp.findEmulatedForPrivate(any(VolumeInfo.class))).thenReturn(mVolume);
+        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
         when(mVolume.isMountedReadable()).thenReturn(true);
 
         mController.displayPreference(screen);
@@ -388,7 +389,7 @@
         when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
                 .thenReturn(files);
 
-        when(mSvp.findEmulatedForPrivate(any(VolumeInfo.class))).thenReturn(mVolume);
+        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
         when(mVolume.isMountedReadable()).thenReturn(false);
 
         mController.displayPreference(screen);
@@ -417,7 +418,7 @@
         when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
                 .thenReturn(files);
 
-        when(mSvp.findEmulatedForPrivate(any(VolumeInfo.class))).thenReturn(null);
+        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(null);
 
         mController.displayPreference(screen);
 
@@ -445,11 +446,11 @@
         when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
                 .thenReturn(files);
 
-        when(mSvp.findEmulatedForPrivate(any(VolumeInfo.class))).thenReturn(mVolume);
+        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
         when(mVolume.isMountedReadable()).thenReturn(true);
 
         mController.displayPreference(screen);
-        when(mSvp.findEmulatedForPrivate(any(VolumeInfo.class))).thenReturn(null);
+        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(null);
         mController.setVolume(mVolume);
 
         verify(screen).removePreference(files);
@@ -480,7 +481,7 @@
         // This will hide it initially.
         mController.displayPreference(screen);
 
-        when(mSvp.findEmulatedForPrivate(any(VolumeInfo.class))).thenReturn(mVolume);
+        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
         when(mVolume.isMountedReadable()).thenReturn(true);
 
         // And we bring it back.
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
index 6492f67..d3c6a25 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
@@ -27,20 +27,19 @@
 
 import android.content.Context;
 import android.os.storage.VolumeInfo;
-import android.provider.Settings;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settingslib.deviceinfo.StorageVolumeProvider;
 
 import org.junit.Before;
@@ -53,11 +52,14 @@
 import java.io.File;
 
 import static com.android.settings.TestUtils.KILOBYTE;
-import static com.android.settings.TestUtils.MEGABYTE;
 import static com.android.settings.TestUtils.GIGABYTE;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {
+        SettingsShadowResources.class,
+        SettingsShadowResources.SettingsShadowTheme.class
+})
 public class StorageSummaryDonutPreferenceControllerTest {
     private Context mContext;
     private StorageSummaryDonutPreferenceController mController;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
index 2199824..db7c9f7 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
@@ -34,7 +34,7 @@
 import android.util.SparseArray;
 
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.SubSettings;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.UserManagerWrapper;
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
new file mode 100644
index 0000000..d38ac51
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
@@ -0,0 +1,109 @@
+/*
+ * 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.display;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {ShadowSecureSettings.class})
+public class AmbientDisplayAlwaysOnPreferenceControllerTest {
+
+    @Mock Context mContext;
+    @Mock AmbientDisplayConfiguration mConfig;
+    @Mock SwitchPreference mSwitchPreference;
+
+    AmbientDisplayAlwaysOnPreferenceController mController;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mController = new AmbientDisplayAlwaysOnPreferenceController(mContext, mConfig);
+    }
+
+    @Test
+    public void updateState_enabled() throws Exception {
+        when(mConfig.alwaysOnEnabled(anyInt()))
+                .thenReturn(true);
+
+        mController.updateState(mSwitchPreference);
+
+        verify(mSwitchPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_disabled() throws Exception {
+        when(mConfig.alwaysOnEnabled(anyInt()))
+                .thenReturn(false);
+
+        mController.updateState(mSwitchPreference);
+
+        verify(mSwitchPreference).setChecked(false);
+    }
+
+    @Test
+    public void onPreferenceChange_enable() throws Exception {
+        mController.onPreferenceChange(mSwitchPreference, true);
+
+        assertThat(Settings.Secure.getInt(null, Settings.Secure.DOZE_ALWAYS_ON, -1))
+            .isEqualTo(1);
+    }
+
+    @Test
+    public void onPreferenceChange_disable() throws Exception {
+        mController.onPreferenceChange(mSwitchPreference, false);
+
+        assertThat(Settings.Secure.getInt(null, Settings.Secure.DOZE_ALWAYS_ON, -1))
+            .isEqualTo(0);
+    }
+
+    @Test
+    public void isAvailable_available() throws Exception {
+        when(mConfig.alwaysOnAvailable())
+                .thenReturn(true);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_unavailable() throws Exception {
+        when(mConfig.alwaysOnAvailable())
+                .thenReturn(false);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
new file mode 100644
index 0000000..77cb4c6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
@@ -0,0 +1,136 @@
+/*
+ * 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.display;
+
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {ShadowSecureSettings.class})
+public class AmbientDisplayNotificationsPreferenceControllerTest {
+
+    @Mock Context mContext;
+    @Mock AmbientDisplayConfiguration mConfig;
+    @Mock SwitchPreference mSwitchPreference;
+    @Mock MetricsFeatureProvider mMetricsFeatureProvider;
+
+    AmbientDisplayNotificationsPreferenceController mController;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mController = new AmbientDisplayNotificationsPreferenceController(mContext, mConfig,
+                mMetricsFeatureProvider);
+    }
+
+    @Test
+    public void updateState_enabled() throws Exception {
+        when(mConfig.pulseOnNotificationEnabled(anyInt()))
+                .thenReturn(true);
+
+        mController.updateState(mSwitchPreference);
+
+        verify(mSwitchPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_disabled() throws Exception {
+        when(mConfig.pulseOnNotificationEnabled(anyInt()))
+                .thenReturn(false);
+
+        mController.updateState(mSwitchPreference);
+
+        verify(mSwitchPreference).setChecked(false);
+    }
+
+    @Test
+    public void onPreferenceChange_enable() throws Exception {
+        mController.onPreferenceChange(mSwitchPreference, true);
+
+        assertThat(Settings.Secure.getInt(null, Settings.Secure.DOZE_ENABLED, -1))
+                .isEqualTo(1);
+    }
+
+    @Test
+    public void onPreferenceChange_disable() throws Exception {
+        mController.onPreferenceChange(mSwitchPreference, false);
+
+        assertThat(Settings.Secure.getInt(null, Settings.Secure.DOZE_ENABLED, -1))
+                .isEqualTo(0);
+    }
+
+    @Test
+    public void isAvailable_available() throws Exception {
+        when(mConfig.pulseOnNotificationAvailable())
+                .thenReturn(true);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_unavailable() throws Exception {
+        when(mConfig.pulseOnNotificationAvailable())
+                .thenReturn(false);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_reportsEventForItsPreference() throws Exception {
+        when(mSwitchPreference.getKey()).thenReturn(
+                AmbientDisplayNotificationsPreferenceController.KEY_AMBIENT_DISPLAY_NOTIFICATIONS);
+
+        mController.handlePreferenceTreeClick(mSwitchPreference);
+
+        verify(mMetricsFeatureProvider).action(any(), eq(ACTION_AMBIENT_DISPLAY));
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_doesntReportEventForOtherPreferences() throws Exception {
+        when(mSwitchPreference.getKey()).thenReturn("some_other_key");
+
+        mController.handlePreferenceTreeClick(mSwitchPreference);
+
+        verifyNoMoreInteractions(mMetricsFeatureProvider);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java
new file mode 100644
index 0000000..2933517
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java
@@ -0,0 +1,117 @@
+/*
+ * 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.display;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {ShadowSecureSettings.class})
+public class AmbientDisplayPreferenceControllerTest {
+
+    @Mock Context mContext;
+    @Mock AmbientDisplayConfiguration mConfig;
+    @Mock Preference mPreference;
+
+    AmbientDisplayPreferenceController mController;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mController = new AmbientDisplayPreferenceController(mContext, mConfig, "key");
+    }
+
+    @Test
+    public void isAvailable_available() throws Exception {
+        when(mConfig.available()).thenReturn(true);
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_unavailable() throws Exception {
+        when(mConfig.available()).thenReturn(false);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void updateState_alwaysOn() throws Exception {
+        when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(true);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(R.string.ambient_display_screen_summary_always_on);
+    }
+
+    @Test
+    public void updateState_notifications() throws Exception {
+        when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
+        when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(true);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(R.string.ambient_display_screen_summary_notifications);
+    }
+
+    @Test
+    public void updateState_gestures() throws Exception {
+        when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
+        when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(false);
+        when(mConfig.enabled(anyInt())).thenReturn(true);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(R.string.switch_on_text);
+    }
+
+    @Test
+    public void updateState_off() throws Exception {
+        when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
+        when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(false);
+        when(mConfig.pulseOnDoubleTapEnabled(anyInt())).thenReturn(false);
+        when(mConfig.pulseOnPickupEnabled(anyInt())).thenReturn(false);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(R.string.switch_off_text);
+    }
+
+    @Test
+    public void getPreferenceKey() throws Exception {
+        assertThat(mController.getPreferenceKey()).isEqualTo("key");
+    }
+
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
index 6d8696f..02f46f2 100644
--- a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
@@ -16,13 +16,15 @@
 
 package com.android.settings.display;
 
+import android.content.ContentResolver;
 import android.content.Context;
 import android.provider.Settings;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.gestures.DoubleTapPowerPreferenceController;
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
+import com.android.settings.search.InlinePayload;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -79,13 +81,25 @@
     }
 
     @Test
-    public void testPreferenceController_CorrectPayload() {
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        mController = new AutoBrightnessPreferenceController(context, PREFERENCE_KEY);
-        InlineSwitchPayload payload = (InlineSwitchPayload) mController.getResultPayload();
-        assertThat(payload.settingsUri).isEqualTo("screen_brightness_mode");
-        assertThat(payload.settingSource).isEqualTo(ResultPayload.SettingsSource.SYSTEM);
-        assertThat(payload.valueMap.get(1)).isEqualTo(true);
-        assertThat(payload.valueMap.get(0)).isEqualTo(false);
+    public void testSetValue_updatesCorrectly() {
+        int newValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.System.putInt(resolver, SCREEN_BRIGHTNESS_MODE, 0);
+
+        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
+        int updatedValue = Settings.System.getInt(resolver, SCREEN_BRIGHTNESS_MODE, -1);
+
+        assertThat(updatedValue).isEqualTo(newValue);
+    }
+
+    @Test
+    public void testGetValue_correctValueReturned() {
+        int currentValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.System.putInt(resolver, SCREEN_BRIGHTNESS_MODE, currentValue);
+
+        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
+
+        assertThat(newValue).isEqualTo(currentValue);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
new file mode 100644
index 0000000..6d9cbab
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
@@ -0,0 +1,111 @@
+/*
+ * 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.display;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowSystemSettings;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.After;
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+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.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AutoRotatePreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private PackageManager mPackageManager;
+    private Lifecycle mLifecycle;
+    private SwitchPreference mPreference;
+    private ContentResolver mContentResolver;
+    private AutoRotatePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
+        mContentResolver = RuntimeEnvironment.application.getContentResolver();
+        mLifecycle = new Lifecycle();
+        mPreference = new SwitchPreference(RuntimeEnvironment.application);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        when(mContext.getContentResolver()).thenReturn(mContentResolver);
+
+        mController = new AutoRotatePreferenceController(mContext, mLifecycle);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowSystemSettings.reset();
+    }
+
+    @Test
+    public void isAvailableWhenPolicyAllows() {
+        assertThat(mController.isAvailable()).isFalse();
+
+        when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);
+        when(mContext.getResources().getBoolean(anyInt())).thenReturn(true);
+        Settings.System.putInt(mContentResolver,
+                Settings.System.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY, 0);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    @Config(shadows = ShadowSystemSettings.class)
+    public void updatePreference_settingsIsOff_shouldTurnOffToggle() {
+        Settings.System.putIntForUser(mContentResolver,
+                Settings.System.ACCELEROMETER_ROTATION, 0, UserHandle.USER_CURRENT);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    @Config(shadows = ShadowSystemSettings.class)
+    public void updatePreference_settingsIsOn_shouldTurnOnToggle() {
+        Settings.System.putIntForUser(mContentResolver,
+                Settings.System.ACCELEROMETER_ROTATION, 1, UserHandle.USER_CURRENT);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
index 792b853..73c5374 100644
--- a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
@@ -21,7 +21,7 @@
 
 import android.content.Context;
 import android.provider.Settings;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
new file mode 100644
index 0000000..378b054
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
@@ -0,0 +1,157 @@
+/*
+ * 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.display;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+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.ContentResolver;
+import android.content.Context;
+import android.provider.Settings.System;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.internal.ShadowExtractor;
+import org.robolectric.shadows.ShadowContentResolver;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BrightnessLevelPreferenceControllerTest {
+    @Mock
+    private Context mContext;
+    @Mock
+    private ContentResolver mContentResolver;
+    @Mock
+    private PowerManagerWrapper mPowerManager;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private Preference mPreference;
+
+    private BrightnessLevelPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getContentResolver()).thenReturn(mContentResolver);
+        when(mPowerManager.getMinimumScreenBrightnessSetting()).thenReturn(0);
+        when(mPowerManager.getMaximumScreenBrightnessSetting()).thenReturn(100);
+        when(mPowerManager.getMinimumScreenBrightnessForVrSetting()).thenReturn(0);
+        when(mPowerManager.getMaximumScreenBrightnessForVrSetting()).thenReturn(100);
+        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+        mController = spy(new BrightnessLevelPreferenceController(mContext, null, mPowerManager));
+        doReturn(false).when(mController).isInVrMode();
+
+    }
+
+    @Test
+    public void isAvailable_shouldAlwaysReturnTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void onResume_shouldRegisterObserver() {
+        Context context = RuntimeEnvironment.application;
+        BrightnessLevelPreferenceController controller =
+            new BrightnessLevelPreferenceController(context, null, mPowerManager);
+        ShadowContentResolver shadowContentResolver =
+            (ShadowContentResolver) ShadowExtractor.extract(context.getContentResolver());
+
+        controller.onResume();
+
+        assertThat(shadowContentResolver.getContentObservers(
+            System.getUriFor(System.SCREEN_BRIGHTNESS_MODE))).isNotEmpty();
+        assertThat(shadowContentResolver.getContentObservers(
+            System.getUriFor(System.SCREEN_BRIGHTNESS))).isNotEmpty();
+        assertThat(shadowContentResolver.getContentObservers(
+            System.getUriFor(System.SCREEN_BRIGHTNESS_FOR_VR))).isNotEmpty();
+        assertThat(shadowContentResolver.getContentObservers(
+            System.getUriFor(System.SCREEN_AUTO_BRIGHTNESS_ADJ))).isNotEmpty();
+    }
+
+    @Test
+    public void onPause_shouldUnregisterObserver() {
+        Context context = RuntimeEnvironment.application;
+        BrightnessLevelPreferenceController controller =
+            new BrightnessLevelPreferenceController(context, null, mPowerManager);
+        ShadowContentResolver shadowContentResolver =
+            (ShadowContentResolver) ShadowExtractor.extract(context.getContentResolver());
+
+        controller.displayPreference(mScreen);
+        controller.onResume();
+        controller.onPause();
+
+        assertThat(shadowContentResolver.getContentObservers(
+            System.getUriFor(System.SCREEN_BRIGHTNESS_MODE))).isEmpty();
+        assertThat(shadowContentResolver.getContentObservers(
+            System.getUriFor(System.SCREEN_BRIGHTNESS))).isEmpty();
+        assertThat(shadowContentResolver.getContentObservers(
+            System.getUriFor(System.SCREEN_BRIGHTNESS_FOR_VR))).isEmpty();
+        assertThat(shadowContentResolver.getContentObservers(
+            System.getUriFor(System.SCREEN_AUTO_BRIGHTNESS_ADJ))).isEmpty();
+    }
+
+    @Test
+    public void updateState_inVrMode_shouldSetSummaryToVrBrightness() {
+        doReturn(true).when(mController).isInVrMode();
+        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_FOR_VR, 85);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary("85%");
+    }
+
+    @Test
+    public void updateState_autoBrightness_shouldSetSummaryToVrBrightness() {
+        doReturn(false).when(mController).isInVrMode();
+        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_MODE,
+            System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
+
+        System.putFloat(mContentResolver, System.SCREEN_AUTO_BRIGHTNESS_ADJ, 0.0f);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary("50%");
+    }
+
+    @Test
+    public void updateState_manualBrightness_shouldSetSummaryToVrBrightness() {
+        doReturn(false).when(mController).isInVrMode();
+        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_MODE,
+            System.SCREEN_BRIGHTNESS_MODE_MANUAL);
+
+        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS, 45);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary("45%");
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java
new file mode 100644
index 0000000..00d910e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java
@@ -0,0 +1,113 @@
+/*
+ * 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.display;
+
+import android.content.Context;
+import android.os.IBinder;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ColorModePreferenceControllerTest {
+    @Mock
+    private ColorModePreferenceController.ConfigurationWrapper mConfigWrapper;
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private Context mContext;
+    @Mock
+    private IBinder mSurfaceFlinger;
+
+    private ColorModePreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        SettingsShadowSystemProperties.clear();
+
+        mController = new ColorModePreferenceController(mContext);
+        ReflectionHelpers.setField(mController, "mSurfaceFlinger", mSurfaceFlinger);
+        ReflectionHelpers.setField(mController, "mConfigWrapper", mConfigWrapper);
+
+        when(mConfigWrapper.isScreenWideColorGamut()).thenReturn(true);
+
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
+    }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void shouldCheckPreference() {
+        SettingsShadowSystemProperties.set(
+                ColorModePreferenceController.PERSISTENT_PROPERTY_SATURATION,
+                Float.toString(ColorModePreferenceController.COLOR_SATURATION_VIVID));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void shouldUncheckPreference() {
+        SettingsShadowSystemProperties.set(
+                ColorModePreferenceController.PERSISTENT_PROPERTY_SATURATION,
+                Float.toString(ColorModePreferenceController.COLOR_SATURATION_DEFAULT));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void shouldBoostSaturationOnCheck() {
+        mController.onPreferenceChange(mPreference, true);
+
+        String saturation = SettingsShadowSystemProperties
+                .get(ColorModePreferenceController.PERSISTENT_PROPERTY_SATURATION);
+        assertThat(saturation)
+                .isEqualTo(Float.toString(ColorModePreferenceController.COLOR_SATURATION_VIVID));
+    }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void shouldResetSaturationOnUncheck() {
+        mController.onPreferenceChange(mPreference, false);
+
+        String saturation = SettingsShadowSystemProperties
+                .get(ColorModePreferenceController.PERSISTENT_PROPERTY_SATURATION);
+        assertThat(saturation)
+                .isEqualTo(Float.toString(ColorModePreferenceController.COLOR_SATURATION_DEFAULT));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
index 2c0f4a7..3d99f65 100644
--- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
@@ -21,20 +21,25 @@
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.support.v7.preference.ListPreference;
+
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.display.ThemePreferenceController.OverlayManager;
+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.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 import static org.mockito.Matchers.any;
 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;
@@ -45,33 +50,65 @@
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class ThemePreferenceControllerTest {
 
-    @Mock
-    private ListPreference mPreference;
-    @Mock
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock
     private PackageManager mPackageManager;
     @Mock
     private ApplicationInfo mApplicationInfo;
+    @Mock
+    private ListPreference mPreference;
 
     private ThemePreferenceController mController;
 
     @Before
     public void setUp() throws NameNotFoundException {
         MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
         when(mPackageManager.getApplicationInfo(any(), anyInt())).thenReturn(mApplicationInfo);
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        when(mContext.getString(R.string.default_theme))
+                .thenReturn(RuntimeEnvironment.application.getString(R.string.default_theme));
+
         mController = spy(new ThemePreferenceController(mContext, mock(OverlayManager.class)));
     }
 
     @Test
-    public void updateState_themeSet_shouldSetPreferenceValue() {
-        final String[] themes = {"Theme1", "Theme2"};
-        doReturn("Theme1").when(mController).getCurrentTheme();
+    public void updateState_themeSet_shouldSetPreferenceValue() throws NameNotFoundException {
+        final String pkg1 = "pkg1.theme1";
+        final String pkg2 = "pkg2.theme2";
+        final String themeLabel1 = "Theme1";
+        final String themeLabel2 = "Theme2";
+        final String[] themes = {pkg1, pkg2};
+        doReturn("pkg1.theme1").when(mController).getCurrentTheme();
         doReturn(themes).when(mController).getAvailableThemes();
+        when(mPackageManager.getApplicationInfo(anyString(), anyInt()).loadLabel(mPackageManager))
+                .thenReturn(themeLabel1)
+                .thenReturn(themeLabel2);
 
         mController.updateState(mPreference);
 
-        verify(mPreference).setValue("Theme1");
+        verify(mPreference).setSummary(themeLabel1);
+        verify(mPreference).setValue(pkg1);
+    }
+
+    @Test
+    public void updateState_themeNull_shouldSetDefaultSummary() throws NameNotFoundException {
+        final String pkg1 = "pkg1.theme1";
+        final String pkg2 = "pkg2.theme2";
+        final String themeLabel1 = "Theme1";
+        final String themeLabel2 = "Theme2";
+        final String[] themes = {pkg1, pkg2};
+        doReturn(null).when(mController).getCurrentTheme();
+        doReturn(themes).when(mController).getAvailableThemes();
+        when(mPackageManager.getApplicationInfo(anyString(), anyInt()).loadLabel(mPackageManager))
+                .thenReturn(themeLabel1)
+                .thenReturn(themeLabel2);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference)
+                .setSummary(RuntimeEnvironment.application.getString(R.string.default_theme));
+        verify(mPreference).setValue(null);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
index 2ebad46..480e41f 100644
--- a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 import android.provider.Settings;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.TimeoutListPreference;
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java
index 56d4c47..191a8fb 100644
--- a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java
+++ b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java
@@ -25,7 +25,7 @@
 import android.provider.Settings;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
 
diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java
new file mode 100644
index 0000000..bd25d92
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java
@@ -0,0 +1,91 @@
+/*
+ * 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.dream;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.UserManager;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.dream.DreamBackend;
+import com.android.settingslib.dream.DreamBackend.DreamInfo;
+import java.util.ArrayList;
+import java.util.Arrays;
+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.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class CurrentDreamPickerTest {
+    private static String COMPONENT_KEY = "mocked_component_name_string";
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private DreamBackend mBackend;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Activity mActivity;
+    @Mock
+    private UserManager mUserManager;
+    private CurrentDreamPicker mPicker;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        FakeFeatureFactory.setupForTest(mActivity);
+
+        mPicker = new CurrentDreamPicker();
+        mPicker.onAttach((Context)mActivity);
+
+        ReflectionHelpers.setField(mPicker, "mBackend", mBackend);
+    }
+
+    @Test
+    public void getDefaultShouldReturnActiveDream() {
+        ComponentName mockComponentName = mock(ComponentName.class);
+        when(mockComponentName.flattenToString()).thenReturn(COMPONENT_KEY);
+        when(mBackend.getActiveDream()).thenReturn(mockComponentName);
+
+        assertThat(mPicker.getDefaultKey()).isEqualTo(COMPONENT_KEY);
+    }
+
+    @Test
+    public void setDefaultShouldUpdateActiveDream() {
+        DreamInfo mockInfo = mock(DreamInfo.class);
+        ComponentName mockName = mock(ComponentName.class);
+
+        mockInfo.componentName = mockName;
+        when(mockName.flattenToString()).thenReturn(COMPONENT_KEY);
+        when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(Arrays.asList(mockInfo)));
+
+        mPicker.setDefaultKey(COMPONENT_KEY);
+
+        verify(mBackend).setActiveDream(mockName);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java
new file mode 100644
index 0000000..e3493a1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java
@@ -0,0 +1,111 @@
+/*
+ * 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.dream;
+
+import android.content.ComponentName;
+import android.content.Context;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.widget.GearPreference;
+import com.android.settingslib.dream.DreamBackend;
+import com.android.settingslib.dream.DreamBackend.DreamInfo;
+import java.util.ArrayList;
+import java.util.Arrays;
+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;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class CurrentDreamPreferenceControllerTest {
+    private static String TAG = "CurrentDreamPreferenceControllerTest";
+
+    private CurrentDreamPreferenceController mController;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private DreamBackend mBackend;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private DreamInfo mDreamInfo;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+
+        mController = new CurrentDreamPreferenceController(mContext);
+        ReflectionHelpers.setField(mController, "mBackend", mBackend);
+    }
+
+    @Test
+    public void isDisabledIfNoDreamsAvailable() {
+        when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(0));
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isEnabledIfDreamsAvailable() {
+        when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(Arrays.asList(mDreamInfo)));
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void gearShowsIfActiveDreamInfoHasOptions() {
+        mDreamInfo.settingsComponentName = mock(ComponentName.class);
+        mDreamInfo.isActive = true;
+
+        when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(Arrays.asList(mDreamInfo)));
+
+        GearPreference mockPref = mock(GearPreference.class);
+        ArgumentCaptor<GearPreference.OnGearClickListener> captor =
+                ArgumentCaptor.forClass(GearPreference.OnGearClickListener.class);
+
+        // verify that updateState sets a non-null gear click listener
+        mController.updateState(mockPref);
+        verify(mockPref).setOnGearClickListener(captor.capture());
+        captor.getAllValues().forEach(listener -> assertThat(listener).isNotNull());
+    }
+
+    @Test
+    public void gearHidesIfActiveDreamInfoHasNoOptions() {
+        mDreamInfo.settingsComponentName = null;
+        mDreamInfo.isActive = true;
+
+        when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(Arrays.asList(mDreamInfo)));
+
+        GearPreference mockPref = mock(GearPreference.class);
+        ArgumentCaptor<GearPreference.OnGearClickListener> captor =
+                ArgumentCaptor.forClass(GearPreference.OnGearClickListener.class);
+
+        // setting a null onGearClickListener removes the gear from view
+        mController.updateState(mockPref);
+        verify(mockPref).setOnGearClickListener(captor.capture());
+        captor.getAllValues().forEach(listener -> assertThat(listener).isNull());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java
new file mode 100644
index 0000000..73526e5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java
@@ -0,0 +1,113 @@
+/*
+ * 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.dream;
+
+import android.content.Context;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settingslib.dream.DreamBackend;
+import com.android.settingslib.dream.DreamBackend.WhenToDream;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class DreamSettingsTest {
+    private static final List<String> KEYS = Arrays.asList(
+            DreamSettings.WHILE_CHARGING_ONLY,
+            DreamSettings.WHILE_DOCKED_ONLY,
+            DreamSettings.EITHER_CHARGING_OR_DOCKED,
+            DreamSettings.NEVER_DREAM
+        );
+
+    private static final @WhenToDream int[] SETTINGS = {
+                DreamBackend.WHILE_CHARGING,
+                DreamBackend.WHILE_DOCKED,
+                DreamBackend.EITHER,
+                DreamBackend.NEVER,
+        };
+
+    private static final int[] RES_IDS = {
+            R.string.screensaver_settings_summary_sleep,
+            R.string.screensaver_settings_summary_dock,
+            R.string.screensaver_settings_summary_either_long,
+            R.string.screensaver_settings_summary_never
+    };
+
+    @Test
+    public void getSettingFromPrefKey() {
+        for (int i = 0; i < KEYS.size(); i++) {
+            assertThat(DreamSettings.getSettingFromPrefKey(KEYS.get(i)))
+                    .isEqualTo(SETTINGS[i]);
+        }
+        // Default case
+        assertThat(DreamSettings.getSettingFromPrefKey("garbage value"))
+                .isEqualTo(DreamBackend.NEVER);
+    }
+
+    @Test
+    public void getKeyFromSetting() {
+        for (int i = 0; i < SETTINGS.length; i++) {
+            assertThat(DreamSettings.getKeyFromSetting(SETTINGS[i]))
+                    .isEqualTo(KEYS.get(i));
+        }
+        // Default
+        assertThat(DreamSettings.getKeyFromSetting(-1))
+                .isEqualTo(DreamSettings.NEVER_DREAM);
+    }
+
+    @Test
+    public void getDreamSettingDescriptionResId() {
+        for (int i = 0; i < SETTINGS.length; i++) {
+            assertThat(DreamSettings.getDreamSettingDescriptionResId(SETTINGS[i]))
+                    .isEqualTo(RES_IDS[i]);
+        }
+        // Default
+        assertThat(DreamSettings.getDreamSettingDescriptionResId(-1))
+                .isEqualTo(R.string.screensaver_settings_summary_never);
+    }
+
+    @Test
+    public void summaryText_whenDreamsAreOff() {
+        DreamBackend mockBackend = mock(DreamBackend.class);
+        Context mockContext = mock(Context.class);
+        when(mockBackend.isEnabled()).thenReturn(false);
+
+        assertThat(DreamSettings.getSummaryTextFromBackend(mockBackend, mockContext))
+                .isEqualTo(mockContext.getString(R.string.screensaver_settings_summary_off));
+    }
+
+    @Test
+    public void summaryTest_WhenDreamsAreOn() {
+        final String fakeName = "test_name";
+        DreamBackend mockBackend = mock(DreamBackend.class);
+        Context mockContext = mock(Context.class);
+        when(mockBackend.isEnabled()).thenReturn(true);
+        when(mockBackend.getActiveDreamName()).thenReturn(fakeName);
+
+        assertThat(DreamSettings.getSummaryTextFromBackend(mockBackend, mockContext))
+                .isEqualTo(fakeName);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java
new file mode 100644
index 0000000..444591a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java
@@ -0,0 +1,94 @@
+/*
+ * 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.dream;
+
+import android.content.Context;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settingslib.dream.DreamBackend;
+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;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class StartNowPreferenceControllerTest {
+    private StartNowPreferenceController mController;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private LayoutPreference mLayoutPref;
+    @Mock
+    private Button mButton;
+    @Mock
+    private DreamBackend mBackend;
+
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+
+        mController = new StartNowPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mLayoutPref);
+        when(mLayoutPref.findViewById(R.id.dream_start_now_button)).thenReturn(mButton);
+
+        ReflectionHelpers.setField(mController, "mBackend", mBackend);
+    }
+
+    @Test
+    public void setsOnClickListenerForStartNow() {
+        ArgumentCaptor<OnClickListener> captor =
+                ArgumentCaptor.forClass(Button.OnClickListener.class);
+
+        mController.displayPreference(mScreen);
+        verify(mButton).setOnClickListener(captor.capture());
+        assertThat(captor.getValue()).isNotNull();
+    }
+
+    @Test
+    public void buttonIsDisabledWhenNeverDreaming() {
+        when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.NEVER);
+
+        mController.updateState(mLayoutPref);
+        verify(mButton).setEnabled(false);
+    }
+
+    @Test
+    public void buttonIsEnabledWhenDreamIsAvailable() {
+        when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.EITHER);
+
+        mController.updateState(mLayoutPref);
+        verify(mButton).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java
new file mode 100644
index 0000000..bafc2d4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java
@@ -0,0 +1,108 @@
+/*
+ * 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.dream;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.UserManager;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.dream.DreamBackend;
+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.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WhenToDreamPickerTest {
+    private WhenToDreamPicker mPicker;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private DreamBackend mBackend;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Activity mActivity;
+    @Mock
+    private UserManager mUserManager;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        FakeFeatureFactory.setupForTest(mActivity);
+
+        mPicker = new WhenToDreamPicker();
+        mPicker.onAttach((Context)mActivity);
+
+        ReflectionHelpers.setField(mPicker, "mBackend", mBackend);
+    }
+
+    @Test
+    public void getDefaultKeyReturnsCurrentWhenToDreamSetting() {
+        when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.WHILE_CHARGING);
+        assertThat(mPicker.getDefaultKey())
+                .isEqualTo(DreamSettings.getKeyFromSetting(DreamBackend.WHILE_CHARGING));
+
+        when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.WHILE_DOCKED);
+        assertThat(mPicker.getDefaultKey())
+                .isEqualTo(DreamSettings.getKeyFromSetting(DreamBackend.WHILE_DOCKED));
+
+        when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.EITHER);
+        assertThat(mPicker.getDefaultKey())
+                .isEqualTo(DreamSettings.getKeyFromSetting(DreamBackend.EITHER));
+
+        when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.NEVER);
+        assertThat(mPicker.getDefaultKey())
+                .isEqualTo(DreamSettings.getKeyFromSetting(DreamBackend.NEVER));
+    }
+
+    @Test
+    public void setDreamWhileCharging() {
+        String key = DreamSettings.getKeyFromSetting(DreamBackend.WHILE_CHARGING);
+        mPicker.setDefaultKey(key);
+        verify(mBackend).setWhenToDream(DreamBackend.WHILE_CHARGING);
+    }
+
+    @Test
+    public void setDreamWhileDocked() {
+        String key = DreamSettings.getKeyFromSetting(DreamBackend.WHILE_DOCKED);
+        mPicker.setDefaultKey(key);
+        verify(mBackend).setWhenToDream(DreamBackend.WHILE_DOCKED);
+    }
+
+    @Test
+    public void setDreamWhileChargingOrDocked() {
+        String key = DreamSettings.getKeyFromSetting(DreamBackend.EITHER);
+        mPicker.setDefaultKey(key);
+        verify(mBackend).setWhenToDream(DreamBackend.EITHER);
+    }
+
+    @Test
+    public void setDreamNever() {
+        String key = DreamSettings.getKeyFromSetting(DreamBackend.NEVER);
+        mPicker.setDefaultKey(key);
+        verify(mBackend).setWhenToDream(DreamBackend.NEVER);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java
new file mode 100644
index 0000000..2acf82b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java
@@ -0,0 +1,70 @@
+/*
+ * 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.dream;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settingslib.dream.DreamBackend;
+import com.android.settingslib.dream.DreamBackend.WhenToDream;
+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.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WhenToDreamPreferenceControllerTest {
+    private WhenToDreamPreferenceController mController;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private DreamBackend mBackend;
+
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mController = new WhenToDreamPreferenceController(mContext);
+        ReflectionHelpers.setField(mController, "mBackend", mBackend);
+    }
+
+    @Test
+    public void updateSummary() {
+        // Don't have to test the other settings because DreamSettings tests that all
+        // @WhenToDream values map to the correct ResId
+        final @WhenToDream int testSetting = DreamBackend.WHILE_CHARGING;
+        final Preference mockPref = mock(Preference.class);
+        when(mockPref.getContext()).thenReturn(mContext);
+        when(mBackend.getWhenToDreamSetting()).thenReturn(testSetting);
+        final String expectedString =
+                mContext.getString(DreamSettings.getDreamSettingDescriptionResId(testSetting));
+
+        mController.updateState(mockPref);
+        verify(mockPref).setSummary(expectedString);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java
index b5d6b7a..111e503 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java
@@ -16,9 +16,7 @@
 
 package com.android.settings.enterprise;
 
-import android.content.Context;
-
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java
index 0281ce5..491fcdb 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import android.Manifest;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java
index d556296..01a13d2 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import android.Manifest;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java
index e2a45ec..fed1631 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import android.Manifest;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java
index 4da1cd2..a209a46 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java
@@ -16,12 +16,7 @@
 
 package com.android.settings.enterprise;
 
-import android.Manifest;
-import android.content.Intent;
-import android.support.v7.preference.Preference;
-import android.text.TextUtils;
-
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
index 51c8a7b..045acf2 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import com.android.settings.R;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
index 4562711..b321652 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
index 1936f80..83ea399 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
@@ -23,7 +23,7 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.applications.UserAppInfo;
diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java
index 56a6c62..0d22d2e 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.applications.UserAppInfo;
diff --git a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java
index b9c838b..0b97353 100644
--- a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java
@@ -16,9 +16,8 @@
 
 package com.android.settings.enterprise;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java
index 2c0e320..00b3573 100644
--- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java
@@ -17,11 +17,11 @@
 package com.android.settings.enterprise;
 
 import android.content.Context;
-import android.content.res.Resources;
+
 import com.android.settings.R;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
index cf54bb0..cc6335f 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
@@ -19,9 +19,8 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.core.PreferenceAvailabilityObserver;
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
index 5e46216..d506a8e 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
@@ -29,7 +29,7 @@
 import android.text.SpannableStringBuilder;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.vpn2.ConnectivityManagerWrapper;
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
index 101a45a..7077ad5 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
@@ -17,11 +17,10 @@
 package com.android.settings.enterprise;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
index 16fa5ba..42639d6 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
@@ -16,14 +16,12 @@
 
 package com.android.settings.enterprise;
 
-import android.app.Application;
 import android.content.Context;
-import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
 import com.android.settings.core.PreferenceController;
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
index e5c877f..54a825e 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
@@ -21,7 +21,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceController;
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
index 6a1a7f7..c38f56a 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
@@ -28,7 +28,7 @@
 
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.EnterpriseDefaultApps;
 import com.android.settings.applications.UserAppInfo;
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
index 5eb59e7..bb21bf7 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
@@ -16,6 +16,14 @@
 
 package com.android.settings.enterprise;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -25,7 +33,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.EnterpriseDefaultApps;
 import com.android.settings.applications.UserAppInfo;
@@ -44,14 +52,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.anyObject;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 /**
  * Tests for {@link EnterpriseSetDefaultAppsPreferenceController}.
  */
@@ -92,7 +93,7 @@
             final List<UserAppInfo> apps = new ArrayList<>(number);
             apps.add(new UserAppInfo(new UserInfo(i, "user." + i, UserInfo.FLAG_ADMIN), appInfo));
             when(mFeatureFactory.applicationFeatureProvider.findPersistentPreferredActivities(eq(i),
-                    argThat(new MatchesIntents(intents)))).thenReturn(apps);
+                    argThat(matchesIntents(intents)))).thenReturn(apps);
         }
     }
 
@@ -127,7 +128,7 @@
     @Test
     public void testIsAvailable() {
         when(mFeatureFactory.applicationFeatureProvider.findPersistentPreferredActivities(anyInt(),
-                anyObject())).thenReturn(new ArrayList<UserAppInfo>());
+                any(Intent[].class))).thenReturn(new ArrayList<>());
         assertThat(mController.isAvailable()).isFalse();
         verify(mObserver).onPreferenceAvailabilityUpdated(KEY_DEFAULT_APPS, false);
 
@@ -148,28 +149,20 @@
         assertThat(mController.getPreferenceKey()).isEqualTo(KEY_DEFAULT_APPS);
     }
 
-    private static class MatchesIntents extends ArgumentMatcher<Intent[]> {
-        private final Intent[] mExpectedIntents;
-
-        MatchesIntents(Intent[] intents) {
-            mExpectedIntents = intents;
-        }
-
-        @Override
-        public boolean matches(Object object) {
-            final Intent[] actualIntents = (Intent[]) object;
+    private ArgumentMatcher<Intent[]> matchesIntents(Intent[] intents) {
+        return (Intent[] actualIntents) -> {
             if (actualIntents == null) {
                 return false;
             }
-            if (actualIntents.length != mExpectedIntents.length) {
+            if (actualIntents.length != intents.length) {
                 return false;
             }
-            for (int i = 0; i < mExpectedIntents.length; i++) {
-                if (!mExpectedIntents[i].filterEquals(actualIntents[i])) {
+            for (int i = 0; i < intents.length; i++) {
+                if (!intents[i].filterEquals(actualIntents[i])) {
                     return false;
                 }
             }
             return true;
-        }
+        };
     }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java
index 1c92ea5..f77aef8 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
 import com.android.settings.core.PreferenceAvailabilityObserver;
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java
index b2f4fa7..db9182b 100644
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java
@@ -16,9 +16,7 @@
 
 package com.android.settings.enterprise;
 
-import android.content.Context;
-
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java
index 99c68f8..329c526 100644
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java
@@ -16,9 +16,7 @@
 
 package com.android.settings.enterprise;
 
-import android.content.Context;
-
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java
index 74c3de5..5d1b28a 100644
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.enterprise;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
index 016d970..d5ce102 100644
--- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
index 3304b44..22d2a7d 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
@@ -17,11 +17,11 @@
 package com.android.settings.enterprise;
 
 import android.content.Context;
-import android.content.res.Resources;
+
 import com.android.settings.R;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
index d3f5e97..2df05c2 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
@@ -17,11 +17,10 @@
 package com.android.settings.enterprise;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
diff --git a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java
index 33360cc..43b793d 100644
--- a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java
@@ -16,9 +16,8 @@
 
 package com.android.settings.enterprise;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java
index 1205b0b..11e219a 100644
--- a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java
@@ -16,9 +16,8 @@
 
 package com.android.settings.enterprise;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
index 646774d..84dfbfd 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
@@ -29,10 +29,10 @@
 import android.os.CancellationSignal;
 import android.widget.Button;
 
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settings.password.IFingerprintManager;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
@@ -93,18 +93,11 @@
 
     @Test
     public void clickNextAndFingerprint_shouldNotCrash() {
-        ArgumentCaptor<EnrollmentCallback> callbackCaptor =
-                ArgumentCaptor.forClass(EnrollmentCallback.class);
-        verify(mFingerprintManager).enroll(
-                any(byte[].class),
-                any(CancellationSignal.class),
-                anyInt(),
-                anyInt(),
-                callbackCaptor.capture());
+        EnrollmentCallback enrollmentCallback = verifyAndCaptureEnrollmentCallback();
 
         Button nextButton = mActivity.findViewById(R.id.next_button);
         nextButton.performClick();
-        callbackCaptor.getValue().onEnrollmentProgress(123);
+        enrollmentCallback.onEnrollmentProgress(123);
         nextButton.performClick();
 
         ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
@@ -118,4 +111,37 @@
         assertThat(shadowActivity.getNextStartedActivityForResult()).named("Next activity 2")
                 .isNull();
     }
+
+    // Use a non-default resource qualifier to load the test layout in
+    // robotests/res/layout-mcc999/fingerprint_enroll_find_sensor. This layout is a copy of the
+    // regular find sensor layout, with the animation removed.
+    @Config(qualifiers = "mcc999")
+    @Test
+    public void layoutWithoutAnimation_shouldNotCrash() {
+        EnrollmentCallback enrollmentCallback = verifyAndCaptureEnrollmentCallback();
+        enrollmentCallback.onEnrollmentProgress(123);
+
+        Button nextButton = mActivity.findViewById(R.id.next_button);
+        nextButton.performClick();
+
+        ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
+        IntentForResult startedActivity =
+                shadowActivity.getNextStartedActivityForResult();
+        assertThat(startedActivity).named("Next activity").isNotNull();
+        assertThat(startedActivity.intent.getComponent())
+                .isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
+    }
+
+    private EnrollmentCallback verifyAndCaptureEnrollmentCallback() {
+        ArgumentCaptor<EnrollmentCallback> callbackCaptor =
+                ArgumentCaptor.forClass(EnrollmentCallback.class);
+        verify(mFingerprintManager).enroll(
+                any(byte[].class),
+                any(CancellationSignal.class),
+                anyInt(),
+                anyInt(),
+                callbackCaptor.capture());
+
+        return callbackCaptor.getValue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java
index e8dc2b5..7b7e440 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java
@@ -22,12 +22,11 @@
 import android.net.Uri;
 import android.view.TextureView.SurfaceTextureListener;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
index f4ed43e..d837c40 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -18,17 +18,15 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doAnswer;
 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 static org.mockito.Mockito.when;
 
 import android.app.Activity;
 import android.app.Fragment;
@@ -39,20 +37,25 @@
 import android.os.BatteryStats;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.view.View;
+import android.support.v7.preference.Preference;
+import android.support.v7.widget.RecyclerView;
 
 import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.applications.AppHeaderController;
 import com.android.settings.applications.LayoutPreference;
+import com.android.settings.R;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
+import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -60,23 +63,22 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = ShadowEntityHeaderController.class)
 public class AdvancedPowerUsageDetailTest {
     private static final String APP_LABEL = "app label";
     private static final String SUMMARY = "summary";
     private static final String[] PACKAGE_NAME = {"com.android.app"};
-    private static final String USAGE_PERCENT = "16";
+    private static final String USAGE_PERCENT = "16%";
     private static final int ICON_ID = 123;
     private static final int UID = 1;
+    private static final int POWER_MAH = 150;
     private static final long BACKGROUND_TIME_US = 100 * 1000;
     private static final long FOREGROUND_TIME_US = 200 * 1000;
     private static final long BACKGROUND_TIME_MS = 100;
@@ -85,11 +87,9 @@
     private static final long PHONE_BACKGROUND_TIME_MS = 0;
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Activity mActivity;
     @Mock
-    private AppHeaderController mAppHeaderController;
+    private EntityHeaderController mEntityHeaderController;
     @Mock
     private LayoutPreference mHeaderPreference;
     @Mock
@@ -108,6 +108,10 @@
     private BatteryStats.Uid mUid;
     @Mock
     private PackageManager mPackageManager;
+    private Context mContext;
+    private Preference mForegroundPreference;
+    private Preference mBackgroundPreference;
+    private Preference mPowerUsagePreference;
     private AdvancedPowerUsageDetail mFragment;
     private FakeFeatureFactory mFeatureFactory;
     private SettingsActivity mTestActivity;
@@ -115,6 +119,8 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+
+        mContext = spy(RuntimeEnvironment.application);
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
 
@@ -122,21 +128,26 @@
         doReturn(mContext).when(mFragment).getContext();
         doReturn(mActivity).when(mFragment).getActivity();
         doReturn(SUMMARY).when(mFragment).getString(anyInt());
-        doReturn(APP_LABEL).when(mBundle).getString(anyString());
+        doReturn(APP_LABEL).when(mBundle).getString(nullable(String.class));
         doReturn(mBundle).when(mFragment).getArguments();
 
-        doReturn(mAppHeaderController).when(mFeatureFactory.applicationFeatureProvider)
-                .newAppHeaderController(any(Fragment.class), any(View.class));
-        doReturn(mAppHeaderController).when(mAppHeaderController).setButtonActions(anyInt(),
-                anyInt());
-        doReturn(mAppHeaderController).when(mAppHeaderController).setIcon(any(Drawable.class));
-        doReturn(mAppHeaderController).when(mAppHeaderController).setIcon(any(
+        ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
+        doReturn(mEntityHeaderController).when(mEntityHeaderController)
+                .setRecyclerView(nullable(RecyclerView.class), nullable(Lifecycle.class));
+        doReturn(mEntityHeaderController).when(mEntityHeaderController)
+                .setButtonActions(anyInt(), anyInt());
+        doReturn(mEntityHeaderController).when(mEntityHeaderController)
+                .setIcon(nullable(Drawable.class));
+        doReturn(mEntityHeaderController).when(mEntityHeaderController).setIcon(nullable(
                 ApplicationsState.AppEntry.class));
-        doReturn(mAppHeaderController).when(mAppHeaderController).setLabel(anyString());
-        doReturn(mAppHeaderController).when(mAppHeaderController).setLabel(any(
-                ApplicationsState.AppEntry.class));
-        doReturn(mAppHeaderController).when(mAppHeaderController).setSummary(anyString());
-
+        doReturn(mEntityHeaderController).when(mEntityHeaderController)
+                .setLabel(nullable(String.class));
+        doReturn(mEntityHeaderController).when(mEntityHeaderController)
+                .setLabel(nullable(String.class));
+        doReturn(mEntityHeaderController).when(mEntityHeaderController)
+                .setLabel(nullable(ApplicationsState.AppEntry.class));
+        doReturn(mEntityHeaderController).when(mEntityHeaderController)
+                .setSummary(nullable(String.class));
 
         doReturn(UID).when(mBatterySipper).getUid();
         doReturn(APP_LABEL).when(mBatteryEntry).getLabel();
@@ -159,15 +170,25 @@
 
         final ArgumentCaptor<Bundle> captor = ArgumentCaptor.forClass(Bundle.class);
 
-        Answer<Void> callable = new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Exception {
-                mBundle = captor.getValue();
-                return null;
-            }
+        Answer<Void> callable = invocation -> {
+            mBundle = captor.getValue();
+            return null;
         };
-        doAnswer(callable).when(mTestActivity).startPreferencePanelAsUser(any(), anyString(),
-                captor.capture(), anyInt(), any(), any());
+        doAnswer(callable).when(mTestActivity).startPreferencePanelAsUser(
+                nullable(Fragment.class), nullable(String.class), captor.capture(), anyInt(),
+                nullable(CharSequence.class), nullable(UserHandle.class));
+
+        mForegroundPreference = new Preference(mContext);
+        mBackgroundPreference = new Preference(mContext);
+        mPowerUsagePreference = new Preference(mContext);
+        mFragment.mForegroundPreference = mForegroundPreference;
+        mFragment.mBackgroundPreference = mBackgroundPreference;
+        mFragment.mPowerUsagePreference = mPowerUsagePreference;
+    }
+
+    @After
+    public void reset() {
+        ShadowEntityHeaderController.reset();
     }
 
     @Test
@@ -175,8 +196,8 @@
         mFragment.mAppEntry = null;
         mFragment.initHeader();
 
-        verify(mAppHeaderController).setIcon(any(Drawable.class));
-        verify(mAppHeaderController).setLabel(APP_LABEL);
+        verify(mEntityHeaderController).setIcon(nullable(Drawable.class));
+        verify(mEntityHeaderController).setLabel(APP_LABEL);
     }
 
     @Test
@@ -191,9 +212,9 @@
         mFragment.mAppEntry = mAppEntry;
         mFragment.initHeader();
 
-        verify(mAppHeaderController).setIcon(mAppEntry);
-        verify(mAppHeaderController).setLabel(mAppEntry);
-        verify(mAppHeaderController).setIsInstantApp(false);
+        verify(mEntityHeaderController).setIcon(mAppEntry);
+        verify(mEntityHeaderController).setLabel(mAppEntry);
+        verify(mEntityHeaderController).setIsInstantApp(false);
     }
 
     @Test
@@ -208,10 +229,10 @@
         mFragment.mAppEntry = mAppEntry;
         mFragment.initHeader();
 
-        verify(mAppHeaderController).setIcon(mAppEntry);
-        verify(mAppHeaderController).setLabel(mAppEntry);
-        verify(mAppHeaderController).setIsInstantApp(true);
-        verify(mAppHeaderController).setSummary((CharSequence) null);
+        verify(mEntityHeaderController).setIcon(mAppEntry);
+        verify(mEntityHeaderController).setLabel(mAppEntry);
+        verify(mEntityHeaderController).setIsInstantApp(true);
+        verify(mEntityHeaderController).setSummary((CharSequence) null);
     }
 
     @Test
@@ -276,21 +297,20 @@
                 mBatteryEntry, USAGE_PERCENT);
 
         verify(mTestActivity).startPreferencePanelAsUser(
-                any(), anyString(), any(), anyInt(), any(), eq(new UserHandle(10)));
+                nullable(Fragment.class), nullable(String.class), nullable(Bundle.class), anyInt(),
+                nullable(CharSequence.class), eq(new UserHandle(10)));
     }
 
     @Test
     public void testStartBatteryDetailPage_noBatteryUsage_hasBasicData() {
         final ArgumentCaptor<Bundle> captor = ArgumentCaptor.forClass(Bundle.class);
-        Answer<Void> callable = new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Exception {
-                mBundle = captor.getValue();
-                return null;
-            }
+        Answer<Void> callable = invocation -> {
+            mBundle = captor.getValue();
+            return null;
         };
-        doAnswer(callable).when(mTestActivity).startPreferencePanelAsUser(any(), anyString(),
-                captor.capture(), anyInt(), any(), any());
+        doAnswer(callable).when(mTestActivity).startPreferencePanelAsUser(nullable(Fragment.class),
+                nullable(String.class), captor.capture(), anyInt(), nullable(CharSequence.class),
+                nullable(UserHandle.class));
 
         AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, PACKAGE_NAME[0]);
 
@@ -299,4 +319,29 @@
         assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT)).isEqualTo(
                 "0%");
     }
+
+    @Test
+    public void testInitPreference_hasCorrectSummary() {
+        Bundle bundle = new Bundle(4);
+        bundle.putLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME, BACKGROUND_TIME_MS);
+        bundle.putLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME, FOREGROUND_TIME_MS);
+        bundle.putString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT, USAGE_PERCENT);
+        bundle.putInt(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_AMOUNT, POWER_MAH);
+        doReturn(bundle).when(mFragment).getArguments();
+
+        doReturn(mContext.getText(R.string.battery_used_for)).when(mFragment).getText(
+                R.string.battery_used_for);
+        doReturn(mContext.getText(R.string.battery_active_for)).when(mFragment).getText(
+                R.string.battery_active_for);
+        doReturn(mContext.getString(R.string.battery_detail_power_percentage, USAGE_PERCENT,
+                POWER_MAH)).when(mFragment)
+                .getString(R.string.battery_detail_power_percentage, USAGE_PERCENT, POWER_MAH);
+
+        mFragment.initPreference();
+
+        assertThat(mForegroundPreference.getSummary().toString()).isEqualTo("Used for 0m");
+        assertThat(mBackgroundPreference.getSummary().toString()).isEqualTo("Active for 0m");
+        assertThat(mPowerUsagePreference.getSummary()).isEqualTo("16% of total app usage (150mAh)");
+    }
+
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
index b40cb9e..92df48e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
@@ -45,12 +45,12 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
index 799dab9..c3b660c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
@@ -19,7 +19,7 @@
 import android.content.Intent;
 import android.os.BatteryManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.Utils;
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index 04bb2cf..18c09b0 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -17,28 +17,26 @@
 
 package com.android.settings.fuelgauge;
 
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.BatteryManager;
-import android.support.v7.preference.Preference;
+import android.support.v14.preference.PreferenceFragment;
 import android.support.v7.preference.PreferenceScreen;
+import android.support.v7.widget.RecyclerView;
 import android.widget.TextView;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
-import com.android.settingslib.BatteryInfo;
+import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
+import com.android.settings.widget.EntityHeaderController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -47,13 +45,23 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.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;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH,
         sdk = TestConfig.SDK_VERSION,
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
-                ShadowDynamicIndexableContentMonitor.class
+                ShadowDynamicIndexableContentMonitor.class,
+                ShadowEntityHeaderController.class
         })
 public class BatteryHeaderPreferenceControllerTest {
     private static final int BATTERY_LEVEL = 60;
@@ -61,25 +69,36 @@
     private static final String BATTERY_STATUS = "Charging";
 
     @Mock
+    private Activity mActivity;
+    @Mock
+    private PreferenceFragment mPreferenceFragment;
+    @Mock
     private PreferenceScreen mPreferenceScreen;
     @Mock
     private BatteryInfo mBatteryInfo;
+    @Mock
+    private EntityHeaderController mEntityHeaderController;
     private BatteryHeaderPreferenceController mController;
     private Context mContext;
     private BatteryMeterView mBatteryMeterView;
     private TextView mTimeText;
     private TextView mSummary;
+    private TextView mSummary2;
     private LayoutPreference mBatteryLayoutPref;
     private Intent mBatteryIntent;
+    private Lifecycle mLifecycle;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
+        mLifecycle = new Lifecycle();
         mContext = spy(RuntimeEnvironment.application);
         mBatteryMeterView = new BatteryMeterView(mContext);
         mTimeText = new TextView(mContext);
         mSummary = new TextView(mContext);
+        ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
+        mSummary2 = new TextView(mContext);
 
         mBatteryIntent = new Intent();
         mBatteryIntent.putExtra(BatteryManager.EXTRA_LEVEL, BATTERY_LEVEL);
@@ -92,10 +111,17 @@
 
         mBatteryInfo.batteryLevel = BATTERY_LEVEL;
 
-        mController = new BatteryHeaderPreferenceController(mContext);
+        mController = new BatteryHeaderPreferenceController(
+                mContext, mActivity, mPreferenceFragment, mLifecycle);
         mController.mBatteryMeterView = mBatteryMeterView;
         mController.mTimeText = mTimeText;
-        mController.mSummary = mSummary;
+        mController.mSummary1 = mSummary;
+        mController.mSummary2 = mSummary2;
+    }
+
+    @After
+    public void tearDown() {
+        ShadowEntityHeaderController.reset();
     }
 
     @Test
@@ -138,4 +164,15 @@
 
         assertThat(mSummary.getText()).isEqualTo(BATTERY_STATUS);
     }
+
+    @Test
+    public void testOnStart_shouldStyleActionBar() {
+        when(mEntityHeaderController.setRecyclerView(nullable(RecyclerView.class), eq(mLifecycle)))
+                .thenReturn(mEntityHeaderController);
+
+        mController.displayPreference(mPreferenceScreen);
+        mLifecycle.onStart();
+
+        verify(mEntityHeaderController).styleActionBar(mActivity);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
index 221408d..5a5e28d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
@@ -15,18 +15,23 @@
  */
 package com.android.settings.fuelgauge;
 
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.anyInt;
+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.support.v7.preference.PreferenceViewHolder;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settingslib.BatteryInfo;
-import com.android.settingslib.graph.UsageView;
+import com.android.settings.graph.UsageView;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -35,20 +40,14 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static org.mockito.AdditionalMatchers.not;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class
+        })
 public class BatteryHistoryPreferenceTest {
     @Mock
     private PreferenceViewHolder mViewHolder;
@@ -84,7 +83,7 @@
         mBatteryHistoryPreference.onBindViewHolder(mViewHolder);
 
         verify(mViewHolder).findViewById(R.id.battery_usage);
-        verify(mTextView).setText(anyString());
+        verify(mTextView).setText(nullable(String.class));
         verify(mBatteryInfo).bindHistory(mUsageView);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
new file mode 100644
index 0000000..c1b6174
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
@@ -0,0 +1,150 @@
+/*
+ * 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.content.Intent;
+import android.content.res.Resources;
+import android.os.BatteryManager;
+import android.os.BatteryStats;
+import android.os.SystemClock;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BatteryInfoTest {
+    private static final String STATUS_FULL = "Full";
+    private static final String STATUS_CHARGING_NO_TIME = "50% - charging";
+    private static final String STATUS_CHARGING_TIME = "50% - 0m until fully charged";
+    private static final int PLUGGED_IN = 1;
+    private static final long REMAINING_TIME_NULL = -1;
+    private static final long REMAINING_TIME = 2;
+    public static final String ENHANCED_STRING_SUFFIX = "left based on your usage";
+    private Intent mDisChargingBatteryBroadcast;
+    private Intent mChargingBatteryBroadcast;
+    private Context mContext;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private BatteryStats mBatteryStats;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Resources mResources;
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        FakeFeatureFactory.setupForTest(mContext);
+
+        mDisChargingBatteryBroadcast = new Intent();
+        mDisChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_PLUGGED, 0);
+        mDisChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_LEVEL, 0);
+        mDisChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_SCALE, 100);
+        mDisChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_STATUS,
+                BatteryManager.BATTERY_STATUS_FULL);
+
+        mChargingBatteryBroadcast = new Intent();
+        mChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_PLUGGED,
+                BatteryManager.BATTERY_PLUGGED_AC);
+        mChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_LEVEL, 50);
+        mChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_SCALE, 100);
+        mChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_STATUS,
+                BatteryManager.BATTERY_STATUS_UNKNOWN);
+    }
+
+    @Test
+    public void testGetBatteryInfo_hasStatusLabel() {
+        doReturn(REMAINING_TIME_NULL).when(mBatteryStats).computeBatteryTimeRemaining(anyLong());
+        BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext,
+                mDisChargingBatteryBroadcast, mBatteryStats, SystemClock.elapsedRealtime() * 1000,
+                true /* shortString */);
+
+        assertThat(info.statusLabel).isEqualTo(STATUS_FULL);
+    }
+
+    @Test
+    public void testGetBatteryInfo_doNotShowChargingMethod_hasRemainingTime() {
+        doReturn(REMAINING_TIME).when(mBatteryStats).computeChargeTimeRemaining(anyLong());
+        BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext, mChargingBatteryBroadcast,
+                mBatteryStats, 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());
+        BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext, mChargingBatteryBroadcast,
+                mBatteryStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */);
+
+        assertThat(info.chargeLabel.toString()).isEqualTo(STATUS_CHARGING_NO_TIME);
+    }
+
+    @Test
+    public void testGetBatteryInfo_pluggedIn_dischargingFalse() {
+        BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext, mChargingBatteryBroadcast,
+                mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */);
+
+        assertThat(info.discharging).isEqualTo(false);
+    }
+
+    @Test
+    public void testGetBatteryInfo_basedOnUsageTrue_usesUsageString() {
+        BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
+                mBatteryStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */,
+                1000, true /* basedOnUsage */);
+        BatteryInfo info2 = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
+                mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */,
+                1000, true /* basedOnUsage */);
+
+        assertThat(info.remainingLabel.toString()).contains(ENHANCED_STRING_SUFFIX);
+        assertThat(info2.remainingLabel.toString()).contains(ENHANCED_STRING_SUFFIX);
+    }
+
+    @Test
+    public void testGetBatteryInfo_basedOnUsageFalse_usesDefaultString() {
+        BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
+                mBatteryStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */,
+                1000, false /* basedOnUsage */);
+        BatteryInfo info2 = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
+                mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */,
+                1000, false /* basedOnUsage */);
+
+        assertThat(info.remainingLabel.toString()).doesNotContain(ENHANCED_STRING_SUFFIX);
+        assertThat(info2.remainingLabel.toString()).doesNotContain(ENHANCED_STRING_SUFFIX);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
index cb37a6e..e3a94d2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
@@ -20,7 +20,7 @@
 import android.content.Context;
 import android.graphics.ColorFilter;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsShadowTheme;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
index b3afbb4..77e3198 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
@@ -18,10 +18,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -84,9 +82,9 @@
         final boolean handled = mController.handlePreferenceTreeClick(mPreference);
 
         assertThat(handled).isTrue();
-        verify(mSettingsActivity).startPreferencePanel(any(Fragment.class),
-                anyString(), any(Bundle.class), anyInt(), any(CharSequence.class),
-                any(Fragment.class), anyInt());
+        verify(mSettingsActivity).startPreferencePanel(nullable(Fragment.class),
+                nullable(String.class), nullable(Bundle.class), anyInt(),
+                nullable(CharSequence.class), nullable(Fragment.class), anyInt());
     }
 
     @Test
@@ -96,9 +94,9 @@
         final boolean handled = mController.handlePreferenceTreeClick(mPreference);
 
         assertThat(handled).isFalse();
-        verify(mSettingsActivity, never()).startPreferencePanel(any(Fragment.class),
-                anyString(), any(Bundle.class), anyInt(), any(CharSequence.class),
-                any(Fragment.class), anyInt());
+        verify(mSettingsActivity, never()).startPreferencePanel(nullable(Fragment.class),
+                nullable(String.class), nullable(Bundle.class), anyInt(),
+                nullable(CharSequence.class), nullable(Fragment.class), anyInt());
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
index 9656381..84204e6 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
@@ -17,10 +17,10 @@
 
 import android.content.Context;
 import android.os.PowerManager;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java
index d19a4b2..f04b3b8 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java
@@ -15,7 +15,6 @@
  */
 package com.android.settings.fuelgauge;
 
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 
 import android.content.Context;
@@ -24,7 +23,7 @@
 import android.os.UserManager;
 
 import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
index 495410d..053cc98 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
@@ -22,7 +22,7 @@
 
 import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -70,6 +70,8 @@
     private static final long TIME_FOREGROUND_ACTIVITY_ZERO = 0;
     private static final long TIME_FOREGROUND_ACTIVITY = 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;
 
     private static final int UID = 123;
     private static final long TIME_EXPECTED_FOREGROUND = 1500;
@@ -126,6 +128,8 @@
                 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);
 
         mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
         mNormalBatterySipper.totalPowerMah = TOTAL_BATTERY_USAGE;
@@ -283,6 +287,12 @@
     }
 
     @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);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java
index d750382..dec445d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java
@@ -29,7 +29,7 @@
 import android.content.DialogInterface;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
index a60bc65..d87020e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java
new file mode 100644
index 0000000..806acf3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java
@@ -0,0 +1,107 @@
+/*
+ * 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.verify;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.VectorDrawable;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class PowerGaugePreferenceTest {
+    private static final String SUBTITLE = "Summary";
+    private static final String CONTENT_DESCRIPTION = "Content description";
+    private Context mContext;
+    private PowerGaugePreference mPowerGaugePreference;
+    private View mRootView;
+    private View mWidgetView;
+    private PreferenceViewHolder mPreferenceViewHolder;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mRootView = LayoutInflater.from(mContext).inflate(R.layout.preference_material_settings,
+                null);
+        mWidgetView = LayoutInflater.from(mContext).inflate(R.layout.preference_widget_summary,
+                null);
+        ((LinearLayout) mRootView.findViewById(android.R.id.widget_frame)).addView(mWidgetView);
+        mPreferenceViewHolder = PreferenceViewHolder.createInstanceForTests(mRootView);
+
+        mPowerGaugePreference = new PowerGaugePreference(mContext);
+    }
+
+    @Test
+    public void testOnBindViewHolder_bindSubtitle() {
+        mPowerGaugePreference.setSubtitle(SUBTITLE);
+        mPowerGaugePreference.onBindViewHolder(mPreferenceViewHolder);
+
+        assertThat(((TextView) mPreferenceViewHolder.findViewById(
+                R.id.widget_summary)).getText()).isEqualTo(SUBTITLE);
+    }
+
+    @Test
+    public void testOnBindViewHolder_showAnomaly_bindAnomalyIcon() {
+        mPowerGaugePreference.shouldShowAnomalyIcon(true);
+        mPowerGaugePreference.onBindViewHolder(mPreferenceViewHolder);
+
+        final Drawable[] drawables = ((TextView) mPreferenceViewHolder.findViewById(
+                R.id.widget_summary)).getCompoundDrawablesRelative();
+
+        assertThat(drawables[0]).isInstanceOf(VectorDrawable.class);
+    }
+
+    @Test
+    public void testOnBindViewHolder_notShowAnomaly_bindAnomalyIcon() {
+        mPowerGaugePreference.shouldShowAnomalyIcon(false);
+        mPowerGaugePreference.onBindViewHolder(mPreferenceViewHolder);
+
+        final Drawable[] drawables = ((TextView) mPreferenceViewHolder.findViewById(
+                R.id.widget_summary)).getCompoundDrawablesRelative();
+
+        assertThat(drawables[0]).isNull();
+    }
+
+    @Test
+    public void testOnBindViewHolder_bindContentDescription() {
+        mPowerGaugePreference.setContentDescription(CONTENT_DESCRIPTION);
+        mPowerGaugePreference.onBindViewHolder(mPreferenceViewHolder);
+
+        assertThat(mPreferenceViewHolder.findViewById(android.R.id.title).getContentDescription())
+                .isEqualTo(CONTENT_DESCRIPTION);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
index 26cf7e0..8831a6c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
@@ -36,7 +36,7 @@
 import com.android.internal.os.BatterySipper.DrainType;
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.Utils;
 import com.android.settings.fuelgauge.PowerUsageAdvanced.PowerUsageData;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java
new file mode 100644
index 0000000..7845870
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java
@@ -0,0 +1,171 @@
+/*
+ * 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.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceGroup;
+import android.support.v7.preference.PreferenceManager;
+
+import com.android.settings.SettingsActivity;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+import com.android.settings.fuelgauge.anomaly.AnomalyPreference;
+
+
+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.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class PowerUsageAnomalyDetailsTest {
+    private static final String NAME_APP_1 = "app1";
+    private static final String NAME_APP_2 = "app2";
+    private static final String PACKAGE_NAME_1 = "com.android.app1";
+    private static final String PACKAGE_NAME_2 = "com.android.app2";
+
+    @Mock
+    private SettingsActivity mSettingsActivity;
+    @Mock
+    private PreferenceManager mPreferenceManager;
+    @Mock
+    private Drawable mDrawable1;
+    @Mock
+    private Drawable mDrawable2;
+    private Context mContext;
+    private PowerUsageAnomalyDetails mFragment;
+    private PreferenceGroup mAbnormalListGroup;
+    private Bundle mBundle;
+    private List<Anomaly> mAnomalyList;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mAbnormalListGroup = spy(new PreferenceCategory(mContext));
+
+        mAnomalyList = new ArrayList<>();
+        Anomaly anomaly1 = new Anomaly.Builder()
+                .setType(Anomaly.AnomalyType.WAKE_LOCK)
+                .setPackageName(PACKAGE_NAME_1)
+                .setDisplayName(NAME_APP_1)
+                .build();
+        mAnomalyList.add(anomaly1);
+        Anomaly anomaly2 = new Anomaly.Builder()
+                .setType(Anomaly.AnomalyType.WAKE_LOCK)
+                .setPackageName(PACKAGE_NAME_2)
+                .setDisplayName(NAME_APP_2)
+                .build();
+        mAnomalyList.add(anomaly2);
+
+        mFragment = spy(new PowerUsageAnomalyDetails());
+        doReturn(null).when(mFragment).getIconFromPackageName(any());
+        mFragment.mAbnormalListGroup = mAbnormalListGroup;
+        mFragment.mAnomalies = mAnomalyList;
+        doReturn(mPreferenceManager).when(mFragment).getPreferenceManager();
+        doReturn(mContext).when(mPreferenceManager).getContext();
+    }
+
+    @Test
+    public void testRefreshUi_dataCorrect() {
+        final List<Anomaly> testAnomalyList = new ArrayList<>();
+        final ArgumentCaptor<Preference> preferenceCaptor = ArgumentCaptor.forClass(
+                Preference.class);
+        Answer<Void> prefCallable = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) throws Throwable {
+                testAnomalyList.add(
+                        ((AnomalyPreference) preferenceCaptor.getValue()).getAnomaly());
+                return null;
+            }
+        };
+        doAnswer(prefCallable).when(mAbnormalListGroup).addPreference(preferenceCaptor.capture());
+
+        mFragment.refreshUi();
+
+        assertThat(testAnomalyList).containsExactlyElementsIn(mAnomalyList);
+    }
+
+    @Test
+    public void testRefreshUi_iconCorrect() {
+        doReturn(mDrawable1).when(mFragment).getIconFromPackageName(PACKAGE_NAME_1);
+        doReturn(mDrawable2).when(mFragment).getIconFromPackageName(PACKAGE_NAME_2);
+
+        final List<Drawable> testIcons = new ArrayList<>();
+        final ArgumentCaptor<Preference> preferenceCaptor = ArgumentCaptor.forClass(
+                Preference.class);
+        Answer<Void> prefCallable = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) throws Throwable {
+                testIcons.add(preferenceCaptor.getValue().getIcon());
+                return null;
+            }
+        };
+        doAnswer(prefCallable).when(mAbnormalListGroup).addPreference(preferenceCaptor.capture());
+
+        mFragment.refreshUi();
+
+        assertThat(testIcons).containsExactly(mDrawable1, mDrawable2);
+    }
+
+    @Test
+    public void testStartBatteryAbnormalPage_dataCorrect() {
+        final ArgumentCaptor<Bundle> bundleCaptor = ArgumentCaptor.forClass(Bundle.class);
+        Answer<Void> bundleCallable = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) throws Exception {
+                mBundle = bundleCaptor.getValue();
+                return null;
+            }
+        };
+        doAnswer(bundleCallable).when(mSettingsActivity).startPreferencePanelAsUser(any(),
+                anyString(),
+                bundleCaptor.capture(), anyInt(), any(), any());
+
+        PowerUsageAnomalyDetails.startBatteryAbnormalPage(mSettingsActivity, mFragment,
+                mAnomalyList);
+
+        assertThat(mBundle.getParcelableArrayList(
+                PowerUsageAnomalyDetails.EXTRA_ANOMALY_LIST)).isEqualTo(mAnomalyList);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
index 8e9febe..afda69f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
@@ -20,7 +20,7 @@
 import android.content.pm.PackageManager;
 import android.os.Process;
 import com.android.internal.os.BatterySipper;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index 0610456..a3747e2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -15,14 +15,20 @@
  */
 package com.android.settings.fuelgauge;
 
-import android.app.Activity;
+import android.view.View;
+import java.util.List;
+import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
+import android.app.LoaderManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.content.ContentResolver;
 import android.os.PowerManager;
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
+import android.util.SparseArray;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -34,11 +40,12 @@
 import com.android.internal.os.BatteryStatsImpl;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.Utils;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
@@ -50,11 +57,9 @@
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_ADDITIONAL_BATTERY_INFO;
 import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_HIGH_POWER_APPS;
@@ -89,6 +94,7 @@
     private static final String[] PACKAGE_NAMES = {"com.app1", "com.app2"};
     private static final String STUB_STRING = "stub_string";
     private static final int UID = 123;
+    private static final int UID_2 = 234;
     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 =
@@ -103,6 +109,8 @@
     private static final double POWER_USAGE_PERCENTAGE = 50;
     private static final Intent ADDITIONAL_BATTERY_INFO_INTENT =
             new Intent("com.example.app.ADDITIONAL_BATTERY_INFO");
+    public static final String NEW_ML_EST_SUFFIX = "(New ML est)";
+    public static final String OLD_EST_SUFFIX = "(Old est)";
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
@@ -135,6 +143,10 @@
     @Mock
     private SettingsActivity mSettingsActivity;
     @Mock
+    private LoaderManager mLoaderManager;
+    @Mock
+    private ContentResolver mContentResolver;
+    @Mock
     private PreferenceScreen mPreferenceScreen;
 
     private List<BatterySipper> mUsageList;
@@ -145,6 +157,7 @@
     private PowerGaugePreference mPreference;
     private PowerGaugePreference mScreenUsagePref;
     private PowerGaugePreference mLastFullChargePref;
+    private SparseArray<List<Anomaly>> mAnomalySparseArray;
 
     @Before
     public void setUp() {
@@ -401,12 +414,6 @@
     }
 
     @Test
-    public void testCalculateRunningTimeBasedOnStatsType() {
-        assertThat(mFragment.calculateRunningTimeBasedOnStatsType()).isEqualTo(
-                TIME_SINCE_LAST_FULL_CHARGE_MS);
-    }
-
-    @Test
     public void testNonIndexableKeys_MatchPreferenceKeys() {
         final Context context = RuntimeEnvironment.application;
         final List<String> niks = PowerUsageSummary.SEARCH_INDEX_DATA_PROVIDER
@@ -434,6 +441,47 @@
     }
 
     @Test
+    public void testUpdateAnomalySparseArray() {
+        mFragment.mAnomalySparseArray = new SparseArray<>();
+        final List<Anomaly> anomalies = new ArrayList<>();
+        final Anomaly anomaly1 = new Anomaly.Builder().setUid(UID).build();
+        final Anomaly anomaly2 = new Anomaly.Builder().setUid(UID).build();
+        final Anomaly anomaly3 = new Anomaly.Builder().setUid(UID_2).build();
+        anomalies.add(anomaly1);
+        anomalies.add(anomaly2);
+        anomalies.add(anomaly3);
+
+        mFragment.updateAnomalySparseArray(anomalies);
+
+        assertThat(mFragment.mAnomalySparseArray.get(UID)).containsExactly(anomaly1, anomaly2);
+        assertThat(mFragment.mAnomalySparseArray.get(UID_2)).containsExactly(anomaly3);
+    }
+
+    @Test
+    public void testInitAnomalyDetectionIfPossible_detectionEnabled_init() {
+        when(mFeatureFactory.powerUsageFeatureProvider.isAnomalyDetectionEnabled()).thenReturn(
+                true);
+        doReturn(mLoaderManager).when(mFragment).getLoaderManager();
+
+        mFragment.initAnomalyDetectionIfPossible();
+
+        verify(mLoaderManager).initLoader(eq(PowerUsageSummary.ANOMALY_LOADER), eq(Bundle.EMPTY),
+                any());
+    }
+
+    @Test
+    public void testShowBothEstimates_summariesAreBothModified() {
+        doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary2);
+        doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary1);
+        mFragment.onLongClick(new View(mRealContext));
+        TextView summary1 = mFragment.mBatteryLayoutPref.findViewById(R.id.summary1);
+        TextView summary2 = mFragment.mBatteryLayoutPref.findViewById(R.id.summary2);
+        Robolectric.flushBackgroundThreadScheduler();
+        assertThat(summary2.getText().toString().contains(NEW_ML_EST_SUFFIX));
+        assertThat(summary1.getText().toString().contains(OLD_EST_SUFFIX));
+    }
+
+    @Test
     public void testSaveInstanceState_showAllAppsRestored() {
         Bundle bundle = new Bundle();
         mFragment.mShowAllApps = true;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
new file mode 100644
index 0000000..d5bd53b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
@@ -0,0 +1,112 @@
+/*
+ * 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.anomaly;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.text.format.DateUtils;
+import android.util.KeyValueListParser;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AnomalyDetectionPolicyTest {
+    private static final String ANOMALY_DETECTION_CONSTANTS_VALUE = "anomaly_detection_enabled=true"
+            + ",wakelock_enabled=false"
+            + ",wakelock_threshold=3000"
+            + ",wakeup_alarm_enabled=true"
+            + ",wakeup_alarm_threshold=100";
+    private Context mContext;
+    private KeyValueListParserWrapper mKeyValueListParserWrapper;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mKeyValueListParserWrapper = spy(
+                new KeyValueListParserWrapperImpl(new KeyValueListParser(',')));
+    }
+
+    @Test
+    public void testInit_containsDataFromSettings() {
+        AnomalyDetectionPolicy anomalyDetectionPolicy = createAnomalyPolicyWithConfig();
+
+        assertThat(anomalyDetectionPolicy.anomalyDetectionEnabled).isTrue();
+        assertThat(anomalyDetectionPolicy.wakeLockDetectionEnabled).isFalse();
+        assertThat(anomalyDetectionPolicy.wakeLockThreshold).isEqualTo(3000);
+        assertThat(anomalyDetectionPolicy.wakeupAlarmDetectionEnabled).isTrue();
+        assertThat(anomalyDetectionPolicy.wakeupAlarmThreshold).isEqualTo(100);
+    }
+
+    @Test
+    public void testInit_containsDefaultData() {
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.ANOMALY_DETECTION_CONSTANTS, "");
+        // Mock it to avoid noSuchMethodError
+        doReturn(true).when(mKeyValueListParserWrapper).getBoolean(anyString(), eq(true));
+        doReturn(false).when(mKeyValueListParserWrapper).getBoolean(anyString(), eq(false));
+
+        AnomalyDetectionPolicy anomalyDetectionPolicy = new AnomalyDetectionPolicy(mContext,
+                mKeyValueListParserWrapper);
+
+        assertThat(anomalyDetectionPolicy.anomalyDetectionEnabled).isTrue();
+        assertThat(anomalyDetectionPolicy.wakeLockDetectionEnabled).isTrue();
+        assertThat(anomalyDetectionPolicy.wakeLockThreshold).isEqualTo(DateUtils.HOUR_IN_MILLIS);
+        assertThat(anomalyDetectionPolicy.wakeupAlarmDetectionEnabled).isTrue();
+        assertThat(anomalyDetectionPolicy.wakeupAlarmThreshold).isEqualTo(60);
+    }
+
+    @Test
+    public void testIsAnomalyDetectorEnabled() {
+        AnomalyDetectionPolicy anomalyDetectionPolicy = createAnomalyPolicyWithConfig();
+
+        assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
+                Anomaly.AnomalyType.WAKE_LOCK)).isFalse();
+        assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
+                Anomaly.AnomalyType.WAKEUP_ALARM)).isTrue();
+    }
+
+    private AnomalyDetectionPolicy createAnomalyPolicyWithConfig() {
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.ANOMALY_DETECTION_CONSTANTS, ANOMALY_DETECTION_CONSTANTS_VALUE);
+        // Mock it to avoid noSuchMethodError
+        doReturn(true).when(mKeyValueListParserWrapper).getBoolean(
+                AnomalyDetectionPolicy.KEY_ANOMALY_DETECTION_ENABLED, true);
+        doReturn(false).when(mKeyValueListParserWrapper).getBoolean(
+                AnomalyDetectionPolicy.KEY_WAKELOCK_DETECTION_ENABLED, true);
+        doReturn(true).when(mKeyValueListParserWrapper).getBoolean(
+                AnomalyDetectionPolicy.KEY_WAKEUP_ALARM_DETECTION_ENABLED, true);
+
+        return new AnomalyDetectionPolicy(mContext, mKeyValueListParserWrapper);
+    }
+
+
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java
new file mode 100644
index 0000000..8f3d2db
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.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.anomaly;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.robolectric.Shadows.shadowOf;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowAlertDialog;
+import org.robolectric.shadows.ShadowDialog;
+import org.robolectric.util.FragmentTestUtil;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AnomalyDialogFragmentTest {
+    @Anomaly.AnomalyType
+    private static final int ANOMALY_TYPE = Anomaly.AnomalyType.WAKE_LOCK;
+    private static final String PACKAGE_NAME = "com.android.app";
+    private static final int UID = 111;
+    private Anomaly mAnomaly;
+    private AnomalyDialogFragment mAnomalyDialogFragment;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mAnomaly = new Anomaly.Builder()
+                .setType(ANOMALY_TYPE)
+                .setUid(UID)
+                .setPackageName(PACKAGE_NAME)
+                .build();
+
+        mAnomalyDialogFragment = AnomalyDialogFragment.newInstance(mAnomaly, 0 /* metricskey */);
+    }
+
+    @Test
+    public void testOnCreateDialog_hasCorrectData() {
+        FragmentTestUtil.startFragment(mAnomalyDialogFragment);
+
+        assertThat(mAnomalyDialogFragment.mAnomaly).isEqualTo(mAnomaly);
+    }
+
+    @Test
+    public void testOnCreateDialog_hasCorrectDialog() {
+        FragmentTestUtil.startFragment(mAnomalyDialogFragment);
+
+        final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
+        ShadowAlertDialog shadowDialog = shadowOf(dialog);
+
+        assertThat(shadowDialog.getMessage()).isEqualTo(
+                mContext.getString(R.string.force_stop_dlg_text));
+        assertThat(shadowDialog.getTitle()).isEqualTo(
+                mContext.getString(R.string.force_stop_dlg_title));
+        assertThat(dialog.getButton(DialogInterface.BUTTON_POSITIVE).getText()).isEqualTo(
+                mContext.getString(R.string.dlg_ok));
+        assertThat(dialog.getButton(DialogInterface.BUTTON_NEGATIVE).getText()).isEqualTo(
+                mContext.getString(R.string.dlg_cancel));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java
new file mode 100644
index 0000000..8119168
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java
@@ -0,0 +1,126 @@
+/*
+ * 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.anomaly;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+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.pm.PackageManager;
+import android.os.UserManager;
+
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.anomaly.checker.WakeLockAnomalyDetector;
+import com.android.settings.fuelgauge.anomaly.checker.WakeupAlarmAnomalyDetector;
+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.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AnomalyLoaderTest {
+    private static final String PACKAGE_NAME = "com.android.settings";
+    private static final CharSequence DISPLAY_NAME = "Settings";
+    private static final int UID = 0;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private BatteryStatsHelper mBatteryStatsHelper;
+    @Mock
+    private WakeLockAnomalyDetector mWakeLockAnomalyDetector;
+    @Mock
+    private WakeupAlarmAnomalyDetector mWakeupAlarmAnomalyDetector;
+    @Mock
+    private AnomalyDetectionPolicy mAnomalyDetectionPolicy;
+    @Mock
+    private UserManager mUserManager;
+    private Anomaly mWakeLockAnomaly;
+    private Anomaly mWakeupAlarmAnomaly;
+    private List<Anomaly> mWakeLockAnomalies;
+    private List<Anomaly> mWakeupAlarmAnomalies;
+    private AnomalyLoader mAnomalyLoader;
+
+    @Before
+    public void setUp() throws PackageManager.NameNotFoundException {
+        MockitoAnnotations.initMocks(this);
+
+        FakeFeatureFactory.setupForTest(mContext);
+        doReturn(true).when(mAnomalyDetectionPolicy).isAnomalyDetectorEnabled(anyInt());
+        doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
+        when(mContext.getPackageManager().getPackageUid(anyString(), anyInt())).thenReturn(UID);
+
+        mWakeLockAnomalies = new ArrayList<>();
+        mWakeLockAnomaly = createAnomaly(Anomaly.AnomalyType.WAKE_LOCK);
+        mWakeLockAnomalies.add(mWakeLockAnomaly);
+        doReturn(mWakeLockAnomalies).when(mWakeLockAnomalyDetector).detectAnomalies(any(), any());
+
+        mWakeupAlarmAnomalies = new ArrayList<>();
+        mWakeupAlarmAnomaly = createAnomaly(Anomaly.AnomalyType.WAKEUP_ALARM);
+        mWakeupAlarmAnomalies.add(mWakeupAlarmAnomaly);
+        doReturn(mWakeupAlarmAnomalies).when(mWakeupAlarmAnomalyDetector).detectAnomalies(any(),
+                any());
+
+        mAnomalyLoader = new AnomalyLoader(mContext, mBatteryStatsHelper, null,
+                mAnomalyDetectionPolicy);
+        mAnomalyLoader.mAnomalyUtils = spy(new AnomalyUtils(mContext));
+    }
+
+    @Test
+    public void testLoadInBackground_containsValidAnomalies() {
+        doReturn(mWakeLockAnomalyDetector).when(mAnomalyLoader.mAnomalyUtils).getAnomalyDetector(
+                Anomaly.AnomalyType.WAKE_LOCK);
+        doReturn(mWakeupAlarmAnomalyDetector).when(mAnomalyLoader.mAnomalyUtils).getAnomalyDetector(
+                Anomaly.AnomalyType.WAKEUP_ALARM);
+
+        List<Anomaly> anomalies = mAnomalyLoader.loadInBackground();
+
+        assertThat(anomalies).containsExactly(mWakeLockAnomaly, mWakeupAlarmAnomaly);
+    }
+
+    private Anomaly createAnomaly(@Anomaly.AnomalyType int type) {
+        return new Anomaly.Builder()
+                .setType(type)
+                .setUid(UID)
+                .setPackageName(PACKAGE_NAME)
+                .setDisplayName(DISPLAY_NAME)
+                .build();
+    }
+
+    @Test
+    public void testGenerateFakeData() {
+        List<Anomaly> anomalies = mAnomalyLoader.generateFakeData();
+
+        assertThat(anomalies).containsExactly(mWakeLockAnomaly, mWakeupAlarmAnomaly);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyPreferenceTest.java
new file mode 100644
index 0000000..c0157ae
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyPreferenceTest.java
@@ -0,0 +1,66 @@
+/*
+ * 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.anomaly;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AnomalyPreferenceTest {
+    @Anomaly.AnomalyType
+    private static final int ANOMALY_TYPE = Anomaly.AnomalyType.WAKE_LOCK;
+    private static final String PACKAGE_NAME = "com.android.app";
+    private static final String DISPLAY_NAME = "app";
+    private static final int UID = 111;
+
+    private Context mContext;
+    private Anomaly mAnomaly;
+    private AnomalyPreference mAnomalyPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+
+        mAnomaly = new Anomaly.Builder()
+                .setType(ANOMALY_TYPE)
+                .setPackageName(PACKAGE_NAME)
+                .setDisplayName(DISPLAY_NAME)
+                .setUid(UID)
+                .build();
+    }
+
+    @Test
+    public void testAnomalyPreference_containsCorrectData() {
+        mAnomalyPreference = new AnomalyPreference(mContext, mAnomaly);
+
+        assertThat(mAnomalyPreference.getTitle()).isEqualTo(DISPLAY_NAME);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java
new file mode 100644
index 0000000..2aa2417
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java
@@ -0,0 +1,138 @@
+/*
+ * 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.anomaly;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.content.Context;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.SettingsActivity;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AnomalySummaryPreferenceControllerTest {
+    @Anomaly.AnomalyType
+    private static final int ANOMALY_TYPE = Anomaly.AnomalyType.WAKE_LOCK;
+    private static final String PACKAGE_NAME = "com.android.app";
+    private static final String DISPLAY_NAME = "app";
+    private static final int UID = 111;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private PreferenceFragment mFragment;
+    @Mock
+    private FragmentManager mFragmentManager;
+    @Mock
+    private FragmentTransaction mFragmentTransaction;
+    @Mock
+    private SettingsActivity mSettingsActivity;
+    private AnomalySummaryPreferenceController mAnomalySummaryPreferenceController;
+    private Preference mPreference;
+    private Context mContext;
+    private List<Anomaly> mAnomalyList;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mPreference = new Preference(mContext);
+        mPreference.setKey(AnomalySummaryPreferenceController.ANOMALY_KEY);
+        when(mFragment.getPreferenceScreen().findPreference(any())).thenReturn(mPreference);
+        when(mFragment.getFragmentManager()).thenReturn(mFragmentManager);
+        when(mFragmentManager.beginTransaction()).thenReturn(mFragmentTransaction);
+        when(mFragment.getContext()).thenReturn(mContext);
+
+        mAnomalyList = new ArrayList<>();
+
+        mAnomalySummaryPreferenceController = new AnomalySummaryPreferenceController(
+                mSettingsActivity, mFragment, 0 /* metricskey */);
+    }
+
+    @Test
+    public void testUpdateHighUsageSummaryPreference_hasCorrectData() {
+        mAnomalySummaryPreferenceController.updateAnomalySummaryPreference(mAnomalyList);
+
+        assertThat(mAnomalySummaryPreferenceController.mAnomalies).isEqualTo(mAnomalyList);
+    }
+
+    @Test
+    public void testUpdateAnomalySummaryPreference_oneAnomaly_showCorrectSummary() {
+        mAnomalyList.add(createTestAnomaly());
+
+        mAnomalySummaryPreferenceController.updateAnomalySummaryPreference(mAnomalyList);
+
+        assertThat(mPreference.getSummary()).isEqualTo("app behaving abnormally");
+    }
+
+    @Test
+    public void testUpdateAnomalySummaryPreference_multipleAnomalies_showCorrectSummary() {
+        mAnomalyList.add(createTestAnomaly());
+        mAnomalyList.add(createTestAnomaly());
+
+        mAnomalySummaryPreferenceController.updateAnomalySummaryPreference(mAnomalyList);
+
+        assertThat(mPreference.getSummary()).isEqualTo("2 apps behaving abnormally");
+    }
+
+    @Test
+    public void testOnPreferenceTreeClick_oneAnomaly_showDialog() {
+
+        mAnomalyList.add(createTestAnomaly());
+        mAnomalySummaryPreferenceController.mAnomalies = mAnomalyList;
+
+        mAnomalySummaryPreferenceController.onPreferenceTreeClick(mPreference);
+
+        verify(mFragmentManager).beginTransaction();
+        verify(mFragmentTransaction).add(any(), anyString());
+        verify(mFragmentTransaction).commit();
+    }
+
+    private Anomaly createTestAnomaly() {
+        return new Anomaly.Builder()
+                .setType(ANOMALY_TYPE)
+                .setUid(UID)
+                .setPackageName(PACKAGE_NAME)
+                .setDisplayName(DISPLAY_NAME)
+                .build();
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyTest.java
new file mode 100644
index 0000000..55b8308
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyTest.java
@@ -0,0 +1,53 @@
+/*
+ * 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.anomaly;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AnomalyTest {
+    private static int TYPE = Anomaly.AnomalyType.WAKE_LOCK;
+    private static int UID = 111;
+    private static long WAKE_LOCK_TIME_MS = 1500;
+    private static String PACKAGE_NAME = "com.android.settings";
+    private static String DISPLAY_NAME = "settings";
+
+    @Test
+    public void testBuilder_buildCorrectly() {
+        Anomaly anomaly = new Anomaly.Builder()
+                .setType(TYPE)
+                .setUid(UID)
+                .setWakeLockTimeMs(WAKE_LOCK_TIME_MS)
+                .setPackageName(PACKAGE_NAME)
+                .setDisplayName(DISPLAY_NAME)
+                .build();
+
+        assertThat(anomaly.type).isEqualTo(TYPE);
+        assertThat(anomaly.uid).isEqualTo(UID);
+        assertThat(anomaly.wakelockTimeMs).isEqualTo(WAKE_LOCK_TIME_MS);
+        assertThat(anomaly.packageName).isEqualTo(PACKAGE_NAME);
+        assertThat(anomaly.displayName).isEqualTo(DISPLAY_NAME);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java
new file mode 100644
index 0000000..15bca7e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java
@@ -0,0 +1,69 @@
+/*
+ * 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.anomaly;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.anomaly.action.BackgroundCheckAction;
+import com.android.settings.fuelgauge.anomaly.action.ForceStopAction;
+import com.android.settings.fuelgauge.anomaly.checker.WakeLockAnomalyDetector;
+import com.android.settings.testutils.shadow.ShadowKeyValueListParserWrapperImpl;
+import com.android.settings.fuelgauge.anomaly.checker.WakeupAlarmAnomalyDetector;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
+        ShadowKeyValueListParserWrapperImpl.class})
+public class AnomalyUtilsTest {
+    private AnomalyUtils mAnomalyUtils;
+
+    @Before
+    public void setUp() {
+        mAnomalyUtils = new AnomalyUtils(RuntimeEnvironment.application);
+    }
+
+    @Test
+    public void testGetAnomalyAction_typeWakeLock_returnForceStop() {
+        assertThat(mAnomalyUtils.getAnomalyAction(Anomaly.AnomalyType.WAKE_LOCK)).isInstanceOf(
+                ForceStopAction.class);
+    }
+
+    @Test
+    public void testGetAnomalyAction_typeWakeUpAlarm_returnBackgroundCheck() {
+        assertThat(mAnomalyUtils.getAnomalyAction(Anomaly.AnomalyType.WAKEUP_ALARM)).isInstanceOf(
+                BackgroundCheckAction.class);
+    }
+
+    @Test
+    public void testGetAnomalyDetector_typeWakeLock_returnWakeLockDetector() {
+        assertThat(mAnomalyUtils.getAnomalyDetector(Anomaly.AnomalyType.WAKE_LOCK)).isInstanceOf(
+                WakeLockAnomalyDetector.class);
+    }
+
+    @Test
+    public void testGetAnomalyDetector_typeWakeUpAlarm_returnWakeUpAlarmDetector() {
+        assertThat(mAnomalyUtils.getAnomalyDetector(Anomaly.AnomalyType.WAKEUP_ALARM)).isInstanceOf(
+                WakeupAlarmAnomalyDetector.class);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java
new file mode 100644
index 0000000..99f7c33
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java
@@ -0,0 +1,72 @@
+/*
+ * 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.anomaly.action;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.verify;
+
+import android.app.AppOpsManager;
+import android.content.Context;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+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.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BackgroundCheckActionTest {
+    private static final String PACKAGE_NAME = "com.android.app";
+    private static final int UID = 111;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private AppOpsManager mAppOpsManagerr;
+    private Anomaly mAnomaly;
+    private BackgroundCheckAction mBackgroundCheckAction;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        FakeFeatureFactory.setupForTest(mContext);
+        doReturn(mAppOpsManagerr).when(mContext).getSystemService(Context.APP_OPS_SERVICE);
+
+        mAnomaly = new Anomaly.Builder()
+                .setUid(UID)
+                .setPackageName(PACKAGE_NAME)
+                .build();
+        mBackgroundCheckAction = new BackgroundCheckAction(mContext);
+    }
+
+    @Test
+    public void testHandlePositiveAction_forceStopPackage() {
+        mBackgroundCheckAction.handlePositiveAction(mAnomaly, 0 /* metricskey */);
+
+        verify(mAppOpsManagerr).setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, UID, PACKAGE_NAME,
+                AppOpsManager.MODE_IGNORED);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java
new file mode 100644
index 0000000..7bb6a04
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java
@@ -0,0 +1,69 @@
+/*
+ * 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.anomaly.action;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.verify;
+
+import android.app.ActivityManager;
+import android.content.Context;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+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.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ForceStopActionTest {
+    private static final String PACKAGE_NAME = "com.android.app";
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private ActivityManager mActivityManager;
+    private Anomaly mAnomaly;
+    private ForceStopAction mForceStopAction;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        FakeFeatureFactory.setupForTest(mContext);
+        doReturn(mActivityManager).when(mContext).getSystemService(Context.ACTIVITY_SERVICE);
+
+        mAnomaly = new Anomaly.Builder()
+                .setPackageName(PACKAGE_NAME)
+                .build();
+        mForceStopAction = new ForceStopAction(mContext);
+    }
+
+    @Test
+    public void testHandlePositiveAction_forceStopPackage() {
+        mForceStopAction.handlePositiveAction(mAnomaly, 0 /* metricskey */);
+
+        verify(mActivityManager).forceStopPackage(PACKAGE_NAME);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java
new file mode 100644
index 0000000..64e3840
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java
@@ -0,0 +1,191 @@
+/*
+ * 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.anomaly.checker;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.BatteryStats;
+import android.text.format.DateUtils;
+import android.util.ArrayMap;
+
+import com.android.internal.os.BatterySipper;
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.BatteryUtils;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WakeLockAnomalyDetectorTest {
+    private static final String TARGET_PACKAGE_NAME = "com.android.app";
+    private static final long ANOMALY_WAKELOCK_TIME_MS = 2 * DateUtils.HOUR_IN_MILLIS;
+    private static final long NORMAL_WAKELOCK_TIME_MS = DateUtils.SECOND_IN_MILLIS;
+    private static final long WAKELOCK_THRESHOLD_MS = DateUtils.HOUR_IN_MILLIS;
+    private static final int ANOMALY_UID = 111;
+    private static final int NORMAL_UID = 222;
+    private static final int TARGET_UID = 333;
+    @Mock
+    private BatteryStatsHelper mBatteryStatsHelper;
+    @Mock
+    private BatterySipper mAnomalySipper;
+    @Mock
+    private BatterySipper mTargetSipper;
+    @Mock
+    private BatteryStats.Timer mAnomalyTimer;
+    @Mock
+    private BatteryStats.Uid.Wakelock mAnomalyWakelock;
+    @Mock
+    private BatterySipper mNormalSipper;
+    @Mock
+    private BatteryStats.Timer mNormalTimer;
+    @Mock
+    private BatteryStats.Timer mTargetTimer;
+    @Mock
+    private BatteryStats.Uid.Wakelock mNormalWakelock;
+    @Mock
+    private BatteryStats.Uid.Wakelock mTargetWakelock;
+    @Mock
+    private BatteryStats.Uid mAnomalyUid;
+    @Mock
+    private BatteryStats.Uid mNormalUid;
+    @Mock
+    private BatteryStats.Uid mTargetUid;
+    @Mock
+    private BatteryUtils mBatteryUtils;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private ApplicationInfo mApplicationInfo;
+    @Mock
+    private AnomalyDetectionPolicy mPolicy;
+
+    private ArrayMap<String, BatteryStats.Uid.Wakelock> mAnomalyWakelocks;
+    private ArrayMap<String, BatteryStats.Uid.Wakelock> mNormalWakelocks;
+    private ArrayMap<String, BatteryStats.Uid.Wakelock> mTargetWakelocks;
+    private WakeLockAnomalyDetector mWakelockAnomalyDetector;
+    private Context mContext;
+    private List<BatterySipper> mUsageList;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(RuntimeEnvironment.application);
+        ReflectionHelpers.setField(mPolicy, "wakeLockThreshold", WAKELOCK_THRESHOLD_MS);
+
+        doReturn(false).when(mBatteryUtils).shouldHideSipper(nullable(BatterySipper.class));
+        doReturn(mPackageManager).when(mContext).getPackageManager();
+        doReturn(mApplicationInfo).when(mPackageManager)
+                .getApplicationInfo(nullable(String.class), anyInt());
+
+        mAnomalySipper.uidObj = mAnomalyUid;
+        mAnomalyWakelocks = new ArrayMap<>();
+        mAnomalyWakelocks.put("", mAnomalyWakelock);
+        doReturn(mAnomalyWakelocks).when(mAnomalyUid).getWakelockStats();
+        doReturn(mAnomalyTimer).when(mAnomalyWakelock).getWakeTime(BatteryStats.WAKE_TYPE_PARTIAL);
+        doReturn(ANOMALY_UID).when(mAnomalyUid).getUid();
+
+        mNormalSipper.uidObj = mNormalUid;
+        mNormalWakelocks = new ArrayMap<>();
+        mNormalWakelocks.put("", mNormalWakelock);
+        doReturn(mNormalTimer).when(mNormalWakelock).getWakeTime(BatteryStats.WAKE_TYPE_PARTIAL);
+        doReturn(mNormalWakelocks).when(mNormalUid).getWakelockStats();
+        doReturn(NORMAL_UID).when(mNormalUid).getUid();
+
+        mTargetSipper.uidObj = mTargetUid;
+        mTargetWakelocks = new ArrayMap<>();
+        mTargetWakelocks.put("", mTargetWakelock);
+        doReturn(mTargetTimer).when(mTargetWakelock).getWakeTime(BatteryStats.WAKE_TYPE_PARTIAL);
+        doReturn(mTargetWakelocks).when(mTargetUid).getWakelockStats();
+        doReturn(TARGET_UID).when(mTargetUid).getUid();
+
+        mUsageList = new ArrayList<>();
+        mUsageList.add(mAnomalySipper);
+        mUsageList.add(mNormalSipper);
+        mUsageList.add(mTargetSipper);
+        doReturn(mUsageList).when(mBatteryStatsHelper).getUsageList();
+
+        mWakelockAnomalyDetector = spy(new WakeLockAnomalyDetector(mContext, mPolicy));
+        mWakelockAnomalyDetector.mBatteryUtils = mBatteryUtils;
+        doReturn(ANOMALY_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector).getTotalDurationMs(
+                eq(mAnomalyTimer), anyLong());
+        doReturn(ANOMALY_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector).getTotalDurationMs(
+                eq(mTargetTimer), anyLong());
+        doReturn(NORMAL_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector).getTotalDurationMs(
+                eq(mNormalTimer), anyLong());
+    }
+
+    @Test
+    public void testDetectAnomalies_containsAnomaly_detectIt() {
+        doReturn(BatteryUtils.UID_NULL).when(mBatteryUtils).getPackageUid(nullable(String.class));
+        final Anomaly anomaly = new Anomaly.Builder()
+                .setUid(ANOMALY_UID)
+                .setType(Anomaly.AnomalyType.WAKE_LOCK)
+                .build();
+        final Anomaly targetAnomaly = new Anomaly.Builder()
+                .setUid(TARGET_UID)
+                .setType(Anomaly.AnomalyType.WAKE_LOCK)
+                .build();
+
+        List<Anomaly> mAnomalies = mWakelockAnomalyDetector.detectAnomalies(mBatteryStatsHelper);
+
+        assertThat(mAnomalies).containsExactly(anomaly, targetAnomaly);
+    }
+
+    @Test
+    public void testDetectAnomalies_containsTargetPackage_detectIt() {
+        doReturn(TARGET_UID).when(mBatteryUtils).getPackageUid(TARGET_PACKAGE_NAME);
+        final Anomaly targetAnomaly = new Anomaly.Builder()
+                .setUid(TARGET_UID)
+                .setType(Anomaly.AnomalyType.WAKE_LOCK)
+                .build();
+
+        List<Anomaly> mAnomalies = mWakelockAnomalyDetector.detectAnomalies(mBatteryStatsHelper,
+                TARGET_PACKAGE_NAME);
+
+        assertThat(mAnomalies).containsExactly(targetAnomaly);
+    }
+
+    @Test
+    public void testContainsThresholdFromPolicy() {
+        assertThat(mWakelockAnomalyDetector.mWakeLockThresholdMs).isEqualTo(WAKELOCK_THRESHOLD_MS);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java
new file mode 100644
index 0000000..e6cdc4e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java
@@ -0,0 +1,178 @@
+/*
+ * 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.anomaly.checker;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.os.BatteryStats;
+import android.text.format.DateUtils;
+import android.util.ArrayMap;
+
+import com.android.internal.os.BatterySipper;
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.BatteryUtils;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WakeupAlarmAnomalyDetectorTest {
+    private static final String TARGET_PACKAGE_NAME = "com.android.app";
+    private static final int ANOMALY_UID = 111;
+    private static final int NORMAL_UID = 222;
+    private static final int TARGET_UID = 333;
+    private static final long RUNNING_TIME_MS = 2 * DateUtils.HOUR_IN_MILLIS;
+    private static final int ANOMALY_WAKEUP_COUNT = 500;
+    private static final int NORMAL_WAKEUP_COUNT = 50;
+    @Mock
+    private BatteryStatsHelper mBatteryStatsHelper;
+    @Mock
+    private BatterySipper mAnomalySipper;
+    @Mock
+    private BatterySipper mNormalSipper;
+    @Mock
+    private BatterySipper mTargetSipper;
+    @Mock
+    private BatteryStats.Uid mAnomalyUid;
+    @Mock
+    private BatteryStats.Uid mNormalUid;
+    @Mock
+    private BatteryStats.Uid mTargetUid;
+    @Mock
+    private BatteryUtils mBatteryUtils;
+    @Mock
+    private ApplicationInfo mApplicationInfo;
+    @Mock
+    private BatteryStats.Uid.Pkg mPkg;
+    @Mock
+    private BatteryStats.Counter mCounter;
+    @Mock
+    private AnomalyDetectionPolicy mPolicy;
+
+    private WakeupAlarmAnomalyDetector mWakeupAlarmAnomalyDetector;
+    private Context mContext;
+    private List<BatterySipper> mUsageList;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(RuntimeEnvironment.application);
+        ReflectionHelpers.setField(mPolicy, "wakeupAlarmThreshold", 60);
+
+        doReturn(false).when(mBatteryUtils).shouldHideSipper(any());
+        doReturn(RUNNING_TIME_MS).when(mBatteryUtils).calculateRunningTimeBasedOnStatsType(any(),
+                anyInt());
+
+        mAnomalySipper.uidObj = mAnomalyUid;
+        doReturn(ANOMALY_UID).when(mAnomalyUid).getUid();
+        mNormalSipper.uidObj = mNormalUid;
+        doReturn(NORMAL_UID).when(mNormalUid).getUid();
+        mTargetSipper.uidObj = mTargetUid;
+        doReturn(TARGET_UID).when(mTargetUid).getUid();
+
+        mUsageList = new ArrayList<>();
+        mUsageList.add(mAnomalySipper);
+        mUsageList.add(mNormalSipper);
+        mUsageList.add(mTargetSipper);
+        doReturn(mUsageList).when(mBatteryStatsHelper).getUsageList();
+
+        mWakeupAlarmAnomalyDetector = spy(new WakeupAlarmAnomalyDetector(mContext, mPolicy));
+        mWakeupAlarmAnomalyDetector.mBatteryUtils = mBatteryUtils;
+    }
+
+    @Test
+    public void testDetectAnomalies_containsAnomaly_detectIt() {
+        doReturn(-1).when(mBatteryUtils).getPackageUid(nullable(String.class));
+        doReturn(ANOMALY_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector).getWakeupAlarmCountFromUid(
+                mAnomalyUid);
+        doReturn(ANOMALY_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector).getWakeupAlarmCountFromUid(
+                mTargetUid);
+        doReturn(NORMAL_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector).getWakeupAlarmCountFromUid(
+                mNormalUid);
+        final Anomaly anomaly = new Anomaly.Builder()
+                .setUid(ANOMALY_UID)
+                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
+                .build();
+        final Anomaly targetAnomaly = new Anomaly.Builder()
+                .setUid(TARGET_UID)
+                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
+                .build();
+
+        List<Anomaly> mAnomalies = mWakeupAlarmAnomalyDetector.detectAnomalies(mBatteryStatsHelper);
+
+        assertThat(mAnomalies).containsExactly(anomaly, targetAnomaly);
+    }
+
+    @Test
+    public void testDetectAnomalies_detectTargetAnomaly_detectIt() {
+        doReturn(TARGET_UID).when(mBatteryUtils).getPackageUid(TARGET_PACKAGE_NAME);
+        doReturn(ANOMALY_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector).getWakeupAlarmCountFromUid(
+                mAnomalyUid);
+        doReturn(ANOMALY_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector).getWakeupAlarmCountFromUid(
+                mTargetUid);
+        doReturn(NORMAL_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector).getWakeupAlarmCountFromUid(
+                mNormalUid);
+        final Anomaly targetAnomaly = new Anomaly.Builder()
+                .setUid(TARGET_UID)
+                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
+                .build();
+
+        List<Anomaly> mAnomalies = mWakeupAlarmAnomalyDetector.detectAnomalies(mBatteryStatsHelper,
+                TARGET_PACKAGE_NAME);
+
+        assertThat(mAnomalies).containsExactly(targetAnomaly);
+    }
+
+    @Test
+    public void testGetWakeupAlarmCountFromUid_countCorrect() {
+        final ArrayMap<String, BatteryStats.Uid.Pkg> packageStats = new ArrayMap<>();
+        final ArrayMap<String, BatteryStats.Counter> alarms = new ArrayMap<>();
+        doReturn(alarms).when(mPkg).getWakeupAlarmStats();
+        doReturn(NORMAL_WAKEUP_COUNT).when(mCounter).getCountLocked(anyInt());
+        doReturn(packageStats).when(mAnomalyUid).getPackageStats();
+        packageStats.put("", mPkg);
+        alarms.put("1", mCounter);
+        alarms.put("2", mCounter);
+
+        assertThat(mWakeupAlarmAnomalyDetector.getWakeupAlarmCountFromUid(mAnomalyUid)).isEqualTo(
+                2 * NORMAL_WAKEUP_COUNT);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java
index e83e237..e7ac835 100644
--- a/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java
@@ -19,12 +19,10 @@
 import android.content.Context;
 import android.provider.Settings;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -34,12 +32,8 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import static android.provider.Settings.Secure.ASSIST_GESTURE_ENABLED;
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java
index 229ef49..349ca4f 100644
--- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java
@@ -19,29 +19,19 @@
 import android.content.Context;
 import android.provider.Settings;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
 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.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import static android.provider.Settings.Secure.ASSIST_GESTURE_ENABLED;
-import static android.provider.Settings.Secure.ASSIST_GESTURE_SENSITIVITY;
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
index 4efc822..ba0a90a 100644
--- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
@@ -20,7 +20,7 @@
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceController;
 
@@ -35,7 +35,6 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
diff --git a/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java
new file mode 100644
index 0000000..94cac96
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java
@@ -0,0 +1,131 @@
+/*
+ * 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.gestures;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import com.android.settings.R;
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static android.provider.Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class CameraLiftTriggerPreferenceControllerTest {
+
+    private static final String KEY_CAMERA_LIFT_TRIGGER = "gesture_camera_lift_trigger";
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private PreferenceScreen mScreen;
+    private CameraLiftTriggerPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new CameraLiftTriggerPreferenceController(mContext, null,
+                KEY_CAMERA_LIFT_TRIGGER);
+    }
+
+    @Test
+    public void isAvailable_configIsTrue_shouldReturnTrue() {
+        when(mContext.getResources().
+                getBoolean(R.bool.config_cameraLiftTriggerAvailable))
+                .thenReturn(true);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_configIsTrue_shouldReturnFalse() {
+        when(mContext.getResources().
+                getBoolean(R.bool.config_cameraLiftTriggerAvailable))
+                .thenReturn(false);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void testSwitchEnabled_defaultConfig_shouldReturnTrue() {
+        final Context context = RuntimeEnvironment.application;
+        mController = new CameraLiftTriggerPreferenceController(context, null,
+                KEY_CAMERA_LIFT_TRIGGER);
+
+        assertThat(mController.isSwitchPrefEnabled()).isTrue();
+    }
+
+    @Test
+    public void testSwitchEnabled_configIsNotSet_shouldReturnFalse() {
+        // Set the setting to be enabled.
+        final Context context = RuntimeEnvironment.application;
+        Settings.System.putInt(context.getContentResolver(),
+                CAMERA_LIFT_TRIGGER_ENABLED, 0);
+        mController = new CameraLiftTriggerPreferenceController(context, null,
+                KEY_CAMERA_LIFT_TRIGGER);
+
+        assertThat(mController.isSwitchPrefEnabled()).isFalse();
+    }
+
+    @Test
+    public void testSwitchEnabled_configIsSet_shouldReturnTrue() {
+        // Set the setting to be disabled.
+        final Context context = RuntimeEnvironment.application;
+        Settings.System.putInt(context.getContentResolver(),
+                CAMERA_LIFT_TRIGGER_ENABLED, 1);
+        mController = new CameraLiftTriggerPreferenceController(context, null,
+                KEY_CAMERA_LIFT_TRIGGER);
+
+        assertThat(mController.isSwitchPrefEnabled()).isTrue();
+    }
+
+    @Test
+    public void testEnablePreference_shouldSetSetting() {
+        final Context context = RuntimeEnvironment.application;
+        mController = new CameraLiftTriggerPreferenceController(context, null,
+                KEY_CAMERA_LIFT_TRIGGER);
+        mController.onPreferenceChange(null, true);
+
+        assertThat(Settings.Secure.getInt(context.getContentResolver(),
+                CAMERA_LIFT_TRIGGER_ENABLED, 0)).isEqualTo(1);
+    }
+
+    @Test
+    public void testDisablePreference_shouldClearSetting() {
+        final Context context = RuntimeEnvironment.application;
+        mController = new CameraLiftTriggerPreferenceController(context, null,
+                KEY_CAMERA_LIFT_TRIGGER);
+        mController.onPreferenceChange(null, false);
+
+        assertThat(Settings.Secure.getInt(context.getContentResolver(),
+                CAMERA_LIFT_TRIGGER_ENABLED, 1)).isEqualTo(0);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerSettingsTest.java
new file mode 100644
index 0000000..befdfa6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerSettingsTest.java
@@ -0,0 +1,55 @@
+/*
+ * 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.gestures;
+
+import android.provider.SearchIndexableResource;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+
+import java.util.List;
+
+import static com.google.common.truth.Truth.assertThat;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class CameraLiftTriggerSettingsTest {
+
+    private CameraLiftTriggerSettings mSettings;
+
+    @Before
+    public void setUp() {
+        mSettings = new CameraLiftTriggerSettings();
+    }
+
+    @Test
+    public void testSearchIndexProvider_shouldIndexResource() {
+        final List<SearchIndexableResource> indexRes =
+                CameraLiftTriggerSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                        ShadowApplication.getInstance().getApplicationContext(),
+                        true /* enabled */);
+
+        assertThat(indexRes).isNotNull();
+        assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
index d7961e3..cc30a74 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
@@ -20,11 +20,9 @@
 import android.provider.Settings;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
index f8c3367..b9635a7 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
@@ -18,7 +18,7 @@
 
 import android.provider.SearchIndexableResource;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
index 442d11d..539c7db 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
@@ -19,11 +19,9 @@
 import android.content.Context;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java
index 433ba46..3d56d71 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java
@@ -18,7 +18,7 @@
 
 import android.provider.SearchIndexableResource;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java
index 35c48ec..236896a 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java
@@ -18,7 +18,7 @@
 
 import android.provider.SearchIndexableResource;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -30,7 +30,6 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
index 7caf3fc..a06395a 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
@@ -22,7 +22,7 @@
 import android.os.UserManager;
 import android.provider.Settings;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
 
diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
index 3dc6892..8b4ef61 100644
--- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
@@ -21,10 +21,10 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.preference.TwoStatePreference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.widget.VideoPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
index 46c0f65..d81163d 100644
--- a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
@@ -19,11 +19,9 @@
 import android.content.Context;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
index 921a1be..2c4a1c4 100644
--- a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
@@ -18,7 +18,7 @@
 
 import android.provider.SearchIndexableResource;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -30,7 +30,6 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
index cf26cb2..ac551de 100644
--- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
@@ -19,11 +19,9 @@
 import android.content.Context;
 import android.provider.Settings;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
index 78dc27ac..e2ed14d 100644
--- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
@@ -20,7 +20,7 @@
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceController;
 
@@ -35,7 +35,6 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
diff --git a/tests/robotests/src/com/android/settings/graph/BottomLabelLayoutTest.java b/tests/robotests/src/com/android/settings/graph/BottomLabelLayoutTest.java
new file mode 100644
index 0000000..c9804d6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/graph/BottomLabelLayoutTest.java
@@ -0,0 +1,70 @@
+/*
+ * 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.graph;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.Space;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BottomLabelLayoutTest {
+    private BottomLabelLayout mBottomLabelLayout;
+    private Context mContext;
+    private Space mSpace;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mBottomLabelLayout = new BottomLabelLayout(mContext, null);
+        mBottomLabelLayout.setOrientation(LinearLayout.HORIZONTAL);
+
+        mSpace = new Space(mContext);
+        mSpace.setId(R.id.spacer);
+        mBottomLabelLayout.addView(mSpace);
+    }
+
+    @Test
+    public void testSetStacked_stackedTrue_layoutVertical() {
+        mBottomLabelLayout.setStacked(true);
+
+        assertThat(mBottomLabelLayout.getOrientation()).isEqualTo(LinearLayout.VERTICAL);
+        assertThat(mSpace.getVisibility()).isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void testSetStacked_stackedFalse_layoutHorizontal() {
+        mBottomLabelLayout.setStacked(false);
+
+        assertThat(mBottomLabelLayout.getOrientation()).isEqualTo(LinearLayout.HORIZONTAL);
+        assertThat(mSpace.getVisibility()).isEqualTo(View.VISIBLE);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
index c1bd0e0..7d803f4 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.hardware.input.InputManager;
 import android.view.InputDevice;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
index 5fa2c0d..8f9b2c5 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
@@ -27,7 +27,7 @@
 import android.view.InputDevice;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowInputDevice;
 
diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
index 8ca7d64..4457cc0 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
@@ -22,7 +22,7 @@
 import android.view.textservice.TextServicesManager;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
index 1332445..fe2b0df 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
@@ -34,7 +34,7 @@
 import android.view.inputmethod.InputMethodManager;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
index 527b1cd..b3af6b8 100644
--- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
@@ -16,15 +16,6 @@
 
 package com.android.settings.language;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-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.app.Activity;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
@@ -40,15 +31,15 @@
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
 import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -62,12 +53,21 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class LanguageAndInputSettingsTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
+    private Activity mActivity;
     @Mock
     private PackageManager mPackageManager;
     @Mock
@@ -85,15 +85,18 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mock(UserManager.class));
-        when(mContext.getSystemService(Context.INPUT_SERVICE)).thenReturn(mock(InputManager.class));
-        when(mContext.getSystemService(Context.INPUT_SERVICE)).thenReturn(mIm);
-        when(mContext.getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE))
+        FakeFeatureFactory.setupForTest(mActivity);
+        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mock(UserManager.class));
+        when(mActivity.getSystemService(Context.INPUT_SERVICE))
+                .thenReturn(mock(InputManager.class));
+        when(mActivity.getSystemService(Context.INPUT_SERVICE)).thenReturn(mIm);
+        when(mActivity.getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE))
                 .thenReturn(mock(TextServicesManager.class));
-        when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(mDpm);
-        when(mContext.getSystemService(Context.INPUT_METHOD_SERVICE)).thenReturn(mImm);
-        when(mContext.getSystemService(AutofillManager.class)).thenReturn(mAutofillManager);
-        mFragment = new TestFragment(mContext);
+        when(mActivity.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(mDpm);
+        when(mActivity.getSystemService(Context.INPUT_METHOD_SERVICE)).thenReturn(mImm);
+        when((Object) mActivity.getSystemService(AutofillManager.class))
+                .thenReturn(mAutofillManager);
+        mFragment = new TestFragment(mActivity);
     }
 
     @Test
@@ -103,7 +106,8 @@
 
     @Test
     public void testGetPreferenceControllers_shouldRegisterLifecycleObservers() {
-        final List<PreferenceController> controllers = mFragment.getPreferenceControllers(mContext);
+        final List<PreferenceController> controllers =
+                mFragment.getPreferenceControllers(mActivity);
         int lifecycleObserverCount = 0;
         for (PreferenceController controller : controllers) {
             if (controller instanceof LifecycleObserver) {
@@ -117,7 +121,8 @@
     @Test
 
     public void testGetPreferenceControllers_shouldAllBeCreated() {
-        final List<PreferenceController> controllers = mFragment.getPreferenceControllers(mContext);
+        final List<PreferenceController> controllers =
+                mFragment.getPreferenceControllers(mActivity);
 
         assertThat(controllers.isEmpty()).isFalse();
     }
@@ -150,6 +155,29 @@
     }
 
     @Test
+    @Config(shadows = {
+            ShadowSecureSettings.class,
+    })
+    public void testSummary_assistSupported_shouldSetToAssistGestureStatus() {
+        final FakeFeatureFactory featureFactory =
+            (FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
+        when(featureFactory.assistGestureFeatureProvider.isSupported(any(Context.class)))
+            .thenReturn(true);
+
+        final SummaryLoader loader = mock(SummaryLoader.class);
+        SummaryLoader.SummaryProvider provider = mFragment.SUMMARY_PROVIDER_FACTORY
+                .createSummaryProvider(mActivity, loader);
+
+        ShadowSecureSettings.putInt(null, Settings.Secure.ASSIST_GESTURE_ENABLED, 0);
+        provider.setListening(true);
+        verify(mActivity).getString(R.string.language_input_gesture_summary_off);
+
+        ShadowSecureSettings.putInt(null, Settings.Secure.ASSIST_GESTURE_ENABLED, 1);
+        provider.setListening(true);
+        verify(mActivity).getString(R.string.language_input_gesture_summary_on_with_assist);
+    }
+
+    @Test
     public void testNonIndexableKeys_existInXmlLayout() {
         final Context context = spy(RuntimeEnvironment.application);
         //(InputManager) context.getSystemService(Context.INPUT_SERVICE);
diff --git a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
index e7367bb..4050dd1 100644
--- a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
diff --git a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
index 4908b49..e4b3cf2 100644
--- a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
@@ -22,7 +22,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
index d2032ed..3fc99d2 100644
--- a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.speech.tts.TtsEngines;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.UserDictionarySettings;
 import com.android.settings.inputmethod.UserDictionaryList;
diff --git a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
index c7f76df..602bbd1 100644
--- a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
@@ -1,12 +1,11 @@
 package com.android.settings.location;
 
 import android.content.Context;
-import android.os.UserManager;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -16,7 +15,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
 import static org.mockito.Matchers.any;
diff --git a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
index 2e00169..ea2a18b 100644
--- a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
@@ -15,14 +15,26 @@
  */
 package com.android.settings.location;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.location.LocationManager;
 import android.provider.Settings.Secure;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -31,12 +43,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -46,6 +52,7 @@
     @Mock
     private PreferenceScreen mScreen;
 
+    private Lifecycle mLifecycle;
     private LocationPreferenceController mController;
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -54,7 +61,8 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mController = new LocationPreferenceController(mContext);
+        mLifecycle = new Lifecycle();
+        mController = new LocationPreferenceController(mContext, mLifecycle);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
     }
 
@@ -67,7 +75,7 @@
     public void updateState_shouldSetSummary() {
         mController.updateState(mPreference);
 
-        verify(mPreference).setSummary(anyString());
+        verify(mPreference).setSummary(nullable(String.class));
     }
 
     @Test
@@ -75,58 +83,81 @@
         mController.displayPreference(mScreen);
         mController.updateSummary();
 
-        verify(mPreference).setSummary(anyString());
+        verify(mPreference).setSummary(nullable(String.class));
     }
 
     @Test
     public void getLocationSummary_locationOff_shouldSetSummaryOff() {
         Secure.putInt(mContext.getContentResolver(),
-            Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF);
+                Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF);
 
         assertThat(mController.getLocationSummary(mContext)).isEqualTo(
-            mContext.getString(R.string.location_off_summary));
+                mContext.getString(R.string.location_off_summary));
     }
 
     @Test
     public void getLocationSummary_sensorsOnly_shouldSetSummarySensorsOnly() {
         Secure.putInt(mContext.getContentResolver(),
-            Secure.LOCATION_MODE, Secure.LOCATION_MODE_SENSORS_ONLY);
+                Secure.LOCATION_MODE, Secure.LOCATION_MODE_SENSORS_ONLY);
 
         assertThat(mController.getLocationSummary(mContext)).isEqualTo(
-            mContext.getString(R.string.location_on_summary,
-                mContext.getString(R.string.location_mode_sensors_only_title)));
+                mContext.getString(R.string.location_on_summary,
+                        mContext.getString(R.string.location_mode_sensors_only_title)));
     }
 
     @Test
     public void getLocationSummary_highAccuracy_shouldSetSummarHighAccuracy() {
         Secure.putInt(mContext.getContentResolver(),
-            Secure.LOCATION_MODE, Secure.LOCATION_MODE_HIGH_ACCURACY);
+                Secure.LOCATION_MODE, Secure.LOCATION_MODE_HIGH_ACCURACY);
 
         assertThat(mController.getLocationSummary(mContext)).isEqualTo(
-            mContext.getString(R.string.location_on_summary,
-                mContext.getString(R.string.location_mode_high_accuracy_title)));
+                mContext.getString(R.string.location_on_summary,
+                        mContext.getString(R.string.location_mode_high_accuracy_title)));
     }
 
     @Test
     public void getLocationSummary_batterySaving_shouldSetSummaryBatterySaving() {
         Secure.putInt(mContext.getContentResolver(),
-            Secure.LOCATION_MODE, Secure.LOCATION_MODE_BATTERY_SAVING);
+                Secure.LOCATION_MODE, Secure.LOCATION_MODE_BATTERY_SAVING);
 
         assertThat(mController.getLocationSummary(mContext)).isEqualTo(
-            mContext.getString(R.string.location_on_summary,
-                mContext.getString(R.string.location_mode_battery_saving_title)));
+                mContext.getString(R.string.location_on_summary,
+                        mContext.getString(R.string.location_mode_battery_saving_title)));
     }
 
     @Test
     public void getLocationString_shouldCorrectString() {
         assertThat(mController.getLocationString(Secure.LOCATION_MODE_OFF)).isEqualTo(
-            R.string.location_mode_location_off_title);
+                R.string.location_mode_location_off_title);
         assertThat(mController.getLocationString(Secure.LOCATION_MODE_SENSORS_ONLY)).isEqualTo(
-            R.string.location_mode_sensors_only_title);
+                R.string.location_mode_sensors_only_title);
         assertThat(mController.getLocationString(Secure.LOCATION_MODE_BATTERY_SAVING)).isEqualTo(
-            R.string.location_mode_battery_saving_title);
+                R.string.location_mode_battery_saving_title);
         assertThat(mController.getLocationString(Secure.LOCATION_MODE_HIGH_ACCURACY)).isEqualTo(
-            R.string.location_mode_high_accuracy_title);
+                R.string.location_mode_high_accuracy_title);
     }
 
+    @Test
+    public void onResume_shouldRegisterObserver() {
+        mLifecycle.onResume();
+        verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
+    }
+
+    @Test
+    public void onPause_shouldUnregisterObserver() {
+        mLifecycle.onPause();
+        verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
+    }
+
+    @Test
+    public void locationProvidersChangedReceiver_updatesPreferenceSummary() {
+        mController.displayPreference(mScreen);
+        mController.onResume();
+
+        mController.mLocationProvidersChangedReceiver.onReceive(
+                mContext,
+                new Intent().setAction(LocationManager.PROVIDERS_CHANGED_ACTION));
+
+        verify(mPreference).setSummary(any());
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
index 1ae40aa..e115dad 100644
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
@@ -24,9 +24,9 @@
 import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
index 5827c8b..a84179d 100644
--- a/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
index d1c3207..7471632 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
@@ -19,15 +19,18 @@
 import android.provider.SearchIndexableResource;
 import android.view.Menu;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settingslib.drawer.CategoryKey;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
@@ -36,18 +39,27 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class NetworkDashboardFragmentTest {
 
+    @Mock
+    private Context mContext;
+
     private NetworkDashboardFragment mFragment;
 
     @Before
     public void setUp() {
+        MockitoAnnotations.initMocks(this);
         mFragment = new NetworkDashboardFragment();
     }
 
@@ -75,7 +87,7 @@
 
         mFragment.onCreateOptionsMenu(null, null);
 
-        verify(resetController).buildMenuItem(any(Menu.class));
+        verify(resetController).buildMenuItem(nullable(Menu.class));
     }
 
     @Test
@@ -89,4 +101,58 @@
 
         assertThat(keys).containsAllIn(niks);
     }
-}
+
+    @Test
+    public void testSummaryProvider_hasMobileAndHotspot_shouldReturnMobileSummary() {
+        final MobileNetworkPreferenceController mobileNetworkPreferenceController =
+                mock(MobileNetworkPreferenceController.class);
+        final TetherPreferenceController tetherPreferenceController =
+                mock(TetherPreferenceController.class);
+
+        final SummaryLoader summaryLoader = mock(SummaryLoader.class);
+        final SummaryLoader.SummaryProvider provider =
+                new NetworkDashboardFragment.SummaryProvider(mContext, summaryLoader,
+                        mobileNetworkPreferenceController, tetherPreferenceController);
+
+        provider.setListening(false);
+
+        verifyZeroInteractions(summaryLoader);
+
+        when(mobileNetworkPreferenceController.isAvailable()).thenReturn(true);
+        when(tetherPreferenceController.isAvailable()).thenReturn(true);
+
+        provider.setListening(true);
+
+        verify(mContext).getString(R.string.wifi_settings_title);
+        verify(mContext).getString(R.string.network_dashboard_summary_data_usage);
+        verify(mContext).getString(R.string.network_dashboard_summary_hotspot);
+        verify(mContext).getString(R.string.network_dashboard_summary_mobile);
+        verify(mContext, times(3)).getString(R.string.join_many_items_middle, null, null);
+    }
+
+    @Test
+    public void testSummaryProvider_noMobileOrHotspot_shouldReturnSimpleSummary() {
+        final MobileNetworkPreferenceController mobileNetworkPreferenceController =
+                mock(MobileNetworkPreferenceController.class);
+        final TetherPreferenceController tetherPreferenceController =
+                mock(TetherPreferenceController.class);
+
+        final SummaryLoader summaryLoader = mock(SummaryLoader.class);
+        final SummaryLoader.SummaryProvider provider =
+                new NetworkDashboardFragment.SummaryProvider(mContext, summaryLoader,
+                        mobileNetworkPreferenceController, tetherPreferenceController);
+
+        provider.setListening(false);
+
+        verifyZeroInteractions(summaryLoader);
+
+        when(mobileNetworkPreferenceController.isAvailable()).thenReturn(false);
+        when(tetherPreferenceController.isAvailable()).thenReturn(false);
+
+        provider.setListening(true);
+
+        verify(mContext).getString(R.string.wifi_settings_title);
+        verify(mContext).getString(R.string.network_dashboard_summary_data_usage);
+        verify(mContext).getString(R.string.join_many_items_middle, null, null);
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java
index ee6ef69..0b2be3a 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java
@@ -27,7 +27,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java
index eeb4131..4d8c626 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java
@@ -19,7 +19,7 @@
 
 import android.content.Context;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java
index b1c88d5..792bdd3 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java
@@ -25,7 +25,7 @@
 import android.content.Context;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
index 57dd8e6..0b1586e 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
@@ -28,7 +28,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
index aba1f77..9885bdf 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
@@ -30,7 +30,7 @@
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.widget.RadioButtonPreference;
 import com.google.android.collect.Lists;
diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
index cecc910..4ae8c2c 100644
--- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
@@ -30,7 +30,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
index 2a0b873..b7c4848 100644
--- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
@@ -25,9 +25,9 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java
index c31ab40..172508d 100644
--- a/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java
@@ -22,7 +22,7 @@
 import android.telephony.TelephonyManager;
 
 import com.android.ims.ImsManager;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
index 7e898fb..a82daf3 100644
--- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
@@ -18,11 +18,11 @@
 package com.android.settings.nfc;
 
 import android.content.Context;
-
 import android.content.pm.PackageManager;
-import android.content.pm.PackageParser;
-import com.android.settings.SettingsRobolectricTestRunner;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,7 +33,6 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
@@ -67,6 +66,6 @@
         when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true);
 
         List<String> niks = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
-        assertThat(niks).isNull();
+        assertThat(niks).isEmpty();
     }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java
index 994582c..d33d734 100644
--- a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.accounts.AccountRestrictionHelper;
 import com.android.settingslib.RestrictedPreference;
diff --git a/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java
index 4ac9179..f4bd522 100644
--- a/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.media.RingtoneManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
index a08ec17..7b0b033 100644
--- a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.media.AudioManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
index c547c63..58ba46b 100644
--- a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
@@ -21,7 +21,7 @@
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
 
@@ -32,7 +32,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java
index fc9867e..ed9cc98 100644
--- a/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
index 4cdf7c7..2b2d024 100644
--- a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.provider.Settings.Global;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
index e9410e6..4ec67e6 100644
--- a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
@@ -24,7 +24,7 @@
 import android.provider.Settings.System;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
index bc6eb3a..58e5636 100644
--- a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.provider.Settings.Global;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
index 3350fb9..d6a277f 100644
--- a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.provider.Settings.Global;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
index 392bd2c..24f4b6c 100644
--- a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.content.pm.PackageManager;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.accounts.AccountRestrictionHelper;
 import com.android.settingslib.RestrictedPreference;
diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java
index 0124566..c3e887f 100644
--- a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java
@@ -24,7 +24,7 @@
 import android.provider.Settings.Global;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
index 9944379..ca7fc44 100644
--- a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.media.AudioManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -30,7 +30,6 @@
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java
index b0aa856..d3f66b9 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java
@@ -16,10 +16,14 @@
 
 package com.android.settings.notification;
 
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -31,10 +35,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class NotificationAccessSettingsTest {
@@ -56,12 +56,12 @@
     @Test
     public void logSpecialPermissionChange() {
         mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW),
                 eq("app"));
 
         mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_DENY),
                 eq("app"));
     }
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java
index 841367f..940a948 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.media.RingtoneManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
index e6d8a41..f919e7b 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
@@ -21,7 +21,7 @@
 import android.os.Vibrator;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
index 85e74b0..57ab4d3 100644
--- a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.media.RingtoneManager;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
index 4780e5c..1a6d3d7 100644
--- a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
@@ -19,12 +19,11 @@
 import android.app.NotificationManager;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
 import android.media.AudioManager;
 import android.os.Vibrator;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
index d680c38..e72ef53 100644
--- a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
@@ -20,7 +20,7 @@
 import android.support.v7.preference.Preference;
 import android.media.RingtoneManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
index 8963a5d..f94f8bf 100644
--- a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.provider.Settings.System;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
index 25581b9..307536d 100644
--- a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
@@ -23,9 +23,9 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,7 +40,7 @@
 
 import static com.android.settings.notification.SettingPref.TYPE_GLOBAL;
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
index 547117b..59b7078 100644
--- a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
@@ -21,7 +21,7 @@
 import android.media.AudioManager;
 import android.os.UserManager;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.ShadowAudioHelper;
diff --git a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
index f530f66..eaf9bb5 100644
--- a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
@@ -24,7 +24,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.provider.Settings.System;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -32,7 +32,6 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
diff --git a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
index 440b69e..b0ab54b 100644
--- a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
@@ -24,7 +24,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.provider.Settings.System;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -36,7 +36,7 @@
 import org.robolectric.shadows.ShadowApplication;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.when;
 
diff --git a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
index 3bc1ffa..054309c 100644
--- a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import android.support.v7.preference.TwoStatePreference;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
index 581ed47..a1d9205 100644
--- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
@@ -16,12 +16,18 @@
 
 package com.android.settings.notification;
 
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
-import android.preference.SeekBarVolumizer;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -31,13 +37,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class VolumeSeekBarPreferenceControllerTest {
@@ -56,7 +55,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+        when(mScreen.findPreference(nullable(String.class))).thenReturn(mPreference);
         mController =
             new VolumeSeekBarPreferenceControllerTestable(mContext, mCallback);
     }
diff --git a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
index 520e1f0..0c826ed 100644
--- a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
@@ -16,6 +16,16 @@
 
 package com.android.settings.notification;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -28,7 +38,7 @@
 import com.android.settings.DefaultRingtonePreference;
 import com.android.settings.R;
 import com.android.settings.RingtonePreference;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -38,16 +48,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class WorkSoundPreferenceControllerTest {
@@ -94,9 +94,9 @@
 
     @Test
     public void isAvailable_managedProfileAndNotSingleVolume_shouldReturnTrue() {
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.myUserId());
-        when(mAudioHelper.isUserUnlocked(any(UserManager.class), anyInt())).thenReturn(true);
+        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
         when(mAudioHelper.isSingleVolume()).thenReturn(false);
 
         assertThat(mController.isAvailable()).isTrue();
@@ -104,9 +104,9 @@
 
     @Test
     public void isAvailable_noManagedProfile_shouldReturnFalse() {
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.USER_NULL);
-        when(mAudioHelper.isUserUnlocked(any(UserManager.class), anyInt())).thenReturn(true);
+        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
         when(mAudioHelper.isSingleVolume()).thenReturn(false);
 
         assertThat(mController.isAvailable()).isFalse();
@@ -114,9 +114,9 @@
 
     @Test
     public void isAvailable_singleVolume_shouldReturnFalse() {
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.myUserId());
-        when(mAudioHelper.isUserUnlocked(any(UserManager.class), anyInt())).thenReturn(true);
+        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
         when(mAudioHelper.isSingleVolume()).thenReturn(true);
 
         assertThat(mController.isAvailable()).isFalse();
@@ -128,7 +128,7 @@
         when(mAudioHelper.isSingleVolume()).thenReturn(false);
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
         when(mAudioHelper.createPackageContextAsUser(anyInt())).thenReturn(mContext);
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.USER_NULL);
 
         // When the fragment first displays, the category should not appear.
@@ -137,7 +137,7 @@
 
         // However, when a managed profile is added later, the category should appear.
         mController.onResume();
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.myUserId());
         mController.onManagedProfileAdded(UserHandle.myUserId());
 
@@ -150,9 +150,9 @@
         when(mAudioHelper.isSingleVolume()).thenReturn(false);
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
         when(mAudioHelper.createPackageContextAsUser(anyInt())).thenReturn(mContext);
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.myUserId());
-        when(mAudioHelper.isUserUnlocked(any(UserManager.class), anyInt())).thenReturn(true);
+        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
 
         // Which is in resumed state:
         mController.displayPreference(mScreen);
@@ -161,7 +161,7 @@
         verify(mWorkCategory, times(2)).setVisible(true);
 
         // When a managed profile is removed, the category should be hidden.
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.USER_NULL);
         mController.onManagedProfileRemoved(UserHandle.myUserId());
 
@@ -171,9 +171,9 @@
 
     @Test
     public void displayPreference_isAvailable_shouldShowPreferenceCategory() {
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.myUserId());
-        when(mAudioHelper.isUserUnlocked(any(UserManager.class), anyInt())).thenReturn(true);
+        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
         when(mAudioHelper.isSingleVolume()).thenReturn(false);
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
         when(mAudioHelper.createPackageContextAsUser(anyInt())).thenReturn(mContext);
@@ -184,7 +184,7 @@
 
     @Test
     public void displayPreference_notAvailable_shouldHidePreferenceCategory() {
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.USER_NULL);
         when(mAudioHelper.isSingleVolume()).thenReturn(true);
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
@@ -200,7 +200,7 @@
 
         mController.onPreferenceChange(preference, "hello");
 
-        verify(preference).setSummary(anyString());
+        verify(preference).setSummary(nullable(String.class));
     }
 
     @Test
@@ -208,9 +208,9 @@
         when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
         mController = new WorkSoundPreferenceController(mContext, mFragment, null, mAudioHelper);
 
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.myUserId());
-        when(mAudioHelper.isUserUnlocked(any(UserManager.class), anyInt())).thenReturn(true);
+        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
         when(mAudioHelper.isSingleVolume()).thenReturn(false);
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
         when(mAudioHelper.createPackageContextAsUser(anyInt())).thenReturn(mContext);
@@ -234,9 +234,9 @@
         when(mAudioHelper.isSingleVolume()).thenReturn(false);
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
         when(mAudioHelper.createPackageContextAsUser(anyInt())).thenReturn(mContext);
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.myUserId());
-        when(mAudioHelper.isUserUnlocked(any(UserManager.class), anyInt())).thenReturn(false);
+        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(false);
 
         // When resumed:
         mController.displayPreference(mScreen);
@@ -256,9 +256,9 @@
     @Test
     public void onResume_shouldSetUserIdToPreference() {
         final int managedProfileUserId = 10;
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(managedProfileUserId);
-        when(mAudioHelper.isUserUnlocked(any(UserManager.class), anyInt())).thenReturn(true);
+        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
         when(mAudioHelper.isSingleVolume()).thenReturn(false);
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
         when(mAudioHelper.createPackageContextAsUser(anyInt())).thenReturn(mContext);
diff --git a/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java
index 854edcd..591378f 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java
index 685390e..1d71a8a 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java
@@ -22,7 +22,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
index 7a3742d..8ac482b 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -29,8 +29,6 @@
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
new file mode 100644
index 0000000..28b0264
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
@@ -0,0 +1,233 @@
+/*
+ * 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.password;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.robolectric.RuntimeEnvironment.application;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import java.util.Arrays;
+import java.util.regex.Pattern;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                SettingsShadowResources.class
+        })
+public class ChooseLockGenericControllerTest {
+
+    private ChooseLockGenericController mController;
+
+    @Mock
+    private ManagedLockPasswordProvider mManagedLockPasswordProvider;
+
+    @Mock
+    private DevicePolicyManager mDevicePolicyManager;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mController = new ChooseLockGenericController(
+                application,
+                0 /* userId */,
+                mDevicePolicyManager,
+                mManagedLockPasswordProvider);
+        SettingsShadowResources.overrideResource(R.bool.config_hide_none_security_option, false);
+        SettingsShadowResources.overrideResource(R.bool.config_hide_swipe_security_option, false);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
+    @Test
+    public void isScreenLockVisible_shouldRespectResourceConfig() {
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            // All locks except managed defaults to visible
+            assertThat(mController.isScreenLockVisible(lock)).named(lock + " visible")
+                    .isEqualTo(lock != ScreenLockType.MANAGED);
+        }
+
+        SettingsShadowResources.overrideResource(R.bool.config_hide_none_security_option, true);
+        SettingsShadowResources.overrideResource(R.bool.config_hide_swipe_security_option, true);
+        assertThat(mController.isScreenLockVisible(ScreenLockType.NONE)).named("NONE visible")
+                .isFalse();
+        assertThat(mController.isScreenLockVisible(ScreenLockType.SWIPE)).named("SWIPE visible")
+                .isFalse();
+    }
+
+    @Test
+    public void isScreenLockVisible_notCurrentUser_shouldHideSwipe() {
+        mController = new ChooseLockGenericController(application, 1 /* userId */);
+        assertThat(mController.isScreenLockVisible(ScreenLockType.SWIPE)).named("SWIPE visible")
+                .isFalse();
+    }
+
+    @Test
+    public void isScreenLockVisible_managedPasswordChoosable_shouldShowManaged() {
+        doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
+
+        assertThat(mController.isScreenLockVisible(ScreenLockType.MANAGED)).named("MANAGED visible")
+                .isTrue();
+    }
+
+    @Test
+    public void isScreenLockEnabled_lowerQuality_shouldReturnFalse() {
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            assertThat(mController.isScreenLockEnabled(lock, lock.maxQuality + 1))
+                    .named(lock + " enabled")
+                    .isFalse();
+        }
+    }
+
+    @Test
+    public void isScreenLockEnabled_equalQuality_shouldReturnTrue() {
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            assertThat(mController.isScreenLockEnabled(lock, lock.defaultQuality))
+                    .named(lock + " enabled")
+                    .isTrue();
+        }
+    }
+
+    @Test
+    public void isScreenLockEnabled_higherQuality_shouldReturnTrue() {
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            assertThat(mController.isScreenLockEnabled(lock, lock.maxQuality - 1))
+                    .named(lock + " enabled")
+                    .isTrue();
+        }
+    }
+
+    @Test
+    public void isScreenLockDisabledByAdmin_lowerQuality_shouldReturnTrue() {
+        doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality + 1))
+                    .named(lock + " disabledByAdmin")
+                    .isTrue();
+        }
+    }
+
+    @Test
+    public void isScreenLockDisabledByAdmin_equalQuality_shouldReturnFalse() {
+        doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality))
+                    .named(lock + " disabledByAdmin")
+                    .isFalse();
+        }
+    }
+
+    @Test
+    public void isScreenLockDisabledByAdmin_higherQuality_shouldReturnFalse() {
+        doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality - 1))
+                    .named(lock + " disabledByAdmin")
+                    .isFalse();
+        }
+    }
+
+    @Test
+    public void isScreenLockDisabledByAdmin_managedNotChoosable_shouldReturnTrue() {
+        doReturn(false).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
+        assertThat(mController.isScreenLockDisabledByAdmin(
+                ScreenLockType.MANAGED, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED))
+                .named("MANANGED disabledByAdmin")
+                .isTrue();
+    }
+
+    @Test
+    public void getTitle_shouldContainEnumName() {
+        doReturn("MANAGED").when(mManagedLockPasswordProvider).getPickerOptionTitle(anyBoolean());
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            assertThat(mController.getTitle(lock).toString())
+                    .containsMatch(Pattern.compile(lock.toString(), Pattern.CASE_INSENSITIVE));
+        }
+    }
+
+    @Test
+    public void getVisibleScreenLockTypes_qualitySomething_shouldReturnPatterPinPassword() {
+        assertThat(mController.getVisibleScreenLockTypes(
+                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, false))
+                .isEqualTo(Arrays.asList(
+                        ScreenLockType.PATTERN,
+                        ScreenLockType.PIN,
+                        ScreenLockType.PASSWORD));
+    }
+
+    @Test
+    public void getVisibleScreenLockTypes_showDisabled_shouldReturnAllButManaged() {
+        assertThat(mController.getVisibleScreenLockTypes(
+                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, true))
+                .isEqualTo(Arrays.asList(
+                        ScreenLockType.NONE,
+                        ScreenLockType.SWIPE,
+                        ScreenLockType.PATTERN,
+                        ScreenLockType.PIN,
+                        ScreenLockType.PASSWORD));
+    }
+
+    @Test
+    public void upgradeQuality_noDpmRequirement_shouldReturnQuality() {
+        doReturn(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED)
+                .when(mDevicePolicyManager)
+                .getPasswordQuality(nullable(ComponentName.class), anyInt());
+
+        int upgradedQuality = mController.upgradeQuality(
+                DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
+        assertThat(upgradedQuality).named("upgradedQuality")
+                .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
+    }
+
+    @Test
+    public void upgradeQuality_dpmRequirement_shouldReturnRequiredQuality() {
+        doReturn(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC)
+                .when(mDevicePolicyManager)
+                .getPasswordQuality(nullable(ComponentName.class), anyInt());
+
+        int upgradedQuality = mController.upgradeQuality(
+                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+        assertThat(upgradedQuality).named("upgradedQuality")
+                .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
new file mode 100644
index 0000000..74eeaf1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
@@ -0,0 +1,98 @@
+/*
+ * 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.password;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.robolectric.RuntimeEnvironment.application;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Intent;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.password.ChooseLockPassword.IntentBuilder;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION)
+public class ChooseLockPasswordTest {
+
+    @Test
+    public void intentBuilder_setPassword_shouldAddExtras() {
+        Intent intent = new IntentBuilder(application)
+                .setPassword("password")
+                .setPasswordQuality(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC)
+                .setPasswordLengthRange(123, 456)
+                .setUserId(123)
+                .build();
+
+        assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true))
+                .named("EXTRA_KEY_HAS_CHALLENGE")
+                .isFalse();
+        assertThat(intent.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
+                .named("EXTRA_KEY_PASSWORD")
+                .isEqualTo("password");
+        assertThat(intent.getIntExtra(ChooseLockPassword.PASSWORD_MIN_KEY, 0))
+                .named("PASSWORD_MIN_KEY")
+                .isEqualTo(123);
+        assertThat(intent.getIntExtra(ChooseLockPassword.PASSWORD_MAX_KEY, 0))
+                .named("PASSWORD_MAX_KEY")
+                .isEqualTo(456);
+        assertThat(intent.getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, 0))
+                .named("PASSWORD_TYPE_KEY")
+                .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
+        assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
+                .named("EXTRA_USER_ID")
+                .isEqualTo(123);
+    }
+
+    @Test
+    public void intentBuilder_setChallenge_shouldAddExtras() {
+        Intent intent = new IntentBuilder(application)
+                .setChallenge(12345L)
+                .setPasswordQuality(DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC)
+                .setPasswordLengthRange(123, 456)
+                .setUserId(123)
+                .build();
+
+        assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false))
+                .named("EXTRA_KEY_HAS_CHALLENGE")
+                .isTrue();
+        assertThat(intent.getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L))
+                .named("EXTRA_KEY_CHALLENGE")
+                .isEqualTo(12345L);
+        assertThat(intent.getIntExtra(ChooseLockPassword.PASSWORD_MIN_KEY, 0))
+                .named("PASSWORD_MIN_KEY")
+                .isEqualTo(123);
+        assertThat(intent.getIntExtra(ChooseLockPassword.PASSWORD_MAX_KEY, 0))
+                .named("PASSWORD_MAX_KEY")
+                .isEqualTo(456);
+        assertThat(intent.getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, 0))
+                .named("PASSWORD_TYPE_KEY")
+                .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC);
+        assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
+                .named("EXTRA_USER_ID")
+                .isEqualTo(123);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
new file mode 100644
index 0000000..fa09884
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
@@ -0,0 +1,98 @@
+/*
+ * 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.password;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.robolectric.RuntimeEnvironment.application;
+
+import android.content.Intent;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.password.ChooseLockPattern.IntentBuilder;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
+import com.android.settings.testutils.shadow.ShadowEventLogWriter;
+import com.android.settings.testutils.shadow.ShadowUtils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class,
+                ShadowDynamicIndexableContentMonitor.class,
+                ShadowEventLogWriter.class,
+                ShadowUtils.class
+        })
+public class ChooseLockPatternTest {
+
+    @Test
+    public void activityCreationTest() {
+        // Basic sanity test for activity created without crashing
+        Robolectric.buildActivity(ChooseLockPattern.class, new IntentBuilder(application).build())
+                .setup().get();
+    }
+
+    @Test
+    public void intentBuilder_setPattern_shouldAddExtras() {
+        Intent intent = new IntentBuilder(application)
+                .setPattern("pattern")
+                .setUserId(123)
+                .build();
+
+        assertThat(intent
+                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true))
+                .named("EXTRA_KEY_HAS_CHALLENGE")
+                .isFalse();
+        assertThat(intent
+                .getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
+                .named("EXTRA_KEY_PASSWORD")
+                .isEqualTo("pattern");
+        assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
+                .named("EXTRA_USER_ID")
+                .isEqualTo(123);
+    }
+
+    @Test
+    public void intentBuilder_setChallenge_shouldAddExtras() {
+        Intent intent = new IntentBuilder(application)
+                .setChallenge(12345L)
+                .setUserId(123)
+                .build();
+
+        assertThat(intent
+                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false))
+                .named("EXTRA_KEY_HAS_CHALLENGE")
+                .isTrue();
+        assertThat(intent
+                .getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L))
+                .named("EXTRA_KEY_CHALLENGE")
+                .isEqualTo(12345L);
+        assertThat(intent
+                .getIntExtra(Intent.EXTRA_USER_ID, 0))
+                .named("EXTRA_USER_ID")
+                .isEqualTo(123);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/ConfirmCredentialTest.java b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
similarity index 71%
rename from tests/robotests/src/com/android/settings/ConfirmCredentialTest.java
rename to tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
index f771a1f..d76968e 100644
--- a/tests/robotests/src/com/android/settings/ConfirmCredentialTest.java
+++ b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
@@ -14,14 +14,15 @@
  * limitations under the License
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
-import static com.android.settings.ConfirmDeviceCredentialBaseFragment.LastTryDialog;
 import static com.google.common.truth.Truth.assertThat;
 
-import android.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.password.ConfirmDeviceCredentialBaseFragment.LastTryDialog;
+
 import android.app.Activity;
-import android.app.Fragment;
 import android.app.FragmentManager;
 
 import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -45,11 +46,14 @@
         FragmentManager fm = Robolectric.buildActivity(Activity.class).get().getFragmentManager();
 
         // Launch only one instance at a time.
-        assertThat(LastTryDialog.show(fm, "title", R.string.yes, R.string.ok, false)).isTrue();
-        assertThat(LastTryDialog.show(fm, "title", R.string.yes, R.string.ok, false)).isFalse();
+        assertThat(LastTryDialog.show(
+                fm, "title", android.R.string.yes, android.R.string.ok, false)).isTrue();
+        assertThat(LastTryDialog.show(
+                fm, "title", android.R.string.yes, android.R.string.ok, false)).isFalse();
 
         // After cancelling, the dialog should be re-shown when asked for.
         LastTryDialog.hide(fm);
-        assertThat(LastTryDialog.show(fm, "title", R.string.yes, R.string.ok, false)).isTrue();
+        assertThat(LastTryDialog.show(
+                fm, "title", android.R.string.yes, android.R.string.ok, false)).isTrue();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java b/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java
new file mode 100644
index 0000000..8beefa8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java
@@ -0,0 +1,65 @@
+/*
+ * 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.password;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.admin.DevicePolicyManager;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION)
+public class ScreenLockTypeTest {
+
+    @Test
+    public void fromQuality_shouldReturnLockWithAssociatedQuality() {
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC))
+                .isEqualTo(ScreenLockType.PASSWORD);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC))
+                .isEqualTo(ScreenLockType.PASSWORD);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK))
+                .isNull();
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_COMPLEX))
+                .isEqualTo(ScreenLockType.PASSWORD);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_MANAGED))
+                .isEqualTo(ScreenLockType.MANAGED);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC))
+                .isEqualTo(ScreenLockType.PIN);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX))
+                .isEqualTo(ScreenLockType.PIN);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING))
+                .isEqualTo(ScreenLockType.PATTERN);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED))
+                .isEqualTo(ScreenLockType.SWIPE);
+    }
+
+    @Test
+    public void fromKey_shouldReturnLockWithGivenKey() {
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            assertThat(ScreenLockType.fromKey(lock.preferenceKey)).isEqualTo(lock);
+        }
+        assertThat(ScreenLockType.fromKey("nonexistent")).isNull();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java
index 573f5d8..cb863a0 100644
--- a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java
@@ -16,14 +16,16 @@
 
 package com.android.settings.password;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.robolectric.Shadows.shadowOf;
+
 import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Bundle;
 import android.provider.Settings;
 
-import com.android.settings.ChooseLockGeneric;
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.SetupChooseLockGeneric;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.After;
@@ -35,9 +37,6 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowActivity;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.robolectric.Shadows.shadowOf;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SetNewPasswordActivityTest {
diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
index ab01360..96775ad 100644
--- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
@@ -16,13 +16,32 @@
 
 package com.android.settings.password;
 
+import static android.content.pm.PackageManager.FEATURE_FINGERPRINT;
+
+import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment
+        .HIDE_DISABLED_PREFS;
+import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment
+        .MINIMUM_QUALITY_KEY;
+import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE;
+import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT;
+import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -33,20 +52,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static android.content.pm.PackageManager.FEATURE_FINGERPRINT;
-import static com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS;
-import static com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY;
-import static com.android.settings.ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE;
-import static com.android.settings.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT;
-import static com.android.settings.ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE;
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 
 /**
  * Tests for {@link SetNewPasswordController}.
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
new file mode 100644
index 0000000..f7526db
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
@@ -0,0 +1,114 @@
+/*
+ * 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.password;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.robolectric.RuntimeEnvironment.application;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Button;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
+import com.android.settings.password.ChooseLockPassword.IntentBuilder;
+import com.android.settings.password.SetupChooseLockPassword.SetupChooseLockPasswordFragment;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
+import com.android.settings.testutils.shadow.ShadowEventLogWriter;
+import com.android.settings.testutils.shadow.ShadowUtils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowActivity;
+import org.robolectric.shadows.ShadowActivity.IntentForResult;
+import org.robolectric.shadows.ShadowDialog;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class,
+                ShadowDynamicIndexableContentMonitor.class,
+                ShadowEventLogWriter.class,
+                ShadowUtils.class
+        })
+public class SetupChooseLockPasswordTest {
+
+    @Test
+    public void createActivity_shouldNotCrash() {
+        // Basic sanity test for activity created without crashing
+        Robolectric.buildActivity(SetupChooseLockPassword.class,
+                SetupChooseLockPassword.modifyIntentForSetup(
+                        application,
+                        new IntentBuilder(application).build()))
+                .setup().get();
+    }
+
+    @Test
+    public void createActivity_withShowOptionsButtonExtra_shouldShowButton() {
+        Intent intent = SetupChooseLockPassword.modifyIntentForSetup(
+                application,
+                new IntentBuilder(application).build());
+        intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, true);
+        SetupChooseLockPassword activity =
+                Robolectric.buildActivity(SetupChooseLockPassword.class, intent).setup().get();
+
+        Button optionsButton = activity.findViewById(R.id.screen_lock_options);
+        assertThat(optionsButton).isNotNull();
+
+        ShadowActivity shadowActivity = shadowOf(activity);
+        optionsButton.performClick();
+
+        assertThat(ShadowDialog.getLatestDialog()).isNotNull();
+    }
+
+    @Test
+    public void createActivity_clickDifferentOption_extrasShouldBePropagated() {
+        Bundle bundle = new Bundle();
+        bundle.putString("foo", "bar");
+
+        Intent intent = new IntentBuilder(application).build();
+        intent.putExtra(ChooseLockGenericFragment.EXTRA_CHOOSE_LOCK_GENERIC_EXTRAS, bundle);
+        intent = SetupChooseLockPassword.modifyIntentForSetup(application, intent);
+        intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, true);
+
+        SetupChooseLockPassword activity =
+                Robolectric.buildActivity(SetupChooseLockPassword.class, intent).setup().get();
+
+        SetupChooseLockPasswordFragment fragment =
+                (SetupChooseLockPasswordFragment) activity.getFragmentManager()
+                        .findFragmentById(R.id.main_content);
+        fragment.onLockTypeSelected(ScreenLockType.PATTERN);
+
+        ShadowActivity shadowActivity = shadowOf(activity);
+        IntentForResult chooseLockIntent = shadowActivity.getNextStartedActivityForResult();
+        assertThat(chooseLockIntent).isNotNull();
+        assertThat(chooseLockIntent.requestCode)
+                .isEqualTo(SetupChooseLockPasswordFragment.REQUEST_SCREEN_LOCK_OPTIONS);
+        assertThat(chooseLockIntent.intent.getStringExtra("foo")).named("Foo extra")
+                .isEqualTo("bar");
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java
index 0e2a2f6..cf34f45 100644
--- a/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java
@@ -22,21 +22,25 @@
 
 import android.app.Activity;
 import android.content.res.Resources;
+import android.print.PrintJob;
+import android.print.PrintJobInfo;
 import android.print.PrintManager;
 import android.printservice.PrintServiceInfo;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -63,13 +67,26 @@
     }
 
     @Test
+    public void testSummary_hasActiveJob_shouldSetSummaryToNumberOfJobs() {
+        final List<PrintJob> printJobs = new ArrayList<>();
+        final PrintJob job = mock(PrintJob.class, Mockito.RETURNS_DEEP_STUBS);
+        printJobs.add(job);
+        when(job.getInfo().getState()).thenReturn(PrintJobInfo.STATE_STARTED);
+        when(mPrintManager.getPrintJobs()).thenReturn(printJobs);
+
+        mSummaryProvider.setListening(true);
+
+        verify(mRes).getQuantityString(R.plurals.print_jobs_summary, 1, 1);
+    }
+
+    @Test
     public void testSummary_shouldSetSummaryToNumberOfPrintServices() {
         final List<PrintServiceInfo> printServices = mock(List.class);
         when(printServices.isEmpty()).thenReturn(false);
         when(printServices.size()).thenReturn(2);
         // 2 services
         when(mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES))
-            .thenReturn(printServices);
+                .thenReturn(printServices);
 
         mSummaryProvider.setListening(true);
 
diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
index 42c5301..ff39deb 100644
--- a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
+++ b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
@@ -21,7 +21,7 @@
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceController;
 
@@ -60,7 +60,7 @@
 
     @Test
     public void getNonIndexableKeys_noPreferenceController_shouldReturnEmptyList() {
-        assertThat(mIndexProvider.getNonIndexableKeys(mContext)).isEqualTo(Collections.EMPTY_LIST);
+        assertThat(mIndexProvider.getNonIndexableKeys(mContext)).isEmpty();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java b/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java
new file mode 100644
index 0000000..7fb4f44
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java
@@ -0,0 +1,400 @@
+/*
+ * 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.search;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.graphics.drawable.Drawable;
+
+import com.android.settings.DisplaySettings;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.SiteMapManager;
+import com.android.settings.gestures.SwipeToNotificationSettings;
+import com.android.settings.search.ResultPayload.Availability;
+import com.android.settings.search.ResultPayload.PayloadType;
+
+import com.android.settings.wifi.WifiSettings;
+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.Robolectric;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+
+import static com.google.common.truth.Truth.assertThat;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class CursorToSearchResultConverterTest {
+
+    private static final List<String> TITLES = Arrays.asList("title1", "title2", "title3");
+    private static final String SUMMARY = "summary";
+    private static final String TARGET_PACKAGE = "a.b.c";
+    private static final String TARGET_CLASS = "a.b.c.class";
+    private static final String KEY = "key";
+    private static final Intent INTENT = new Intent("com.android.settings");
+    private static final int ICON = R.drawable.ic_search_history;
+    private static final int BASE_RANK = 1;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private SiteMapManager mSiteMapManager;
+    private Drawable mDrawable;
+    private CursorToSearchResultConverter mConverter;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        Context context = Robolectric.buildActivity(Activity.class).get();
+        mDrawable = context.getDrawable(ICON);
+        mConverter = new CursorToSearchResultConverter(context);
+    }
+
+    @Test
+    public void testParseNullResults_ReturnsNull() {
+        final Set<SearchResult> results = mConverter.convertCursor(
+                mSiteMapManager, null, BASE_RANK);
+        assertThat(results).isNull();
+    }
+
+    @Test
+    public void testParseCursor_NotNull() {
+        final Set<SearchResult> results = mConverter.convertCursor(
+                mSiteMapManager, getDummyCursor(), BASE_RANK);
+        assertThat(results).isNotNull();
+    }
+
+    @Test
+    public void testParseCursor_MatchesRank() {
+        final Set<SearchResult> results = mConverter.convertCursor(
+                mSiteMapManager, getDummyCursor(), BASE_RANK);
+        for (SearchResult result : results) {
+            assertThat(result.rank).isEqualTo(BASE_RANK);
+        }
+    }
+
+    @Test
+    public void testParseCursor_MatchesTitle() {
+        final Set<SearchResult> results = mConverter.convertCursor(
+                mSiteMapManager, getDummyCursor(), BASE_RANK);
+        for (SearchResult result : results) {
+            assertThat(TITLES).contains(result.title);
+        }
+    }
+
+    @Test
+    public void testParseCursor_MatchesSummary() {
+        final Set<SearchResult> results = mConverter.convertCursor(
+                mSiteMapManager, getDummyCursor(), BASE_RANK);
+        for (SearchResult result : results) {
+            assertThat(result.summary).isEqualTo(SUMMARY);
+        }
+    }
+
+    @Test
+    public void testParseCursor_MatchesIcon() {
+        final MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
+        final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(INTENT));
+        final String BLANK = "";
+        cursor.addRow(new Object[]{
+                KEY.hashCode(),      // Doc ID
+                "Longer than 20 characters", // Title
+                SUMMARY, // Summary on
+                SUMMARY, // summary off
+                DisplaySettings.class.getName(),
+                BLANK,   // screen title
+                ICON,    // icon
+                BLANK,   // action
+                null,    // target package
+                BLANK,   // target class
+                KEY,   // Key
+                PayloadType.INTENT,       // Payload Type
+                payload     // Payload
+        });
+
+        final Set<SearchResult> results = mConverter.convertCursor(
+                mSiteMapManager, cursor, BASE_RANK);
+
+        for (SearchResult result : results) {
+            Drawable resultDrawable = result.icon;
+            assertThat(resultDrawable).isNotNull();
+            assertThat(resultDrawable.toString()).isEqualTo(mDrawable.toString());
+        }
+    }
+
+    @Test
+    public void testParseCursor_NoIcon() {
+        final Set<SearchResult> results = mConverter.convertCursor(
+                mSiteMapManager, getDummyCursor("noIcon" /* key */, "" /* className */), BASE_RANK);
+        for (SearchResult result : results) {
+            assertThat(result.icon).isNull();
+        }
+    }
+
+    @Test
+    public void testParseCursor_MatchesPayloadType() {
+        final Set<SearchResult> results = mConverter.convertCursor(
+                mSiteMapManager, getDummyCursor(), BASE_RANK);
+        ResultPayload payload;
+        for (SearchResult result : results) {
+            payload = result.payload;
+            assertThat(payload.getType()).isEqualTo(PayloadType.INTENT);
+        }
+    }
+
+    @Test
+    public void testLongTitle_PenalizedInRank() {
+        final MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
+        final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(INTENT));
+        final String BLANK = "";
+        cursor.addRow(new Object[]{
+                KEY.hashCode(),      // Doc ID
+                "Longer than 20 characters", // Title
+                SUMMARY, // Summary on
+                SUMMARY, // summary off
+                DisplaySettings.class.getName(),
+                BLANK,   // screen title
+                null,    // icon
+                BLANK,   // action
+                null,    // target package
+                BLANK,   // target class
+                KEY,   // Key
+                PayloadType.INTENT,       // Payload Type
+                payload     // Payload
+        });
+        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
+                BASE_RANK);
+        for (SearchResult result : results) {
+            assertThat(result.rank).isEqualTo(BASE_RANK + 1);
+        }
+    }
+
+    @Test
+    public void testParseCursor_MatchesResultPayload() {
+        final Set<SearchResult> results = mConverter.convertCursor(
+                mSiteMapManager, getDummyCursor(), BASE_RANK);
+        ResultPayload payload;
+        for (SearchResult result : results) {
+            payload = result.payload;
+            Intent intent = payload.getIntent();
+            assertThat(intent.getAction()).isEqualTo(INTENT.getAction());
+        }
+    }
+
+
+    @Test
+    public void testParseCursor_MatchesInlineSwitchPayload() {
+        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
+        final String BLANK = "";
+        final String uri = "test.com";
+        final int type = ResultPayload.PayloadType.INLINE_SWITCH;
+        final int source = ResultPayload.SettingsSource.SECURE;
+        final String intentKey = "key";
+        final String intentVal = "value";
+        final Intent intent = new Intent();
+        intent.putExtra(intentKey, intentVal);
+        final InlineSwitchPayload payload = new InlineSwitchPayload(uri, source, 1 /* onValue */,
+                intent, true /* isDeviceSupported */);
+
+        cursor.addRow(new Object[]{
+                KEY.hashCode(),      // Doc ID
+                TITLES.get(0), // Title
+                SUMMARY, // Summary on
+                SUMMARY, // summary off
+                SwipeToNotificationSettings.class.getName(),
+                BLANK,   // screen title
+                null,    // icon
+                BLANK,   // action
+                null,    // target package
+                BLANK,   // target class
+                KEY,   // Key
+                type,    // Payload Type
+                ResultPayloadUtils.marshall(payload) // Payload
+        });
+        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
+                BASE_RANK);
+
+        for (SearchResult result : results) {
+            final InlineSwitchPayload newPayload = (InlineSwitchPayload) result.payload;
+            final Intent rebuiltIntent = newPayload.getIntent();
+            assertThat(newPayload.mSettingKey).isEqualTo(uri);
+            assertThat(newPayload.mInlineType).isEqualTo(type);
+            assertThat(newPayload.mSettingSource).isEqualTo(source);
+            assertThat(newPayload.isStandard()).isTrue();
+            assertThat(newPayload.getAvailability()).isEqualTo(Availability.AVAILABLE);
+            assertThat(rebuiltIntent.getStringExtra(intentKey)).isEqualTo(intentVal);
+        }
+    }
+
+    // The following tests are temporary, and should be removed when we replace the Search
+    // White-list solution for elevating ranking.
+
+    @Test
+    public void testWifiKey_PrioritizedResult() {
+        final String key = "main_toggle_wifi";
+        final Cursor cursor = getDummyCursor(key,  WifiSettings.class.getName());
+        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
+                BASE_RANK);
+
+        for (SearchResult result : results) {
+            assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
+        }
+    }
+
+    @Test
+    public void testBluetoothKey_PrioritizedResult() {
+        final String key = "main_toggle_bluetooth";
+        final Cursor cursor = getDummyCursor(key,  WifiSettings.class.getName());
+        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
+                BASE_RANK);
+
+        for (SearchResult result : results) {
+            assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
+        }
+    }
+
+    @Test
+    public void testAirplaneKey_PrioritizedResult() {
+        final String key = "toggle_airplane";
+        final Cursor cursor = getDummyCursor(key,  WifiSettings.class.getName());
+        Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
+        for (SearchResult result : results) {
+            assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
+        }
+    }
+
+    @Test
+    public void testHotspotKey_PrioritizedResult() {
+        final String key = "tether_settings";
+        final Cursor cursor = getDummyCursor(key,  WifiSettings.class.getName());
+        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
+                BASE_RANK);
+
+        for (SearchResult result : results) {
+            assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
+        }
+    }
+
+    @Test
+    public void testBatterySaverKey_PrioritizedResult() {
+        final String key = "battery_saver";
+        final Cursor cursor = getDummyCursor(key,  WifiSettings.class.getName());
+        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
+                BASE_RANK);
+
+        for (SearchResult result : results) {
+            assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
+        }
+    }
+
+    @Test
+    public void testNFCKey_PrioritizedResult() {
+        final String key = "toggle_nfc";
+        final Cursor cursor = getDummyCursor(key,  WifiSettings.class.getName());
+        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
+                BASE_RANK);
+
+        for (SearchResult result : results) {
+            assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
+        }
+    }
+
+    @Test
+    public void testDataSaverKey_PrioritizedResult() {
+        final String key = "restrict_background";
+        final Cursor cursor = getDummyCursor(key,  WifiSettings.class.getName());
+        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
+                BASE_RANK);
+
+        for (SearchResult result : results) {
+            assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
+        }
+    }
+
+    @Test
+    public void testDataUsageKey_PrioritizedResult() {
+        final String key = "data_usage_enable";
+        final Cursor cursor = getDummyCursor(key,  WifiSettings.class.getName());
+        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
+                BASE_RANK);
+        for (SearchResult result : results) {
+            assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
+        }
+    }
+
+    @Test
+    public void testRoamingKey_PrioritizedResult() {
+        final String key = "button_roaming_key";
+        final Cursor cursor = getDummyCursor(key,  WifiSettings.class.getName());
+        final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
+                BASE_RANK);
+
+        for (SearchResult result : results) {
+            assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
+        }
+    }
+
+    // End of temporary tests
+
+    private MatrixCursor getDummyCursor() {
+        String[] keys = new String[] {KEY + "1", KEY + "2", KEY + "3"};
+        return getDummyCursor(keys, "" /* className */);
+    }
+
+    private MatrixCursor getDummyCursor(String key, String className) {
+        String[] keys = new String[] {key};
+        return getDummyCursor(keys, className);
+    }
+
+    private MatrixCursor getDummyCursor(String[] keys, String className) {
+        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
+        final String BLANK = "";
+        final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(INTENT));
+
+        for (int i = 0; i < keys.length; i++) {
+            ArrayList<Object> item = new ArrayList<>(DatabaseResultLoader.SELECT_COLUMNS.length);
+            item.add(keys[i].hashCode()); // Doc ID
+            item.add(TITLES.get(i)); // Title
+            item.add(SUMMARY); // Summary on
+            item.add(BLANK); // summary off
+            item.add(className); // classname
+            item.add(BLANK); // screen title
+            item.add(null); // Icon
+            item.add(INTENT.getAction()); // Intent action
+            item.add(TARGET_PACKAGE); // target package
+            item.add(TARGET_CLASS); // target class
+            item.add(keys[i]); // Key
+            item.add(Integer.toString(0));     // Payload Type
+            item.add(payload); // Payload
+
+            cursor.addRow(item);
+        }
+        return cursor;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java b/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java
index 6ffd704..ba2b636 100644
--- a/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java
+++ b/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java
@@ -6,11 +6,10 @@
 import com.android.settings.DateTimeSettings;
 import com.android.settings.R;
 import com.android.settings.SecuritySettings;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.codeinspection.CodeInspector;
 import com.android.settings.datausage.DataUsageSummary;
-import com.android.settings.search2.DatabaseIndexingUtils;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
similarity index 95%
rename from tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
rename to tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
index 6844be5..8c31e6e 100644
--- a/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
@@ -33,15 +33,14 @@
 import android.os.Build;
 import android.provider.SearchIndexableResource;
 import android.util.ArrayMap;
+
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search.IndexDatabaseHelper;
-import com.android.settings.search.IndexingCallback;
-import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.testutils.DatabaseTestUtils;
 import com.android.settings.testutils.shadow.ShadowDatabaseIndexingUtils;
 import com.android.settings.testutils.shadow.ShadowRunnableAsyncTask;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -136,7 +135,7 @@
 
     @After
     public void cleanUp() {
-        DatabaseTestUtils.clearDb();
+        DatabaseTestUtils.clearDb(mContext);
     }
 
     @Test
@@ -229,7 +228,10 @@
         // Payload Type - default is 0
         assertThat(cursor.getInt(19)).isEqualTo(0);
         // Payload
-        assertThat(cursor.getBlob(20)).isNull();
+        byte[] payload = cursor.getBlob(20);
+        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
+                ResultPayload.CREATOR);
+        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
     }
 
     @Test
@@ -256,7 +258,7 @@
         SearchIndexableResource resource = getFakeResource(R.xml.display_settings);
         mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
         Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
-        assertThat(cursor.getCount()).isEqualTo(18);
+        assertThat(cursor.getCount()).isEqualTo(17);
     }
 
     @Test
@@ -271,7 +273,7 @@
         Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 0", null);
         assertThat(cursor.getCount()).isEqualTo(2);
         cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 1", null);
-        assertThat(cursor.getCount()).isEqualTo(16);
+        assertThat(cursor.getCount()).isEqualTo(15);
     }
 
     @Test
@@ -323,7 +325,10 @@
         // Payload Type - default is 0
         assertThat(cursor.getInt(19)).isEqualTo(0);
         // Payload - should be updated to real payloads as controllers are added
-        assertThat(cursor.getBlob(20)).isNull();
+        byte[] payload = cursor.getBlob(20);
+        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
+                ResultPayload.CREATOR);
+        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
     }
 
     @Test
@@ -359,6 +364,7 @@
                 mContext.getString(R.string.fingerprint_swipe_for_notifications_title);
         final String prefSummary =
                 mContext.getString(R.string.fingerprint_swipe_for_notifications_summary);
+        final String keywords = mContext.getString(R.string.keywords_gesture);
         Cursor cursor = mDb.rawQuery(
                 "SELECT * FROM prefs_index where data_title='" + prefTitle + "'", null);
         cursor.moveToFirst();
@@ -382,7 +388,7 @@
         // Entries - only on for list preferences
         assertThat(cursor.getString(8)).isNull();
         // Keywords
-        assertThat(cursor.getString(9)).isEmpty();
+        assertThat(cursor.getString(9)).isEqualTo(keywords);
         // Screen Title
         assertThat(cursor.getString(10)).isEqualTo(
                 mContext.getString(R.string.fingerprint_swipe_for_notifications_title));
@@ -405,7 +411,10 @@
         // Payload Type - default is 0
         assertThat(cursor.getInt(19)).isEqualTo(0);
         // Payload - should be updated to real payloads as controllers are added
-        assertThat(cursor.getBlob(20)).isNull();
+        byte[] payload = cursor.getBlob(20);
+        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
+                ResultPayload.CREATOR);
+        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
     }
 
     @Test
@@ -459,7 +468,10 @@
         // Payload Type - default is 0
         assertThat(cursor.getInt(19)).isEqualTo(0);
         // Payload - should be updated to real payloads as controllers are added
-        assertThat(cursor.getBlob(20)).isNull();
+        byte[] payload = cursor.getBlob(20);
+        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
+                ResultPayload.CREATOR);
+        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
     }
 
     @Test
@@ -513,7 +525,10 @@
         // Payload Type - default is 0
         assertThat(cursor.getInt(19)).isEqualTo(0);
         // Payload - should be updated to real payloads as controllers are added
-        assertThat(cursor.getBlob(20)).isNull();
+        byte[] payload = cursor.getBlob(20);
+        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
+                ResultPayload.CREATOR);
+        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
     }
 
     @Test
@@ -594,7 +609,10 @@
         // Payload Type - default is 0
         assertThat(cursor.getInt(19)).isEqualTo(0);
         // Payload - should be updated to real payloads as controllers are added
-        assertThat(cursor.getBlob(20)).isNull();
+        byte[] payload = cursor.getBlob(20);
+        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
+                ResultPayload.CREATOR);
+        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
     }
 
     @Test
@@ -659,7 +677,10 @@
         // Payload Type - default is 0
         assertThat(cursor.getInt(19)).isEqualTo(0);
         // Payload - should be updated to real payloads as controllers are added
-        assertThat(cursor.getBlob(20)).isNull();
+        byte[] payload = cursor.getBlob(20);
+        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
+                ResultPayload.CREATOR);
+        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
     }
 
     @Test
@@ -896,7 +917,10 @@
         // Payload Type - default is 0
         assertThat(cursor.getInt(19)).isEqualTo(0);
         // Payload
-        assertThat(cursor.getBlob(20)).isNull();
+        byte[] payload = cursor.getBlob(20);
+        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
+                ResultPayload.CREATOR);
+        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
     }
 
     @Test
@@ -1065,7 +1089,6 @@
     }
 
     private void insertSpecialCase(String specialCase, boolean enabled, String key) {
-
         ContentValues values = new ContentValues();
         values.put(IndexDatabaseHelper.IndexColumns.DOCID, specialCase.hashCode());
         values.put(IndexDatabaseHelper.IndexColumns.LOCALE, localeStr);
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
index f4370fc..d44ecff 100644
--- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
@@ -17,35 +17,27 @@
 
 package com.android.settings.search;
 
-import android.content.Context;
+import static com.google.common.truth.Truth.assertThat;
 
+import android.content.Context;
 import android.util.ArrayMap;
+
 import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.display.AutoBrightnessPreferenceController;
-import com.android.settings.gestures.DoubleTapPowerPreferenceController;
-import com.android.settings.gestures.DoubleTapScreenPreferenceController;
-import com.android.settings.gestures.DoubleTwistPreferenceController;
-import com.android.settings.gestures.PickupGesturePreferenceController;
-import com.android.settings.gestures.SwipeToNotificationPreferenceController;
-import com.android.settings.search2.DatabaseIndexingUtils;
+import com.android.settings.deviceinfo.SystemUpdatePreferenceController;
 
-import com.android.settings.search2.IntentPayload;
-import com.android.settings.search2.ResultPayload;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 
 import java.util.Map;
 
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DatabaseIndexingUtilsTest {
@@ -57,7 +49,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mContext = ShadowApplication.getInstance().getApplicationContext();
+        mContext = RuntimeEnvironment.application;
     }
 
     @Test
@@ -74,11 +66,11 @@
 
     @Test
     public void testGetPreferenceControllerUriMap_CompatibleClass_ReturnsValidMap() {
-        String className = "com.android.settings.DisplaySettings";
-
-        Map map = DatabaseIndexingUtils.getPreferenceControllerUriMap(className, mContext);
-        assertThat(map.get("auto_brightness"))
-                .isInstanceOf(AutoBrightnessPreferenceController.class);
+        final String className = "com.android.settings.system.SystemDashboardFragment";
+        final Map<String, PreferenceController> map =
+                DatabaseIndexingUtils.getPreferenceControllerUriMap(className, mContext);
+        assertThat(map.get("system_update_settings"))
+                .isInstanceOf(SystemUpdatePreferenceController.class);
     }
 
     @Test
@@ -103,13 +95,13 @@
 
             @Override
             public ResultPayload getResultPayload() {
-                return new IntentPayload(null);
+                return new ResultPayload(null);
             }
         };
-        ArrayMap<String,PreferenceController> map = new ArrayMap<>();
+        ArrayMap<String, PreferenceController> map = new ArrayMap<>();
         map.put(key, prefController);
 
         ResultPayload payload = DatabaseIndexingUtils.getPayloadFromUriMap(map, key);
-        assertThat(payload).isInstanceOf(IntentPayload.class);
+        assertThat(payload).isInstanceOf(ResultPayload.class);
     }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java
new file mode 100644
index 0000000..ad89bfe
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java
@@ -0,0 +1,383 @@
+/*
+ * 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.search;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.database.sqlite.SQLiteDatabase;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.SiteMapManager;
+import com.android.settings.testutils.DatabaseTestUtils;
+import com.android.settings.testutils.FakeFeatureFactory;
+
+import org.junit.After;
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class DatabaseResultLoaderTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mMockContext;
+    @Mock
+    private SiteMapManager mSiteMapManager;
+    private Context mContext;
+
+    SQLiteDatabase mDb;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        FakeFeatureFactory.setupForTest(mMockContext);
+        FakeFeatureFactory factory =
+                (FakeFeatureFactory) FakeFeatureFactory.getFactory(mMockContext);
+        when(factory.searchFeatureProvider.getSiteMapManager())
+                .thenReturn(mSiteMapManager);
+        mDb = IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
+        setUpDb();
+    }
+
+    @After
+    public void cleanUp() {
+        DatabaseTestUtils.clearDb(mContext);
+    }
+
+    @Test
+    public void testMatchTitle() {
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "title", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(2);
+        verify(mSiteMapManager, times(2)).buildBreadCrumb(eq(mContext), anyString(), anyString());
+    }
+
+    @Test
+    public void testMatchSummary() {
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "summary",
+                mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(2);
+    }
+
+    @Test
+    public void testMatchKeywords() {
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "keywords",
+                mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(2);
+    }
+
+    @Test
+    public void testMatchEntries() {
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "entries",
+                mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(2);
+    }
+
+    @Test
+    public void testSpecialCaseWord_matchesNonPrefix() {
+        insertSpecialCase("Data usage");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "usage", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCaseSpace_matches() {
+        insertSpecialCase("space");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, " space ",
+                mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCaseDash_matchesWordNoDash() {
+        insertSpecialCase("wi-fi calling");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "wifi", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCaseDash_matchesWordWithDash() {
+        insertSpecialCase("priorités seulment");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "priorités",
+                mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCaseDash_matchesWordWithoutDash() {
+        insertSpecialCase("priorités seulment");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "priorites",
+                mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCaseDash_matchesEntireQueryWithoutDash() {
+        insertSpecialCase("wi-fi calling");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "wifi calling",
+                mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCasePrefix_matchesPrefixOfEntry() {
+        insertSpecialCase("Photos");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "pho", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCasePrefix_DoesNotMatchNonPrefixSubstring() {
+        insertSpecialCase("Photos");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "hot", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(0);
+    }
+
+    @Test
+    public void testSpecialCaseMultiWordPrefix_matchesPrefixOfEntry() {
+        insertSpecialCase("Apps Notifications");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "Apps", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCaseMultiWordPrefix_matchesSecondWordPrefixOfEntry() {
+        insertSpecialCase("Apps Notifications");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "Not", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCaseMultiWordPrefix_DoesNotMatchMatchesPrefixOfFirstEntry() {
+        insertSpecialCase("Apps Notifications");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "pp", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(0);
+    }
+
+    @Test
+    public void testSpecialCaseMultiWordPrefix_DoesNotMatchMatchesPrefixOfSecondEntry() {
+        insertSpecialCase("Apps Notifications");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "tion", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(0);
+    }
+
+    @Test
+    public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfEntry() {
+        insertSpecialCase("Apps & Notifications");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "App", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfSecondEntry() {
+        insertSpecialCase("Apps & Notifications");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "No", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testResultMatchedByMultipleQueries_duplicatesRemoved() {
+        String key = "durr";
+        insertSameValueAllFieldsCase(key);
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, key, null);
+
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCaseTwoWords_multipleResults() {
+        final String caseOne = "Apple pear";
+        final String caseTwo = "Banana apple";
+        insertSpecialCase(caseOne);
+        insertSpecialCase(caseTwo);
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "App", null);
+        Set<? extends SearchResult> results = loader.loadInBackground();
+        Set<CharSequence> expectedTitles = new HashSet<>(Arrays.asList(caseOne, caseTwo));
+        Set<CharSequence> actualTitles = new HashSet<>();
+        for (SearchResult result : results) {
+            actualTitles.add(result.title);
+        }
+        assertThat(actualTitles).isEqualTo(expectedTitles);
+    }
+
+    private void insertSpecialCase(String specialCase) {
+        String normalized = DatabaseIndexingUtils.normalizeHyphen(specialCase);
+        normalized = DatabaseIndexingUtils.normalizeString(normalized);
+        final ResultPayload payload = new ResultPayload(new Intent());
+
+        ContentValues values = new ContentValues();
+        values.put(IndexDatabaseHelper.IndexColumns.DOCID, normalized.hashCode());
+        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, specialCase);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, normalized);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "");
+        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
+                "com.android.settings.gestures.GestureSettings");
+        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
+        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
+        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, normalized.hashCode());
+        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, ResultPayloadUtils.marshall(payload));
+
+        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
+    }
+
+    private void setUpDb() {
+        final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(new Intent()));
+
+        ContentValues values = new ContentValues();
+        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 1);
+        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "alpha_title");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "alpha title");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "alpha_summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "alpha summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "alpha_summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "alpha summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "alpha entries");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "alpha keywords");
+        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
+                "com.android.settings.gestures.GestureSettings");
+        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
+        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
+        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power_0");
+        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, payload);
+
+        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
+
+        values = new ContentValues();
+        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 2);
+        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "bravo_title");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "bravo title");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "bravo_summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "bravo summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "bravo_summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "bravo summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "bravo entries");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "bravo keywords");
+        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
+                "com.android.settings.gestures.GestureSettings");
+        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
+        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
+        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power_1");
+        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, payload);
+        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
+
+        values = new ContentValues();
+        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 3);
+        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "charlie_title");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "charlie title");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "charlie_summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "charlie summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "charlie_summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "charlie summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "charlie entries");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "charlie keywords");
+        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
+                "com.android.settings.gestures.GestureSettings");
+        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
+        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
+        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, false);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power_2");
+        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, payload);
+
+        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
+    }
+
+    private void insertSameValueAllFieldsCase(String key) {
+        final ResultPayload payload = new ResultPayload(new Intent());
+
+        ContentValues values = new ContentValues();
+        values.put(IndexDatabaseHelper.IndexColumns.DOCID, key.hashCode());
+        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, key);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, key);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, key);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, key);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, key);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, key);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, key);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, key);
+        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME, key);
+        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, key);
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, key);
+        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
+        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, key.hashCode());
+        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, ResultPayloadUtils.marshall(payload));
+
+        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java b/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java
index 34626bd..60afff5 100644
--- a/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -10,24 +10,26 @@
  * 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 static for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  *
  */
 
 package com.android.settings.search;
 
+import android.content.ComponentName;
 import android.content.Intent;
-import com.android.settings.SettingsRobolectricTestRunner;
+import android.content.Context;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.DatabaseIndexingManager.DatabaseRow;
-import com.android.settings.search2.DatabaseIndexingManager.DatabaseRow.Builder;
-import com.android.settings.search2.IntentPayload;
-import com.android.settings.search2.ResultPayload;
-import com.android.settings.search2.ResultPayloadUtils;
+import com.android.settings.search.DatabaseIndexingManager.DatabaseRow;
+import com.android.settings.search.DatabaseIndexingManager.DatabaseRow.Builder;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -35,7 +37,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DatabaseRowTest {
-    private Builder builder;
+    private Builder mBuilder;
 
     private static final String LOCALE = "locale";
     private static final String UPDATED_TITLE = "updated title";
@@ -46,7 +48,7 @@
     private static final String NORMALIZED_SUMMARY_OFF = "normalized summary off";
     private static final String ENTRIES = "entries";
     private static final String CLASS_NAME = "class name";
-    private static final String SCREEN_TITLE = "sceen title";
+    private static final String SCREEN_TITLE = "screen title";
     private static final int ICON_RES_ID = 0xff;
     private static final int RANK = 1;
     private static final String SPACE_DELIMITED_KEYWORDS = "keywords";
@@ -56,28 +58,23 @@
     private static final boolean ENABLED = true;
     private static final String KEY = "key";
     private static final int USER_ID = 1;
-    private static IntentPayload intentPayload;
 
-    private final String EXTRA_KEY = "key";
-    private final String EXTRA_VALUE = "value";
+    private Context mContext;
 
     @Before
     public void setUp() {
-        Intent intent = new Intent();
-        intent.putExtra(EXTRA_KEY, EXTRA_VALUE);
-        intentPayload = new IntentPayload(intent);
-
-        builder = new DatabaseRow.Builder();
+        mContext = RuntimeEnvironment.application;
+        mBuilder = createBuilder();
     }
 
     @Test
-    public void testFullRowBuild_NonNull() {
+    public void testFullRowBuild_nonNull() {
         DatabaseRow row = generateRow();
         assertThat(row).isNotNull();
     }
 
     @Test
-    public void testPrimativesBuild_NoDataLoss() {
+    public void testPrimitivesBuild_noDataLoss() {
         DatabaseRow row = generateRow();
 
         assertThat(row.locale).isEqualTo(LOCALE);
@@ -100,30 +97,61 @@
         assertThat(row.userId).isEqualTo(USER_ID);
         assertThat(row.key).isEqualTo(KEY);
         assertThat(row.payloadType).isEqualTo(ResultPayload.PayloadType.INTENT);
+        assertThat(row.payload).isNotNull();
     }
 
     @Test
-    public void testPayload_PayloadTypeAdded() {
-        DatabaseRow row = generateRow();
-        byte[] marshalledPayload = row.payload;
-        IntentPayload payload = ResultPayloadUtils.unmarshall(marshalledPayload,
-                IntentPayload.CREATOR);
-
-        Intent intent = payload.intent;
-        assertThat(intent.getExtra(EXTRA_KEY)).isEqualTo(EXTRA_VALUE);
+    public void testGenericIntent_addedToPayload() {
+        final DatabaseRow row = generateRow();
+        final ResultPayload payload = ResultPayloadUtils.unmarshall(row.payload,
+                ResultPayload.CREATOR);
+        final ComponentName name = payload.getIntent().getComponent();
+        assertThat(name.getClassName()).isEqualTo(INTENT_TARGET_CLASS);
+        assertThat(name.getPackageName()).isEqualTo(INTENT_TARGET_PACKAGE);
     }
 
     @Test
-    public void TestNullPayload_NoCrash() {
-        Builder builder = new Builder();
-        builder.setPayload(null);
-        DatabaseRow row = builder.build();
+    public void testRowWithInlinePayload_genericPayloadNotAdded() {
+        final String URI = "test uri";
+        final InlineSwitchPayload payload = new InlineSwitchPayload(URI, 0 /* mSettingSource */,
+                1 /* onValue */, null /* intent */, true /* isDeviceSupported */);
+        mBuilder.setPayload(payload);
+        final DatabaseRow row = generateRow();
+        final InlineSwitchPayload unmarshalledPayload = ResultPayloadUtils
+                .unmarshall(row.payload, InlineSwitchPayload.CREATOR);
 
-        assertThat(row.payload).isNull();
+        assertThat(row.payloadType).isEqualTo(ResultPayload.PayloadType.INLINE_SWITCH);
+        assertThat(unmarshalledPayload.mSettingKey).isEqualTo(URI);
     }
 
+    @Test
+    public void testRowWithInlinePayload_intentAddedToInlinePayload() {
+        final String URI = "test uri";
+        final ComponentName component = new ComponentName(INTENT_TARGET_PACKAGE,
+                INTENT_TARGET_CLASS);
+        final Intent intent = new Intent();
+        intent.setComponent(component);
+
+        final InlineSwitchPayload payload = new InlineSwitchPayload(URI, 0 /* mSettingSource */,
+                1 /* onValue */, intent, true /* isDeviceSupported */);
+        mBuilder.setPayload(payload);
+        final DatabaseRow row = generateRow();
+        final InlineSwitchPayload unmarshalledPayload = ResultPayloadUtils
+                .unmarshall(row.payload, InlineSwitchPayload.CREATOR);
+        final ComponentName name = unmarshalledPayload.getIntent().getComponent();
+
+        assertThat(name.getClassName()).isEqualTo(INTENT_TARGET_CLASS);
+        assertThat(name.getPackageName()).isEqualTo(INTENT_TARGET_PACKAGE);
+    }
+
+
     private DatabaseRow generateRow() {
-        builder.setLocale(LOCALE)
+        return mBuilder.build(mContext);
+    }
+
+    private DatabaseRow.Builder createBuilder() {
+        mBuilder = new DatabaseRow.Builder();
+        mBuilder.setLocale(LOCALE)
                 .setUpdatedTitle(UPDATED_TITLE)
                 .setNormalizedTitle(NORMALIZED_TITLE)
                 .setUpdatedSummaryOn(UPDATED_SUMMARY_ON)
@@ -141,10 +169,7 @@
                 .setIntentTargetClass(INTENT_TARGET_CLASS)
                 .setEnabled(ENABLED)
                 .setKey(KEY)
-                .setUserId(USER_ID)
-                .setPayload(intentPayload);
-
-        return(builder.build());
+                .setUserId(USER_ID);
+        return mBuilder;
     }
-}
-;
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java b/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java
index 79c0d63..64a658e 100644
--- a/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java
+++ b/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java
@@ -16,20 +16,6 @@
 
 package com.android.settings.search;
 
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.only;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.Activity;
 import android.app.Application;
@@ -54,7 +40,7 @@
 import android.view.inputmethod.InputMethodInfo;
 
 import com.android.internal.content.PackageMonitor;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
@@ -62,7 +48,6 @@
 import com.android.settings.inputmethod.VirtualKeyboardFragment;
 import com.android.settings.language.LanguageAndInputSettings;
 import com.android.settings.print.PrintSettingsFragment;
-import com.android.settings.search2.DatabaseIndexingManager;
 import com.android.settings.testutils.DatabaseTestUtils;
 import com.android.settings.testutils.shadow.ShadowActivityWithLoadManager;
 import com.android.settings.testutils.shadow.ShadowContextImplWithRegisterReceiver;
@@ -92,6 +77,19 @@
 import java.util.Collections;
 import java.util.List;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.only;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
@@ -164,7 +162,7 @@
         DynamicIndexableContentMonitor.resetForTesting();
         mRobolectricPackageManager.reset();
 
-        DatabaseTestUtils.clearDb();
+        DatabaseTestUtils.clearDb(mActivity);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/search/FakeIndexProvider.java b/tests/robotests/src/com/android/settings/search/FakeIndexProvider.java
index 35486ef..69c2589 100644
--- a/tests/robotests/src/com/android/settings/search/FakeIndexProvider.java
+++ b/tests/robotests/src/com/android/settings/search/FakeIndexProvider.java
@@ -19,12 +19,12 @@
 
 import android.content.Context;
 import android.provider.SearchIndexableResource;
+
 import com.android.settings.core.PreferenceController;
 
-import java.util.ArrayList;
 import java.util.List;
 
-public class FakeIndexProvider  implements Indexable {
+public class FakeIndexProvider implements Indexable {
 
     public static final String KEY = "TestKey";
 
@@ -38,7 +38,7 @@
 
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
-                    ArrayList<String> result = new ArrayList<>();
+                    List<String> result = super.getNonIndexableKeys(context);
                     result.add(KEY);
                     return result;
                 }
diff --git a/tests/robotests/src/com/android/settings/search/HeaderDecoratorTest.java b/tests/robotests/src/com/android/settings/search/HeaderDecoratorTest.java
new file mode 100644
index 0000000..61536b7
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/HeaderDecoratorTest.java
@@ -0,0 +1,80 @@
+/*
+ * 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.search;
+
+import android.graphics.Rect;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+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.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class HeaderDecoratorTest {
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private View mView;
+    @Mock
+    private RecyclerView mRecyclerView;
+    @Mock
+    private RecyclerView.LayoutParams mLayoutParams;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mView.getLayoutParams()).thenReturn(mLayoutParams);
+    }
+
+    @Test
+    public void testgetItemOffsets_positionZero_headerAdded() {
+        HeaderDecorator decorator = new HeaderDecorator();
+        Rect outRect = new Rect();
+        when(mRecyclerView.getChildAdapterPosition(any(View.class))).thenReturn(0);
+        when(mView.getContext().obtainStyledAttributes(any(int[].class))
+                .getDimensionPixelSize(0, 0)).thenReturn(20);
+        when(mView.getContext().getResources().getDimensionPixelSize(R.dimen.search_bar_margin))
+                .thenReturn(5);
+
+        decorator.getItemOffsets(outRect, mView, mRecyclerView, null);
+
+        assertThat(outRect).isEqualTo(new Rect(0, 30, 0, 0));
+    }
+
+    @Test
+    public void testgetItemOffsets_positionGreaterThanZero_noDecoration() {
+        HeaderDecorator decorator = new HeaderDecorator();
+        Rect outRect = new Rect();
+        when(mRecyclerView.getChildAdapterPosition(any(View.class))).thenReturn(1);
+
+        decorator.getItemOffsets(outRect, mView, mRecyclerView, null);
+
+        assertThat(outRect).isEqualTo(new Rect(0, 0, 0, 0));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java
index 701679c..c4d798b 100644
--- a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java
+++ b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java
@@ -17,97 +17,208 @@
 
 package com.android.settings.search;
 
+import android.content.ContentResolver;
+import android.content.Intent;
 import android.os.Parcel;
-import android.util.ArrayMap;
+import android.provider.Settings;
 import android.content.Context;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
+import com.android.settings.search.ResultPayload.Availability;
+import com.android.settings.search.ResultPayload.SettingsSource;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 
+import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.fail;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class InlineSwitchPayloadTest {
 
-    @Test
-    public void testGetSwitch_EmptyMap_ExceptionThrown() {
-        final String uri = "test.com";
-        final int source = ResultPayload.SettingsSource.SECURE;
+    private static final String DUMMY_SETTING = "inline_test";
+    private static final int STANDARD_ON = 1;
+    private static final int FLIPPED_ON = 0;
 
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        InlineSwitchPayload payload = new InlineSwitchPayload(uri, source, null);
-        try {
-            payload.getSwitchValue(context);
-            fail("Should have thrown exception for null map");
-        } catch (IllegalStateException e) {
-            assertThat(e).isNotNull();
-        }
-    }
+    private Context mContext;
 
-    @Test
-    public void testGetSwitch_BadMap_ExceptionThrown() {
-        final String uri = "test.com";
-        final int source = ResultPayload.SettingsSource.SECURE;
-        final ArrayMap<Integer, Boolean> map = new ArrayMap<>();
-
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        InlineSwitchPayload payload = new InlineSwitchPayload(uri, source, map);
-        try {
-            payload.getSwitchValue(context);
-            fail("Should have thrown exception for bad map");
-        } catch (IllegalStateException e) {
-            assertThat(e).isNotNull();
-        }
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
     }
 
     @Test
     public void testConstructor_DataRetained() {
         final String uri = "test.com";
         final int type = ResultPayload.PayloadType.INLINE_SWITCH;
-        final int source = ResultPayload.SettingsSource.SECURE;
-        final ArrayMap<Integer, Boolean> map = new ArrayMap<>();
-        map.put(1, true);
-        map.put(0, false);
+        final int source = SettingsSource.SECURE;
+        final String intentKey = "key";
+        final String intentVal = "value";
+        final Intent intent = new Intent();
+        intent.putExtra(intentKey, intentVal);
 
-        InlineSwitchPayload payload = new InlineSwitchPayload(uri, source, map);
-        assertThat(payload.settingsUri).isEqualTo(uri);
-        assertThat(payload.inlineType).isEqualTo(type);
-        assertThat(payload.settingSource).isEqualTo(source);
-        assertThat(payload.valueMap.get(1)).isTrue();
-        assertThat(payload.valueMap.get(0)).isFalse();
+        InlineSwitchPayload payload = new InlineSwitchPayload(uri, source, 1, intent, true);
+        final Intent retainedIntent = payload.getIntent();
+        assertThat(payload.mSettingKey).isEqualTo(uri);
+        assertThat(payload.mInlineType).isEqualTo(type);
+        assertThat(payload.mSettingSource).isEqualTo(source);
+        assertThat(payload.isStandard()).isTrue();
+        assertThat(payload.getAvailability()).isEqualTo(ResultPayload.Availability.AVAILABLE);
+        assertThat(retainedIntent.getStringExtra(intentKey)).isEqualTo(intentVal);
     }
 
     @Test
     public void testParcelConstructor_DataRetained() {
         String uri = "test.com";
         int type = ResultPayload.PayloadType.INLINE_SWITCH;
-        int source = ResultPayload.SettingsSource.SECURE;
-        final ArrayMap<Integer, Boolean> map = new ArrayMap<>();
-        map.put(1, true);
-        map.put(0, false);
+        int source = SettingsSource.SECURE;
+        final String intentKey = "key";
+        final String intentVal = "value";
+        final Intent intent = new Intent();
+        intent.putExtra(intentKey, intentVal);
 
         Parcel parcel = Parcel.obtain();
+        parcel.writeParcelable(intent, 0);
         parcel.writeString(uri);
         parcel.writeInt(type);
         parcel.writeInt(source);
-        parcel.writeMap(map);
+        parcel.writeInt(InlineSwitchPayload.TRUE);
+        parcel.writeInt(InlineSwitchPayload.TRUE);
         parcel.setDataPosition(0);
 
         InlineSwitchPayload payload = InlineSwitchPayload.CREATOR.createFromParcel(parcel);
-        assertThat(payload.settingsUri).isEqualTo(uri);
-        assertThat(payload.inlineType).isEqualTo(type);
-        assertThat(payload.settingSource).isEqualTo(source);
-        assertThat(payload.valueMap.get(1)).isTrue();
-        assertThat(payload.valueMap.get(0)).isFalse();
+        final Intent builtIntent = payload.getIntent();
+        assertThat(payload.mSettingKey).isEqualTo(uri);
+        assertThat(payload.mInlineType).isEqualTo(type);
+        assertThat(payload.mSettingSource).isEqualTo(source);
+        assertThat(payload.isStandard()).isTrue();
+        assertThat(payload.getAvailability()).isEqualTo(Availability.AVAILABLE);
+        assertThat(builtIntent.getStringExtra(intentKey)).isEqualTo(intentVal);
     }
 
+    @Test
+    public void testGetSecure_returnsSecureSetting() {
+        InlineSwitchPayload payload = new InlineSwitchPayload(DUMMY_SETTING, SettingsSource.SECURE,
+                STANDARD_ON, null /* intent */, true);
+        int currentValue = 1;
+        Settings.Secure.putInt(mContext.getContentResolver(), DUMMY_SETTING, currentValue);
 
+        int newValue = payload.getValue(mContext);
+
+        assertThat(newValue).isEqualTo(currentValue);
+    }
+
+    @Test
+    public void testGetGlobal_returnsGlobalSetting() {
+        InlineSwitchPayload payload = new InlineSwitchPayload(DUMMY_SETTING, SettingsSource.GLOBAL,
+                STANDARD_ON, null /* intent */, true);
+        int currentValue = 1;
+        Settings.Global.putInt(mContext.getContentResolver(), DUMMY_SETTING, currentValue);
+
+        int newValue = payload.getValue(mContext);
+
+        assertThat(newValue).isEqualTo(currentValue);
+    }
+
+    @Test
+    public void testGetSystem_returnsSystemSetting() {
+        InlineSwitchPayload payload = new InlineSwitchPayload(DUMMY_SETTING, SettingsSource.SYSTEM,
+                STANDARD_ON, null /* intent */, true);
+        int currentValue = 1;
+        Settings.System.putInt(mContext.getContentResolver(), DUMMY_SETTING, currentValue);
+
+        int newValue = payload.getValue(mContext);
+
+        assertThat(newValue).isEqualTo(currentValue);
+    }
+
+    @Test
+    public void testSetSecure_updatesSecureSetting() {
+        InlineSwitchPayload payload = new InlineSwitchPayload(DUMMY_SETTING, SettingsSource.SECURE,
+                STANDARD_ON, null /* intent */, true);
+        int newValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver, SCREEN_BRIGHTNESS_MODE, 0);
+
+        payload.setValue(mContext, newValue);
+        int updatedValue = Settings.System.getInt(resolver, DUMMY_SETTING, -1);
+
+        assertThat(updatedValue).isEqualTo(newValue);
+    }
+
+    @Test
+    public void testSetGlobal_updatesGlobalSetting() {
+        InlineSwitchPayload payload = new InlineSwitchPayload(DUMMY_SETTING, SettingsSource.GLOBAL,
+                STANDARD_ON, null /* intent */, true);
+        int newValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Global.putInt(resolver, SCREEN_BRIGHTNESS_MODE, 0);
+
+        payload.setValue(mContext, newValue);
+        int updatedValue = Settings.Global.getInt(resolver, DUMMY_SETTING, -1);
+
+        assertThat(updatedValue).isEqualTo(newValue);
+    }
+
+    @Test
+    public void testSetSystem_updatesSystemSetting() {
+        InlineSwitchPayload payload = new InlineSwitchPayload(DUMMY_SETTING, SettingsSource.SYSTEM,
+                STANDARD_ON, null /* intent */, true);
+        int newValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.System.putInt(resolver, SCREEN_BRIGHTNESS_MODE, 0);
+
+        payload.setValue(mContext, newValue);
+        int updatedValue = Settings.System.getInt(resolver, DUMMY_SETTING, -1);
+
+        assertThat(updatedValue).isEqualTo(newValue);
+    }
+
+    @Test
+    public void testGetSystem_flippedSetting_returnsFlippedValue() {
+        // Stores 1s as 0s, and vis versa
+        InlineSwitchPayload payload = new InlineSwitchPayload(DUMMY_SETTING, SettingsSource.SYSTEM,
+                FLIPPED_ON, null /* intent */, true);
+        int currentValue = 1;
+        Settings.System.putInt(mContext.getContentResolver(), DUMMY_SETTING, currentValue);
+
+        int newValue = payload.getValue(mContext);
+
+        assertThat(newValue).isEqualTo(1 - currentValue);
+    }
+
+    @Test
+    public void testSetSystem_flippedSetting_updatesToFlippedValue() {
+        // Stores 1s as 0s, and vis versa
+        InlineSwitchPayload payload = new InlineSwitchPayload(DUMMY_SETTING, SettingsSource.SYSTEM,
+                FLIPPED_ON, null /* intent */, true);
+        int newValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.System.putInt(resolver, SCREEN_BRIGHTNESS_MODE, newValue);
+
+        payload.setValue(mContext, newValue);
+        int updatedValue = Settings.System.getInt(resolver, DUMMY_SETTING, -1);
+
+        assertThat(updatedValue).isEqualTo(1 - newValue);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testSetSystem_negativeValue_ThrowsError() {
+        InlineSwitchPayload payload = new InlineSwitchPayload(DUMMY_SETTING, SettingsSource.SYSTEM,
+                STANDARD_ON, null /* intent */, true);
+
+        payload.setValue(mContext, -1);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testSetSystem_highValue_ThrowsError() {
+        InlineSwitchPayload payload = new InlineSwitchPayload(DUMMY_SETTING, SettingsSource.SYSTEM,
+                STANDARD_ON, null /* intent */, true);
+
+        payload.setValue(mContext, 2);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
index ba9feb3..093909b 100644
--- a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
@@ -19,17 +19,11 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.util.Pair;
 import android.view.LayoutInflater;
 
-import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.InlineSwitchViewHolder;
-import com.android.settings.search2.SearchFragment;
-import com.android.settings.search2.SearchResult;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
@@ -46,8 +40,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
@@ -94,7 +86,7 @@
 
     @Test
     public void testBindViewElements_AllUpdated() {
-        when(mPayload.getSwitchValue(any(Context.class))).thenReturn(true);
+        when(mPayload.getValue(any(Context.class))).thenReturn(1);
         SearchResult result = getSearchResult();
         mHolder.onBind(mFragment, result);
         // Precondition: switch is on.
@@ -102,10 +94,6 @@
 
         mHolder.switchView.performClick();
 
-        verify(mFeatureFactory.metricsFeatureProvider).action(
-                any(Context.class),
-                eq(MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_INLINE_RESULT),
-                any(Pair.class), any(Pair.class), any(Pair.class));
         assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
         assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
         assertThat(mHolder.iconView.getDrawable()).isEqualTo(mIcon);
@@ -114,13 +102,16 @@
 
     private SearchResult getSearchResult() {
         SearchResult.Builder builder = new SearchResult.Builder();
-        builder.addTitle(TITLE)
-                .addSummary(SUMMARY)
-                .addRank(1)
-                .addPayload(new InlineSwitchPayload("", 0, null))
+
+        builder.setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setRank(1)
+                .setPayload(new InlineSwitchPayload("" /* uri */, 0 /* mSettingSource */,
+                        1 /* onValue */, null /* intent */, true /* isDeviceSupported */))
                 .addBreadcrumbs(new ArrayList<>())
-                .addIcon(mIcon)
-                .addPayload(mPayload);
+                .setIcon(mIcon)
+                .setPayload(mPayload)
+                .setStableId(TITLE.hashCode());
 
         return builder.build();
     }
diff --git a/tests/robotests/src/com/android/settings/search2/InstalledAppResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
similarity index 87%
rename from tests/robotests/src/com/android/settings/search2/InstalledAppResultLoaderTest.java
rename to tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
index e808946..645b986 100644
--- a/tests/robotests/src/com/android/settings/search2/InstalledAppResultLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -12,18 +12,20 @@
  * 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.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.content.pm.ResolveInfo;
 import android.content.pm.UserInfo;
 import android.os.UserManager;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.dashboard.SiteMapManager;
@@ -36,17 +38,22 @@
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 import org.robolectric.annotation.Config;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import static android.content.pm.ApplicationInfo.FLAG_SYSTEM;
 import static android.content.pm.ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyList;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
@@ -162,6 +169,36 @@
     }
 
     @Test
+    public void query_matchingQuery_shouldReturnSystemAppIfHomeApp() {
+        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
+                .thenReturn(Arrays.asList(
+                        ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_SYSTEM,
+                                0 /* targetSdkVersion */)));
+        when(mPackageManagerWrapper.queryIntentActivitiesAsUser(
+                any(Intent.class), anyInt(), anyInt()))
+                .thenReturn(null);
+
+        when(mPackageManagerWrapper.getHomeActivities(anyList())).thenAnswer(new Answer<Object>() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                final List<ResolveInfo> list = (List<ResolveInfo>) invocation.getArguments()[0];
+                final ResolveInfo info = new ResolveInfo();
+                info.activityInfo = new ActivityInfo();
+                info.activityInfo.packageName = "app1";
+                list.add(info);
+                return null;
+            }
+        });
+
+        final String query = "app";
+
+        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+                mSiteMapManager);
+
+        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
     public void query_matchingQuery_shouldNotReturnSystemAppIfNotLaunchable() {
         when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
                 .thenReturn(Arrays.asList(
@@ -182,18 +219,19 @@
     }
 
     @Test
-    public void query_matchingQuery_shouldRankBasedOnSimilarity() {
+    public void query_matchingQuery_multipleResults() {
         final String query = "app";
 
         mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
                 mSiteMapManager);
-        final List<? extends SearchResult> results = mLoader.loadInBackground();
+        final Set<? extends SearchResult> results = mLoader.loadInBackground();
 
-        // List is sorted by rank
-        assertThat(results.get(0).rank).isAtMost(results.get(1).rank);
-        assertThat(results.get(0).title).isEqualTo("app4");
-        assertThat(results.get(1).title).isEqualTo("app");
-        assertThat(results.get(2).title).isEqualTo("appBuffer");
+        Set<CharSequence> expectedTitles = new HashSet<>(Arrays.asList("app4", "app", "appBuffer"));
+        Set<CharSequence> actualTitles = new HashSet<>();
+        for (SearchResult result : results) {
+            actualTitles.add(result.title);
+        }
+        assertThat(actualTitles).isEqualTo(expectedTitles);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
index 404a824..574e4f7 100644
--- a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -21,19 +21,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
-import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 
-import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.IntentPayload;
-import com.android.settings.search2.IntentSearchViewHolder;
-import com.android.settings.search2.SearchFragment;
-import com.android.settings.search2.SearchResult;
-import com.android.settings.search2.SearchResult.Builder;
+import com.android.settings.search.SearchResult.Builder;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
@@ -47,6 +41,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
@@ -101,12 +96,8 @@
         assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.VISIBLE);
         assertThat(mHolder.breadcrumbView.getVisibility()).isEqualTo(View.GONE);
 
-        verify(mFragment).onSearchResultClicked();
+        verify(mFragment).onSearchResultClicked(eq(mHolder), any(SearchResult.class));
         verify(mFragment).startActivity(any(Intent.class));
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
-                eq(MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT),
-                eq(((IntentPayload)result.payload).intent.getComponent().flattenToString()),
-                any(Pair.class));
     }
 
     @Test
@@ -120,10 +111,11 @@
     @Test
     public void testBindViewElements_emptySummary_hideSummaryView() {
         final SearchResult result = new Builder()
-                .addTitle(TITLE)
-                .addRank(1)
-                .addPayload(new IntentPayload(null))
-                .addIcon(mIcon)
+                .setTitle(TITLE)
+                .setRank(1)
+                .setPayload(new ResultPayload(null))
+                .setIcon(mIcon)
+                .setStableId(1)
                 .build();
 
         mHolder.onBind(mFragment, result);
@@ -137,11 +129,12 @@
         breadcrumbs.add("b");
         breadcrumbs.add("c");
         final SearchResult result = new Builder()
-                .addTitle(TITLE)
-                .addRank(1)
-                .addPayload(new IntentPayload(null))
+                .setTitle(TITLE)
+                .setRank(1)
+                .setPayload(new ResultPayload(null))
                 .addBreadcrumbs(breadcrumbs)
-                .addIcon(mIcon)
+                .setIcon(mIcon)
+                .setStableId(1)
                 .build();
 
         mHolder.onBind(mFragment, result);
@@ -153,9 +146,10 @@
     public void testBindElements_placeholderSummary_visibilityIsGone() {
         String nonBreakingSpace = mContext.getString(R.string.summary_placeholder);
         SearchResult result = new Builder()
-                .addTitle(TITLE)
-                .addSummary(nonBreakingSpace)
-                .addPayload(new IntentPayload(null))
+                .setTitle(TITLE)
+                .setSummary(nonBreakingSpace)
+                .setPayload(new ResultPayload(null))
+                .setStableId(1)
                 .build();
 
         mHolder.onBind(mFragment, result);
@@ -167,9 +161,10 @@
     public void testBindElements_dynamicSummary_visibilityIsGone() {
         String dynamicSummary = "%s";
         SearchResult result = new Builder()
-                .addTitle(TITLE)
-                .addSummary(dynamicSummary)
-                .addPayload(new IntentPayload(null))
+                .setTitle(TITLE)
+                .setSummary(dynamicSummary)
+                .setPayload(new ResultPayload(null))
+                .setStableId(1)
                 .build();
 
         mHolder.onBind(mFragment, result);
@@ -179,13 +174,15 @@
 
     private SearchResult getSearchResult(String title, String summary, Drawable icon) {
         Builder builder = new Builder();
-        builder.addTitle(title)
-                .addSummary(summary)
-                .addRank(1)
-                .addPayload(new IntentPayload(
+        builder.setStableId(Objects.hash(title, summary, icon))
+                .setTitle(title)
+                .setSummary(summary)
+                .setRank(1)
+                .setPayload(new ResultPayload(
                         new Intent().setComponent(new ComponentName("pkg", "class"))))
                 .addBreadcrumbs(new ArrayList<>())
-                .addIcon(icon);
+                .setStableId(1)
+                .setIcon(icon);
 
         return builder.build();
     }
diff --git a/tests/robotests/src/com/android/settings/search2/MockAppLoader.java b/tests/robotests/src/com/android/settings/search/MockAppLoader.java
similarity index 72%
rename from tests/robotests/src/com/android/settings/search2/MockAppLoader.java
rename to tests/robotests/src/com/android/settings/search/MockAppLoader.java
index 17cda43..c68cbdf 100644
--- a/tests/robotests/src/com/android/settings/search2/MockAppLoader.java
+++ b/tests/robotests/src/com/android/settings/search/MockAppLoader.java
@@ -15,12 +15,14 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
+import com.android.settings.search.InstalledAppResultLoader;
+import com.android.settings.search.SearchResult;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Mock loader to subvert the requirements of returning data while also driving the Loader
@@ -33,12 +35,12 @@
     }
 
     @Override
-    public List<? extends SearchResult> loadInBackground() {
-        return new ArrayList<>();
+    public Set<? extends SearchResult> loadInBackground() {
+        return new HashSet<>();
     }
 
     @Override
-    protected void onDiscardResult(List<? extends SearchResult> result) {
+    protected void onDiscardResult(Set<? extends SearchResult> result) {
 
     }
 }
diff --git a/tests/robotests/src/com/android/settings/search2/MockDBLoader.java b/tests/robotests/src/com/android/settings/search/MockDBLoader.java
similarity index 72%
rename from tests/robotests/src/com/android/settings/search2/MockDBLoader.java
rename to tests/robotests/src/com/android/settings/search/MockDBLoader.java
index 18d8771..b28c1ed 100644
--- a/tests/robotests/src/com/android/settings/search2/MockDBLoader.java
+++ b/tests/robotests/src/com/android/settings/search/MockDBLoader.java
@@ -15,12 +15,14 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
+import com.android.settings.search.DatabaseResultLoader;
+import com.android.settings.search.SearchResult;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Mock loader to subvert the requirements of returning data while also driving the Loader
@@ -33,12 +35,12 @@
     }
 
     @Override
-    public List<? extends SearchResult> loadInBackground() {
-        return new ArrayList<>();
+    public Set<? extends SearchResult> loadInBackground() {
+        return new HashSet<>();
     }
 
     @Override
-    protected void onDiscardResult(List<? extends SearchResult> result) {
+    protected void onDiscardResult(Set<? extends SearchResult> result) {
 
     }
 }
diff --git a/tests/robotests/src/com/android/settings/search/IntentPayloadTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java
similarity index 74%
rename from tests/robotests/src/com/android/settings/search/IntentPayloadTest.java
rename to tests/robotests/src/com/android/settings/search/ResultPayloadTest.java
index 6f42622..0bb43c5 100644
--- a/tests/robotests/src/com/android/settings/search/IntentPayloadTest.java
+++ b/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -19,9 +19,9 @@
 
 import android.content.Intent;
 import android.os.Parcel;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.IntentPayload;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -31,8 +31,8 @@
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class IntentPayloadTest {
-    private IntentPayload mPayload;
+public class ResultPayloadTest {
+    private ResultPayload mPayload;
 
     private final String EXTRA_KEY = "key";
     private final String EXTRA_VALUE = "value";
@@ -43,14 +43,14 @@
         intent.putExtra(EXTRA_KEY, EXTRA_VALUE);
         Parcel parcel = Parcel.obtain();
 
-        mPayload = new IntentPayload(intent);
+        mPayload = new ResultPayload(intent);
         mPayload.writeToParcel(parcel, 0);
         // Reset parcel for reading
         parcel.setDataPosition(0);
-        IntentPayload newPayload = IntentPayload.CREATOR.createFromParcel(parcel);
+        ResultPayload newPayload = ResultPayload.CREATOR.createFromParcel(parcel);
 
-        String originalIntentExtra = mPayload.intent.getStringExtra(EXTRA_KEY);
-        String copiedIntentExtra = newPayload.intent.getStringExtra(EXTRA_KEY);
+        String originalIntentExtra = mPayload.getIntent().getStringExtra(EXTRA_KEY);
+        String copiedIntentExtra = newPayload.getIntent().getStringExtra(EXTRA_KEY);
         assertThat(originalIntentExtra).isEqualTo(copiedIntentExtra);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java
index 3875d86..50bdb84 100644
--- a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -18,25 +18,21 @@
 package com.android.settings.search;
 
 import android.content.Intent;
-import android.os.BadParcelableException;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.IntentPayload;
-import com.android.settings.search2.ResultPayloadUtils;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
-import java.io.StreamCorruptedException;
-
 import static com.google.common.truth.Truth.assertThat;
 import static junit.framework.Assert.fail;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class ResultPayloadUtilsTest {
-    private IntentPayload payload;
+    private ResultPayload payload;
 
     private final String EXTRA_KEY = "key";
     private final String EXTRA_VALUE = "value";
@@ -45,14 +41,14 @@
     public void setUp() {
         Intent intent = new Intent();
         intent.putExtra(EXTRA_KEY, EXTRA_VALUE);
-        payload = new IntentPayload(intent);
+        payload = new ResultPayload(intent);
     }
 
     @Test
     public void testUnmarshallBadData_ExceptionThrown() {
         byte[] badData = "I'm going to fail :)".getBytes();
         try {
-            ResultPayloadUtils.unmarshall(badData, IntentPayload.CREATOR);
+            ResultPayloadUtils.unmarshall(badData, ResultPayload.CREATOR);
             fail("unmarshall should throw exception");
         } catch ( RuntimeException e) {
             assertThat(e).isNotNull();
@@ -60,7 +56,7 @@
     }
 
     @Test
-    public void testMarshallIntentPayload_NonEmptyArray() {
+    public void testMarshallResultPayload_NonEmptyArray() {
         byte[] marshalledPayload = ResultPayloadUtils.marshall(payload);
         assertThat(marshalledPayload).isNotNull();
         assertThat(marshalledPayload).isNotEmpty();
@@ -69,11 +65,11 @@
     @Test
     public void testUnmarshall_PreservedData() {
         byte[] marshalledPayload = ResultPayloadUtils.marshall(payload);
-        IntentPayload newPayload = ResultPayloadUtils.unmarshall(marshalledPayload,
-                IntentPayload.CREATOR);
+        ResultPayload newPayload = ResultPayloadUtils.unmarshall(marshalledPayload,
+                ResultPayload.CREATOR);
 
-        String originalIntentExtra = payload.intent.getStringExtra(EXTRA_KEY);
-        String copiedIntentExtra = newPayload.intent.getStringExtra(EXTRA_KEY);
+        String originalIntentExtra = payload.getIntent().getStringExtra(EXTRA_KEY);
+        String copiedIntentExtra = newPayload.getIntent().getStringExtra(EXTRA_KEY);
         assertThat(originalIntentExtra).isEqualTo(copiedIntentExtra);
     }
 
diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryLoaderTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
similarity index 92%
rename from tests/robotests/src/com/android/settings/search2/SavedQueryLoaderTest.java
rename to tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
index 5209ed9..780a8a5d 100644
--- a/tests/robotests/src/com/android/settings/search2/SavedQueryLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
@@ -12,18 +12,18 @@
  * 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.search2;
+package com.android.settings.search;
 
 
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search.IndexDatabaseHelper;
 import com.android.settings.testutils.DatabaseTestUtils;
 
 import org.junit.After;
@@ -55,7 +55,7 @@
 
     @After
     public void cleanUp() {
-        DatabaseTestUtils.clearDb();
+        DatabaseTestUtils.clearDb(mContext);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
similarity index 91%
rename from tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java
rename to tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
index daa6d5e..7421d1a 100644
--- a/tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
@@ -12,12 +12,13 @@
  * 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.search2;
+package com.android.settings.search;
 
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryRecorderAndRemoverTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
similarity index 93%
rename from tests/robotests/src/com/android/settings/search2/SavedQueryRecorderAndRemoverTest.java
rename to tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
index ae78279..6d49555 100644
--- a/tests/robotests/src/com/android/settings/search2/SavedQueryRecorderAndRemoverTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
@@ -12,14 +12,15 @@
  * 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.search2;
+package com.android.settings.search;
 
 
 import android.content.Context;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.DatabaseTestUtils;
 
@@ -49,7 +50,7 @@
 
     @After
     public void cleanUp() {
-        DatabaseTestUtils.clearDb();
+        DatabaseTestUtils.clearDb(mContext);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryViewHolderTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
similarity index 86%
rename from tests/robotests/src/com/android/settings/search2/SavedQueryViewHolderTest.java
rename to tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
index 5777609..691fcf7 100644
--- a/tests/robotests/src/com/android/settings/search2/SavedQueryViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
@@ -12,16 +12,21 @@
  * 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.search2;
+package com.android.settings.search;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -32,10 +37,6 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SavedQueryViewHolderTest {
@@ -67,7 +68,7 @@
         mTitleView.performClick();
         mRemoveButton.performClick();
 
-        verify(mSearchFragment).onSavedQueryClicked(any(CharSequence.class));
-        verify(mSearchFragment).onRemoveSavedQueryClicked(any(CharSequence.class));
+        verify(mSearchFragment).onSavedQueryClicked(nullable(CharSequence.class));
+        verify(mSearchFragment).onRemoveSavedQueryClicked(nullable(CharSequence.class));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
index e733196..6cf1cf4 100644
--- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
@@ -20,10 +20,9 @@
 import android.app.Activity;
 import android.view.Menu;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.search2.SearchFeatureProviderImpl;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java b/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
similarity index 77%
rename from tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java
rename to tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
index 2e91ec6..e53c01d 100644
--- a/tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -12,27 +12,35 @@
  * 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.search2;
+package com.android.settings.search;
 
 import android.app.LoaderManager;
 import android.content.Context;
+import android.content.Intent;
 import android.content.Loader;
 import android.os.Bundle;
+import android.util.Pair;
 import android.view.View;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.SettingsActivity;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search.IndexingCallback;
+import com.android.settings.testutils.DatabaseTestUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
+import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatcher;
+import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
@@ -41,11 +49,14 @@
 import org.robolectric.util.ActivityController;
 import org.robolectric.util.ReflectionHelpers;
 
-import java.util.List;
+import java.util.Set;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.argThat;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -69,14 +80,23 @@
     private SavedQueryLoader mSavedQueryLoader;
     @Mock
     private SavedQueryController mSavedQueryController;
+    @Mock
+    private SearchResultsAdapter mSearchResultsAdapter;
+    @Captor
+    private ArgumentCaptor<String> mQueryCaptor = ArgumentCaptor.forClass(String.class);
+
     private FakeFeatureFactory mFeatureFactory;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+        mFeatureFactory = FakeFeatureFactory.setupForTest(mContext);
+    }
+
+    @After
+    public void tearDown() {
+        DatabaseTestUtils.clearDb(RuntimeEnvironment.application);
     }
 
     @Test
@@ -137,7 +157,7 @@
     }
 
     @Test
-    public void queryTextChange_shouldTriggerLoader() {
+    public void queryTextChange_shouldTriggerLoaderAndInitializeSearch() {
         when(mFeatureFactory.searchFeatureProvider
                 .getDatabaseSearchLoader(any(Context.class), anyString()))
                 .thenReturn(mDatabaseResultLoader);
@@ -156,6 +176,7 @@
         when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
                 .thenReturn(true);
 
+        ReflectionHelpers.setField(fragment, "mSearchAdapter", mSearchResultsAdapter);
         fragment.onQueryTextChange(testQuery);
         activityController.get().onBackPressed();
 
@@ -170,10 +191,28 @@
                 .getDatabaseSearchLoader(any(Context.class), anyString());
         verify(mFeatureFactory.searchFeatureProvider)
                 .getInstalledAppSearchLoader(any(Context.class), anyString());
+        verify(mSearchResultsAdapter).initializeSearch(mQueryCaptor.capture());
+        assertThat(mQueryCaptor.getValue()).isEqualTo(testQuery);
     }
 
     @Test
-    public void queryTextChangeToEmpty_shouldLoadSavedQuery() {
+    public void onSearchResultsDisplayed_noResult_shouldShowNoResultView() {
+        ActivityController<SearchActivity> activityController =
+                Robolectric.buildActivity(SearchActivity.class);
+        activityController.setup();
+        SearchFragment fragment = spy((SearchFragment) activityController.get().getFragmentManager()
+                .findFragmentById(R.id.main_content));
+        fragment.onSearchResultsDisplayed(0 /* count */);
+
+        assertThat(fragment.mNoResultsView.getVisibility()).isEqualTo(View.VISIBLE);
+        verify(mFeatureFactory.metricsFeatureProvider).visible(
+                any(Context.class),
+                anyInt(),
+                eq(MetricsProto.MetricsEvent.SETTINGS_SEARCH_NO_RESULT));
+    }
+
+    @Test
+    public void queryTextChangeToEmpty_shouldLoadSavedQueryAndNotInitializeSearch() {
         when(mFeatureFactory.searchFeatureProvider
                 .getDatabaseSearchLoader(any(Context.class), anyString()))
                 .thenReturn(mDatabaseResultLoader);
@@ -190,6 +229,7 @@
         when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
                 .thenReturn(true);
         ReflectionHelpers.setField(fragment, "mSavedQueryController", mSavedQueryController);
+        ReflectionHelpers.setField(fragment, "mSearchAdapter", mSearchResultsAdapter);
         fragment.mQuery = "123";
 
         fragment.onQueryTextChange("");
@@ -199,6 +239,7 @@
         verify(mFeatureFactory.searchFeatureProvider, never())
                 .getInstalledAppSearchLoader(any(Context.class), anyString());
         verify(mSavedQueryController).loadSavedQueries();
+        verify(mSearchResultsAdapter, never()).initializeSearch(anyString());
     }
 
     @Test
@@ -249,7 +290,7 @@
 
         Robolectric.flushForegroundThreadScheduler();
 
-        verify(fragment, times(2)).onLoadFinished(any(Loader.class), any(List.class));
+        verify(fragment, times(2)).onLoadFinished(any(Loader.class), any(Set.class));
     }
 
     @Test
@@ -353,12 +394,12 @@
     @Test
     public void onIndexingFinished_noActivity_shouldNotCrash() {
         ActivityController<SearchActivity> activityController =
-            Robolectric.buildActivity(SearchActivity.class);
+                Robolectric.buildActivity(SearchActivity.class);
         activityController.setup();
         SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
-            .findFragmentById(R.id.main_content));
+                .findFragmentById(R.id.main_content));
         when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
-            .thenReturn(true);
+                .thenReturn(true);
         fragment.mQuery = "bright";
         ReflectionHelpers.setField(fragment, "mLoaderManager", null);
         ReflectionHelpers.setField(fragment, "mHost", null);
@@ -366,4 +407,43 @@
         fragment.onIndexingFinished();
         // no crash
     }
+
+    @Test
+    public void onSearchResultClicked_shouldLogResultMeta() {
+        SearchFragment fragment = new SearchFragment();
+        ReflectionHelpers.setField(fragment, "mMetricsFeatureProvider",
+                mFeatureFactory.metricsFeatureProvider);
+        ReflectionHelpers.setField(fragment, "mSearchFeatureProvider",
+                mFeatureFactory.searchFeatureProvider);
+        ReflectionHelpers.setField(fragment, "mSearchAdapter", mock(SearchResultsAdapter.class));
+        fragment.mSavedQueryController = mock(SavedQueryController.class);
+
+        // Should log result name, result count, clicked rank, etc.
+        final SearchViewHolder resultViewHolder = mock(SearchViewHolder.class);
+        when(resultViewHolder.getClickActionMetricName())
+                .thenReturn(MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT);
+        ResultPayload payLoad = new ResultPayload(
+                (new Intent()).putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, "test_setting"));
+        SearchResult searchResult = new SearchResult.Builder()
+                .setStableId(payLoad.hashCode())
+                .setPayload(payLoad)
+                .setTitle("setting_title")
+                .build();
+        fragment.onSearchResultClicked(resultViewHolder, searchResult);
+
+        verify(mFeatureFactory.metricsFeatureProvider).action(
+                nullable(Context.class),
+                eq(MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT),
+                eq("test_setting"),
+                argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_COUNT)),
+                argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_RANK)),
+                argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SERACH_QUERY_LENGTH)));
+
+        verify(mFeatureFactory.searchFeatureProvider).searchResultClicked(nullable(Context.class),
+                nullable(String.class), eq(searchResult));
+    }
+
+    private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag) {
+        return pair -> pair.first == tag;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
index 972bca1..b4a91c5 100644
--- a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
@@ -22,7 +22,6 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.core.codeinspection.CodeInspector;
 import com.android.settings.dashboard.DashboardFragmentSearchIndexProviderInspector;
-import com.android.settings.search2.DatabaseIndexingManager;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -91,7 +90,7 @@
             // If it's a SettingsPreferenceFragment, it must also be Indexable.
             final boolean implementsIndexable = Indexable.class.isAssignableFrom(clazz);
             if (!implementsIndexable) {
-                if (!notImplementingIndexableGrandfatherList.contains(className)) {
+                if (!notImplementingIndexableGrandfatherList.remove(className)) {
                     notImplementingIndexable.add(className);
                 }
                 continue;
@@ -99,7 +98,7 @@
             final boolean hasSearchIndexProvider = hasSearchIndexProvider(clazz);
             // If it implements Indexable, it must also implement the index provider field.
             if (!hasSearchIndexProvider) {
-                if (!notImplementingIndexProviderGrandfatherList.contains(className)) {
+                if (!notImplementingIndexProviderGrandfatherList.remove(className)) {
                     notImplementingIndexProvider.add(className);
                 }
                 continue;
@@ -109,14 +108,14 @@
             final boolean isSharingPrefControllers = DashboardFragmentSearchIndexProviderInspector
                     .isSharingPreferenceControllers(clazz);
             if (!isSharingPrefControllers) {
-                if (!notSharingPrefControllersGrandfatherList.contains(className)) {
+                if (!notSharingPrefControllersGrandfatherList.remove(className)) {
                     notSharingPreferenceControllers.add(className);
                 }
                 continue;
             }
             // Must be in SearchProviderRegistry
             if (SearchIndexableResources.getResourceByName(className) == null) {
-                if (!notInSearchIndexableRegistryGrandfatherList.contains(className)) {
+                if (!notInSearchIndexableRegistryGrandfatherList.remove(className)) {
                     notInSearchProviderRegistry.add(className);
                 }
                 continue;
@@ -145,6 +144,15 @@
         assertWithMessage(notInProviderRegistryError)
                 .that(notInSearchProviderRegistry)
                 .isEmpty();
+        assertNoObsoleteInGrandfatherList("grandfather_not_implementing_indexable",
+                notImplementingIndexableGrandfatherList);
+        assertNoObsoleteInGrandfatherList("grandfather_not_implementing_index_provider",
+                notImplementingIndexProviderGrandfatherList);
+        assertNoObsoleteInGrandfatherList("grandfather_not_in_search_index_provider_registry",
+                notInSearchIndexableRegistryGrandfatherList);
+        assertNoObsoleteInGrandfatherList(
+                "grandfather_not_sharing_pref_controllers_with_search_provider",
+                notSharingPrefControllersGrandfatherList);
     }
 
     private boolean hasSearchIndexProvider(Class clazz) {
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
index 89afcaa..1ddff90 100644
--- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
@@ -29,7 +29,7 @@
 
 import android.text.TextUtils;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.wifi.WifiSettings;
 
diff --git a/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java b/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java
index f83b595..e601087 100644
--- a/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java
@@ -18,15 +18,13 @@
 package com.android.settings.search;
 
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.drawable.Drawable;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.IntentPayload;
-import com.android.settings.search2.ResultPayload;
-import com.android.settings.search2.SearchResult;
-import com.android.settings.search2.SearchResult.Builder;
+import com.android.settings.search.SearchResult.Builder;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -42,9 +40,10 @@
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SearchResultBuilderTest {
 
+    private static final String TITLE = "title";
+    private static final String SUMMARY = "summary";
+
     private Builder mBuilder;
-    private String mTitle;
-    private String mSummary;
     private ArrayList<String> mBreadcrumbs;
     private int mRank;
     private ResultPayload mResultPayload;
@@ -53,11 +52,9 @@
     @Before
     public void setUp() {
         mBuilder = new Builder();
-        mTitle = "title";
-        mSummary = "summary";
         mBreadcrumbs = new ArrayList<>();
         mRank = 3;
-        mResultPayload = new IntentPayload(null);
+        mResultPayload = new ResultPayload(new Intent());
 
         final Context context = ShadowApplication.getInstance().getApplicationContext();
         mIcon = context.getDrawable(R.drawable.ic_search_history);
@@ -65,77 +62,82 @@
 
     @Test
     public void testAllInfo_BuildSearchResult() {
-        mBuilder.addTitle(mTitle)
-                .addSummary(mSummary)
-                .addRank(mRank)
+        mBuilder.setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setRank(mRank)
                 .addBreadcrumbs(mBreadcrumbs)
-                .addIcon(mIcon)
-                .addPayload(mResultPayload);
+                .setIcon(mIcon)
+                .setPayload(mResultPayload)
+                .setStableId(1);
         SearchResult result = mBuilder.build();
 
         assertThat(result).isNotNull();
-        assertThat(result.title).isEqualTo(mTitle);
-        assertThat(result.summary).isEqualTo(mSummary);
+        assertThat(result.title).isEqualTo(TITLE);
+        assertThat(result.summary).isEqualTo(SUMMARY);
         assertThat(result.rank).isEqualTo(mRank);
         assertThat(result.breadcrumbs).isEqualTo(mBreadcrumbs);
         assertThat(result.icon).isEqualTo(mIcon);
         assertThat(result.payload).isEqualTo(mResultPayload);
     }
 
-    @Test
-    public void testNoTitle_BuildSearchResultException() {
-        mBuilder.addSummary(mSummary)
-                .addRank(mRank)
+    @Test(expected = IllegalStateException.class)
+    public void testNoStableId_BuildSearchResultException() {
+        mBuilder.setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setRank(mRank)
                 .addBreadcrumbs(mBreadcrumbs)
-                .addIcon(mIcon)
-                .addPayload(mResultPayload);
+                .setIcon(mIcon)
+                .setPayload(mResultPayload);
 
-        SearchResult result = null;
-        try {
-            result = mBuilder.build();
-        } catch (IllegalArgumentException e) {
-            // passes.
-        }
-        assertThat(result).isNull();
+        mBuilder.build();
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testNoTitle_BuildSearchResultException() {
+        mBuilder.setSummary(SUMMARY)
+                .setRank(mRank)
+                .addBreadcrumbs(mBreadcrumbs)
+                .setIcon(mIcon)
+                .setPayload(mResultPayload)
+                .setStableId(1);
+
+        mBuilder.build();
     }
 
     @Test
     public void testNoRank_BuildSearchResult_pass() {
-        mBuilder.addTitle(mTitle)
-                .addSummary(mSummary)
+        mBuilder.setTitle(TITLE)
+                .setSummary(SUMMARY)
                 .addBreadcrumbs(mBreadcrumbs)
-                .addIcon(mIcon)
-                .addPayload(mResultPayload);
+                .setIcon(mIcon)
+                .setPayload(mResultPayload)
+                .setStableId(1);
 
         assertThat(mBuilder.build()).isNotNull();
     }
 
     @Test
     public void testNoIcon_BuildSearchResult_pass() {
-        mBuilder.addTitle(mTitle)
-                .addSummary(mSummary)
-                .addRank(mRank)
+        mBuilder.setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setRank(mRank)
                 .addBreadcrumbs(mBreadcrumbs)
-                .addPayload(mResultPayload);
+                .setPayload(mResultPayload)
+                .setStableId(1);
 
         assertThat(mBuilder.build()).isNotNull();
     }
 
-    @Test
+    @Test(expected = IllegalStateException.class)
     public void testNoPayload_BuildSearchResultException() {
-        mBuilder.addTitle(mTitle)
-                .addSummary(mSummary)
-                .addRank(mRank)
+        mBuilder.setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setRank(mRank)
                 .addBreadcrumbs(mBreadcrumbs)
-                .addIcon(mIcon);
+                .setIcon(mIcon)
+                .setStableId(1);
 
-        SearchResult result = null;
-        try {
-            result = mBuilder.build();
-        } catch (IllegalArgumentException e) {
-            // passes.
-        }
-        assertThat(result).isNull();
+        mBuilder.build();
     }
 }
 
diff --git a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java b/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
index 645dfe5..0320526 100644
--- a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
@@ -21,37 +21,41 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
+import android.util.Pair;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.AppSearchResult;
-import com.android.settings.search2.DatabaseResultLoader;
-import com.android.settings.search2.InlineSwitchViewHolder;
-import com.android.settings.search2.InstalledAppResultLoader;
-import com.android.settings.search2.IntentPayload;
-import com.android.settings.search2.IntentSearchViewHolder;
-import com.android.settings.search2.ResultPayload;
-import com.android.settings.search2.SearchFragment;
-import com.android.settings.search2.SearchResult;
-import com.android.settings.search2.SearchResult.Builder;
-import com.android.settings.search2.SearchResultsAdapter;
-import com.android.settings.search2.SearchViewHolder;
+import com.android.settings.search.SearchResult.Builder;
+import com.android.settings.search.ranking.SearchResultsRankerCallback;
 
 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.Robolectric;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowLooper;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -59,6 +63,13 @@
 
     @Mock
     private SearchFragment mFragment;
+    @Mock
+    private SearchFeatureProvider mSearchFeatureProvider;
+    @Mock
+    private Context mMockContext;
+    @Captor
+    private ArgumentCaptor<Integer> mSearchResultsCountCaptor =
+            ArgumentCaptor.forClass(Integer.class);
     private SearchResultsAdapter mAdapter;
     private Context mContext;
     private String mLoaderClassName;
@@ -69,8 +80,10 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = Robolectric.buildActivity(Activity.class).get();
-        mAdapter = new SearchResultsAdapter(mFragment);
         mLoaderClassName = DatabaseResultLoader.class.getName();
+        when(mFragment.getContext()).thenReturn(mMockContext);
+        when(mMockContext.getApplicationContext()).thenReturn(mContext);
+        mAdapter = new SearchResultsAdapter(mFragment, mSearchFeatureProvider);
     }
 
     @Test
@@ -81,9 +94,10 @@
 
     @Test
     public void testSingleSourceMerge_exactCopyReturned() {
-        ArrayList<SearchResult> intentResults = getIntentSampleResults();
+        Set<SearchResult> intentResults = getIntentSampleResults();
+        mAdapter.initializeSearch("");
         mAdapter.addSearchResults(intentResults, mLoaderClassName);
-        mAdapter.displaySearchResults();
+        mAdapter.notifyResultsLoaded();
 
         List<SearchResult> updatedResults = mAdapter.getSearchResults();
         assertThat(updatedResults).containsAllIn(intentResults);
@@ -107,130 +121,459 @@
 
     @Test
     public void testEndToEndSearch_properResultsMerged_correctOrder() {
-        mAdapter.addSearchResults(getDummyAppResults(), InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(getDummyDbResults(), DatabaseResultLoader.class.getName());
-        mAdapter.displaySearchResults();
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(new HashSet<SearchResult>(getDummyAppResults()),
+                InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(new HashSet<SearchResult>(getDummyDbResults()),
+                DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
 
         List<SearchResult> results = mAdapter.getSearchResults();
-        List<SearchResult> sortedDummyResults  = getSortedDummyResults();
-
-        assertThat(results).containsExactlyElementsIn(sortedDummyResults).inOrder();
+        assertThat(results.get(0).title).isEqualTo(TITLES[0]); // alpha
+        assertThat(results.get(1).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(results.get(2).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(results.get(3).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(results.get(4).title).isEqualTo(TITLES[5]); // appCharlie
+        assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
+        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
+        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
     }
 
     @Test
     public void testEndToEndSearch_addResults_resultsAddedInOrder() {
-        List<AppSearchResult> appResults = getDummyAppResults();
+        List<SearchResult> appResults = getDummyAppResults();
         List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
         // Add two individual items
-        mAdapter.addSearchResults(appResults.subList(0,1),
+        mAdapter.addSearchResults(new HashSet<SearchResult>(appResults.subList(0, 1)),
                 InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(dbResults.subList(0,1), DatabaseResultLoader.class.getName());
-        mAdapter.displaySearchResults();
+        mAdapter.addSearchResults(new HashSet<SearchResult>(dbResults.subList(0, 1)),
+                DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
         // Add super-set of items
-        mAdapter.addSearchResults(appResults, InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(dbResults, DatabaseResultLoader.class.getName());
-        mAdapter.displaySearchResults();
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(
+                new HashSet<SearchResult>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<SearchResult>(dbResults), DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
 
         List<SearchResult> results = mAdapter.getSearchResults();
-        List<SearchResult> sortedDummyResults  = getSortedDummyResults();
-        assertThat(results).containsExactlyElementsIn(sortedDummyResults).inOrder();
+        assertThat(results.get(0).title).isEqualTo(TITLES[0]); // alpha
+        assertThat(results.get(1).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(results.get(2).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(results.get(3).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(results.get(4).title).isEqualTo(TITLES[5]); // appCharlie
+        assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
+        verify(mFragment, times(2)).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
+        assertThat(mSearchResultsCountCaptor.getAllValues().toArray())
+                .isEqualTo(new Integer[] {2, 6});
     }
 
     @Test
     public void testEndToEndSearch_removeResults_resultsAdded() {
-        List<AppSearchResult> appResults = getDummyAppResults();
+        List<SearchResult> appResults = getDummyAppResults();
         List<SearchResult> dbResults = getDummyDbResults();
         // Add list of items
-        mAdapter.addSearchResults(appResults, InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(dbResults, DatabaseResultLoader.class.getName());
-        mAdapter.displaySearchResults();
-        // Add subset of items
-        mAdapter.addSearchResults(appResults.subList(0,1),
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(new HashSet<SearchResult>(appResults),
                 InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(dbResults.subList(0,1), DatabaseResultLoader.class.getName());
-        int count = mAdapter.displaySearchResults();
+        mAdapter.addSearchResults(new HashSet<SearchResult>(dbResults),
+                DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
+        // Add subset of items
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(new HashSet<SearchResult>(appResults.subList(0, 1)),
+                InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(new HashSet<>(dbResults.subList(0, 1)),
+                DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
 
         List<SearchResult> results = mAdapter.getSearchResults();
         assertThat(results.get(0).title).isEqualTo(TITLES[0]);
         assertThat(results.get(1).title).isEqualTo(TITLES[3]);
-        assertThat(count).isEqualTo(2);
+        verify(mFragment, times(2)).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
+        assertThat(mSearchResultsCountCaptor.getAllValues().toArray())
+                .isEqualTo(new Integer[] {6, 2});
+    }
+    @Test
+    public void testEndToEndSearch_smartSearchRankingEnabledAndSucceededAfterResultsLoaded() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
+        mAdapter.onRankingScoresAvailable(getDummyRankingScores());
+
+        List<SearchResult> results = mAdapter.getSearchResults();
+        assertThat(results.get(0).title).isEqualTo(TITLES[2]); // charlie
+        assertThat(results.get(1).title).isEqualTo(TITLES[0]); // alpha
+        assertThat(results.get(2).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(results.get(3).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(results.get(4).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(results.get(5).title).isEqualTo(TITLES[5]); // appCharlie
+        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
+        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
+    }
+
+    @Test
+    public void testEndToEndSearch_smartSearchRankingEnabledAndSucceededBeforeResultsLoaded() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.onRankingScoresAvailable(getDummyRankingScores());
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
+
+        List<SearchResult> results = mAdapter.getSearchResults();
+        assertThat(results.get(0).title).isEqualTo(TITLES[2]); // charlie
+        assertThat(results.get(1).title).isEqualTo(TITLES[0]); // alpha
+        assertThat(results.get(2).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(results.get(3).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(results.get(4).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(results.get(5).title).isEqualTo(TITLES[5]); // appCharlie
+        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
+        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
+    }
+
+    @Test
+    public void testEndToEndSearch_smartSearchRankingEnabledAndFailedAfterResultsLoaded() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
+        mAdapter.onRankingFailed();
+
+        List<SearchResult> results = mAdapter.getSearchResults();
+        assertThat(results.get(0).title).isEqualTo(TITLES[0]); // alpha
+        assertThat(results.get(1).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(results.get(2).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(results.get(3).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(results.get(4).title).isEqualTo(TITLES[5]); // appCharlie
+        assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
+        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
+        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
+    }
+
+    @Test
+    public void testEndToEndSearch_smartSearchRankingEnabledAndFailedBeforeResultsLoaded() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.onRankingFailed();
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
+
+        List<SearchResult> results = mAdapter.getSearchResults();
+        assertThat(results.get(0).title).isEqualTo(TITLES[0]); // alpha
+        assertThat(results.get(1).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(results.get(2).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(results.get(3).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(results.get(4).title).isEqualTo(TITLES[5]); // appCharlie
+        assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
+        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
+        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
+    }
+
+    @Test
+    public void testEndToEndSearch_smartSearchRankingEnabledAndTimedoutAfterResultsLoaded() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
+
+        waitUntilRankingTimesOut();
+
+        List<SearchResult> results = mAdapter.getSearchResults();
+        assertThat(results.get(0).title).isEqualTo(TITLES[0]); // alpha
+        assertThat(results.get(1).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(results.get(2).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(results.get(3).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(results.get(4).title).isEqualTo(TITLES[5]); // appCharlie
+        assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
+        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
+        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
+    }
+
+    @Test
+    public void testEndToEndSearch_smartSearchRankingEnabledAndTimedoutBeforeResultsLoaded() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+
+        waitUntilRankingTimesOut();
+
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
+
+        List<SearchResult> results = mAdapter.getSearchResults();
+        assertThat(results.get(0).title).isEqualTo(TITLES[0]); // alpha
+        assertThat(results.get(1).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(results.get(2).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(results.get(3).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(results.get(4).title).isEqualTo(TITLES[5]); // appCharlie
+        assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
+        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
+        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
+    }
+
+    @Test
+    public void testDoSmartRanking_shouldRankAppResultsAfterDbResults() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
+        mAdapter.onRankingScoresAvailable(getDummyRankingScores());
+        List<SearchResult> results = mAdapter.doAsyncRanking();
+        assertThat(results.get(0).title).isEqualTo(TITLES[2]); // charlie
+        assertThat(results.get(1).title).isEqualTo(TITLES[0]); // alpha
+        assertThat(results.get(2).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(results.get(3).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(results.get(4).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(results.get(5).title).isEqualTo(TITLES[5]); // appCharlie
+    }
+
+    @Test
+    public void testDoSmartRanking_shouldRankResultsWithMissingScoresAfterScoredResults() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
+        List<Pair<String, Float>> rankingScores = getDummyRankingScores();
+        rankingScores.remove(1); // no ranking score for alpha
+        mAdapter.onRankingScoresAvailable(rankingScores);
+        List<SearchResult> results = mAdapter.doAsyncRanking();
+        assertThat(results.get(0).title).isEqualTo(TITLES[2]); // charlie
+        assertThat(results.get(1).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(results.get(2).title).isEqualTo(TITLES[0]); // alpha
+        assertThat(results.get(3).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(results.get(4).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(results.get(5).title).isEqualTo(TITLES[5]); // appCharlie
+    }
+
+    @Test
+    public void testGetUnsortedLoadedResults () {
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        Set<CharSequence> expectedDbTitles = new HashSet<>(
+                Arrays.asList("alpha", "bravo", "charlie"));
+        Set<CharSequence> expectedAppTitles = new HashSet<>(
+                Arrays.asList("appAlpha", "appBravo", "appCharlie"));
+        Set<CharSequence> actualDbTitles = new HashSet<>();
+        Set<CharSequence> actualAppTitles = new HashSet<>();
+        for (SearchResult result : mAdapter.getUnsortedLoadedResults(SearchResultsAdapter
+                .DB_RESULTS_LOADER_KEY)) {
+            actualDbTitles.add(result.title);
+        }
+        for (SearchResult result : mAdapter.getUnsortedLoadedResults(SearchResultsAdapter
+                .APP_RESULTS_LOADER_KEY)) {
+            actualAppTitles.add(result.title);
+        }
+        assertThat(actualDbTitles).isEqualTo(expectedDbTitles);
+        assertThat(actualAppTitles).isEqualTo(expectedAppTitles);
+    }
+
+    @Test
+    public void testGetSortedLoadedResults() {
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        List<? extends SearchResult> actualDbResults =
+                mAdapter.getSortedLoadedResults(SearchResultsAdapter.DB_RESULTS_LOADER_KEY);
+        List<? extends SearchResult> actualAppResults =
+                mAdapter.getSortedLoadedResults(SearchResultsAdapter.APP_RESULTS_LOADER_KEY);
+        assertThat(actualDbResults.get(0).title).isEqualTo(TITLES[0]); // charlie
+        assertThat(actualDbResults.get(1).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(actualDbResults.get(2).title).isEqualTo(TITLES[2]); // alpha
+        assertThat(actualAppResults.get(0).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(actualAppResults.get(1).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(actualAppResults.get(2).title).isEqualTo(TITLES[5]); // appCharlie
+    }
+
+    @Test
+    public void testInitializeSearch_shouldNotRunSmartRankingIfDisabled() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(false);
+        mAdapter.initializeSearch("");
+        mAdapter.notifyResultsLoaded();
+        verify(mSearchFeatureProvider, never()).querySearchResults(
+                any(Context.class), anyString(), any(SearchResultsRankerCallback.class));
+    }
+
+    @Test
+    public void testInitialSearch_shouldRunSmartRankingIfEnabled() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+        mAdapter.initializeSearch("");
+        mAdapter.notifyResultsLoaded();
+        verify(mSearchFeatureProvider, times(1)).querySearchResults(
+                any(Context.class), anyString(), any(SearchResultsRankerCallback.class));
+    }
+
+    @Test
+    public void testGetRankingScoreByStableId() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.onRankingScoresAvailable(getDummyRankingScores());
+        assertThat(mAdapter.getRankingScoreByStableId(dbResults.get(0).stableId))
+                .isWithin(1e-10f).of(0.8f);
+        assertThat(mAdapter.getRankingScoreByStableId(dbResults.get(1).stableId))
+                .isWithin(1e-10f).of(0.2f);
+        assertThat(mAdapter.getRankingScoreByStableId(dbResults.get(2).stableId))
+                .isWithin(1e-10f).of(0.9f);
+        assertThat(mAdapter.getRankingScoreByStableId(appResults.get(0).stableId))
+                .isEqualTo(-Float.MAX_VALUE);
+        assertThat(mAdapter.getRankingScoreByStableId(appResults.get(1).stableId))
+                .isEqualTo(-Float.MAX_VALUE);
+        assertThat(mAdapter.getRankingScoreByStableId(appResults.get(2).stableId))
+                .isEqualTo(-Float.MAX_VALUE);
+    }
+
+    private void waitUntilRankingTimesOut() {
+        while (mAdapter.getHandler().hasMessages(mAdapter.MSG_RANKING_TIMED_OUT)) {
+            try {
+                ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                // Do nothing
+            }
+        }
     }
 
     private List<SearchResult> getDummyDbResults() {
         List<SearchResult> results = new ArrayList<>();
-        IntentPayload payload = new IntentPayload(new Intent());
+        ResultPayload payload = new ResultPayload(new Intent());
         SearchResult.Builder builder = new SearchResult.Builder();
-        builder.addPayload(payload);
-
-        builder.addTitle(TITLES[0])
-                .addRank(1);
+        builder.setPayload(payload)
+                .setTitle(TITLES[0])
+                .setRank(1)
+                .setStableId(Objects.hash(TITLES[0], "db"));
         results.add(builder.build());
 
-        builder.addTitle(TITLES[1])
-                .addRank(3);
+        builder.setTitle(TITLES[1])
+                .setRank(3)
+                .setStableId(Objects.hash(TITLES[1], "db"));
         results.add(builder.build());
 
-        builder.addTitle(TITLES[2])
-                .addRank(6);
+        builder.setTitle(TITLES[2])
+                .setRank(6)
+                .setStableId(Objects.hash(TITLES[2], "db"));
         results.add(builder.build());
 
         return results;
     }
 
-    private List<AppSearchResult> getDummyAppResults() {
-        List<AppSearchResult> results = new ArrayList<>();
-        IntentPayload payload = new IntentPayload(new Intent());
+    private List<SearchResult> getDummyAppResults() {
+        List<SearchResult> results = new ArrayList<>();
+        ResultPayload payload = new ResultPayload(new Intent());
         AppSearchResult.Builder builder = new AppSearchResult.Builder();
-        builder.addPayload(payload);
-
-        builder.addTitle(TITLES[3])
-                .addRank(1);
+        builder.setPayload(payload)
+                .setTitle(TITLES[3])
+                .setRank(1)
+                .setStableId(Objects.hash(TITLES[3], "app"));
         results.add(builder.build());
 
-        builder.addTitle(TITLES[4])
-                .addRank(2);
+        builder.setTitle(TITLES[4])
+                .setRank(2)
+                .setStableId(Objects.hash(TITLES[4], "app"));
         results.add(builder.build());
 
-        builder.addTitle(TITLES[5])
-                .addRank(4);
+        builder.setTitle(TITLES[5])
+                .setRank(4)
+                .setStableId(Objects.hash(TITLES[5], "app"));
         results.add(builder.build());
 
         return results;
     }
 
-    private List<SearchResult> getSortedDummyResults() {
-        List<AppSearchResult> appResults = getDummyAppResults();
-        List<SearchResult> dbResults = getDummyDbResults();
-        List<SearchResult> sortedResults = new ArrayList<>(appResults.size() + dbResults.size());
-        sortedResults.add(dbResults.get(0)); // alpha
-        sortedResults.add(appResults.get(0)); // appAlpha
-        sortedResults.add(appResults.get(1)); // appBravo
-        sortedResults.add(dbResults.get(1)); // bravo
-        sortedResults.add(appResults.get(2)); // appCharlie
-        sortedResults.add(dbResults.get(2)); // Charlie
-
-        return sortedResults;
-    }
-
-    private ArrayList<SearchResult> getIntentSampleResults() {
-        ArrayList<SearchResult> sampleResults = new ArrayList<>();
+    private Set<SearchResult> getIntentSampleResults() {
+        Set<SearchResult> sampleResults = new HashSet<>();
         ArrayList<String> breadcrumbs = new ArrayList<>();
         final Drawable icon = mContext.getDrawable(R.drawable.ic_search_history);
-        final ResultPayload payload = new IntentPayload(null);
+        final ResultPayload payload = new ResultPayload(null);
         final SearchResult.Builder builder = new Builder();
-        builder.addTitle("title")
-                .addSummary("summary")
-                .addRank(1)
+        builder.setTitle("title")
+                .setSummary("summary")
+                .setRank(1)
                 .addBreadcrumbs(breadcrumbs)
-                .addIcon(icon)
-                .addPayload(payload);
+                .setIcon(icon)
+                .setPayload(payload)
+                .setStableId(Objects.hash("title", "summary", 1));
         sampleResults.add(builder.build());
 
-        builder.addRank(2);
+        builder.setRank(2)
+                .setStableId(Objects.hash("title", "summary", 2));
         sampleResults.add(builder.build());
 
-        builder.addRank(3);
+        builder.setRank(3)
+                .setStableId(Objects.hash("title", "summary", 3));
         sampleResults.add(builder.build());
         return sampleResults;
     }
-}
\ No newline at end of file
+
+    private List<Pair<String, Float>> getDummyRankingScores() {
+        List<SearchResult> results = getDummyDbResults();
+        List<Pair<String, Float>> scores = new ArrayList<>();
+        scores.add(
+                new Pair<String, Float>(Long.toString(results.get(2).stableId), 0.9f)); // charlie
+        scores.add(
+                new Pair<String, Float>(Long.toString(results.get(0).stableId), 0.8f)); // alpha
+        scores.add(
+                new Pair<String, Float>(Long.toString(results.get(1).stableId), 0.2f)); // bravo
+        return scores;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/search2/SiteMapManagerTest.java b/tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/search2/SiteMapManagerTest.java
rename to tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java
index b8ac8fe..b441b66 100644
--- a/tests/robotests/src/com/android/settings/search2/SiteMapManagerTest.java
+++ b/tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java
@@ -12,9 +12,10 @@
  * 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.search2;
+package com.android.settings.search;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -22,10 +23,9 @@
 import android.os.Bundle;
 
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.search.IndexDatabaseHelper;
 import com.android.settings.search.IndexDatabaseHelper.SiteMapColumns;
 import com.android.settings.system.SystemDashboardFragment;
 import com.android.settings.testutils.DatabaseTestUtils;
@@ -79,7 +79,7 @@
 
     @After
     public void cleanUp() {
-        DatabaseTestUtils.clearDb();
+        DatabaseTestUtils.clearDb(mContext);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
index e35eb10..5d2a977 100644
--- a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
+++ b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
@@ -22,11 +22,10 @@
 import android.util.AttributeSet;
 import android.util.Xml;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.R;
 
-import com.android.settings.search2.XmlParserUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java b/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java
deleted file mode 100644
index ab55605..0000000
--- a/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java
+++ /dev/null
@@ -1,541 +0,0 @@
-/*
- * Copyright (C) 2016 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.search2;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.database.MatrixCursor;
-import android.graphics.drawable.Drawable;
-import android.util.ArrayMap;
-
-import com.android.settings.DisplaySettings;
-import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.SubSettings;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.gestures.SwipeToNotificationSettings;
-import com.android.settings.search2.ResultPayload.PayloadType;
-
-import com.android.settings.wifi.WifiSettings;
-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.Robolectric;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class CursorToSearchResultConverterTest {
-
-    private static final String ID = "id";
-    private static final String[] TITLES = {"title1", "title2", "title3"};
-    private static final String SUMMARY = "summary";
-    private static final String TARGET_PACKAGE = "a.b.c";
-    private static final String TARGET_CLASS = "a.b.c.class";
-    private static final String QUERY = "query";
-    private static final Intent INTENT = new Intent("com.android.settings");
-    private static final int ICON = R.drawable.ic_search_history;
-    private static final int BASE_RANK = 1;
-    private static final int EXAMPLES = 3;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private SiteMapManager mSiteMapManager;
-    private Drawable mDrawable;
-    private CursorToSearchResultConverter mConverter;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        Context context = Robolectric.buildActivity(Activity.class).get();
-        mDrawable = context.getDrawable(ICON);
-        mConverter = new CursorToSearchResultConverter(context, QUERY);
-    }
-
-    @Test
-    public void testParseNullResults_ReturnsNull() {
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, null, BASE_RANK);
-        assertThat(results).isNull();
-    }
-
-    @Test
-    public void testParseCursor_NotNull() {
-        List<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        assertThat(results).isNotNull();
-    }
-
-    @Test
-    public void testParseCursor_MatchesRank() {
-        List<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        for (int i = 0; i < EXAMPLES; i++) {
-            assertThat(results.get(i).rank).isEqualTo(BASE_RANK);
-        }
-    }
-
-    @Test
-    public void testParseCursor_MatchesTitle() {
-        List<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        for (int i = 0; i < EXAMPLES; i++) {
-            assertThat(results.get(i).title).isEqualTo(TITLES[i]);
-        }
-    }
-
-    @Test
-    public void testParseCursor_MatchesSummary() {
-        List<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        for (int i = 0; i < EXAMPLES; i++) {
-            assertThat(results.get(i).summary).isEqualTo(SUMMARY);
-        }
-    }
-
-    @Test
-    public void testParseCursor_MatchesIcon() {
-        List<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        for (int i = 0; i < EXAMPLES; i++) {
-            Drawable resultDrawable = results.get(i).icon;
-            assertThat(resultDrawable).isNotNull();
-            assertThat(resultDrawable.toString()).isEqualTo(mDrawable.toString());
-        }
-    }
-
-    @Test
-    public void testParseCursor_NoIcon() {
-        List<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(false /* hasIcon */), BASE_RANK);
-        for (int i = 0; i < EXAMPLES; i++) {
-            Drawable resultDrawable = results.get(i).icon;
-            assertThat(resultDrawable).isNull();
-        }
-    }
-
-    @Test
-    public void testParseCursor_MatchesPayloadType() {
-        List<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        ResultPayload payload;
-        for (int i = 0; i < EXAMPLES; i++) {
-            payload = results.get(i).payload;
-            assertThat(payload.getType()).isEqualTo(PayloadType.INTENT);
-        }
-    }
-
-    @Test
-    public void testLongTitle_PenalizedInRank() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                "Longer than 20 characters", // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                DisplaySettings.class.getName(),
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                BLANK,   // Key
-                0,       // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-        assertThat(results.get(0).rank).isEqualTo(BASE_RANK + 2);
-    }
-
-    @Test
-    public void testParseCursor_MatchesIntentForSubSettings() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                SwipeToNotificationSettings.class.getName(),
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                BLANK,   // Key
-                0,       // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-        IntentPayload payload = (IntentPayload) results.get(0).payload;
-        Intent intent = payload.intent;
-        assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
-    }
-
-    @Test
-    public void testParseCursor_MatchesIntentPayload() {
-        List<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        IntentPayload payload;
-        for (int i = 0; i < EXAMPLES; i++) {
-            payload = (IntentPayload) results.get(i).payload;
-            Intent intent = payload.intent;
-            assertThat(intent.getAction()).isEqualTo(INTENT.getAction());
-        }
-    }
-
-    @Test
-    public void testParseCursor_MatchesIntentPayloadForExternalApps() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                null,    // class
-                TITLES[0], // Title
-                null,    // icon
-                Intent.ACTION_VIEW,   // action
-                TARGET_PACKAGE,    // target package
-                TARGET_CLASS,   // target class
-                QUERY,   // Key
-                PayloadType.INTENT,    // Payload Type
-                null // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-        IntentPayload payload = (IntentPayload) results.get(0).payload;
-        Intent intent = payload.intent;
-
-        assertThat(intent.getComponent().getPackageName()).isEqualTo(TARGET_PACKAGE);
-        assertThat(intent.getComponent().getClassName()).isEqualTo(TARGET_CLASS);
-    }
-
-    @Test
-    public void testParseCursor_MatchesInlineSwitchPayload() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String uri = "test.com";
-        final int type = ResultPayload.PayloadType.INLINE_SWITCH;
-        final int source = ResultPayload.SettingsSource.SECURE;
-        final ArrayMap<Integer, Boolean> map = new ArrayMap<>();
-        map.put(1, true);
-        map.put(0, false);
-        final InlineSwitchPayload payload = new InlineSwitchPayload(uri, source, map);
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                SwipeToNotificationSettings.class.getName(),
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                BLANK,   // Key
-                type,    // Payload Type
-                ResultPayloadUtils.marshall(payload) // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-        InlineSwitchPayload newPayload = (InlineSwitchPayload) results.get(0).payload;
-
-        assertThat(newPayload.settingsUri).isEqualTo(uri);
-        assertThat(newPayload.inlineType).isEqualTo(type);
-        assertThat(newPayload.settingSource).isEqualTo(source);
-        assertThat(newPayload.valueMap.get(1)).isTrue();
-        assertThat(newPayload.valueMap.get(0)).isFalse();
-    }
-
-    // The following tests are temporary, and should be removed when we replace the Search
-    // White-list solution for elevating ranking.
-
-    @Test
-    public void testWifiKey_PrioritizedResult() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String key = "main_toggle_wifi";
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                WifiSettings.class.getName(),   // ClassName
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                key,     // Key
-                0,   // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-
-        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
-    }
-
-    @Test
-    public void testBluetoothKey_PrioritizedResult() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String key = "main_toggle_bluetooth";
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                WifiSettings.class.getName(),   // ClassName
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                key,     // Key
-                0,   // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-
-        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
-    }
-
-    @Test
-    public void testAirplaneKey_PrioritizedResult() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String key = "toggle_airplane";
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                WifiSettings.class.getName(),   // ClassName
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                key,     // Key
-                0,   // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-
-        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
-    }
-
-    @Test
-    public void testHotspotKey_PrioritizedResult() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String key = "tether_settings";
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                WifiSettings.class.getName(),   // ClassName
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                key,     // Key
-                0,   // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-
-        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
-    }
-
-    @Test
-    public void testBatterySaverKey_PrioritizedResult() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String key = "battery_saver";
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                WifiSettings.class.getName(),   // ClassName
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                key,     // Key
-                0,   // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-
-        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
-    }
-
-    @Test
-    public void testNFCKey_PrioritizedResult() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String key = "toggle_nfc";
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                WifiSettings.class.getName(),   // ClassName
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                key,     // Key
-                0,   // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-
-        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
-    }
-
-    @Test
-    public void testDataSaverKey_PrioritizedResult() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String key = "restrict_background";
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                WifiSettings.class.getName(),   // ClassName
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                key,     // Key
-                0,   // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-
-        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
-    }
-
-    @Test
-    public void testDataUsageKey_PrioritizedResult() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String key = "data_usage_enable";
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                WifiSettings.class.getName(),   // ClassName
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                key,     // Key
-                0,   // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-
-        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
-    }
-
-    @Test
-    public void testRoamingKey_PrioritizedResult() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String key = "button_roaming_key";
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                WifiSettings.class.getName(),   // ClassName
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                key,     // Key
-                0,   // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-
-        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
-    }
-
-    // End of temporary tests
-
-    private MatrixCursor getDummyCursor() {
-        return getDummyCursor(true /* hasIcon */);
-    }
-
-    private MatrixCursor getDummyCursor(boolean hasIcon) {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-
-        for (int i = 0; i < EXAMPLES; i++) {
-            ArrayList<String> item = new ArrayList<>(DatabaseResultLoader.SELECT_COLUMNS.length);
-            item.add(ID + i); // Doc ID
-            item.add(TITLES[i]); // Title
-            item.add(SUMMARY); // Summary on
-            item.add(BLANK); // summary off
-            item.add(BLANK); // classname
-            item.add(BLANK); // screen title
-            item.add(hasIcon ? Integer.toString(ICON) : null); // Icon
-            item.add(INTENT.getAction()); // Intent action
-            item.add(BLANK); // target package
-            item.add(BLANK); // target class
-            item.add(BLANK); // Key
-            item.add(Integer.toString(0));     // Payload Type
-            item.add(null); // Payload
-
-            cursor.addRow(item);
-        }
-        return cursor;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java b/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java
deleted file mode 100644
index 862db32..0000000
--- a/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java
+++ /dev/null
@@ -1,549 +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.search2;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.database.sqlite.SQLiteDatabase;
-
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.search.IndexDatabaseHelper;
-import com.android.settings.testutils.DatabaseTestUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.After;
-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.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DatabaseResultLoaderTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mMockContext;
-    @Mock
-    private SiteMapManager mSiteMapManager;
-    private Context mContext;
-    private DatabaseResultLoader loader;
-
-    private final String titleOne = "titleOne";
-    private final String titleTwo = "titleTwo";
-    private final String titleThree = "titleThree";
-    private final String titleFour = "titleFour";
-    private final String summaryOne = "summaryOne";
-    private final String summaryTwo = "summaryTwo";
-    private final String summaryThree = "summaryThree";
-
-    SQLiteDatabase mDb;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        FakeFeatureFactory.setupForTest(mMockContext);
-        FakeFeatureFactory factory =
-                (FakeFeatureFactory) FakeFeatureFactory.getFactory(mMockContext);
-        when(factory.searchFeatureProvider.getSiteMapManager())
-                .thenReturn(mSiteMapManager);
-        mDb = IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
-        setUpDb();
-    }
-
-    @After
-    public void cleanUp() {
-        DatabaseTestUtils.clearDb();
-    }
-
-    @Test
-    public void testMatchTitle() {
-        loader = new DatabaseResultLoader(mContext, "title", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(2);
-        verify(mSiteMapManager, times(2)).buildBreadCrumb(eq(mContext), anyString(), anyString());
-    }
-
-    @Test
-    public void testMatchSummary() {
-        loader = new DatabaseResultLoader(mContext, "summary", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(2);
-    }
-
-    @Test
-    public void testMatchKeywords() {
-        loader = new DatabaseResultLoader(mContext, "keywords", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(2);
-    }
-
-    @Test
-    public void testMatchEntries() {
-        loader = new DatabaseResultLoader(mContext, "entries", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(2);
-    }
-
-    @Test
-    public void testSpecialCaseWord_matchesNonPrefix() {
-        insertSpecialCase("Data usage");
-        loader = new DatabaseResultLoader(mContext, "usage", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseSpace_matches() {
-        insertSpecialCase("space");
-        loader = new DatabaseResultLoader(mContext, " space ", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseDash_matchesWordNoDash() {
-        insertSpecialCase("wi-fi calling");
-        loader = new DatabaseResultLoader(mContext, "wifi", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseDash_matchesWordWithDash() {
-        insertSpecialCase("priorités seulment");
-        loader = new DatabaseResultLoader(mContext, "priorités", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseDash_matchesWordWithoutDash() {
-        insertSpecialCase("priorités seulment");
-        loader = new DatabaseResultLoader(mContext, "priorites", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseDash_matchesEntireQueryWithoutDash() {
-        insertSpecialCase("wi-fi calling");
-        loader = new DatabaseResultLoader(mContext, "wifi calling", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCasePrefix_matchesPrefixOfEntry() {
-        insertSpecialCase("Photos");
-        loader = new DatabaseResultLoader(mContext, "pho", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCasePrefix_DoesNotMatchNonPrefixSubstring() {
-        insertSpecialCase("Photos");
-        loader = new DatabaseResultLoader(mContext, "hot", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(0);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefix_matchesPrefixOfEntry() {
-        insertSpecialCase("Apps Notifications");
-        loader = new DatabaseResultLoader(mContext, "Apps", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefix_matchesSecondWordPrefixOfEntry() {
-        insertSpecialCase("Apps Notifications");
-        loader = new DatabaseResultLoader(mContext, "Not", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefix_DoesNotMatchMatchesPrefixOfFirstEntry() {
-        insertSpecialCase("Apps Notifications");
-        loader = new DatabaseResultLoader(mContext, "pp", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(0);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefix_DoesNotMatchMatchesPrefixOfSecondEntry() {
-        insertSpecialCase("Apps Notifications");
-        loader = new DatabaseResultLoader(mContext, "tion", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(0);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfEntry() {
-        insertSpecialCase("Apps & Notifications");
-        loader = new DatabaseResultLoader(mContext, "App", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfSecondEntry() {
-        insertSpecialCase("Apps & Notifications");
-        loader = new DatabaseResultLoader(mContext, "No", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testDeDupe_noDuplicates_originalListReturn() {
-        // Three elements with unique titles and summaries
-        List<SearchResult> results = new ArrayList();
-        IntentPayload intentPayload = new IntentPayload(new Intent());
-
-        SearchResult.Builder builder = new SearchResult.Builder();
-        builder.addTitle(titleOne)
-                .addSummary(summaryOne)
-                .addPayload(intentPayload);
-        SearchResult resultOne = builder.build();
-        results.add(resultOne);
-
-        builder.addTitle(titleTwo)
-                .addSummary(summaryTwo);
-        SearchResult resultTwo = builder.build();
-        results.add(resultTwo);
-
-        builder.addTitle(titleThree)
-                .addSummary(summaryThree);
-        SearchResult resultThree = builder.build();
-        results.add(resultThree);
-
-        loader = new DatabaseResultLoader(mContext, "", null);
-        loader.removeDuplicates(results);
-        assertThat(results.size()).isEqualTo(3);
-        assertThat(results.get(0)).isEqualTo(resultOne);
-        assertThat(results.get(1)).isEqualTo(resultTwo);
-        assertThat(results.get(2)).isEqualTo(resultThree);
-    }
-
-    @Test
-    public void testDeDupe_oneDuplicate_duplicateRemoved() {
-        List<SearchResult> results = new ArrayList();
-        IntentPayload intentPayload = new IntentPayload(new Intent());
-
-        SearchResult.Builder builder = new SearchResult.Builder();
-        builder.addTitle(titleOne)
-                .addSummary(summaryOne)
-                .addRank(0)
-                .addPayload(intentPayload);
-        SearchResult resultOne = builder.build();
-        results.add(resultOne);
-
-        // Duplicate of the first element
-        builder.addTitle(titleOne)
-                .addSummary(summaryOne)
-                .addRank(1);
-        SearchResult resultTwo = builder.build();
-        results.add(resultTwo);
-
-        // Unique
-        builder.addTitle(titleThree)
-                .addSummary(summaryThree);
-        SearchResult resultThree = builder.build();
-        results.add(resultThree);
-
-        loader = new DatabaseResultLoader(mContext, "", null);
-        loader.removeDuplicates(results);
-        assertThat(results.size()).isEqualTo(2);
-        assertThat(results.get(0)).isEqualTo(resultOne);
-        assertThat(results.get(1)).isEqualTo(resultThree);
-    }
-
-    @Test
-    public void testDeDupe_firstDupeInline_secondDuplicateRemoved() {
-        List<SearchResult> results = new ArrayList();
-        InlineSwitchPayload inlinePayload = new InlineSwitchPayload("", 0,
-                null);
-        IntentPayload intentPayload = new IntentPayload(new Intent());
-
-        SearchResult.Builder builder = new SearchResult.Builder();
-        // Inline result
-        builder.addTitle(titleOne)
-                .addSummary(summaryOne)
-                .addRank(0)
-                .addPayload(inlinePayload);
-        SearchResult resultOne = builder.build();
-        results.add(resultOne);
-
-        // Duplicate of first result, but Intent Result. Should be removed.
-        builder.addTitle(titleOne)
-                .addSummary(summaryOne)
-                .addRank(1)
-                .addPayload(intentPayload);
-        SearchResult resultTwo = builder.build();
-        results.add(resultTwo);
-
-        // Unique
-        builder.addTitle(titleThree)
-                .addSummary(summaryThree);
-        SearchResult resultThree = builder.build();
-        results.add(resultThree);
-
-        loader = new DatabaseResultLoader(mContext, "", null);
-        loader.removeDuplicates(results);
-        assertThat(results.size()).isEqualTo(2);
-        assertThat(results.get(0)).isEqualTo(resultOne);
-        assertThat(results.get(1)).isEqualTo(resultThree);
-    }
-
-    @Test
-    public void testDeDupe_secondDupeInline_firstDuplicateRemoved() {
-        /*
-         * Create a list as follows:
-         * (5) Intent Four
-         * (4) Inline Two
-         * (3) Intent Three
-         * (2) Intent Two
-         * (1) Intent One
-         *
-         * After removing duplicates:
-         * (4) Intent Four
-         * (3) Inline Two
-         * (2) Intent Three
-         * (1) Intent One
-         */
-        List<SearchResult> results = new ArrayList();
-        InlineSwitchPayload inlinePayload = new InlineSwitchPayload("", 0,
-                null);
-        IntentPayload intentPayload = new IntentPayload(new Intent());
-
-
-        SearchResult.Builder builder = new SearchResult.Builder();
-        // Intent One
-        builder.addTitle(titleOne)
-                .addSummary(summaryOne)
-                .addPayload(intentPayload);
-        SearchResult resultOne = builder.build();
-        results.add(resultOne);
-
-        // Intent Two
-        builder.addTitle(titleTwo)
-                .addSummary(summaryTwo)
-                .addPayload(intentPayload);
-        SearchResult resultTwo = builder.build();
-        results.add(resultTwo);
-
-        // Intent Three
-        builder.addTitle(titleThree)
-                .addSummary(summaryThree);
-        SearchResult resultThree = builder.build();
-        results.add(resultThree);
-
-        // Inline Two
-        builder.addTitle(titleTwo)
-                .addSummary(summaryTwo)
-                .addPayload(inlinePayload);
-        SearchResult resultFour = builder.build();
-        results.add(resultFour);
-
-        // Intent Four
-        builder.addTitle(titleFour)
-                .addSummary(summaryOne)
-                .addPayload(intentPayload);
-        SearchResult resultFive = builder.build();
-        results.add(resultFive);
-
-        loader = new DatabaseResultLoader(mContext, "", null);
-        loader.removeDuplicates(results);
-        assertThat(results.size()).isEqualTo(4);
-        assertThat(results.get(0)).isEqualTo(resultOne);
-        assertThat(results.get(1)).isEqualTo(resultThree);
-        assertThat(results.get(2)).isEqualTo(resultFour);
-        assertThat(results.get(3)).isEqualTo(resultFive);
-    }
-
-    @Test
-    public void testDeDupe_threeDuplicates_onlyOneStays() {
-        /*
-         * Create a list as follows:
-         * (3) Intent One
-         * (2) Intent One
-         * (1) Intent One
-         *
-         * After removing duplicates:
-         * (1) Intent One
-         */
-        List<SearchResult> results = new ArrayList();
-        IntentPayload intentPayload = new IntentPayload(new Intent());
-
-        SearchResult.Builder builder = new SearchResult.Builder();
-        // Intent One
-        builder.addTitle(titleOne)
-                .addSummary(summaryOne)
-                .addPayload(intentPayload);
-        SearchResult resultOne = builder.build();
-        results.add(resultOne);
-
-        // Intent Two
-        builder.addTitle(titleOne)
-                .addSummary(summaryOne)
-                .addPayload(intentPayload);
-        SearchResult resultTwo = builder.build();
-        results.add(resultTwo);
-
-        // Intent Three
-        builder.addTitle(titleOne)
-                .addSummary(summaryOne)
-                .addPayload(intentPayload);
-        SearchResult resultThree = builder.build();
-        results.add(resultThree);
-
-        loader = new DatabaseResultLoader(mContext, "", null);
-        loader.removeDuplicates(results);
-        assertThat(results.size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseTwoWords_firstWordMatches_ranksHigher() {
-        final String caseOne = "Apple pear";
-        final String caseTwo = "Banana apple";
-        insertSpecialCase(caseOne);
-        insertSpecialCase(caseTwo);
-        loader = new DatabaseResultLoader(mContext, "App", null);
-        List<? extends SearchResult> results = loader.loadInBackground();
-
-        assertThat(results.get(0).title).isEqualTo(caseOne);
-        assertThat(results.get(1).title).isEqualTo(caseTwo);
-        assertThat(results.get(0).rank).isLessThan(results.get(1).rank);
-    }
-
-    private void insertSpecialCase(String specialCase) {
-        String normalized = DatabaseIndexingUtils.normalizeHyphen(specialCase);
-        normalized = DatabaseIndexingUtils.normalizeString(normalized);
-
-        ContentValues values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, normalized.hashCode());
-        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, specialCase);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, normalized);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
-                "com.android.settings.gestures.GestureSettings");
-        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power");
-        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, (String) null);
-
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-    }
-
-    private void setUpDb() {
-        ContentValues values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "alpha_title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "alpha title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "alpha_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "alpha summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "alpha_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "alpha summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "alpha entries");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "alpha keywords");
-        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
-                "com.android.settings.gestures.GestureSettings");
-        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power");
-        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, (String) null);
-
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-
-        values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "bravo_title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "bravo title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "bravo_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "bravo summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "bravo_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "bravo summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "bravo entries");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "bravo keywords");
-        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
-                "com.android.settings.gestures.GestureSettings");
-        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power");
-        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, (String) null);
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-
-        values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 2);
-        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "charlie_title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "charlie title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "charlie_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "charlie summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "charlie_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "charlie summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "charlie entries");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "charlie keywords");
-        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
-                "com.android.settings.gestures.GestureSettings");
-        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, false);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power");
-        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, (String) null);
-
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
new file mode 100644
index 0000000..1a37dec
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.security;
+
+
+import android.content.DialogInterface;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.ShadowEventLogWriter;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.FragmentController;
+
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ConfigureKeyGuardDialogTest {
+
+    @Test
+    @Config(shadows = ShadowEventLogWriter.class)
+    public void displayDialog_clickPositiveButton_launchSetNewPassword() {
+        final FragmentController<ConfigureKeyGuardDialog> fragmentController =
+                Robolectric.buildFragment(ConfigureKeyGuardDialog.class);
+        final ConfigureKeyGuardDialog fragment = spy(fragmentController.get());
+        doNothing().when(fragment).startPasswordSetup();
+        fragmentController.attach().create().start().resume();
+        fragment.onClick(null /* dialog */, DialogInterface.BUTTON_POSITIVE);
+        fragment.onDismiss(null /* dialog */);
+
+        verify(fragment).startPasswordSetup();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
index c6a0e53..b6487f1 100644
--- a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.security;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.XmlTestUtils;
 
diff --git a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
index d81768a..8406d90 100644
--- a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
@@ -23,8 +23,7 @@
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.OwnerInfoSettings;
-import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedPreference;
diff --git a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
index 9cc33a3..8c5e8e5 100644
--- a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
@@ -27,7 +27,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.util.Pair;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.R;
 import com.android.settings.TestConfig;
 import com.android.settingslib.drawer.DashboardCategory;
diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
index ad035bd..574894e 100644
--- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
+++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
@@ -16,17 +16,13 @@
 
 package com.android.settings.suggestions;
 
-import static com.android.settings.TestConfig.MANIFEST_PATH;
-import static com.google.common.truth.Truth.assertThat;
-
 import android.annotation.StringRes;
 import android.content.Context;
+
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -36,59 +32,78 @@
 import org.robolectric.manifest.IntentFilterData;
 import org.robolectric.shadows.ShadowApplication;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static com.android.settings.TestConfig.MANIFEST_PATH;
+import static com.google.common.truth.Truth.assertThat;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SettingsSuggestionsTest {
 
-  @Test
-  public void zenModeAutomationSuggestion_isValid() {
-    assertSuggestionEquals("Settings$ZenModeAutomationSuggestionActivity",
-        R.string.zen_mode_automation_suggestion_title,
-        R.string.zen_mode_automation_suggestion_summary);
-  }
+    private static final String CATEGORY_FIRST_IMPRESSION =
+            "com.android.settings.suggested.category.FIRST_IMPRESSION";
 
-  @Test
-  public void wallpaperSuggestion_isValid() {
-    assertSuggestionEquals("com.android.settings.wallpaper.WallpaperSuggestionActivity",
-        R.string.wallpaper_suggestion_title, R.string.wallpaper_suggestion_summary);
-  }
+    private static final String CATEGORY_SETTINGS_ONLY =
+            "com.android.settings.suggested.category.SETTINGS_ONLY";
 
-  @Test
-  public void fingerprintSuggestion_isValid() {
-    assertSuggestionEquals("com.android.settings.Settings$FingerprintSuggestionActivity",
-        R.string.suggestion_additional_fingerprints,
-        R.string.suggestion_additional_fingerprints_summary);
-  }
-
-  @Test
-  public void wifiCallingSuggestion_isValid() {
-    assertSuggestionEquals("Settings$WifiCallingSuggestionActivity",
-        R.string.wifi_calling_suggestion_title, R.string.wifi_calling_suggestion_summary);
-  }
-
-  private void assertSuggestionEquals(String activityName, @StringRes int title,
-      @StringRes int summary) {
-    final AndroidManifest androidManifest = ShadowApplication.getInstance().getAppManifest();
-    final ActivityData activityData = androidManifest.getActivityData(activityName);
-    final Map<String, Object> metaData = activityData.getMetaData().getValueMap();
-    final Context context = RuntimeEnvironment.application;
-    final String expectedTitle = context.getString(title);
-    final String expectedSummary = context.getString(summary);
-
-    final String pName= context.getPackageName();
-    final String actualTitle = context.getString(context.getResources().getIdentifier(
-        ((String) metaData.get("com.android.settings.title")).substring(8), "string", pName));
-    final String actualSummary = context.getString(context.getResources().getIdentifier(
-        ((String) metaData.get("com.android.settings.summary")).substring(8), "string", pName));
-    assertThat(actualTitle).isEqualTo(expectedTitle);
-    assertThat(actualSummary).isEqualTo(expectedSummary);
-
-    final List<IntentFilterData> intentFilters = activityData.getIntentFilters();
-    final List<String> categories = new ArrayList<>();
-    for (IntentFilterData intentFilter : intentFilters) {
-      categories.addAll(intentFilter.getCategories());
+    @Test
+    public void zenModeAutomationSuggestion_isValid() {
+        assertSuggestionEquals("Settings$ZenModeAutomationSuggestionActivity",
+                CATEGORY_FIRST_IMPRESSION,
+                R.string.zen_mode_automation_suggestion_title,
+                R.string.zen_mode_automation_suggestion_summary);
     }
 
-    assertThat(categories).contains("com.android.settings.suggested.category.SETTINGS_ONLY");
-  }
+    @Test
+    public void wallpaperSuggestion_isValid() {
+        assertSuggestionEquals("com.android.settings.wallpaper.WallpaperSuggestionActivity",
+                CATEGORY_FIRST_IMPRESSION,
+                R.string.wallpaper_suggestion_title, R.string.wallpaper_suggestion_summary);
+    }
+
+    @Test
+    public void fingerprintSuggestion_isValid() {
+        assertSuggestionEquals("com.android.settings.Settings$FingerprintSuggestionActivity",
+                CATEGORY_FIRST_IMPRESSION,
+                R.string.suggestion_additional_fingerprints,
+                R.string.suggestion_additional_fingerprints_summary);
+    }
+
+    @Test
+    public void wifiCallingSuggestion_isValid() {
+        assertSuggestionEquals("Settings$WifiCallingSuggestionActivity",
+                CATEGORY_FIRST_IMPRESSION,
+                R.string.wifi_calling_suggestion_title, R.string.wifi_calling_suggestion_summary);
+    }
+
+    private void assertSuggestionEquals(String activityName, String category, @StringRes int title,
+            @StringRes int summary) {
+        final AndroidManifest androidManifest = ShadowApplication.getInstance().getAppManifest();
+        final ActivityData activityData = androidManifest.getActivityData(activityName);
+        final Map<String, Object> metaData = activityData.getMetaData().getValueMap();
+        final Context context = RuntimeEnvironment.application;
+        final String expectedTitle = context.getString(title);
+        final String expectedSummary = context.getString(summary);
+
+        final String pName = context.getPackageName();
+        final String actualTitle = context.getString(context.getResources().getIdentifier(
+                ((String) metaData.get("com.android.settings.title")).substring(8), "string",
+                pName));
+        final String actualSummary = context.getString(context.getResources().getIdentifier(
+                ((String) metaData.get("com.android.settings.summary")).substring(8), "string",
+                pName));
+        assertThat(actualTitle).isEqualTo(expectedTitle);
+        assertThat(actualSummary).isEqualTo(expectedSummary);
+
+        final List<IntentFilterData> intentFilters = activityData.getIntentFilters();
+        final List<String> categories = new ArrayList<>();
+        for (IntentFilterData intentFilter : intentFilters) {
+            categories.addAll(intentFilter.getCategories());
+        }
+
+        assertThat(categories).contains(category);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java
new file mode 100644
index 0000000..dc0f5fd
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java
@@ -0,0 +1,115 @@
+/*
+ * 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.support;
+
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ResolveInfo;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.res.builder.RobolectricPackageManager;
+
+import static com.android.settings.support.NewDeviceIntroSuggestionActivity
+        .PERMANENT_DISMISS_THRESHOLD;
+import static com.android.settings.support.NewDeviceIntroSuggestionActivity
+        .PREF_KEY_SUGGGESTION_COMPLETE;
+import static com.android.settings.support.NewDeviceIntroSuggestionActivity
+        .PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME;
+import static com.android.settings.support.NewDeviceIntroSuggestionActivity.isSuggestionComplete;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class NewDeviceIntroSuggestionActivityTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mMockContext;
+
+    private FakeFeatureFactory mFeatureFactory;
+    private Context mContext;
+    private RobolectricPackageManager mRobolectricPackageManager;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mFeatureFactory = FakeFeatureFactory.setupForTest(mMockContext);
+        mContext = RuntimeEnvironment.application;
+        mRobolectricPackageManager = RuntimeEnvironment.getRobolectricPackageManager();
+
+        when(mFeatureFactory.suggestionsFeatureProvider.getSharedPrefs(any(Context.class)))
+                .thenReturn(getSharedPreferences());
+    }
+
+    @Test
+    public void isSuggestionComplete_suggestionExpired_shouldReturnTrue() {
+        final long currentTime = System.currentTimeMillis();
+
+        getSharedPreferences().edit().putLong(PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME,
+                currentTime - 2 * PERMANENT_DISMISS_THRESHOLD);
+        assertThat(isSuggestionComplete(mContext))
+                .isTrue();
+    }
+
+    @Test
+    public void isSuggestionComplete_noUrl_shouldReturnTrue() {
+        when(mFeatureFactory.supportFeatureProvider.getNewDeviceIntroUrl(any(Context.class)))
+                .thenReturn(null);
+        assertThat(isSuggestionComplete(mContext))
+                .isTrue();
+    }
+
+    @Test
+    public void isSuggestionComplete_alreadyLaunchedBefore_shouldReturnTrue() {
+        when(mFeatureFactory.supportFeatureProvider.getNewDeviceIntroUrl(any(Context.class)))
+                .thenReturn("https://com.android.settings");
+
+        getSharedPreferences().edit().putBoolean(PREF_KEY_SUGGGESTION_COMPLETE, true).commit();
+
+        assertThat(isSuggestionComplete(mContext))
+                .isTrue();
+    }
+
+    @Test
+    public void isSuggestionComplete_notExpiredAndCanOpenUrlInBrowser_shouldReturnFalse() {
+        when(mFeatureFactory.supportFeatureProvider.getNewDeviceIntroUrl(any(Context.class)))
+                .thenReturn("https://com.android.settings");
+
+        final Intent intent = NewDeviceIntroSuggestionActivity.getLaunchIntent(mContext);
+        mRobolectricPackageManager.addResolveInfoForIntent(intent, new ResolveInfo());
+        assertThat(isSuggestionComplete(mContext)).isFalse();
+    }
+
+    private SharedPreferences getSharedPreferences() {
+        return mContext.getSharedPreferences("test_new_device_sugg", Context.MODE_PRIVATE);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
index 7c1d587..28b0a9d 100644
--- a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
+++ b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
@@ -17,7 +17,7 @@
 package com.android.settings.support;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
new file mode 100644
index 0000000..2c59ba7
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
@@ -0,0 +1,80 @@
+/*
+ * 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.support;
+
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.search.SearchIndexableRaw;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SupportDashboardActivityTest {
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+    }
+
+    @Test
+    public void shouldIndexSearchActivityForSearch() {
+        final List<SearchIndexableRaw> indexables =
+                SupportDashboardActivity.SEARCH_INDEX_DATA_PROVIDER
+                        .getRawDataToIndex(mContext, true /* enabled */);
+
+        assertThat(indexables).hasSize(1);
+
+        final SearchIndexableRaw value = indexables.get(0);
+
+        assertThat(value.title).isEqualTo(mContext.getString(R.string.page_tab_title_support));
+        assertThat(value.screenTitle).isEqualTo(mContext.getString(R.string.settings_label));
+        assertThat(value.intentTargetPackage).isEqualTo(mContext.getPackageName());
+        assertThat(value.intentTargetClass).isEqualTo(SupportDashboardActivity.class.getName());
+        assertThat(value.intentAction).isEqualTo(Intent.ACTION_MAIN);
+    }
+
+    @Test
+    public void shouldHandleIntentAction() {
+        RuntimeEnvironment.getRobolectricPackageManager().setQueryIntentImplicitly(true);
+        // Intent action used by setup wizard to start support settings
+        Intent intent = new Intent("com.android.settings.action.SUPPORT_SETTINGS");
+        ResolveInfo resolveInfo = RuntimeEnvironment.getPackageManager().resolveActivity(
+                intent,
+                PackageManager.MATCH_DEFAULT_ONLY);
+        assertThat(resolveInfo).isNotNull();
+        assertThat(resolveInfo.activityInfo.targetActivity)
+                .isEqualTo(SupportDashboardActivity.class.getName());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java b/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java
index 8f0484d..8cc05e0 100644
--- a/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java
@@ -12,7 +12,7 @@
 import android.widget.CheckBox;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.SupportFeatureProvider;
diff --git a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
index 73fe09e..116b63c 100644
--- a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
+++ b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
@@ -14,7 +14,7 @@
 import android.content.Context;
 import android.content.IntentFilter;
 import android.support.v4.content.LocalBroadcastManager;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.overlay.SurveyFeatureProvider;
diff --git a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
index bf0005c..b9c34f3 100644
--- a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
@@ -24,7 +24,7 @@
 import android.os.UserManager;
 import android.provider.Settings;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
 import com.android.settings.testutils.shadow.ShadowUtils;
diff --git a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
index 483dee7..19f8ee2 100644
--- a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.ShadowUserManager;
diff --git a/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java b/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java
index 8fbe1c9..7472996 100644
--- a/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java
@@ -16,13 +16,18 @@
 
 package com.android.settings.testutils;
 
+import android.content.Context;
+
 import com.android.settings.search.IndexDatabaseHelper;
 
 import java.lang.reflect.Field;
 
 public class DatabaseTestUtils {
 
-    public static void clearDb() {
+    public static void clearDb(Context context) {
+        IndexDatabaseHelper helper = IndexDatabaseHelper.getInstance(context);
+        helper.close();
+
         Field instance;
         Class clazz = IndexDatabaseHelper.class;
         try {
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
index 68333e7..8be2496 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -18,6 +18,7 @@
 import android.content.Context;
 
 import com.android.settings.applications.ApplicationFeatureProvider;
+import com.android.settings.bluetooth.BluetoothFeatureProvider;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
@@ -28,7 +29,7 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.overlay.SupportFeatureProvider;
 import com.android.settings.security.SecurityFeatureProvider;
-import com.android.settings.search2.SearchFeatureProvider;
+import com.android.settings.search.SearchFeatureProvider;
 import com.android.settings.overlay.SurveyFeatureProvider;
 import com.android.settings.users.UserFeatureProvider;
 
@@ -55,13 +56,14 @@
     public final SuggestionFeatureProvider suggestionsFeatureProvider;
     public final UserFeatureProvider userFeatureProvider;
     public final AssistGestureFeatureProvider assistGestureFeatureProvider;
+    public final BluetoothFeatureProvider bluetoothFeatureProvider;
 
     /**
      * Call this in {@code @Before} method of the test class to use fake factory.
      *
      * @param context The context must be a deep mock.
      */
-    public static void setupForTest(Context context) {
+    public static FakeFeatureFactory setupForTest(Context context) {
         sFactory = null;
         when(context.getString(com.android.settings.R.string.config_featureFactory))
                 .thenReturn(FakeFeatureFactory.class.getName());
@@ -71,6 +73,7 @@
         } catch (ClassNotFoundException e) {
             // Ignore.
         }
+        return (FakeFeatureFactory) FakeFeatureFactory.getFactory(context);
     }
 
     /**
@@ -90,6 +93,7 @@
         suggestionsFeatureProvider = mock(SuggestionFeatureProvider.class);
         userFeatureProvider = mock(UserFeatureProvider.class);
         assistGestureFeatureProvider = mock(AssistGestureFeatureProvider.class);
+        bluetoothFeatureProvider = mock(BluetoothFeatureProvider.class);
     }
 
     @Override
@@ -153,6 +157,11 @@
     }
 
     @Override
+    public BluetoothFeatureProvider getBluetoothFeatureProvider(Context context) {
+        return bluetoothFeatureProvider;
+    }
+
+    @Override
     public AssistGestureFeatureProvider getAssistGestureFeatureProvider() {
         return assistGestureFeatureProvider;
     }
diff --git a/tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
similarity index 70%
rename from tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java
rename to tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
index a991e7a..91bfff2 100644
--- a/tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java
+++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings;
+package com.android.settings.testutils;
 
 import android.app.Fragment;
 import android.content.Intent;
@@ -32,6 +32,8 @@
 import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
 import static org.robolectric.Robolectric.getShadowsAdapter;
 
+import com.android.settings.SettingsActivity;
+
 /**
  * Custom test runner for the testing of BluetoothPairingDialogs. This is needed because the
  * default behavior for robolectric is just to grab the resource directory in the target package.
@@ -65,34 +67,7 @@
             @Override
             public List<ResourcePath> getIncludedResourcePaths() {
                 List<ResourcePath> paths = super.getIncludedResourcePaths();
-                paths.add(new ResourcePath(
-                        getPackageName(),
-                        Fs.fileFromPath("./packages/apps/Settings/res"),
-                        null));
-                paths.add(new ResourcePath(
-                        getPackageName(),
-                        Fs.fileFromPath("./frameworks/base/packages/SettingsLib/res"),
-                        null));
-                paths.add(new ResourcePath(
-                        getPackageName(),
-                        Fs.fileFromPath("./frameworks/base/core/res/res"),
-                        null));
-                paths.add(new ResourcePath(
-                        getPackageName(),
-                        Fs.fileFromPath("./frameworks/opt/setupwizard/library/main/res"),
-                        null));
-                paths.add(new ResourcePath(
-                        getPackageName(),
-                        Fs.fileFromPath("./frameworks/opt/setupwizard/library/eclair-mr1/res"),
-                        null));
-                paths.add(new ResourcePath(
-                        getPackageName(),
-                        Fs.fileFromPath("./frameworks/opt/setupwizard/library/full-support/res"),
-                        null));
-                paths.add(new ResourcePath(
-                        getPackageName(),
-                        Fs.fileFromPath("./frameworks/support/v7/appcompat/res"),
-                        null));
+                SettingsRobolectricTestRunner.getIncludedResourcePaths(getPackageName(), paths);
                 return paths;
             }
         };
@@ -102,6 +77,41 @@
         return manifest;
     }
 
+    public static void getIncludedResourcePaths(String packageName, List<ResourcePath> paths) {
+        paths.add(new ResourcePath(
+                packageName,
+                Fs.fileFromPath("./packages/apps/Settings/res"),
+                null));
+        paths.add(new ResourcePath(
+                packageName,
+                Fs.fileFromPath("./frameworks/base/packages/SettingsLib/res"),
+                null));
+        paths.add(new ResourcePath(
+                packageName,
+                Fs.fileFromPath("./frameworks/base/core/res/res"),
+                null));
+        paths.add(new ResourcePath(
+                packageName,
+                Fs.fileFromPath("./frameworks/opt/setupwizard/library/main/res"),
+                null));
+        paths.add(new ResourcePath(
+                packageName,
+                Fs.fileFromPath("./frameworks/opt/setupwizard/library/gingerbread/res"),
+                null));
+        paths.add(new ResourcePath(
+                packageName,
+                Fs.fileFromPath("./frameworks/opt/setupwizard/library/recyclerview/res"),
+                null));
+        paths.add(new ResourcePath(
+                packageName,
+                Fs.fileFromPath("./frameworks/support/v7/appcompat/res"),
+                null));
+        paths.add(new ResourcePath(
+                packageName,
+                Fs.fileFromPath("./frameworks/support/v7/cardview/res"),
+                null));
+    }
+
     // A simple utility class to start a Settings fragment with an intent. The code here is almost
     // the same as FragmentTestUtil.startFragment except that it starts an activity with an intent.
     public static void startSettingsFragment(
diff --git a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java b/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java
index f9d5439..4f560022 100644
--- a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java
@@ -7,7 +7,7 @@
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Xml;
-import com.android.settings.search2.XmlParserUtils;
+import com.android.settings.search.XmlParserUtils;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java
new file mode 100644
index 0000000..00aa9ec
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java
@@ -0,0 +1,44 @@
+/*
+ * 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.testutils.shadow;
+
+import android.bluetooth.BluetoothDevice;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import org.robolectric.shadows.ShadowBluetoothDevice;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(BluetoothDevice.class)
+public class SettingsShadowBluetoothDevice {
+    private String mAddress;
+
+    public void __constructor__(String address) {
+        mAddress = address;
+    }
+
+    @Implementation
+    public String getAddress() {
+        return mAddress;
+    }
+
+    @Implementation
+    public int hashCode() {
+        return mAddress.hashCode();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
index cb02d3e..d4b0ff7 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
@@ -137,6 +137,16 @@
                 realResources, Resources.class, "getInteger", ClassParameter.from(int.class, id));
     }
 
+    @Implementation
+    public boolean getBoolean(int id) {
+        final Object override = sResourceOverrides.get(id);
+        if (override instanceof Boolean) {
+            return (boolean) override;
+        }
+        return Shadow.directlyOn(realResources, Resources.class, "getBoolean",
+                ClassParameter.from(int.class, id));
+    }
+
     @Implements(Theme.class)
     public static class SettingsShadowTheme extends ShadowTheme {
 
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java
index 724b9c0..f824297 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java
@@ -19,7 +19,7 @@
 
 import android.content.Context;
 import android.content.pm.ResolveInfo;
-import com.android.settings.search2.DatabaseIndexingUtils;
+import com.android.settings.search.DatabaseIndexingUtils;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java
new file mode 100644
index 0000000..4ec48d3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java
@@ -0,0 +1,49 @@
+/*
+ * 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.testutils.shadow;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.view.View;
+
+import com.android.settings.widget.EntityHeaderController;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.Resetter;
+
+@Implements(value = EntityHeaderController.class, callThroughByDefault = false)
+public class ShadowEntityHeaderController {
+
+    private static EntityHeaderController sMockController;
+
+    public static void setUseMock(EntityHeaderController mockController) {
+        sMockController = mockController;
+    }
+
+    @Resetter
+    public static void reset() {
+        sMockController = null;
+    }
+
+    @Implementation
+    public static EntityHeaderController newInstance(Activity activity, Fragment fragment,
+            View header) {
+        return sMockController;
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyValueListParserWrapperImpl.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyValueListParserWrapperImpl.java
new file mode 100644
index 0000000..0af9c30
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyValueListParserWrapperImpl.java
@@ -0,0 +1,20 @@
+package com.android.settings.testutils.shadow;
+
+import com.android.settings.fuelgauge.anomaly.KeyValueListParserWrapperImpl;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+/**
+ * Shadow for {@link KeyValueListParserWrapperImpl} so we could implement
+ * {@link #getBoolean(String, boolean)} that doesn't support in the current
+ * robolectric
+ */
+@Implements(KeyValueListParserWrapperImpl.class)
+public class ShadowKeyValueListParserWrapperImpl {
+
+    @Implementation
+    public boolean getBoolean(String key, boolean defaultValue) {
+        return defaultValue;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManagerWrapper.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManagerWrapper.java
new file mode 100644
index 0000000..7aa28fa
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManagerWrapper.java
@@ -0,0 +1,46 @@
+/*
+ * 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.testutils.shadow;
+
+import com.android.settings.display.PowerManagerWrapper;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(PowerManagerWrapper.class)
+public class ShadowPowerManagerWrapper {
+
+    @Implementation
+    public int getMinimumScreenBrightnessSetting() {
+        return 0;
+    }
+
+    @Implementation
+    public int getMaximumScreenBrightnessSetting() {
+        return 0;
+    }
+
+    @Implementation
+    public int getMinimumScreenBrightnessForVrSetting() {
+        return 0;
+    }
+
+    @Implementation
+    public int getMaximumScreenBrightnessForVrSetting() {
+        return 0;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSystemSettings.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSystemSettings.java
new file mode 100644
index 0000000..e50a769
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSystemSettings.java
@@ -0,0 +1,76 @@
+/*
+ * 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.testutils.shadow;
+
+
+import android.content.ContentResolver;
+import android.provider.Settings;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Implements(Settings.System.class)
+public class ShadowSystemSettings {
+
+    private static final Map<String, Object> sValueMap = new HashMap<>();
+
+    @Implementation
+    public static boolean putInt(ContentResolver resolver, String name, int value) {
+        sValueMap.put(name, value);
+        return true;
+    }
+
+    @Implementation
+    public static boolean putString(ContentResolver resolver, String name, String value) {
+        sValueMap.put(name, value);
+        return true;
+    }
+
+    @Implementation
+    public static String getString(ContentResolver resolver, String name) {
+        return (String) sValueMap.get(name);
+    }
+
+    @Implementation
+    public static String getStringForUser(ContentResolver resolver, String name, int userHandle) {
+        return getString(resolver, name);
+    }
+
+    @Implementation
+    public static boolean putIntForUser(ContentResolver cr, String name, int value,
+            int userHandle) {
+        return putInt(cr, name, value);
+    }
+
+    @Implementation
+    public static int getIntForUser(ContentResolver cr, String name, int def, int userHandle) {
+        return getInt(cr, name, def);
+    }
+
+    @Implementation
+    public static int getInt(ContentResolver resolver, String name, int defaultValue) {
+        Integer value = (Integer) sValueMap.get(name);
+        return value == null ? defaultValue : value;
+    }
+
+    public static void reset() {
+        sValueMap.clear();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/trustagent/TrustAgentFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/trustagent/TrustAgentFeatureProviderImplTest.java
index 87f5ecd..b181253 100644
--- a/tests/robotests/src/com/android/settings/trustagent/TrustAgentFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/trustagent/TrustAgentFeatureProviderImplTest.java
@@ -20,7 +20,7 @@
 import android.content.pm.ServiceInfo;
 import android.content.pm.PackageManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
index c794cdd..e1bc157 100644
--- a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
@@ -20,7 +20,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java
index 031cd77..5b31a82 100644
--- a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java
@@ -24,7 +24,7 @@
 import android.os.UserHandle;
 import android.view.View;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.RestrictedPreferenceHelper;
 
diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
index ed95175..a578364 100644
--- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
@@ -21,7 +21,7 @@
 import android.os.UserManager;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SummaryLoader;
 
diff --git a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
index eb5be8f..690c292 100644
--- a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
+++ b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/utils/ThreadUtilsTest.java b/tests/robotests/src/com/android/settings/utils/ThreadUtilsTest.java
deleted file mode 100644
index 4267ed1..0000000
--- a/tests/robotests/src/com/android/settings/utils/ThreadUtilsTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2016 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 com.android.settings.TestConfig;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.fail;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ThreadUtilsTest {
-
-    @Test
-    public void testMainThread() throws InterruptedException {
-        assertThat(ThreadUtils.isMainThread()).isTrue();
-        Thread background = new Thread(new Runnable() {
-            public void run() {
-                assertThat(ThreadUtils.isMainThread()).isFalse();
-            }
-        });
-        background.start();
-        background.join();
-    }
-
-    @Test
-    public void testEnsureMainThread() throws InterruptedException {
-        ThreadUtils.ensureMainThread();
-        Thread background = new Thread(new Runnable() {
-            public void run() {
-                try {
-                    ThreadUtils.ensureMainThread();
-                    fail("Should not pass ensureMainThread in a background thread");
-                } catch (RuntimeException e) {
-                }
-            }
-        });
-        background.start();
-        background.join();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java
index 088bfae..4b4f3fb 100644
--- a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java
@@ -22,7 +22,7 @@
 import android.app.Fragment;
 import android.content.pm.PackageInfo;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
index 582f9fb..2926727 100644
--- a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.vpn2;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
index 494492e..dd93938 100644
--- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
@@ -20,7 +20,7 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.SubSettings;
 import com.android.settings.TestConfig;
 
diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
index 655f354..e535445 100644
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
+++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
@@ -16,20 +16,6 @@
 
 package com.android.settings.webview;
 
-import static android.provider.Settings.ACTION_WEBVIEW_SETTINGS;
-import static com.google.common.truth.Truth.assertThat;
-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.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -40,10 +26,12 @@
 import android.content.pm.UserInfo;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.applications.defaultapps.DefaultAppInfo;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.widget.RadioButtonPreference;
 
 import org.junit.Before;
@@ -58,6 +46,20 @@
 
 import java.util.Arrays;
 
+import static android.provider.Settings.ACTION_WEBVIEW_SETTINGS;
+import static com.google.common.truth.Truth.assertThat;
+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.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class WebViewAppPickerTest {
@@ -87,6 +89,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mActivity);
         when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
 
         mPicker = new WebViewAppPicker();
@@ -96,7 +99,8 @@
         doReturn(mActivity).when(mPicker).getActivity();
 
         ReflectionHelpers.setField(mPicker, "mPm", mPackageManager);
-
+        ReflectionHelpers.setField(mPicker, "mMetricsFeatureProvider",
+                mock(MetricsFeatureProvider.class));
         mWvusWrapper = mock(WebViewUpdateServiceWrapper.class);
         mPicker.setWebViewUpdateServiceWrapper(mWvusWrapper);
     }
diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java
index d32f486..5ce21e8 100644
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
index de097fc..df45ad5 100644
--- a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
@@ -23,7 +23,7 @@
 import android.net.wifi.p2p.WifiP2pManager;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SummaryLoader;
 
diff --git a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
new file mode 100644
index 0000000..2fbf03e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
@@ -0,0 +1,89 @@
+/*
+ * 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.widget;
+
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.support.v7.widget.RecyclerView;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.List;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ActionBarShadowControllerTest {
+
+    @Mock
+    private RecyclerView mRecyclerView;
+    @Mock
+    private Activity mActivity;
+    @Mock
+    private ActionBar mActionBar;
+    private Lifecycle mLifecycle;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mActivity.getActionBar()).thenReturn(mActionBar);
+        mLifecycle = new Lifecycle();
+    }
+
+    @Test
+    public void attachToRecyclerView_shouldAddScrollWatcherAndUpdateActionBar() {
+        when(mRecyclerView.canScrollVertically(-1)).thenReturn(false);
+
+        ActionBarShadowController.attachToRecyclerView(mActivity, mLifecycle, mRecyclerView);
+
+        verify(mActionBar).setElevation(0);
+    }
+
+
+    @Test
+    public void attachToRecyclerView_lifecycleChange_shouldAttachDetach() {
+        ActionBarShadowController.attachToRecyclerView(mActivity, mLifecycle, mRecyclerView);
+
+        List<LifecycleObserver> observers = ReflectionHelpers.getField(mLifecycle, "mObservers");
+        assertThat(observers).hasSize(1);
+        verify(mRecyclerView).addOnScrollListener(any());
+
+        mLifecycle.onStop();
+        verify(mRecyclerView).removeOnScrollListener(any());
+
+        mLifecycle.onStart();
+        verify(mRecyclerView, times(2)).addOnScrollListener(any());
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java b/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java
index cf4be56..7fcf328 100644
--- a/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java
+++ b/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.widget;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.After;
diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
new file mode 100644
index 0000000..49d5e7d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
@@ -0,0 +1,342 @@
+/*
+ * Copyright (C) 2016 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.widget;
+
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.ResolveInfo;
+import android.graphics.drawable.ColorDrawable;
+import android.os.UserHandle;
+import android.support.v7.preference.Preference;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.LayoutPreference;
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class EntityHeaderControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Activity mActivity;
+    @Mock
+    private Fragment mFragment;
+
+    private Context mShadowContext;
+    private LayoutInflater mLayoutInflater;
+    private PackageInfo mInfo;
+    private EntityHeaderController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
+        mShadowContext = RuntimeEnvironment.application;
+        when(mActivity.getApplicationContext()).thenReturn(mShadowContext);
+        when(mContext.getApplicationContext()).thenReturn(mContext);
+        when(mFragment.getContext()).thenReturn(mShadowContext);
+        mLayoutInflater = LayoutInflater.from(mShadowContext);
+        mInfo = new PackageInfo();
+        mInfo.versionName = "1234";
+    }
+
+    @Test
+    public void testBuildView_constructedWithoutView_shouldCreateNewView() {
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
+        View view = mController.done(mActivity);
+
+        assertThat(view).isNotNull();
+    }
+
+    @Test
+    public void testBuildView_withContext_shouldBuildPreference() {
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
+        Preference preference = mController.done(mActivity, mShadowContext);
+
+        assertThat(preference instanceof LayoutPreference).isTrue();
+    }
+
+    @Test
+    public void testBuildView_constructedWithView_shouldReturnSameView() {
+        View inputView = mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */);
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, inputView);
+        View view = mController.done(mActivity);
+
+        assertThat(view).isSameAs(inputView);
+    }
+
+    @Test
+    public void bindViews_shouldBindAllData() {
+        final String testString = "test";
+        final View header = mLayoutInflater.inflate(
+                R.layout.settings_entity_header, null /* root */);
+        final TextView label = header.findViewById(R.id.entity_header_title);
+        final TextView version = header.findViewById(R.id.entity_header_summary);
+
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, header);
+        mController.setLabel(testString);
+        mController.setSummary(testString);
+        mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add));
+        mController.done(mActivity);
+
+        assertThat(label.getText()).isEqualTo(testString);
+        assertThat(version.getText()).isEqualTo(testString);
+    }
+
+    @Test
+    public void bindButton_hasAppPref_shouldShowButton() {
+        final ResolveInfo info = new ResolveInfo();
+        info.activityInfo = new ActivityInfo();
+        info.activityInfo.packageName = "123";
+        info.activityInfo.name = "321";
+        final View appLinks = mLayoutInflater
+                .inflate(R.layout.settings_entity_header, null /* root */);
+        when(mActivity.getApplicationContext()).thenReturn(mContext);
+        when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
+                .thenReturn(info);
+
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
+        mController.setButtonActions(
+                EntityHeaderController.ActionType.ACTION_APP_PREFERENCE,
+                EntityHeaderController.ActionType.ACTION_NONE);
+        mController.done(mActivity);
+
+        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
+                .isEqualTo(View.VISIBLE);
+        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
+                .isEqualTo(View.GONE);
+        try {
+            appLinks.findViewById(android.R.id.button1).performClick();
+        } catch (Exception e) {
+            // Ignore exception because the launching intent is fake.
+        }
+        verify(mFragment).startActivity(any(Intent.class));
+    }
+
+    @Test
+    public void bindButton_noAppPref_shouldNotShowButton() {
+        final View appLinks = mLayoutInflater
+                .inflate(R.layout.settings_entity_header, null /* root */);
+        when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
+                .thenReturn(null);
+
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
+        mController.setButtonActions(
+                EntityHeaderController.ActionType.ACTION_APP_PREFERENCE,
+                EntityHeaderController.ActionType.ACTION_NONE);
+        mController.done(mActivity);
+
+        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
+                .isEqualTo(View.GONE);
+        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void bindButton_noAppInfo_shouldNotShowButton() {
+        final View appLinks = mLayoutInflater
+                .inflate(R.layout.settings_entity_header, null /* root */);
+
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
+        mController.setPackageName(null)
+                .setButtonActions(
+                        EntityHeaderController.ActionType.ACTION_APP_INFO,
+                        EntityHeaderController.ActionType.ACTION_NONE);
+        mController.done(mActivity);
+
+        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
+                .isEqualTo(View.GONE);
+        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void bindButton_hasAppInfo_shouldShowButton() {
+        final View appLinks = mLayoutInflater
+                .inflate(R.layout.settings_entity_header, null /* root */);
+        when(mFragment.getActivity()).thenReturn(mock(Activity.class));
+
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
+        mController.setPackageName("123")
+                .setUid(UserHandle.USER_SYSTEM)
+                .setButtonActions(
+                        EntityHeaderController.ActionType.ACTION_APP_INFO,
+                        EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE);
+        mController.done(mActivity);
+
+        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
+                .isEqualTo(View.VISIBLE);
+        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void bindButton_hasAppInfo_shouldHaveContentDescription() {
+        final View appLinks = mLayoutInflater
+                .inflate(R.layout.settings_entity_header, null /* root */);
+        when(mFragment.getActivity()).thenReturn(mock(Activity.class));
+        when(mContext.getString(eq(R.string.application_info_label))).thenReturn("App Info");
+
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
+        mController.setPackageName("123")
+                .setUid(UserHandle.USER_SYSTEM)
+                .setButtonActions(
+                        EntityHeaderController.ActionType.ACTION_APP_INFO,
+                        EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE);
+        mController.done(mActivity);
+
+        assertThat(appLinks.findViewById(android.R.id.button1).getContentDescription().toString())
+                .isEqualTo("App info");
+    }
+
+    @Test
+    public void iconContentDescription_shouldWorkWithSetIcon() {
+        final View view = mLayoutInflater
+                .inflate(R.layout.settings_entity_header, null /* root */);
+        when(mFragment.getActivity()).thenReturn(mock(Activity.class));
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
+        String description = "Fake Description";
+        mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add));
+        mController.setIconContentDescription(description);
+        mController.done(mActivity);
+        assertThat(view.findViewById(R.id.entity_header_icon).getContentDescription().toString())
+                .isEqualTo(description);
+    }
+
+    @Test
+    public void iconContentDescription_shouldWorkWithoutSetIcon() {
+        final View view = mLayoutInflater
+                .inflate(R.layout.settings_entity_header, null /* root */);
+        when(mFragment.getActivity()).thenReturn(mock(Activity.class));
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
+        String description = "Fake Description";
+        mController.setIconContentDescription(description);
+        mController.done(mActivity);
+        assertThat(view.findViewById(R.id.entity_header_icon).getContentDescription().toString())
+                .isEqualTo(description);
+    }
+
+    @Test
+    public void bindButton_hasAppNotifIntent_shouldShowButton() {
+        final View appLinks = mLayoutInflater
+                .inflate(R.layout.settings_entity_header, null /* root */);
+
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
+        mController.setAppNotifPrefIntent(new Intent())
+                .setButtonActions(
+                        EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE,
+                        EntityHeaderController.ActionType.ACTION_NONE);
+        mController.done(mActivity);
+
+        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
+                .isEqualTo(View.VISIBLE);
+        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+
+    // Ensure that the instant app label does not show up when we haven't told the controller the
+    // app is instant.
+    @Test
+    public void instantApps_normalAppsDontGetLabel() {
+        final View header = mLayoutInflater.inflate(
+                R.layout.settings_entity_header, null /* root */);
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, header);
+        mController.done(mActivity);
+
+        assertThat(header.findViewById(R.id.install_type).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+
+    // Test that the "instant apps" label is present in the header when we have an instant app.
+    @Test
+    public void instantApps_expectedHeaderItem() {
+        final View header = mLayoutInflater.inflate(
+                R.layout.settings_entity_header, null /* root */);
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, header);
+        mController.setIsInstantApp(true);
+        mController.done(mActivity);
+        TextView label = header.findViewById(R.id.install_type);
+
+        assertThat(label.getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(label.getText()).isEqualTo(
+                header.getResources().getString(R.string.install_type_instant));
+        assertThat(header.findViewById(R.id.entity_header_summary).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void styleActionBar_invalidObjects_shouldNotCrash() {
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
+        mController.styleActionBar(null);
+
+        when(mActivity.getActionBar()).thenReturn(null);
+        mController.styleActionBar(mActivity);
+
+        verify(mActivity).getActionBar();
+    }
+
+    @Test
+    public void styleActionBar_setElevationAndBackground() {
+        final ActionBar actionBar = mActivity.getActionBar();
+
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
+        mController.styleActionBar(mActivity);
+
+        verify(actionBar).setElevation(0);
+        // Enforce a color drawable as background here, as image based drawables might not be
+        // wide enough to cover entire action bar.
+        verify(actionBar).setBackgroundDrawable(any(ColorDrawable.class));
+    }
+
+    @Test
+    public void initAppHeaderController_appHeaderNull_useFragmentContext() {
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
+
+        // Fragment.getContext() is invoked to inflate the view
+        verify(mFragment).getContext();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java
new file mode 100644
index 0000000..0d9a77b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java
@@ -0,0 +1,80 @@
+/*
+ * 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.widget;
+
+import android.content.Context;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class FixedLineSummaryPreferenceTest {
+
+    @Mock
+    private TextView mSummary;
+
+    private Context mContext;
+    private PreferenceViewHolder mHolder;
+    private FixedLineSummaryPreference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mPreference = new FixedLineSummaryPreference(mContext, null);
+        LayoutInflater inflater = LayoutInflater.from(mContext);
+        final View view = inflater.inflate(mPreference.getLayoutResource(),
+                new LinearLayout(mContext), false);
+        mHolder = spy(PreferenceViewHolder.createInstanceForTests(view));
+        when(mHolder.findViewById(android.R.id.summary)).thenReturn(mSummary);
+    }
+
+    @Test
+    public void onBindViewHolder_shouldSetSingleLine() {
+        mPreference.onBindViewHolder(mHolder);
+
+        verify(mSummary).setMinLines(1);
+        verify(mSummary).setMaxLines(1);
+    }
+
+    @Test
+    public void onBindViewHolder_TwoLineSummary_shouldSetTwoLines() {
+        mPreference.setSummaryLineCount(2);
+        mPreference.onBindViewHolder(mHolder);
+
+        verify(mSummary).setMinLines(2);
+        verify(mSummary).setMaxLines(2);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/widget/FooterPreferenceMixinTest.java b/tests/robotests/src/com/android/settings/widget/FooterPreferenceMixinTest.java
deleted file mode 100644
index 21ebb25..0000000
--- a/tests/robotests/src/com/android/settings/widget/FooterPreferenceMixinTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2016 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.widget;
-
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class FooterPreferenceMixinTest {
-
-    @Mock
-    private PreferenceFragment mFragment;
-    @Mock
-    private PreferenceScreen mScreen;
-
-    private Lifecycle mLifecycle;
-    private FooterPreferenceMixin mMixin;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mLifecycle = new Lifecycle();
-        when(mFragment.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
-        when(mFragment.getPreferenceManager().getContext())
-                .thenReturn(ShadowApplication.getInstance().getApplicationContext());
-        mMixin = new FooterPreferenceMixin(mFragment, mLifecycle);
-    }
-
-    @Test
-    public void createFooter_screenNotAvailable_noCrash() {
-        assertThat(mMixin.createFooterPreference()).isNotNull();
-    }
-
-    @Test
-    public void createFooter_screenAvailable_canAttachToScreen() {
-        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-
-        final FooterPreference preference = mMixin.createFooterPreference();
-
-        assertThat(preference).isNotNull();
-        verify(mScreen).addPreference(preference);
-    }
-
-    @Test
-    public void createFooter_screenAvailableDelayed_canAttachToScreen() {
-        final FooterPreference preference = mMixin.createFooterPreference();
-
-        mLifecycle.setPreferenceScreen(mScreen);
-
-        assertThat(preference).isNotNull();
-        verify(mScreen).addPreference(preference);
-    }
-
-    @Test
-    public void createFooterTwice_screenAvailable_replaceOldFooter() {
-        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-
-        mMixin.createFooterPreference();
-        mMixin.createFooterPreference();
-
-        verify(mScreen).removePreference(any(FooterPreference.class));
-        verify(mScreen, times(2)).addPreference(any(FooterPreference.class));
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/widget/FooterPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FooterPreferenceTest.java
deleted file mode 100644
index 885ac68..0000000
--- a/tests/robotests/src/com/android/settings/widget/FooterPreferenceTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2016 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.widget;
-
-import android.content.Context;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.text.method.LinkMovementMethod;
-import android.view.LayoutInflater;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class FooterPreferenceTest {
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = ShadowApplication.getInstance().getApplicationContext();
-    }
-
-    @Test
-    public void createNewPreference_shouldSetKeyAndOrder() {
-        final FooterPreference preference = new FooterPreference(mContext);
-
-        assertThat(preference.getKey()).isEqualTo(FooterPreference.KEY_FOOTER);
-        assertThat(preference.getOrder()).isEqualTo(FooterPreference.ORDER_FOOTER);
-    }
-
-    @Test
-    public void bindPreference_shouldLinkifyContent() {
-        final FooterPreference preference = new FooterPreference(mContext);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext).inflate(R.layout.preference_footer, null));
-
-        preference.onBindViewHolder(holder);
-        assertThat(((TextView) holder.findViewById(android.R.id.title)).getMovementMethod())
-                .isInstanceOf(LinkMovementMethod.class);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
index 21dc038..1c449cc 100644
--- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
@@ -25,7 +25,7 @@
 import android.widget.Switch;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
index e6d00b3..e314ef3 100644
--- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
@@ -16,21 +16,15 @@
 
 package com.android.settings.widget;
 
-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.app.Activity;
 import android.content.Context;
 import android.os.UserManager;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.defaultapps.DefaultAppInfo;
-import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
+import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -44,6 +38,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
+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;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class RadioButtonPickerFragmentTest {
@@ -61,6 +61,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mActivity);
         mFragment = spy(new TestFragment());
 
         when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
@@ -72,7 +73,6 @@
     public void onAttach_userIsInitialized() {
         mFragment.onAttach((Context) mActivity);
 
-        verify(mActivity).getPackageManager();
         verify(mActivity).getSystemService(Context.USER_SERVICE);
     }
 
@@ -99,7 +99,7 @@
         assertThat(mFragment.setDefaultKeyCalled).isTrue();
     }
 
-    public static class TestFragment extends DefaultAppPickerFragment {
+    public static class TestFragment extends RadioButtonPickerFragment {
 
         boolean setDefaultKeyCalled;
 
diff --git a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java b/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java
index 1a7161c..a1a2f24 100644
--- a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.view.View.MeasureSpec;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
index da7b092..ea27d05 100644
--- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
@@ -21,7 +21,7 @@
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowTextUtils;
 import java.util.Locale;
diff --git a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java
new file mode 100644
index 0000000..5755015
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java
@@ -0,0 +1,83 @@
+/*
+ * 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.widget;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.robolectric.RuntimeEnvironment.application;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.graphics.Rect;
+import android.widget.FrameLayout;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowView;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ScrollToParentEditTextTest {
+
+    private static final int EDIT_TEXT_SIZE = 20;
+    private static final int PARENT_SIZE = 50;
+    private static final int SCROLL_RECT_SIZE = 30;
+
+    private ScrollToParentEditText mEditText;
+    private FrameLayout mParent;
+
+    @Before
+    public void setUp() {
+        mEditText = new ScrollToParentEditText(
+                application,
+                Robolectric.buildAttributeSet().build());
+        mEditText.layout(0, 0, EDIT_TEXT_SIZE, EDIT_TEXT_SIZE);
+
+        mParent = spy(new FrameLayout(application));
+        mParent.layout(0, 0, PARENT_SIZE, PARENT_SIZE);
+
+        doReturn(true).when(mParent).requestRectangleOnScreen(any(Rect.class), anyBoolean());
+    }
+
+    @Test
+    public void requestRectangleOnScreen_noParent_shouldScrollToItself() {
+        assertThat(mEditText.requestRectangleOnScreen(
+                new Rect(0, 0, SCROLL_RECT_SIZE, SCROLL_RECT_SIZE), true)).isFalse();
+    }
+
+    @Test
+    public void requestRectangleOnScreen_withParent_shouldScrollToParent() {
+        ShadowView shadowEditText = shadowOf(mEditText);
+        shadowEditText.setMyParent(mParent);
+
+        assertThat(mEditText.requestRectangleOnScreen(
+                new Rect(0, 0, SCROLL_RECT_SIZE, SCROLL_RECT_SIZE), true)).isTrue();
+        verify(mParent)
+                .requestRectangleOnScreen(eq(new Rect(0, 0, PARENT_SIZE, PARENT_SIZE)), eq(true));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java
index e57d25a..2f42550 100644
--- a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java
@@ -18,14 +18,12 @@
 
 import android.content.Context;
 
-import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 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.RuntimeEnvironment;
@@ -34,7 +32,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
diff --git a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java
index bf564a5..415cd92 100644
--- a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.net.wifi.WifiManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java
index 96cb217..9321827 100644
--- a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java
@@ -27,7 +27,7 @@
 
 import com.android.settings.LinkifyUtils;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
index 75b304e..b83a3e3 100644
--- a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
@@ -28,9 +28,9 @@
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
index 5b55006..60d38b6 100644
--- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
@@ -37,9 +37,9 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.network.NetworkScoreManagerWrapper;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
index 2e57781..b45ea1e 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -23,7 +23,7 @@
 import android.widget.TextView;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
 import com.android.settingslib.wifi.AccessPoint;
@@ -44,10 +44,14 @@
         shadows = ShadowConnectivityManager.class)
 public class WifiConfigControllerTest {
 
-    @Mock private WifiConfigUiBase mConfigUiBase;
-    @Mock private Context mContext;
-    @Mock private View mView;
-    @Mock private AccessPoint mAccessPoint;
+    @Mock
+    private WifiConfigUiBase mConfigUiBase;
+    @Mock
+    private Context mContext;
+    @Mock
+    private View mView;
+    @Mock
+    private AccessPoint mAccessPoint;
 
     public WifiConfigController mController;
 
@@ -73,6 +77,38 @@
         mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
                 WifiConfigUiBase.MODE_CONNECT);
     }
+
+    @Test
+    public void ssidExceeds32Bytes_shouldShowSsidTooLongWarning() {
+        mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */,
+                WifiConfigUiBase.MODE_CONNECT);
+        final TextView ssid = mView.findViewById(R.id.ssid);
+        ssid.setText("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎");
+        mController.showWarningMessagesIfAppropriate();
+
+        assertThat(mView.findViewById(R.id.ssid_too_long_warning).getVisibility())
+                .isEqualTo(View.VISIBLE);
+    }
+
+    @Test
+    public void ssidShorterThan32Bytes_shouldNotShowSsidTooLongWarning() {
+        mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */,
+                WifiConfigUiBase.MODE_CONNECT);
+
+        final TextView ssid = mView.findViewById(R.id.ssid);
+        ssid.setText("123456789012345678901234567890");
+        mController.showWarningMessagesIfAppropriate();
+
+        assertThat(mView.findViewById(R.id.ssid_too_long_warning).getVisibility())
+                .isEqualTo(View.GONE);
+
+        ssid.setText("123");
+        mController.showWarningMessagesIfAppropriate();
+
+        assertThat(mView.findViewById(R.id.ssid_too_long_warning).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+
     @Test
     public void isSubmittable_noSSID_shouldReturnFalse() {
         final TextView ssid = mView.findViewById(R.id.ssid);
@@ -87,13 +123,14 @@
         assertThat(mController.isSubmittable()).isFalse();
 
     }
+
     @Test
     public void isSubmittable_shortPsk_shouldReturnFalse() {
         final TextView password = mView.findViewById(R.id.password);
         password.setText(SHORT_PSK);
         assertThat(mController.isSubmittable()).isFalse();
-
     }
+
     @Test
     public void isSubmittable_goodPsk_shouldReturnTrue() {
         final TextView password = mView.findViewById(R.id.password);
@@ -101,6 +138,7 @@
         assertThat(mController.isSubmittable()).isTrue();
 
     }
+
     @Test
     public void isSubmittable_savedConfigZeroLengthPassword_shouldReturnTrue() {
         final TextView password = mView.findViewById(R.id.password);
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
index 5646470..c7647ba 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
@@ -20,7 +20,7 @@
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.widget.SwitchWidgetController;
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
index 40c480f..1650816 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
@@ -23,9 +23,9 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
index 694fe0e..307cccb 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
@@ -20,12 +20,10 @@
 import android.content.Context;
 import android.content.IntentFilter;
 import android.net.wifi.WifiManager;
-import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.testutils.FakeFeatureFactory;
@@ -43,7 +41,6 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
index 967da08..4507e54 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
@@ -23,7 +23,7 @@
 import android.net.wifi.WifiManager;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
 import com.android.settingslib.wifi.WifiStatusTracker;
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
index 61981c4..6fb0abd 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
@@ -30,10 +30,10 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java
index ac0861e..94cc46b 100644
--- a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java
@@ -31,9 +31,9 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java
index 000f2fa..41b71ad 100644
--- a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java
@@ -22,10 +22,9 @@
 
 import android.app.Activity;
 import android.content.Context;
-import android.net.wifi.WifiManager;
 import android.view.inputmethod.InputMethodManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowNfcAdapter;
 
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
index 2aa338c..d4c6402 100644
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
@@ -17,6 +17,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.inOrder;
@@ -54,13 +55,13 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.vpn2.ConnectivityManagerWrapperImpl;
 import com.android.settings.wifi.WifiDetailPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.wifi.AccessPoint;
 
 import org.junit.Before;
@@ -76,7 +77,6 @@
 import org.robolectric.annotation.Config;
 
 import java.net.Inet4Address;
-import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Arrays;
@@ -200,7 +200,7 @@
         when(mockConnectivityManager.getNetworkInfo(any(Network.class)))
                 .thenReturn(mockNetworkInfo);
         doNothing().when(mockConnectivityManagerWrapper).registerNetworkCallback(
-                any(NetworkRequest.class), mCallbackCaptor.capture(), any(Handler.class));
+                nullable(NetworkRequest.class), mCallbackCaptor.capture(), nullable(Handler.class));
         doNothing().when(mockForgetButton).setOnClickListener(mForgetClickListener.capture());
 
         when(mockWifiInfo.getLinkSpeed()).thenReturn(LINK_SPEED);
@@ -303,7 +303,7 @@
         displayAndResume();
 
         verify(mockConnectivityManagerWrapper, times(1)).registerNetworkCallback(
-                any(NetworkRequest.class), mCallbackCaptor.capture(), any(Handler.class));
+                nullable(NetworkRequest.class), mCallbackCaptor.capture(), nullable(Handler.class));
     }
 
     @Test
@@ -714,6 +714,8 @@
         verify(mockSignInButton).setOnClickListener(captor.capture());
         captor.getValue().onClick(mockSignInButton);
         verify(mockConnectivityManagerWrapper).startCaptivePortalApp(mockNetwork);
+        verify(mockMetricsFeatureProvider)
+                .action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_SIGNIN);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java
new file mode 100644
index 0000000..dd2ef52
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java
@@ -0,0 +1,97 @@
+/*
+ * 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.wifi.p2p;
+
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class P2pCategoryPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private PreferenceCategory mCategory;
+    private P2pCategoryPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mPreferenceScreen.findPreference(anyString())).thenReturn(mCategory);
+
+        mController = new P2pCategoryPreferenceController(RuntimeEnvironment.application) {
+
+            @Override
+            public String getPreferenceKey() {
+                return "test_key";
+            }
+        };
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void isAlwaysAvailable() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+
+    @Test
+    public void removeAllChildren_shouldRemove() {
+        mController.removeAllChildren();
+
+        verify(mCategory).removeAll();
+        verify(mCategory).setVisible(false);
+    }
+
+    @Test
+    public void addChild_shouldAdd() {
+        final Preference pref = new Preference(RuntimeEnvironment.application);
+        mController.addChild(pref);
+
+        verify(mCategory).addPreference(pref);
+        verify(mCategory).setVisible(true);
+    }
+
+    @Test
+    public void shouldToggleEnable() {
+        mController.setEnabled(false);
+
+        verify(mCategory).setEnabled(false);
+
+        mController.setEnabled(true);
+
+        verify(mCategory).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java
new file mode 100644
index 0000000..62fd01f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java
@@ -0,0 +1,82 @@
+/*
+ * 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.wifi.p2p;
+
+
+import android.net.wifi.p2p.WifiP2pDevice;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class P2pThisDevicePreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    private Preference mPreference;
+    private P2pThisDevicePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mPreference = new Preference(RuntimeEnvironment.application);
+        when(mPreferenceScreen.findPreference(anyString())).thenReturn(mPreference);
+
+        mController = new P2pThisDevicePreferenceController(RuntimeEnvironment.application);
+    }
+
+    @Test
+    public void isAlwaysAvailable() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void updateDeviceName_emptyName_shouldUseIpAddress() {
+        WifiP2pDevice device = new WifiP2pDevice();
+        device.deviceAddress = "address";
+        mController.displayPreference(mPreferenceScreen);
+        mController.updateDeviceName(device);
+
+        assertThat(mPreference.getTitle()).isEqualTo(device.deviceAddress);
+    }
+
+    @Test
+    public void updateDeviceName_hasName_shouldUseName() {
+        WifiP2pDevice device = new WifiP2pDevice();
+        device.deviceAddress = "address";
+        device.deviceName = "name";
+        mController.displayPreference(mPreferenceScreen);
+        mController.updateDeviceName(device);
+
+        assertThat(mPreference.getTitle()).isEqualTo(device.deviceName);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
index 06caadf..8946a5e 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
@@ -30,9 +30,9 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/unit/AndroidTest.xml b/tests/unit/AndroidTest.xml
index 80a5a73..b74c1e3 100644
--- a/tests/unit/AndroidTest.xml
+++ b/tests/unit/AndroidTest.xml
@@ -20,7 +20,7 @@
 
     <option name="test-suite-tag" value="apct" />
     <option name="test-tag" value="SettingsUnitTests" />
-    <test class="com.android.tradefed.testtype.InstrumentationTest" >
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.settings.tests.unit" />
         <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
     </test>
diff --git a/tests/unit/src/com/android/settings/CameraLiftTriggerSuggestionActivityTest.java b/tests/unit/src/com/android/settings/CameraLiftTriggerSuggestionActivityTest.java
new file mode 100644
index 0000000..cbf1db8
--- /dev/null
+++ b/tests/unit/src/com/android/settings/CameraLiftTriggerSuggestionActivityTest.java
@@ -0,0 +1,66 @@
+/*
+ * 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;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static android.support.test.espresso.matcher.ViewMatchers.hasSibling;
+import static org.hamcrest.Matchers.allOf;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class CameraLiftTriggerSuggestionActivityTest {
+    private Instrumentation mInstrumentation;
+    private Context mTargetContext;
+
+    @Before
+    public void setUp() throws Exception {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mTargetContext = mInstrumentation.getTargetContext();
+    }
+
+    @Test
+    public void launchCameraLiftTriggerSuggestion_shouldNotCrash() {
+        final Intent cameraTriggerSuggestionIntent = new Intent(mTargetContext,
+                Settings.CameraLiftTriggerSuggestionActivity.class);
+        final boolean cameraLiftTriggerEnabled = mTargetContext.getResources()
+                .getBoolean(R.bool.config_cameraLiftTriggerAvailable);
+
+        if (!cameraLiftTriggerEnabled) {
+            return;
+        }
+
+        mInstrumentation.startActivitySync(cameraTriggerSuggestionIntent);
+
+        onView(allOf(withText(R.string.camera_lift_trigger_title),
+                          hasSibling(withText(R.string.camera_lift_trigger_summary))))
+                .check(matches(isDisplayed()));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/unit/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
new file mode 100644
index 0000000..5e5e143
--- /dev/null
+++ b/tests/unit/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
@@ -0,0 +1,80 @@
+/*
+ * 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.accessibility;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+import android.app.Instrumentation;
+import android.os.Bundle;
+import android.os.Looper;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import com.android.settings.Settings.AccessibilitySettingsActivity;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class ToggleFeaturePreferenceFragmentTest {
+    private static final String SUMMARY_TEXT = "Here's some summary text";
+
+    @Rule
+    public final ActivityTestRule<AccessibilitySettingsActivity> mActivityRule =
+            new ActivityTestRule<>(AccessibilitySettingsActivity.class, true);
+
+    private final Instrumentation mInstrumentation = InstrumentationRegistry.getInstrumentation();
+
+    @BeforeClass
+    public static void oneTimeSetup() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+    }
+
+    @Before
+    public void setUp() {
+        mInstrumentation.runOnMainSync(() -> {
+            MyToggleFeaturePreferenceFragment fragment = new MyToggleFeaturePreferenceFragment();
+            Bundle args = new Bundle();
+            args.putString(AccessibilitySettings.EXTRA_SUMMARY, SUMMARY_TEXT);
+            fragment.setArguments(args);
+            mActivityRule.getActivity().startPreferenceFragment(fragment, false);
+        });
+    }
+
+    @Test
+    public void testSummaryTestDisplayed() {
+        onView(withText(SUMMARY_TEXT)).check(matches(isDisplayed()));
+    }
+
+    public static class MyToggleFeaturePreferenceFragment extends ToggleFeaturePreferenceFragment {
+        @Override
+        protected void onPreferenceToggled(String preferenceKey, boolean enabled) {}
+
+        @Override
+        public int getMetricsCategory() {
+            return 0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/applications/ManageApplicationsLaunchTest.java b/tests/unit/src/com/android/settings/applications/ManageApplicationsLaunchTest.java
new file mode 100644
index 0000000..e074966
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/ManageApplicationsLaunchTest.java
@@ -0,0 +1,56 @@
+/*
+ * 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.applications;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.provider.Settings;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.Matchers.allOf;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ManageApplicationsLaunchTest {
+
+    private Instrumentation mInstrumentation;
+
+    @Before
+    public void setUp() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+    }
+
+    @Test
+    public void launchAppsSettings_shouldShowAppList() throws Exception {
+        final Intent appsSettingsIntent = new
+                Intent(Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS);
+
+        mInstrumentation.startActivitySync(appsSettingsIntent);
+
+        onView(allOf(withText("Calculator"))).check(matches(isDisplayed()));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/ManageApplicationsTest.java b/tests/unit/src/com/android/settings/applications/ManageApplicationsUnitTest.java
similarity index 95%
rename from tests/unit/src/com/android/settings/applications/ManageApplicationsTest.java
rename to tests/unit/src/com/android/settings/applications/ManageApplicationsUnitTest.java
index d207701..c65f9ea 100644
--- a/tests/unit/src/com/android/settings/applications/ManageApplicationsTest.java
+++ b/tests/unit/src/com/android/settings/applications/ManageApplicationsUnitTest.java
@@ -16,11 +16,9 @@
 
 package com.android.settings.applications;
 
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-
 import android.content.pm.ApplicationInfo;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
@@ -30,8 +28,14 @@
 import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
 import java.lang.reflect.Field;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class ManageApplicationsTest {
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ManageApplicationsUnitTest {
     @Test
     public void getCompositeFilter_filtersVolumeForAudio() {
         AppFilter filter =
diff --git a/tests/app/src/com/android/settings/dashboard/FirstIdViewMatcher.java b/tests/unit/src/com/android/settings/dashboard/FirstIdViewMatcher.java
similarity index 100%
rename from tests/app/src/com/android/settings/dashboard/FirstIdViewMatcher.java
rename to tests/unit/src/com/android/settings/dashboard/FirstIdViewMatcher.java
diff --git a/tests/app/src/com/android/settings/dashboard/PreferenceThemeTest.java b/tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java
similarity index 95%
rename from tests/app/src/com/android/settings/dashboard/PreferenceThemeTest.java
rename to tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java
index 22723a6..16e309d 100644
--- a/tests/app/src/com/android/settings/dashboard/PreferenceThemeTest.java
+++ b/tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java
@@ -58,8 +58,7 @@
     @Test
     public void startPhoneStatus_preferenceIconSpaceReserved() throws InterruptedException {
         launchPhoneStatus();
-        onView(withId(R.id.icon_frame)).check(doesNotExist());
-        onView(withFirstId(R.id.icon_container)).check(matches(isDisplayed()));
+        onView(withFirstId(R.id.icon_frame)).check(matches(isDisplayed()));
     }
 
     @Test
diff --git a/tests/unit/src/com/android/settings/ChooseLockSettingsHelperTest.java b/tests/unit/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
similarity index 99%
rename from tests/unit/src/com/android/settings/ChooseLockSettingsHelperTest.java
rename to tests/unit/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
index 218a74e..e534fb6 100644
--- a/tests/unit/src/com/android/settings/ChooseLockSettingsHelperTest.java
+++ b/tests/unit/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
@@ -1,6 +1,13 @@
-package com.android.settings;
+package com.android.settings.password;
 
 
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
@@ -16,13 +23,6 @@
 
 import java.util.List;
 
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 public class ChooseLockSettingsHelperTest extends AndroidTestCase {
 
     private static final String SYSTEM_PROPERTY_DEXMAKER_DEXCACHE = "dexmaker.dexcache";
diff --git a/tests/unit/src/com/android/settings/search/SearchActivityTest.java b/tests/unit/src/com/android/settings/search/SearchActivityTest.java
index 26b097e..8a7e3fe 100644
--- a/tests/unit/src/com/android/settings/search/SearchActivityTest.java
+++ b/tests/unit/src/com/android/settings/search/SearchActivityTest.java
@@ -25,7 +25,6 @@
 import android.support.test.runner.AndroidJUnit4;
 
 import com.android.settings.Settings;
-import com.android.settings.search2.SearchActivity;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java b/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
index c1c5199..c418d45 100644
--- a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
+++ b/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
@@ -15,6 +15,36 @@
  */
 package com.android.settings.wifi;
 
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+import android.net.wifi.WifiSsid;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import com.android.settings.Settings.WifiSettingsActivity;
+import com.android.settingslib.wifi.AccessPoint;
+import com.android.settingslib.wifi.WifiTracker;
+import com.android.settingslib.wifi.WifiTracker.WifiListener;
+import com.android.settingslib.wifi.WifiTrackerFactory;
+
+import com.google.common.collect.Lists;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.List;
+
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
@@ -29,33 +59,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WifiSsid;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import com.android.settings.Settings.WifiSettingsActivity;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTracker.WifiListener;
-import com.android.settingslib.wifi.WifiTrackerFactory;
-import com.google.common.collect.Lists;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.List;
-
 @RunWith(AndroidJUnit4.class)
 public class WifiSettingsUiTest {
 
@@ -76,8 +79,10 @@
     private static final int TEST_RSSI = 123;
     private static final int TEST_NETWORK_ID = 1;
 
-    @Mock private WifiTracker mWifiTracker;
-    @Mock private WifiManager mWifiManager;
+    @Mock
+    private WifiTracker mWifiTracker;
+    @Mock
+    private WifiManager mWifiManager;
     private Context mContext;
     private WifiListener mWifiListener;
 
@@ -136,7 +141,7 @@
 
     private void callOnWifiStateChanged(int state) {
         mActivityRule.getActivity().getMainThreadHandler()
-                .post( () -> mWifiListener.onWifiStateChanged(state) );
+                .post(() -> mWifiListener.onWifiStateChanged(state));
     }
 
     @Test
@@ -152,7 +157,7 @@
     }
 
     @Test
-    public void noSavedNetworks_shouldNotShowSavedNetworksButton() {
+    public void noSavedNetworks_wifiEnabled_shouldNotShowSavedNetworksButton() {
         setWifiState(WifiManager.WIFI_STATE_ENABLED);
         when(mWifiTracker.getNumSavedNetworks()).thenReturn(0);
 
@@ -162,6 +167,16 @@
     }
 
     @Test
+    public void noSavedNetworks_wifiDisabled_shouldNotShowSavedNetworksButton() {
+        setWifiState(WifiManager.WIFI_STATE_DISABLED);
+        when(mWifiTracker.getNumSavedNetworks()).thenReturn(0);
+
+        launchActivity();
+
+        onView(withText(SAVED_NETWORKS)).check(doesNotExist());
+    }
+
+    @Test
     public void savedNetworksExist_shouldShowSavedNetworksButton() {
         setWifiState(WifiManager.WIFI_STATE_ENABLED);
         when(mWifiTracker.getNumSavedNetworks()).thenReturn(1);